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

Side by Side Diff: trunk/Source/core/dom/shadow/ShadowRoot.cpp

Issue 16336010: Revert 150924 "Node::lazyAttach shouldn't lie about being attached" (Closed) Base URL: svn://svn.chromium.org/blink/
Patch Set: Created 7 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Neither the name of Google Inc. nor the names of its 10 * * Neither the name of Google Inc. nor the names of its
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 } 135 }
136 136
137 void ShadowRoot::recalcStyle(StyleChange change) 137 void ShadowRoot::recalcStyle(StyleChange change)
138 { 138 {
139 // ShadowRoot doesn't support custom callbacks. 139 // ShadowRoot doesn't support custom callbacks.
140 ASSERT(!hasCustomStyleCallbacks()); 140 ASSERT(!hasCustomStyleCallbacks());
141 141
142 StyleResolver* styleResolver = document()->styleResolver(); 142 StyleResolver* styleResolver = document()->styleResolver();
143 styleResolver->pushParentShadowRoot(this); 143 styleResolver->pushParentShadowRoot(this);
144 144
145 // When we're set to lazyAttach we'll have a FullStyleChange and we'll need
146 // to promote the change to a Force for all our descendants so they get a
147 // recalc and will attach.
148 if (styleChangeType() == FullStyleChange)
149 change = Force;
150
151 for (Node* child = firstChild(); child; child = child->nextSibling()) { 145 for (Node* child = firstChild(); child; child = child->nextSibling()) {
152 if (child->isElementNode()) 146 if (child->isElementNode())
153 toElement(child)->recalcStyle(change); 147 toElement(child)->recalcStyle(change);
154 else if (child->isTextNode()) 148 else if (child->isTextNode())
155 toText(child)->recalcTextStyle(change); 149 toText(child)->recalcTextStyle(change);
156 } 150 }
157 151
158 styleResolver->popParentShadowRoot(this); 152 styleResolver->popParentShadowRoot(this);
159 clearNeedsStyleRecalc(); 153 clearNeedsStyleRecalc();
160 clearChildNeedsStyleRecalc(); 154 clearChildNeedsStyleRecalc();
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 { 271 {
278 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM); 272 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM);
279 DocumentFragment::reportMemoryUsage(memoryObjectInfo); 273 DocumentFragment::reportMemoryUsage(memoryObjectInfo);
280 TreeScope::reportMemoryUsage(memoryObjectInfo); 274 TreeScope::reportMemoryUsage(memoryObjectInfo);
281 info.addMember(m_prev, "prev"); 275 info.addMember(m_prev, "prev");
282 info.addMember(m_next, "next"); 276 info.addMember(m_next, "next");
283 info.addMember(m_scopeDistribution, "scopeDistribution"); 277 info.addMember(m_scopeDistribution, "scopeDistribution");
284 } 278 }
285 279
286 } 280 }
OLDNEW
« no previous file with comments | « trunk/Source/core/dom/shadow/ElementShadow.cpp ('k') | trunk/Source/core/html/HTMLDialogElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698