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 2231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2242 { | 2242 { |
2243 return false; | 2243 return false; |
2244 } | 2244 } |
2245 | 2245 |
2246 void RenderObject::scheduleRelayout() | 2246 void RenderObject::scheduleRelayout() |
2247 { | 2247 { |
2248 if (isRenderView()) { | 2248 if (isRenderView()) { |
2249 FrameView* view = toRenderView(this)->frameView(); | 2249 FrameView* view = toRenderView(this)->frameView(); |
2250 if (view) | 2250 if (view) |
2251 view->scheduleRelayout(); | 2251 view->scheduleRelayout(); |
2252 } else if (parent()) { | 2252 } else { |
2253 FrameView* v = view() ? view()->frameView() : 0; | 2253 RenderView* renderView; |
2254 if (v) | 2254 if (isRooted(&renderView)) { |
2255 v->scheduleRelayoutOfSubtree(this); | 2255 if (FrameView* frameView = renderView->frameView()) |
| 2256 frameView->scheduleRelayoutOfSubtree(this); |
| 2257 } |
2256 } | 2258 } |
2257 } | 2259 } |
2258 | 2260 |
2259 void RenderObject::layout() | 2261 void RenderObject::layout() |
2260 { | 2262 { |
2261 ASSERT(needsLayout()); | 2263 ASSERT(needsLayout()); |
2262 RenderObject* child = firstChild(); | 2264 RenderObject* child = firstChild(); |
2263 while (child) { | 2265 while (child) { |
2264 child->layoutIfNeeded(); | 2266 child->layoutIfNeeded(); |
2265 ASSERT(!child->needsLayout()); | 2267 ASSERT(!child->needsLayout()); |
(...skipping 448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2714 { | 2716 { |
2715 if (object1) { | 2717 if (object1) { |
2716 const WebCore::RenderObject* root = object1; | 2718 const WebCore::RenderObject* root = object1; |
2717 while (root->parent()) | 2719 while (root->parent()) |
2718 root = root->parent(); | 2720 root = root->parent(); |
2719 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 2721 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
2720 } | 2722 } |
2721 } | 2723 } |
2722 | 2724 |
2723 #endif | 2725 #endif |
OLD | NEW |