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

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

Issue 1170503003: Remove resource type-specific fetching logic from ResourceFetcher (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Null-check Document::loader() before calling startPreload() Created 5 years, 6 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/css/CSSSVGDocumentValue.cpp ('k') | Source/core/dom/ProcessingInstruction.cpp » ('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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 // in our parent chain with the same URL, then just bail. 121 // in our parent chain with the same URL, then just bail.
122 StyleSheetContents* rootSheet = m_parentStyleSheet; 122 StyleSheetContents* rootSheet = m_parentStyleSheet;
123 for (StyleSheetContents* sheet = m_parentStyleSheet; sheet; sheet = sheet->p arentStyleSheet()) { 123 for (StyleSheetContents* sheet = m_parentStyleSheet; sheet; sheet = sheet->p arentStyleSheet()) {
124 if (equalIgnoringFragmentIdentifier(absURL, sheet->baseURL()) 124 if (equalIgnoringFragmentIdentifier(absURL, sheet->baseURL())
125 || equalIgnoringFragmentIdentifier(absURL, document->completeURL(she et->originalURL()))) 125 || equalIgnoringFragmentIdentifier(absURL, document->completeURL(she et->originalURL())))
126 return; 126 return;
127 rootSheet = sheet; 127 rootSheet = sheet;
128 } 128 }
129 129
130 FetchRequest request(ResourceRequest(absURL), FetchInitiatorTypeNames::css, m_parentStyleSheet->charset()); 130 FetchRequest request(ResourceRequest(absURL), FetchInitiatorTypeNames::css, m_parentStyleSheet->charset());
131 m_resource = fetcher->fetchCSSStyleSheet(request); 131 m_resource = CSSStyleSheetResource::fetch(request, fetcher);
132 if (m_resource) { 132 if (m_resource) {
133 // if the import rule is issued dynamically, the sheet may be 133 // if the import rule is issued dynamically, the sheet may be
134 // removed from the pending sheet count, so let the doc know 134 // removed from the pending sheet count, so let the doc know
135 // the sheet being imported is pending. 135 // the sheet being imported is pending.
136 if (m_parentStyleSheet && m_parentStyleSheet->loadCompleted() && rootShe et == m_parentStyleSheet) 136 if (m_parentStyleSheet && m_parentStyleSheet->loadCompleted() && rootShe et == m_parentStyleSheet)
137 m_parentStyleSheet->startLoadingDynamicSheet(); 137 m_parentStyleSheet->startLoadingDynamicSheet();
138 m_loading = true; 138 m_loading = true;
139 m_resource->addClient(&m_styleSheetClient); 139 m_resource->addClient(&m_styleSheetClient);
140 } 140 }
141 } 141 }
142 142
143 } // namespace blink 143 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/CSSSVGDocumentValue.cpp ('k') | Source/core/dom/ProcessingInstruction.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698