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

Side by Side Diff: third_party/WebKit/Source/core/css/StyleRuleImport.cpp

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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
OLDNEW
1 /* 1 /*
2 * (C) 1999-2003 Lars Knoll (knoll@kde.org) 2 * (C) 1999-2003 Lars Knoll (knoll@kde.org)
3 * (C) 2002-2003 Dirk Mueller (mueller@kde.org) 3 * (C) 2002-2003 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2002, 2005, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved. 4 * Copyright (C) 2002, 2005, 2006, 2008, 2009, 2010, 2012 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 context.setCharset(charset); 86 context.setCharset(charset);
87 Document* document = m_parentStyleSheet ? m_parentStyleSheet->singleOwnerDoc ument() : nullptr; 87 Document* document = m_parentStyleSheet ? m_parentStyleSheet->singleOwnerDoc ument() : nullptr;
88 if (!baseURL.isNull()) { 88 if (!baseURL.isNull()) {
89 context.setBaseURL(baseURL); 89 context.setBaseURL(baseURL);
90 if (document) 90 if (document)
91 context.setReferrer(Referrer(baseURL.strippedForUseAsReferrer(), doc ument->getReferrerPolicy())); 91 context.setReferrer(Referrer(baseURL.strippedForUseAsReferrer(), doc ument->getReferrerPolicy()));
92 } 92 }
93 93
94 m_styleSheet = StyleSheetContents::create(this, href, context); 94 m_styleSheet = StyleSheetContents::create(this, href, context);
95 95
96 m_styleSheet->parseAuthorStyleSheet(cachedStyleSheet, document ? document->s ecurityOrigin() : 0); 96 m_styleSheet->parseAuthorStyleSheet(cachedStyleSheet, document ? document->g etSecurityOrigin() : 0);
97 97
98 m_loading = false; 98 m_loading = false;
99 99
100 if (m_parentStyleSheet) { 100 if (m_parentStyleSheet) {
101 m_parentStyleSheet->notifyLoadedSheet(cachedStyleSheet); 101 m_parentStyleSheet->notifyLoadedSheet(cachedStyleSheet);
102 m_parentStyleSheet->checkLoaded(); 102 m_parentStyleSheet->checkLoaded();
103 } 103 }
104 } 104 }
105 105
106 bool StyleRuleImport::isLoading() const 106 bool StyleRuleImport::isLoading() const
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 // removed from the pending sheet count, so let the doc know 145 // removed from the pending sheet count, so let the doc know
146 // the sheet being imported is pending. 146 // the sheet being imported is pending.
147 if (m_parentStyleSheet && m_parentStyleSheet->loadCompleted() && rootShe et == m_parentStyleSheet) 147 if (m_parentStyleSheet && m_parentStyleSheet->loadCompleted() && rootShe et == m_parentStyleSheet)
148 m_parentStyleSheet->startLoadingDynamicSheet(); 148 m_parentStyleSheet->startLoadingDynamicSheet();
149 m_loading = true; 149 m_loading = true;
150 m_resource->addClient(&m_styleSheetClient); 150 m_resource->addClient(&m_styleSheetClient);
151 } 151 }
152 } 152 }
153 153
154 } // namespace blink 154 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698