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

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

Issue 66383005: Remove the concept of user stylesheets. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix WebFrameCSSCallbackTest tests Created 7 years, 1 month 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/css/InspectorCSSOMWrappers.cpp ('k') | Source/core/css/StyleSheetContents.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 * (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 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 // in our parent chain with the same URL, then just bail. 108 // in our parent chain with the same URL, then just bail.
109 StyleSheetContents* rootSheet = m_parentStyleSheet; 109 StyleSheetContents* rootSheet = m_parentStyleSheet;
110 for (StyleSheetContents* sheet = m_parentStyleSheet; sheet; sheet = sheet->p arentStyleSheet()) { 110 for (StyleSheetContents* sheet = m_parentStyleSheet; sheet; sheet = sheet->p arentStyleSheet()) {
111 if (equalIgnoringFragmentIdentifier(absURL, sheet->baseURL()) 111 if (equalIgnoringFragmentIdentifier(absURL, sheet->baseURL())
112 || equalIgnoringFragmentIdentifier(absURL, document->completeURL(she et->originalURL()))) 112 || equalIgnoringFragmentIdentifier(absURL, document->completeURL(she et->originalURL())))
113 return; 113 return;
114 rootSheet = sheet; 114 rootSheet = sheet;
115 } 115 }
116 116
117 FetchRequest request(ResourceRequest(absURL), FetchInitiatorTypeNames::css, m_parentStyleSheet->charset()); 117 FetchRequest request(ResourceRequest(absURL), FetchInitiatorTypeNames::css, m_parentStyleSheet->charset());
118 if (m_parentStyleSheet->isUserStyleSheet()) 118 m_resource = fetcher->fetchCSSStyleSheet(request);
119 m_resource = fetcher->fetchUserCSSStyleSheet(request);
120 else
121 m_resource = fetcher->fetchCSSStyleSheet(request);
122 if (m_resource) { 119 if (m_resource) {
123 // if the import rule is issued dynamically, the sheet may be 120 // if the import rule is issued dynamically, the sheet may be
124 // removed from the pending sheet count, so let the doc know 121 // removed from the pending sheet count, so let the doc know
125 // the sheet being imported is pending. 122 // the sheet being imported is pending.
126 if (m_parentStyleSheet && m_parentStyleSheet->loadCompleted() && rootShe et == m_parentStyleSheet) 123 if (m_parentStyleSheet && m_parentStyleSheet->loadCompleted() && rootShe et == m_parentStyleSheet)
127 m_parentStyleSheet->startLoadingDynamicSheet(); 124 m_parentStyleSheet->startLoadingDynamicSheet();
128 m_loading = true; 125 m_loading = true;
129 m_resource->addClient(&m_styleSheetClient); 126 m_resource->addClient(&m_styleSheetClient);
130 } 127 }
131 } 128 }
132 129
133 } // namespace WebCore 130 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/InspectorCSSOMWrappers.cpp ('k') | Source/core/css/StyleSheetContents.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698