| 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 2824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2835 } else { | 2835 } else { |
| 2836 if (isRooted()) { | 2836 if (isRooted()) { |
| 2837 if (RenderView* renderView = view()) { | 2837 if (RenderView* renderView = view()) { |
| 2838 if (FrameView* frameView = renderView->frameView()) | 2838 if (FrameView* frameView = renderView->frameView()) |
| 2839 frameView->scheduleRelayoutOfSubtree(this); | 2839 frameView->scheduleRelayoutOfSubtree(this); |
| 2840 } | 2840 } |
| 2841 } | 2841 } |
| 2842 } | 2842 } |
| 2843 } | 2843 } |
| 2844 | 2844 |
| 2845 void RenderObject::layout() | |
| 2846 { | |
| 2847 ASSERT(needsLayout()); | |
| 2848 LayoutRectRecorder recorder(*this); | |
| 2849 RenderObject* child = firstChild(); | |
| 2850 while (child) { | |
| 2851 child->layoutIfNeeded(); | |
| 2852 ASSERT(!child->needsLayout()); | |
| 2853 child = child->nextSibling(); | |
| 2854 } | |
| 2855 clearNeedsLayout(); | |
| 2856 } | |
| 2857 | |
| 2858 void RenderObject::didLayout(ResourceLoadPriorityOptimizer& priorityModifier) | 2845 void RenderObject::didLayout(ResourceLoadPriorityOptimizer& priorityModifier) |
| 2859 { | 2846 { |
| 2860 for (RenderObject* child = firstChild(); child; child = child->nextSibling()
) | 2847 for (RenderObject* child = firstChild(); child; child = child->nextSibling()
) |
| 2861 child->didLayout(priorityModifier); | 2848 child->didLayout(priorityModifier); |
| 2862 } | 2849 } |
| 2863 | 2850 |
| 2864 void RenderObject::didScroll(ResourceLoadPriorityOptimizer& priorityModifier) | 2851 void RenderObject::didScroll(ResourceLoadPriorityOptimizer& priorityModifier) |
| 2865 { | 2852 { |
| 2866 for (RenderObject* child = firstChild(); child; child = child->nextSibling()
) | 2853 for (RenderObject* child = firstChild(); child; child = child->nextSibling()
) |
| 2867 child->didScroll(priorityModifier); | 2854 child->didScroll(priorityModifier); |
| (...skipping 534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3402 { | 3389 { |
| 3403 if (object1) { | 3390 if (object1) { |
| 3404 const WebCore::RenderObject* root = object1; | 3391 const WebCore::RenderObject* root = object1; |
| 3405 while (root->parent()) | 3392 while (root->parent()) |
| 3406 root = root->parent(); | 3393 root = root->parent(); |
| 3407 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3394 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3408 } | 3395 } |
| 3409 } | 3396 } |
| 3410 | 3397 |
| 3411 #endif | 3398 #endif |
| OLD | NEW |