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

Side by Side Diff: sky/engine/core/dom/DocumentStyleSheetCollection.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/Document.cpp ('k') | sky/engine/core/dom/DocumentStyleSheetCollector.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, 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 44
45 void DocumentStyleSheetCollection::collectStyleSheetsFromCandidates(StyleEngine* engine, DocumentStyleSheetCollector& collector) 45 void DocumentStyleSheetCollection::collectStyleSheetsFromCandidates(StyleEngine* engine, DocumentStyleSheetCollector& collector)
46 { 46 {
47 DocumentOrderedList::iterator begin = m_styleSheetCandidateNodes.begin(); 47 DocumentOrderedList::iterator begin = m_styleSheetCandidateNodes.begin();
48 DocumentOrderedList::iterator end = m_styleSheetCandidateNodes.end(); 48 DocumentOrderedList::iterator end = m_styleSheetCandidateNodes.end();
49 for (DocumentOrderedList::iterator it = begin; it != end; ++it) { 49 for (DocumentOrderedList::iterator it = begin; it != end; ++it) {
50 Node* n = *it; 50 Node* n = *it;
51 StyleSheetCandidate candidate(*n); 51 StyleSheetCandidate candidate(*n);
52 52
53 StyleSheet* sheet = candidate.sheet(); 53 CSSStyleSheet* sheet = candidate.sheet();
54 if (!sheet) 54 if (!sheet)
55 continue; 55 continue;
56 56
57 collector.appendSheetForList(sheet); 57 collector.appendSheetForList(sheet);
58 if (candidate.canBeActivated()) 58 if (candidate.canBeActivated())
59 collector.appendActiveStyleSheet(toCSSStyleSheet(sheet)); 59 collector.appendActiveStyleSheet(sheet);
60 } 60 }
61 } 61 }
62 62
63 void DocumentStyleSheetCollection::collectStyleSheets(StyleEngine* engine, Docum entStyleSheetCollector& collector) 63 void DocumentStyleSheetCollection::collectStyleSheets(StyleEngine* engine, Docum entStyleSheetCollector& collector)
64 { 64 {
65 ASSERT(document().styleEngine() == engine); 65 ASSERT(document().styleEngine() == engine);
66 collector.appendActiveStyleSheets(engine->documentAuthorStyleSheets()); 66 collector.appendActiveStyleSheets(engine->documentAuthorStyleSheets());
67 collectStyleSheetsFromCandidates(engine, collector); 67 collectStyleSheetsFromCandidates(engine, collector);
68 } 68 }
69 69
(...skipping 11 matching lines...) Expand all
81 // TODO(esprehn): This is terrible and not needed in Sky, we should mark 81 // TODO(esprehn): This is terrible and not needed in Sky, we should mark
82 // specific tree scopes dirty instead. 82 // specific tree scopes dirty instead.
83 document().setNeedsStyleRecalc(SubtreeStyleChange); 83 document().setNeedsStyleRecalc(SubtreeStyleChange);
84 84
85 collection.swap(*this); 85 collection.swap(*this);
86 86
87 updateUsesRemUnits(); 87 updateUsesRemUnits();
88 } 88 }
89 89
90 } 90 }
OLDNEW
« no previous file with comments | « sky/engine/core/dom/Document.cpp ('k') | sky/engine/core/dom/DocumentStyleSheetCollector.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698