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

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

Issue 2560123003: Revert commit# 415577 "Add grid/flex layout support for <fieldset>" (Closed)
Patch Set: Created 4 years 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
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp ('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. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc.
7 * All rights reserved. 7 * All rights reserved.
8 * Copyright (C) 2009 Google Inc. All rights reserved. 8 * Copyright (C) 2009 Google Inc. All rights reserved.
9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. 9 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
10 * (http://www.torchmobile.com/) 10 * (http://www.torchmobile.com/)
(...skipping 2767 matching lines...) Expand 10 before | Expand all | Expand 10 after
2778 2778
2779 void LayoutObject::destroyAndCleanupAnonymousWrappers() { 2779 void LayoutObject::destroyAndCleanupAnonymousWrappers() {
2780 // If the tree is destroyed, there is no need for a clean-up phase. 2780 // If the tree is destroyed, there is no need for a clean-up phase.
2781 if (documentBeingDestroyed()) { 2781 if (documentBeingDestroyed()) {
2782 destroy(); 2782 destroy();
2783 return; 2783 return;
2784 } 2784 }
2785 2785
2786 LayoutObject* destroyRoot = this; 2786 LayoutObject* destroyRoot = this;
2787 for (LayoutObject *destroyRootParent = destroyRoot->parent(); 2787 for (LayoutObject *destroyRootParent = destroyRoot->parent();
2788 destroyRootParent && destroyRootParent->isAnonymous() && 2788 destroyRootParent && destroyRootParent->isAnonymous();
2789 !destroyRootParent->parent()->createsAnonymousWrapper();
2790 destroyRoot = destroyRootParent, 2789 destroyRoot = destroyRootParent,
2791 destroyRootParent = destroyRootParent->parent()) { 2790 destroyRootParent = destroyRootParent->parent()) {
2792 // Anonymous block continuations are tracked and destroyed elsewhere (see 2791 // Anonymous block continuations are tracked and destroyed elsewhere (see
2793 // the bottom of LayoutBlock::removeChild) 2792 // the bottom of LayoutBlock::removeChild)
2794 if (destroyRootParent->isLayoutBlockFlow() && 2793 if (destroyRootParent->isLayoutBlockFlow() &&
2795 toLayoutBlockFlow(destroyRootParent)->isAnonymousBlockContinuation()) 2794 toLayoutBlockFlow(destroyRootParent)->isAnonymousBlockContinuation())
2796 break; 2795 break;
2797 // A flow thread is tracked by its containing block. Whether its children 2796 // A flow thread is tracked by its containing block. Whether its children
2798 // are removed or not is irrelevant. 2797 // are removed or not is irrelevant.
2799 if (destroyRootParent->isLayoutFlowThread()) 2798 if (destroyRootParent->isLayoutFlowThread())
(...skipping 751 matching lines...) Expand 10 before | Expand all | Expand 10 after
3551 const blink::LayoutObject* root = object1; 3550 const blink::LayoutObject* root = object1;
3552 while (root->parent()) 3551 while (root->parent())
3553 root = root->parent(); 3552 root = root->parent();
3554 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3553 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3555 } else { 3554 } else {
3556 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3555 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3557 } 3556 }
3558 } 3557 }
3559 3558
3560 #endif 3559 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutFlexibleBox.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698