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

Side by Side Diff: third_party/WebKit/Source/core/dom/Node.cpp

Issue 2729453002: Revert of Call Element::rebuildLayoutTree from Document::updateStyle directly (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « third_party/WebKit/Source/core/dom/Node.h ('k') | third_party/WebKit/Source/core/dom/Text.h » ('j') | 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) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 7 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
9 * (http://www.torchmobile.com/) 9 * (http://www.torchmobile.com/)
10 * 10 *
(...skipping 913 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 } 924 }
925 925
926 void Node::detachLayoutTree(const AttachContext& context) { 926 void Node::detachLayoutTree(const AttachContext& context) {
927 DCHECK(document().lifecycle().stateAllowsDetach()); 927 DCHECK(document().lifecycle().stateAllowsDetach());
928 DocumentLifecycle::DetachScope willDetach(document().lifecycle()); 928 DocumentLifecycle::DetachScope willDetach(document().lifecycle());
929 929
930 if (layoutObject()) 930 if (layoutObject())
931 layoutObject()->destroyAndCleanupAnonymousWrappers(); 931 layoutObject()->destroyAndCleanupAnonymousWrappers();
932 setLayoutObject(nullptr); 932 setLayoutObject(nullptr);
933 setStyleChange(NeedsReattachStyleChange); 933 setStyleChange(NeedsReattachStyleChange);
934 setFlag(NeedsReattachLayoutTree);
935 clearChildNeedsStyleInvalidation(); 934 clearChildNeedsStyleInvalidation();
936 } 935 }
937 936
938 void Node::reattachWhitespaceSiblingsIfNeeded(Text* start) { 937 void Node::reattachWhitespaceSiblingsIfNeeded(Text* start) {
939 ScriptForbiddenScope forbidScriptDuringRawIteration; 938 ScriptForbiddenScope forbidScriptDuringRawIteration;
940 for (Node* sibling = start; sibling; sibling = sibling->nextSibling()) { 939 for (Node* sibling = start; sibling; sibling = sibling->nextSibling()) {
941 if (sibling->isTextNode() && toText(sibling)->containsOnlyWhitespace()) { 940 if (sibling->isTextNode() && toText(sibling)->containsOnlyWhitespace()) {
942 bool hadLayoutObject = !!sibling->layoutObject(); 941 bool hadLayoutObject = !!sibling->layoutObject();
943 toText(sibling)->reattachLayoutTreeIfNeeded(); 942 toText(sibling)->reattachLayoutTreeIfNeeded();
944 // If sibling's layout object status didn't change we don't need to 943 // If sibling's layout object status didn't change we don't need to
(...skipping 1622 matching lines...) Expand 10 before | Expand all | Expand 10 after
2567 if (node) { 2566 if (node) {
2568 std::stringstream stream; 2567 std::stringstream stream;
2569 node->printNodePathTo(stream); 2568 node->printNodePathTo(stream);
2570 LOG(INFO) << stream.str(); 2569 LOG(INFO) << stream.str();
2571 } else { 2570 } else {
2572 LOG(INFO) << "Cannot showNodePath for <null>"; 2571 LOG(INFO) << "Cannot showNodePath for <null>";
2573 } 2572 }
2574 } 2573 }
2575 2574
2576 #endif 2575 #endif
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/Node.h ('k') | third_party/WebKit/Source/core/dom/Text.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698