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

Side by Side Diff: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp

Issue 2177163002: Allow <link rel=stylesheet> in a connected shadow tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: split tests Created 4 years, 4 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com) 3 * (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com) 4 * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved. 5 * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org> 6 * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org> 7 * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 8 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved. 9 * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
10 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2011. All rights reserved.
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 } 220 }
221 221
222 void StyleResolver::removePendingAuthorStyleSheets(const HeapVector<Member<CSSSt yleSheet>>& styleSheets) 222 void StyleResolver::removePendingAuthorStyleSheets(const HeapVector<Member<CSSSt yleSheet>>& styleSheets)
223 { 223 {
224 for (unsigned i = 0; i < styleSheets.size(); ++i) 224 for (unsigned i = 0; i < styleSheets.size(); ++i)
225 m_pendingStyleSheets.remove(styleSheets[i].get()); 225 m_pendingStyleSheets.remove(styleSheets[i].get());
226 } 226 }
227 227
228 void StyleResolver::appendCSSStyleSheet(CSSStyleSheet& cssSheet) 228 void StyleResolver::appendCSSStyleSheet(CSSStyleSheet& cssSheet)
229 { 229 {
230 ASSERT(!cssSheet.disabled()); 230 DCHECK(!cssSheet.disabled());
231 ASSERT(cssSheet.ownerDocument()); 231 DCHECK(cssSheet.ownerDocument());
232 ASSERT(cssSheet.ownerNode()); 232 DCHECK(cssSheet.ownerNode());
233 ASSERT(isHTMLStyleElement(cssSheet.ownerNode()) || isSVGStyleElement(cssShee t.ownerNode()) || cssSheet.ownerNode()->treeScope() == cssSheet.ownerDocument()) ; 233 DCHECK(isHTMLStyleElement(cssSheet.ownerNode()) || isSVGStyleElement(cssShee t.ownerNode()) || cssSheet.ownerNode()->isConnected());
234 234
235 if (cssSheet.mediaQueries() && !m_medium->eval(cssSheet.mediaQueries(), &m_v iewportDependentMediaQueryResults, &m_deviceDependentMediaQueryResults)) 235 if (cssSheet.mediaQueries() && !m_medium->eval(cssSheet.mediaQueries(), &m_v iewportDependentMediaQueryResults, &m_deviceDependentMediaQueryResults))
236 return; 236 return;
237 237
238 TreeScope* treeScope = &cssSheet.ownerNode()->treeScope(); 238 TreeScope* treeScope = &cssSheet.ownerNode()->treeScope();
239 // TODO(rune@opera.com): This is a workaround for crbug.com/559292 239 // TODO(rune@opera.com): This is a workaround for crbug.com/559292
240 // when we're in the middle of removing a subtree with a style element 240 // when we're in the middle of removing a subtree with a style element
241 // and the treescope has been changed but inDocument and isInShadowTree 241 // and the treescope has been changed but inDocument and isInShadowTree
242 // are not. 242 // are not.
243 // 243 //
(...skipping 1499 matching lines...) Expand 10 before | Expand all | Expand 10 after
1743 visitor->trace(m_siblingRuleSet); 1743 visitor->trace(m_siblingRuleSet);
1744 visitor->trace(m_uncommonAttributeRuleSet); 1744 visitor->trace(m_uncommonAttributeRuleSet);
1745 visitor->trace(m_watchedSelectorsRules); 1745 visitor->trace(m_watchedSelectorsRules);
1746 visitor->trace(m_treeBoundaryCrossingScopes); 1746 visitor->trace(m_treeBoundaryCrossingScopes);
1747 visitor->trace(m_styleSharingLists); 1747 visitor->trace(m_styleSharingLists);
1748 visitor->trace(m_pendingStyleSheets); 1748 visitor->trace(m_pendingStyleSheets);
1749 visitor->trace(m_document); 1749 visitor->trace(m_document);
1750 } 1750 }
1751 1751
1752 } // namespace blink 1752 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698