| 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 740 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 751 | 751 |
| 752 bool simplifiedNormalFlowLayout = needsSimplifiedNormalFlowLayout() && !self
NeedsLayout() && !normalChildNeedsLayout(); | 752 bool simplifiedNormalFlowLayout = needsSimplifiedNormalFlowLayout() && !self
NeedsLayout() && !normalChildNeedsLayout(); |
| 753 | 753 |
| 754 while (object) { | 754 while (object) { |
| 755 if (object->selfNeedsLayout()) | 755 if (object->selfNeedsLayout()) |
| 756 return; | 756 return; |
| 757 | 757 |
| 758 // Don't mark the outermost object of an unrooted subtree. That object w
ill be | 758 // Don't mark the outermost object of an unrooted subtree. That object w
ill be |
| 759 // marked when the subtree is added to the document. | 759 // marked when the subtree is added to the document. |
| 760 LayoutObject* container = object->container(); | 760 LayoutObject* container = object->container(); |
| 761 if (!container && !object->isLayoutView()) | 761 if (!container && !(object->isLayoutView() || object->isPositioned())) |
| 762 return; | 762 return; |
| 763 if (!last->isTextOrSVGChild() && last->style()->hasOutOfFlowPosition())
{ | 763 if (!last->isTextOrSVGChild() && last->style()->hasOutOfFlowPosition())
{ |
| 764 bool willSkipRelativelyPositionedInlines = !object->isLayoutBlock()
|| object->isAnonymousBlock(); | 764 bool willSkipRelativelyPositionedInlines = !object->isLayoutBlock()
|| object->isAnonymousBlock(); |
| 765 // Skip relatively positioned inlines and anonymous blocks to get to
the enclosing LayoutBlock. | 765 // Skip relatively positioned inlines and anonymous blocks to get to
the enclosing LayoutBlock. |
| 766 while (object && (!object->isLayoutBlock() || object->isAnonymousBlo
ck())) | 766 while (object && (!object->isLayoutBlock() || object->isAnonymousBlo
ck())) |
| 767 object = object->container(); | 767 object = object->container(); |
| 768 if (!object || object->posChildNeedsLayout()) | 768 if (!object || object->posChildNeedsLayout()) |
| 769 return; | 769 return; |
| 770 if (willSkipRelativelyPositionedInlines) | 770 if (willSkipRelativelyPositionedInlines) |
| 771 container = object->container(); | 771 container = object->container(); |
| (...skipping 2528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3300 const blink::LayoutObject* root = object1; | 3300 const blink::LayoutObject* root = object1; |
| 3301 while (root->parent()) | 3301 while (root->parent()) |
| 3302 root = root->parent(); | 3302 root = root->parent(); |
| 3303 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); | 3303 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); |
| 3304 } else { | 3304 } else { |
| 3305 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); | 3305 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); |
| 3306 } | 3306 } |
| 3307 } | 3307 } |
| 3308 | 3308 |
| 3309 #endif | 3309 #endif |
| OLD | NEW |