Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutObject.cpp

Issue 1323313004: Don't re-implement containing block logic when marking container chains for layout (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/block/positioning/complex-positioned-movement-inline-expected.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 while (object) { 791 while (object) {
792 if (object->selfNeedsLayout()) 792 if (object->selfNeedsLayout())
793 return; 793 return;
794 794
795 // Don't mark the outermost object of an unrooted subtree. That object w ill be 795 // Don't mark the outermost object of an unrooted subtree. That object w ill be
796 // marked when the subtree is added to the document. 796 // marked when the subtree is added to the document.
797 LayoutObject* container = object->container(); 797 LayoutObject* container = object->container();
798 if (!container && !object->isLayoutView()) 798 if (!container && !object->isLayoutView())
799 return; 799 return;
800 if (!last->isTextOrSVGChild() && last->style()->hasOutOfFlowPosition()) { 800 if (!last->isTextOrSVGChild() && last->style()->hasOutOfFlowPosition()) {
801 bool willSkipRelativelyPositionedInlines = !object->isLayoutBlock() || object->isAnonymousBlock(); 801 LayoutBlock* containingBlock = last->containingBlock();
802 // Skip relatively positioned inlines and anonymous blocks to get to the enclosing LayoutBlock. 802 if (containingBlock->posChildNeedsLayout())
803 while (object && (!object->isLayoutBlock() || object->isAnonymousBlo ck()))
804 object = object->container();
805 if (!object || object->posChildNeedsLayout())
806 return; 803 return;
807 if (willSkipRelativelyPositionedInlines) 804 container = containingBlock->container();
808 container = object->container(); 805 containingBlock->setPosChildNeedsLayout(true);
809 object->setPosChildNeedsLayout(true);
810 simplifiedNormalFlowLayout = true; 806 simplifiedNormalFlowLayout = true;
811 ASSERT(!object->isSetNeedsLayoutForbidden()); 807 ASSERT(!object->isSetNeedsLayoutForbidden());
812 } else if (simplifiedNormalFlowLayout) { 808 } else if (simplifiedNormalFlowLayout) {
813 if (object->needsSimplifiedNormalFlowLayout()) 809 if (object->needsSimplifiedNormalFlowLayout())
814 return; 810 return;
815 object->setNeedsSimplifiedNormalFlowLayout(true); 811 object->setNeedsSimplifiedNormalFlowLayout(true);
816 ASSERT(!object->isSetNeedsLayoutForbidden()); 812 ASSERT(!object->isSetNeedsLayoutForbidden());
817 } else { 813 } else {
818 if (object->normalChildNeedsLayout()) 814 if (object->normalChildNeedsLayout())
819 return; 815 return;
(...skipping 2886 matching lines...) Expand 10 before | Expand all | Expand 10 after
3706 const blink::LayoutObject* root = object1; 3702 const blink::LayoutObject* root = object1;
3707 while (root->parent()) 3703 while (root->parent())
3708 root = root->parent(); 3704 root = root->parent();
3709 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3705 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3710 } else { 3706 } else {
3711 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n"); 3707 fprintf(stderr, "Cannot showLayoutTree. Root is (nil)\n");
3712 } 3708 }
3713 } 3709 }
3714 3710
3715 #endif 3711 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/fast/block/positioning/complex-positioned-movement-inline-expected.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698