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

Side by Side Diff: sky/engine/core/dom/ShadowTreeStyleSheetCollection.cpp

Issue 778743003: Merge StyleSheet into CSSStyleSheet. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: sort headers. Created 6 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) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2013 Google Inc. All rights reserved. 9 * Copyright (C) 2013 Google Inc. All rights reserved.
10 * 10 *
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 void ShadowTreeStyleSheetCollection::collectStyleSheets(StyleEngine* engine, Sty leSheetCollection& collection) 44 void ShadowTreeStyleSheetCollection::collectStyleSheets(StyleEngine* engine, Sty leSheetCollection& collection)
45 { 45 {
46 DocumentOrderedList::iterator begin = m_styleSheetCandidateNodes.begin(); 46 DocumentOrderedList::iterator begin = m_styleSheetCandidateNodes.begin();
47 DocumentOrderedList::iterator end = m_styleSheetCandidateNodes.end(); 47 DocumentOrderedList::iterator end = m_styleSheetCandidateNodes.end();
48 for (DocumentOrderedList::iterator it = begin; it != end; ++it) { 48 for (DocumentOrderedList::iterator it = begin; it != end; ++it) {
49 Node* node = *it; 49 Node* node = *it;
50 if (!isHTMLStyleElement(*node)) 50 if (!isHTMLStyleElement(*node))
51 continue; 51 continue;
52 52
53 StyleSheet* sheet = toHTMLStyleElement(node)->sheet(); 53 CSSStyleSheet* sheet = toHTMLStyleElement(node)->sheet();
54 if (sheet) 54 if (sheet)
55 collection.appendSheetForList(sheet); 55 collection.appendSheetForList(sheet);
56 if (sheet && sheet->isCSSStyleSheet()) 56 if (sheet)
57 collection.appendActiveStyleSheet(toCSSStyleSheet(sheet)); 57 collection.appendActiveStyleSheet(sheet);
58 } 58 }
59 } 59 }
60 60
61 void ShadowTreeStyleSheetCollection::updateActiveStyleSheets(StyleEngine* engine ) 61 void ShadowTreeStyleSheetCollection::updateActiveStyleSheets(StyleEngine* engine )
62 { 62 {
63 StyleSheetCollection collection; 63 StyleSheetCollection collection;
64 collectStyleSheets(engine, collection); 64 collectStyleSheets(engine, collection);
65 65
66 if (StyleResolver* styleResolver = engine->resolver()) { 66 if (StyleResolver* styleResolver = engine->resolver()) {
67 // We should not destroy StyleResolver when we find any stylesheet updat e in a shadow tree. 67 // We should not destroy StyleResolver when we find any stylesheet updat e in a shadow tree.
68 // In this case, we will reset rulesets created from style elements in t he shadow tree. 68 // In this case, we will reset rulesets created from style elements in t he shadow tree.
69 styleResolver->resetAuthorStyle(treeScope()); 69 styleResolver->resetAuthorStyle(treeScope());
70 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleSheets) ; 70 styleResolver->removePendingAuthorStyleSheets(m_activeAuthorStyleSheets) ;
71 styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAuthorSty leSheets()); 71 styleResolver->lazyAppendAuthorStyleSheets(0, collection.activeAuthorSty leSheets());
72 } 72 }
73 73
74 toShadowRoot(treeScope().rootNode()).host()->setNeedsStyleRecalc(SubtreeStyl eChange); 74 toShadowRoot(treeScope().rootNode()).host()->setNeedsStyleRecalc(SubtreeStyl eChange);
75 75
76 collection.swap(*this); 76 collection.swap(*this);
77 updateUsesRemUnits(); 77 updateUsesRemUnits();
78 } 78 }
79 79
80 } 80 }
OLDNEW
« no previous file with comments | « sky/engine/core/dom/DocumentStyleSheetCollector.cpp ('k') | sky/engine/core/dom/StyleElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698