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

Side by Side Diff: Source/core/dom/DocumentStyleSheetCollection.cpp

Issue 645443003: Move parts of core/dom to C++11 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed nit Created 6 years, 2 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
« no previous file with comments | « Source/core/dom/DocumentParser.cpp ('k') | Source/core/dom/DocumentSupplementable.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 27 matching lines...) Expand all
38 namespace blink { 38 namespace blink {
39 39
40 DocumentStyleSheetCollection::DocumentStyleSheetCollection(TreeScope& treeScope) 40 DocumentStyleSheetCollection::DocumentStyleSheetCollection(TreeScope& treeScope)
41 : TreeScopeStyleSheetCollection(treeScope) 41 : TreeScopeStyleSheetCollection(treeScope)
42 { 42 {
43 ASSERT(treeScope.rootNode() == treeScope.rootNode().document()); 43 ASSERT(treeScope.rootNode() == treeScope.rootNode().document());
44 } 44 }
45 45
46 void DocumentStyleSheetCollection::collectStyleSheetsFromCandidates(StyleEngine* engine, DocumentStyleSheetCollector& collector) 46 void DocumentStyleSheetCollection::collectStyleSheetsFromCandidates(StyleEngine* engine, DocumentStyleSheetCollector& collector)
47 { 47 {
48 DocumentOrderedList::iterator begin = m_styleSheetCandidateNodes.begin(); 48 for (Node* n : m_styleSheetCandidateNodes) {
49 DocumentOrderedList::iterator end = m_styleSheetCandidateNodes.end();
50 for (DocumentOrderedList::iterator it = begin; it != end; ++it) {
51 Node* n = *it;
52 StyleSheetCandidate candidate(*n); 49 StyleSheetCandidate candidate(*n);
53 50
54 ASSERT(!candidate.isXSL()); 51 ASSERT(!candidate.isXSL());
55 if (candidate.isImport()) { 52 if (candidate.isImport()) {
56 Document* document = candidate.importedDocument(); 53 Document* document = candidate.importedDocument();
57 if (!document) 54 if (!document)
58 continue; 55 continue;
59 if (collector.hasVisited(document)) 56 if (collector.hasVisited(document))
60 continue; 57 continue;
61 collector.willVisit(document); 58 collector.willVisit(document);
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 } 114 }
118 if (change.requiresFullStyleRecalc) 115 if (change.requiresFullStyleRecalc)
119 document().setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForT racing::create(StyleChangeReason::ActiveStylesheetsUpdate)); 116 document().setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForT racing::create(StyleChangeReason::ActiveStylesheetsUpdate));
120 117
121 collection.swap(*this); 118 collection.swap(*this);
122 119
123 updateUsesRemUnits(); 120 updateUsesRemUnits();
124 } 121 }
125 122
126 } 123 }
OLDNEW
« no previous file with comments | « Source/core/dom/DocumentParser.cpp ('k') | Source/core/dom/DocumentSupplementable.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698