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

Side by Side Diff: sky/engine/core/dom/StyleEngine.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
« no previous file with comments | « sky/engine/core/dom/StyleEngine.h ('k') | sky/engine/core/dom/StyleSheetCandidate.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 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 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) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 { 138 {
139 if (treeScope == m_document) 139 if (treeScope == m_document)
140 return documentStyleSheetCollection(); 140 return documentStyleSheetCollection();
141 141
142 StyleSheetCollectionMap::iterator it = m_styleSheetCollectionMap.find(&treeS cope); 142 StyleSheetCollectionMap::iterator it = m_styleSheetCollectionMap.find(&treeS cope);
143 if (it == m_styleSheetCollectionMap.end()) 143 if (it == m_styleSheetCollectionMap.end())
144 return 0; 144 return 0;
145 return it->value.get(); 145 return it->value.get();
146 } 146 }
147 147
148 const Vector<RefPtr<StyleSheet> >& StyleEngine::styleSheetsForStyleSheetList(Tre eScope& treeScope) 148 const Vector<RefPtr<CSSStyleSheet> >& StyleEngine::styleSheetsForStyleSheetList( TreeScope& treeScope)
149 { 149 {
150 if (treeScope == m_document) 150 if (treeScope == m_document)
151 return documentStyleSheetCollection()->styleSheetsForStyleSheetList(); 151 return documentStyleSheetCollection()->styleSheetsForStyleSheetList();
152 152
153 return ensureStyleSheetCollectionFor(treeScope)->styleSheetsForStyleSheetLis t(); 153 return ensureStyleSheetCollectionFor(treeScope)->styleSheetsForStyleSheetLis t();
154 } 154 }
155 155
156 void StyleEngine::modifiedStyleSheet(StyleSheet* sheet) 156 void StyleEngine::modifiedStyleSheet(CSSStyleSheet* sheet)
157 { 157 {
158 if (!sheet) 158 if (!sheet)
159 return; 159 return;
160 160
161 Node* node = sheet->ownerNode(); 161 Node* node = sheet->ownerNode();
162 if (!node || !node->inDocument()) 162 if (!node || !node->inDocument())
163 return; 163 return;
164 164
165 TreeScope& treeScope = isHTMLStyleElement(*node) ? node->treeScope() : *m_do cument; 165 TreeScope& treeScope = isHTMLStyleElement(*node) ? node->treeScope() : *m_do cument;
166 ASSERT(isHTMLStyleElement(node) || treeScope == m_document); 166 ASSERT(isHTMLStyleElement(node) || treeScope == m_document);
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 { 442 {
443 if (!document().isActive()) 443 if (!document().isActive())
444 return; 444 return;
445 445
446 if (m_resolver) 446 if (m_resolver)
447 m_resolver->invalidateMatchedPropertiesCache(); 447 m_resolver->invalidateMatchedPropertiesCache();
448 document().setNeedsStyleRecalc(SubtreeStyleChange); 448 document().setNeedsStyleRecalc(SubtreeStyleChange);
449 } 449 }
450 450
451 } 451 }
OLDNEW
« no previous file with comments | « sky/engine/core/dom/StyleEngine.h ('k') | sky/engine/core/dom/StyleSheetCandidate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698