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

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

Issue 14672042: Prepare to add more initiator info to CachedResource(Request) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 7 years, 7 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/CSSImageValue.cpp ('k') | Source/core/css/WebKitCSSSVGDocumentValue.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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 // Check for a cycle in our import chain. If we encounter a stylesheet 110 // Check for a cycle in our import chain. If we encounter a stylesheet
111 // in our parent chain with the same URL, then just bail. 111 // in our parent chain with the same URL, then just bail.
112 StyleSheetContents* rootSheet = m_parentStyleSheet; 112 StyleSheetContents* rootSheet = m_parentStyleSheet;
113 for (StyleSheetContents* sheet = m_parentStyleSheet; sheet; sheet = sheet->p arentStyleSheet()) { 113 for (StyleSheetContents* sheet = m_parentStyleSheet; sheet; sheet = sheet->p arentStyleSheet()) {
114 if (equalIgnoringFragmentIdentifier(absURL, sheet->baseURL()) 114 if (equalIgnoringFragmentIdentifier(absURL, sheet->baseURL())
115 || equalIgnoringFragmentIdentifier(absURL, document->completeURL(she et->originalURL()))) 115 || equalIgnoringFragmentIdentifier(absURL, document->completeURL(she et->originalURL())))
116 return; 116 return;
117 rootSheet = sheet; 117 rootSheet = sheet;
118 } 118 }
119 119
120 CachedResourceRequest request(ResourceRequest(absURL), m_parentStyleSheet->c harset()); 120 CachedResourceRequest request(ResourceRequest(absURL), cachedResourceRequest Initiators().css, m_parentStyleSheet->charset());
121 request.setInitiator(cachedResourceRequestInitiators().css);
122 if (m_parentStyleSheet->isUserStyleSheet()) 121 if (m_parentStyleSheet->isUserStyleSheet())
123 m_cachedSheet = cachedResourceLoader->requestUserCSSStyleSheet(request); 122 m_cachedSheet = cachedResourceLoader->requestUserCSSStyleSheet(request);
124 else 123 else
125 m_cachedSheet = cachedResourceLoader->requestCSSStyleSheet(request); 124 m_cachedSheet = cachedResourceLoader->requestCSSStyleSheet(request);
126 if (m_cachedSheet) { 125 if (m_cachedSheet) {
127 // if the import rule is issued dynamically, the sheet may be 126 // if the import rule is issued dynamically, the sheet may be
128 // removed from the pending sheet count, so let the doc know 127 // removed from the pending sheet count, so let the doc know
129 // the sheet being imported is pending. 128 // the sheet being imported is pending.
130 if (m_parentStyleSheet && m_parentStyleSheet->loadCompleted() && rootShe et == m_parentStyleSheet) 129 if (m_parentStyleSheet && m_parentStyleSheet->loadCompleted() && rootShe et == m_parentStyleSheet)
131 m_parentStyleSheet->startLoadingDynamicSheet(); 130 m_parentStyleSheet->startLoadingDynamicSheet();
132 m_loading = true; 131 m_loading = true;
133 m_cachedSheet->addClient(&m_styleSheetClient); 132 m_cachedSheet->addClient(&m_styleSheetClient);
134 } 133 }
135 } 134 }
136 135
137 void StyleRuleImport::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObject Info) const 136 void StyleRuleImport::reportDescendantMemoryUsage(MemoryObjectInfo* memoryObject Info) const
138 { 137 {
139 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS); 138 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::CSS);
140 info.addMember(m_strHref, "strHref"); 139 info.addMember(m_strHref, "strHref");
141 info.addMember(m_mediaQueries, "mediaQueries"); 140 info.addMember(m_mediaQueries, "mediaQueries");
142 info.addMember(m_styleSheet, "styleSheet"); 141 info.addMember(m_styleSheet, "styleSheet");
143 } 142 }
144 143
145 } // namespace WebCore 144 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/css/CSSImageValue.cpp ('k') | Source/core/css/WebKitCSSSVGDocumentValue.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698