| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Dirk Mueller (mueller@kde.org) | 4 * (C) 2000 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) | 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv
ed. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv
ed. |
| 7 * Copyright (C) 2009 Google Inc. All rights reserved. | 7 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) | 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo
bile.com/) |
| 9 * | 9 * |
| 10 * This library is free software; you can redistribute it and/or | 10 * This library is free software; you can redistribute it and/or |
| (...skipping 2782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2793 if (RenderView* renderView = view()) { | 2793 if (RenderView* renderView = view()) { |
| 2794 if (FrameView* frameView = renderView->frameView()) | 2794 if (FrameView* frameView = renderView->frameView()) |
| 2795 frameView->scheduleRelayoutOfSubtree(this); | 2795 frameView->scheduleRelayoutOfSubtree(this); |
| 2796 } | 2796 } |
| 2797 } | 2797 } |
| 2798 } | 2798 } |
| 2799 } | 2799 } |
| 2800 | 2800 |
| 2801 void RenderObject::layout() | 2801 void RenderObject::layout() |
| 2802 { | 2802 { |
| 2803 StackStats::LayoutCheckPoint layoutCheckPoint; | |
| 2804 ASSERT(needsLayout()); | 2803 ASSERT(needsLayout()); |
| 2805 RenderObject* child = firstChild(); | 2804 RenderObject* child = firstChild(); |
| 2806 while (child) { | 2805 while (child) { |
| 2807 child->layoutIfNeeded(); | 2806 child->layoutIfNeeded(); |
| 2808 ASSERT(!child->needsLayout()); | 2807 ASSERT(!child->needsLayout()); |
| 2809 child = child->nextSibling(); | 2808 child = child->nextSibling(); |
| 2810 } | 2809 } |
| 2811 clearNeedsLayout(); | 2810 clearNeedsLayout(); |
| 2812 } | 2811 } |
| 2813 | 2812 |
| (...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3332 { | 3331 { |
| 3333 if (object1) { | 3332 if (object1) { |
| 3334 const WebCore::RenderObject* root = object1; | 3333 const WebCore::RenderObject* root = object1; |
| 3335 while (root->parent()) | 3334 while (root->parent()) |
| 3336 root = root->parent(); | 3335 root = root->parent(); |
| 3337 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3336 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3338 } | 3337 } |
| 3339 } | 3338 } |
| 3340 | 3339 |
| 3341 #endif | 3340 #endif |
| OLD | NEW |