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

Side by Side Diff: third_party/WebKit/Source/core/inspector/InspectorResourceContentLoader.cpp

Issue 2710983003: Move HistoryItem handling to DocumentLoader (Closed)
Patch Set: Experiment to fix DCHECKing tests Created 3 years, 8 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 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "core/inspector/InspectorResourceContentLoader.h" 5 #include "core/inspector/InspectorResourceContentLoader.h"
6 6
7 #include "core/css/CSSStyleSheet.h" 7 #include "core/css/CSSStyleSheet.h"
8 #include "core/css/StyleSheetContents.h" 8 #include "core/css/StyleSheetContents.h"
9 #include "core/dom/Document.h" 9 #include "core/dom/Document.h"
10 #include "core/frame/LocalFrame.h" 10 #include "core/frame/LocalFrame.h"
11 #include "core/inspector/InspectedFrames.h" 11 #include "core/inspector/InspectedFrames.h"
12 #include "core/inspector/InspectorCSSAgent.h" 12 #include "core/inspector/InspectorCSSAgent.h"
13 #include "core/inspector/InspectorPageAgent.h" 13 #include "core/inspector/InspectorPageAgent.h"
14 #include "core/loader/DocumentLoader.h"
14 #include "core/loader/resource/CSSStyleSheetResource.h" 15 #include "core/loader/resource/CSSStyleSheetResource.h"
15 #include "core/loader/resource/StyleSheetResourceClient.h" 16 #include "core/loader/resource/StyleSheetResourceClient.h"
16 #include "core/page/Page.h" 17 #include "core/page/Page.h"
17 #include "platform/loader/fetch/FetchInitiatorTypeNames.h" 18 #include "platform/loader/fetch/FetchInitiatorTypeNames.h"
18 #include "platform/loader/fetch/RawResource.h" 19 #include "platform/loader/fetch/RawResource.h"
19 #include "platform/loader/fetch/Resource.h" 20 #include "platform/loader/fetch/Resource.h"
20 #include "platform/loader/fetch/ResourceFetcher.h" 21 #include "platform/loader/fetch/ResourceFetcher.h"
21 #include "public/platform/WebCachePolicy.h" 22 #include "public/platform/WebCachePolicy.h"
22 #include "public/platform/WebURLRequest.h" 23 #include "public/platform/WebURLRequest.h"
23 24
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 InspectedFrames* inspectedFrames = InspectedFrames::create(m_inspectedFrame); 103 InspectedFrames* inspectedFrames = InspectedFrames::create(m_inspectedFrame);
103 for (LocalFrame* frame : *inspectedFrames) { 104 for (LocalFrame* frame : *inspectedFrames) {
104 documents.push_back(frame->document()); 105 documents.push_back(frame->document());
105 documents.appendVector(InspectorPageAgent::importsForFrame(frame)); 106 documents.appendVector(InspectorPageAgent::importsForFrame(frame));
106 } 107 }
107 for (Document* document : documents) { 108 for (Document* document : documents) {
108 HashSet<String> urlsToFetch; 109 HashSet<String> urlsToFetch;
109 110
110 ResourceRequest resourceRequest; 111 ResourceRequest resourceRequest;
111 HistoryItem* item = 112 HistoryItem* item =
112 document->frame() ? document->frame()->loader().currentItem() : nullptr; 113 document->loader() ? document->loader()->historyItem() : nullptr;
113 if (item) { 114 if (item) {
114 resourceRequest = FrameLoader::resourceRequestFromHistoryItem( 115 resourceRequest = item->generateResourceRequest(
115 item, WebCachePolicy::ReturnCacheDataDontLoad); 116 WebCachePolicy::ReturnCacheDataDontLoad);
116 } else { 117 } else {
117 resourceRequest = document->url(); 118 resourceRequest = document->url();
118 resourceRequest.setCachePolicy(WebCachePolicy::ReturnCacheDataDontLoad); 119 resourceRequest.setCachePolicy(WebCachePolicy::ReturnCacheDataDontLoad);
119 } 120 }
120 resourceRequest.setRequestContext(WebURLRequest::RequestContextInternal); 121 resourceRequest.setRequestContext(WebURLRequest::RequestContextInternal);
121 122
122 if (!resourceRequest.url().getString().isEmpty()) { 123 if (!resourceRequest.url().getString().isEmpty()) {
123 urlsToFetch.insert(resourceRequest.url().getString()); 124 urlsToFetch.insert(resourceRequest.url().getString());
124 FetchRequest request(resourceRequest, FetchInitiatorTypeNames::internal); 125 FetchRequest request(resourceRequest, FetchInitiatorTypeNames::internal);
125 Resource* resource = RawResource::fetch(request, document->fetcher()); 126 Resource* resource = RawResource::fetch(request, document->fetcher());
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 (*callback)(); 225 (*callback)();
225 } 226 }
226 } 227 }
227 228
228 void InspectorResourceContentLoader::resourceFinished(ResourceClient* client) { 229 void InspectorResourceContentLoader::resourceFinished(ResourceClient* client) {
229 m_pendingResourceClients.erase(client); 230 m_pendingResourceClients.erase(client);
230 checkDone(); 231 checkDone();
231 } 232 }
232 233
233 } // namespace blink 234 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698