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

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

Issue 2555413002: 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. 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 2682 matching lines...) Expand 10 before | Expand all | Expand 10 after
2693 2693
2694 void LayoutObject::destroyAndCleanupAnonymousWrappers() { 2694 void LayoutObject::destroyAndCleanupAnonymousWrappers() {
2695 // If the tree is destroyed, there is no need for a clean-up phase. 2695 // If the tree is destroyed, there is no need for a clean-up phase.
2696 if (documentBeingDestroyed()) { 2696 if (documentBeingDestroyed()) {
2697 destroy(); 2697 destroy();
2698 return; 2698 return;
2699 } 2699 }
2700 2700
2701 LayoutObject* destroyRoot = this; 2701 LayoutObject* destroyRoot = this;
2702 for (LayoutObject *destroyRootParent = destroyRoot->parent(); 2702 for (LayoutObject *destroyRootParent = destroyRoot->parent();
2703 destroyRootParent && destroyRootParent->isAnonymous() && 2703 destroyRootParent && destroyRootParent->isAnonymous();
2704 !destroyRootParent->parent()->createsAnonymousWrapper();
2705 destroyRoot = destroyRootParent, 2704 destroyRoot = destroyRootParent,
2706 destroyRootParent = destroyRootParent->parent()) { 2705 destroyRootParent = destroyRootParent->parent()) {
2707 // Anonymous block continuations are tracked and destroyed elsewhere (see th e bottom of LayoutBlock::removeChild) 2706 // Anonymous block continuations are tracked and destroyed elsewhere (see th e bottom of LayoutBlock::removeChild)
2708 if (destroyRootParent->isLayoutBlockFlow() && 2707 if (destroyRootParent->isLayoutBlockFlow() &&
2709 toLayoutBlockFlow(destroyRootParent)->isAnonymousBlockContinuation()) 2708 toLayoutBlockFlow(destroyRootParent)->isAnonymousBlockContinuation())
2710 break; 2709 break;
2711 // A flow thread is tracked by its containing block. Whether its children ar e removed or not is irrelevant. 2710 // A flow thread is tracked by its containing block. Whether its children ar e removed or not is irrelevant.
2712 if (destroyRootParent->isLayoutFlowThread()) 2711 if (destroyRootParent->isLayoutFlowThread())
2713 break; 2712 break;
2714 2713
(...skipping 739 matching lines...) Expand 10 before | Expand all | Expand 10 after
3454 const blink::LayoutObject* root = object1; 3453 const blink::LayoutObject* root = object1;
3455 while (root->parent()) 3454 while (root->parent())
3456 root = root->parent(); 3455 root = root->parent();
3457 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0); 3456 root->showLayoutTreeAndMark(object1, "*", object2, "-", 0);
3458 } else { 3457 } else {
3459 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)"); 3458 WTFLogAlways("%s", "Cannot showLayoutTree. Root is (nil)");
3460 } 3459 }
3461 } 3460 }
3462 3461
3463 #endif 3462 #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