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

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

Issue 2549973003: Revert commit# 415577 "Add grid/flex layout support for <fieldset>" (Closed)
Patch Set: updated TestExpectations, verified that there are no changes in images 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
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 2796 matching lines...) Expand 10 before | Expand all | Expand 10 after
2807 2807
2808 void LayoutObject::destroyAndCleanupAnonymousWrappers() { 2808 void LayoutObject::destroyAndCleanupAnonymousWrappers() {
2809 // If the tree is destroyed, there is no need for a clean-up phase. 2809 // If the tree is destroyed, there is no need for a clean-up phase.
2810 if (documentBeingDestroyed()) { 2810 if (documentBeingDestroyed()) {
2811 destroy(); 2811 destroy();
2812 return; 2812 return;
2813 } 2813 }
2814 2814
2815 LayoutObject* destroyRoot = this; 2815 LayoutObject* destroyRoot = this;
2816 for (LayoutObject *destroyRootParent = destroyRoot->parent(); 2816 for (LayoutObject *destroyRootParent = destroyRoot->parent();
2817 destroyRootParent && destroyRootParent->isAnonymous() && 2817 destroyRootParent && destroyRootParent->isAnonymous();
2818 !destroyRootParent->parent()->createsAnonymousWrapper();
2819 destroyRoot = destroyRootParent, 2818 destroyRoot = destroyRootParent,
2820 destroyRootParent = destroyRootParent->parent()) { 2819 destroyRootParent = destroyRootParent->parent()) {
2821 // Anonymous block continuations are tracked and destroyed elsewhere (see 2820 // Anonymous block continuations are tracked and destroyed elsewhere (see
2822 // the bottom of LayoutBlock::removeChild) 2821 // the bottom of LayoutBlock::removeChild)
2823 if (destroyRootParent->isLayoutBlockFlow() && 2822 if (destroyRootParent->isLayoutBlockFlow() &&
2824 toLayoutBlockFlow(destroyRootParent)->isAnonymousBlockContinuation()) 2823 toLayoutBlockFlow(destroyRootParent)->isAnonymousBlockContinuation())
2825 break; 2824 break;
2826 // A flow thread is tracked by its containing block. Whether its children 2825 // A flow thread is tracked by its containing block. Whether its children
2827 // are removed or not is irrelevant. 2826 // are removed or not is irrelevant.
2828 if (destroyRootParent->isLayoutFlowThread()) 2827 if (destroyRootParent->isLayoutFlowThread())
(...skipping 679 matching lines...) Expand 10 before | Expand all | Expand 10 after
3508 const blink::LayoutObject* root = object1; 3507 const blink::LayoutObject* root = object1;
3509 while (root->parent()) 3508 while (root->parent())
3510 root = root->parent(); 3509 root = root->parent();
3511 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3510 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3512 } else { 3511 } else {
3513 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3512 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3514 } 3513 }
3515 } 3514 }
3516 3515
3517 #endif 3516 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698