Chromium Code Reviews| 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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 629 bool LayoutObject::skipInvalidationWhenLaidOutChildren() const | 629 bool LayoutObject::skipInvalidationWhenLaidOutChildren() const |
| 630 { | 630 { |
| 631 if (!neededLayoutBecauseOfChildren()) | 631 if (!neededLayoutBecauseOfChildren()) |
| 632 return false; | 632 return false; |
| 633 | 633 |
| 634 // SVG renderers need to be invalidated when their children are laid out. | 634 // SVG renderers need to be invalidated when their children are laid out. |
| 635 // RenderBlocks with line boxes are responsible to invalidate them so we can 't ignore them. | 635 // RenderBlocks with line boxes are responsible to invalidate them so we can 't ignore them. |
| 636 if (isSVG() || (isRenderBlockFlow() && toRenderBlockFlow(this)->firstLineBox ())) | 636 if (isSVG() || (isRenderBlockFlow() && toRenderBlockFlow(this)->firstLineBox ())) |
| 637 return false; | 637 return false; |
| 638 | 638 |
| 639 return rendererHasNoBoxEffect(); | 639 return rendererHasNoBoxEffect() && !hasNonCompositedScrollbars(); |
|
dsinclair
2015/02/23 15:13:53
Can we pull this out to be (assuming the following
mstensho (USE GERRIT)
2015/02/23 17:22:38
Done.
| |
| 640 } | 640 } |
| 641 | 641 |
| 642 RenderBlock* LayoutObject::firstLineBlock() const | 642 RenderBlock* LayoutObject::firstLineBlock() const |
| 643 { | 643 { |
| 644 return 0; | 644 return 0; |
| 645 } | 645 } |
| 646 | 646 |
| 647 static inline bool objectIsRelayoutBoundary(const LayoutObject* object) | 647 static inline bool objectIsRelayoutBoundary(const LayoutObject* object) |
| 648 { | 648 { |
| 649 // FIXME: In future it may be possible to broaden these conditions in order to improve performance. | 649 // FIXME: In future it may be possible to broaden these conditions in order to improve performance. |
| (...skipping 2534 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3184 { | 3184 { |
| 3185 if (object1) { | 3185 if (object1) { |
| 3186 const blink::LayoutObject* root = object1; | 3186 const blink::LayoutObject* root = object1; |
| 3187 while (root->parent()) | 3187 while (root->parent()) |
| 3188 root = root->parent(); | 3188 root = root->parent(); |
| 3189 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); | 3189 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); |
| 3190 } | 3190 } |
| 3191 } | 3191 } |
| 3192 | 3192 |
| 3193 #endif | 3193 #endif |
| OLD | NEW |