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

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

Issue 1493323002: Renamed authorStyleSheets to injectedAuthorStyleSheets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « no previous file | third_party/WebKit/Source/core/dom/StyleEngine.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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 engine.selectStylesheetSetName(candidate.title()); 75 engine.selectStylesheetSetName(candidate.title());
76 collector.appendSheetForList(sheet); 76 collector.appendSheetForList(sheet);
77 if (candidate.canBeActivated(engine.preferredStylesheetSetName())) 77 if (candidate.canBeActivated(engine.preferredStylesheetSetName()))
78 collector.appendActiveStyleSheet(toCSSStyleSheet(sheet)); 78 collector.appendActiveStyleSheet(toCSSStyleSheet(sheet));
79 } 79 }
80 } 80 }
81 81
82 void DocumentStyleSheetCollection::collectStyleSheets(StyleEngine& engine, Docum entStyleSheetCollector& collector) 82 void DocumentStyleSheetCollection::collectStyleSheets(StyleEngine& engine, Docum entStyleSheetCollector& collector)
83 { 83 {
84 ASSERT(&document().styleEngine() == &engine); 84 ASSERT(&document().styleEngine() == &engine);
85 collector.appendActiveStyleSheets(engine.documentAuthorStyleSheets()); 85 collector.appendActiveStyleSheets(engine.injectedAuthorStyleSheets());
86 collectStyleSheetsFromCandidates(engine, collector); 86 collectStyleSheetsFromCandidates(engine, collector);
87 } 87 }
88 88
89 void DocumentStyleSheetCollection::updateActiveStyleSheets(StyleEngine& engine, StyleResolverUpdateMode updateMode) 89 void DocumentStyleSheetCollection::updateActiveStyleSheets(StyleEngine& engine, StyleResolverUpdateMode updateMode)
90 { 90 {
91 StyleSheetCollection collection; 91 StyleSheetCollection collection;
92 ActiveDocumentStyleSheetCollector collector(collection); 92 ActiveDocumentStyleSheetCollector collector(collection);
93 collectStyleSheets(engine, collector); 93 collectStyleSheets(engine, collector);
94 94
95 StyleSheetChange change; 95 StyleSheetChange change;
(...skipping 18 matching lines...) Expand all
114 styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets .size(), collection.activeAuthorStyleSheets()); 114 styleResolver->lazyAppendAuthorStyleSheets(m_activeAuthorStyleSheets .size(), collection.activeAuthorStyleSheets());
115 } 115 }
116 } 116 }
117 if (change.requiresFullStyleRecalc) 117 if (change.requiresFullStyleRecalc)
118 document().setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForT racing::create(StyleChangeReason::ActiveStylesheetsUpdate)); 118 document().setNeedsStyleRecalc(SubtreeStyleChange, StyleChangeReasonForT racing::create(StyleChangeReason::ActiveStylesheetsUpdate));
119 119
120 collection.swap(*this); 120 collection.swap(*this);
121 } 121 }
122 122
123 } 123 }
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/dom/StyleEngine.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698