OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 #include "core/loader/DocumentLoader.h" | 59 #include "core/loader/DocumentLoader.h" |
60 #include "core/loader/FrameLoader.h" | 60 #include "core/loader/FrameLoader.h" |
61 #include "core/loader/MixedContentChecker.h" | 61 #include "core/loader/MixedContentChecker.h" |
62 #include "core/loader/ThreadableLoaderClient.h" | 62 #include "core/loader/ThreadableLoaderClient.h" |
63 #include "core/page/Page.h" | 63 #include "core/page/Page.h" |
64 #include "core/xmlhttprequest/XMLHttpRequest.h" | 64 #include "core/xmlhttprequest/XMLHttpRequest.h" |
65 #include "platform/JSONValues.h" | 65 #include "platform/JSONValues.h" |
66 #include "platform/blob/BlobData.h" | 66 #include "platform/blob/BlobData.h" |
67 #include "platform/network/HTTPHeaderMap.h" | 67 #include "platform/network/HTTPHeaderMap.h" |
68 #include "platform/network/ResourceError.h" | 68 #include "platform/network/ResourceError.h" |
| 69 #include "platform/network/ResourceLoadPriority.h" |
69 #include "platform/network/ResourceRequest.h" | 70 #include "platform/network/ResourceRequest.h" |
70 #include "platform/network/ResourceResponse.h" | 71 #include "platform/network/ResourceResponse.h" |
71 #include "platform/network/WebSocketHandshakeRequest.h" | 72 #include "platform/network/WebSocketHandshakeRequest.h" |
72 #include "platform/network/WebSocketHandshakeResponse.h" | 73 #include "platform/network/WebSocketHandshakeResponse.h" |
73 #include "platform/weborigin/KURL.h" | 74 #include "platform/weborigin/KURL.h" |
74 #include "public/platform/WebURLRequest.h" | 75 #include "public/platform/WebURLRequest.h" |
75 #include "wtf/CurrentTime.h" | 76 #include "wtf/CurrentTime.h" |
76 #include "wtf/RefPtr.h" | 77 #include "wtf/RefPtr.h" |
77 #include "wtf/text/Base64.h" | 78 #include "wtf/text/Base64.h" |
78 | 79 |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 case MixedContentChecker::ContextTypeBlockable: | 187 case MixedContentChecker::ContextTypeBlockable: |
187 return TypeBuilder::Network::Request::MixedContentType::Blockable; | 188 return TypeBuilder::Network::Request::MixedContentType::Blockable; |
188 case MixedContentChecker::ContextTypeOptionallyBlockable: | 189 case MixedContentChecker::ContextTypeOptionallyBlockable: |
189 case MixedContentChecker::ContextTypeShouldBeBlockable: | 190 case MixedContentChecker::ContextTypeShouldBeBlockable: |
190 return TypeBuilder::Network::Request::MixedContentType::Optionally_block
able; | 191 return TypeBuilder::Network::Request::MixedContentType::Optionally_block
able; |
191 } | 192 } |
192 | 193 |
193 return TypeBuilder::Network::Request::MixedContentType::None; | 194 return TypeBuilder::Network::Request::MixedContentType::None; |
194 } | 195 } |
195 | 196 |
| 197 TypeBuilder::Network::ResourcePriority::Enum resourcePriorityJSON(ResourceLoadPr
iority priority) |
| 198 { |
| 199 switch (priority) { |
| 200 case ResourceLoadPriorityVeryLow: return TypeBuilder::Network::ResourcePrior
ity::VeryLow; |
| 201 case ResourceLoadPriorityLow: return TypeBuilder::Network::ResourcePriority:
:Low; |
| 202 case ResourceLoadPriorityMedium: return TypeBuilder::Network::ResourcePriori
ty::Medium; |
| 203 case ResourceLoadPriorityHigh: return TypeBuilder::Network::ResourcePriority
::High; |
| 204 case ResourceLoadPriorityVeryHigh: return TypeBuilder::Network::ResourcePrio
rity::VeryHigh; |
| 205 case ResourceLoadPriorityUnresolved: break; |
| 206 } |
| 207 ASSERT_NOT_REACHED(); |
| 208 return TypeBuilder::Network::ResourcePriority::Medium; |
| 209 } |
| 210 |
| 211 |
196 } // namespace | 212 } // namespace |
197 | 213 |
198 void InspectorResourceAgent::restore() | 214 void InspectorResourceAgent::restore() |
199 { | 215 { |
200 if (m_state->getBoolean(ResourceAgentState::resourceAgentEnabled)) | 216 if (m_state->getBoolean(ResourceAgentState::resourceAgentEnabled)) |
201 enable(); | 217 enable(); |
202 } | 218 } |
203 | 219 |
204 static PassRefPtr<TypeBuilder::Network::ResourceTiming> buildObjectForTiming(con
st ResourceLoadTiming& timing) | 220 static PassRefPtr<TypeBuilder::Network::ResourceTiming> buildObjectForTiming(con
st ResourceLoadTiming& timing) |
205 { | 221 { |
(...skipping 13 matching lines...) Expand all Loading... |
219 .setSendEnd(timing.calculateMillisecondDelta(timing.sendEnd())) | 235 .setSendEnd(timing.calculateMillisecondDelta(timing.sendEnd())) |
220 .setReceiveHeadersEnd(timing.calculateMillisecondDelta(timing.receiveHea
dersEnd())) | 236 .setReceiveHeadersEnd(timing.calculateMillisecondDelta(timing.receiveHea
dersEnd())) |
221 .release(); | 237 .release(); |
222 } | 238 } |
223 | 239 |
224 static PassRefPtr<TypeBuilder::Network::Request> buildObjectForResourceRequest(c
onst ResourceRequest& request) | 240 static PassRefPtr<TypeBuilder::Network::Request> buildObjectForResourceRequest(c
onst ResourceRequest& request) |
225 { | 241 { |
226 RefPtr<TypeBuilder::Network::Request> requestObject = TypeBuilder::Network::
Request::create() | 242 RefPtr<TypeBuilder::Network::Request> requestObject = TypeBuilder::Network::
Request::create() |
227 .setUrl(urlWithoutFragment(request.url()).string()) | 243 .setUrl(urlWithoutFragment(request.url()).string()) |
228 .setMethod(request.httpMethod()) | 244 .setMethod(request.httpMethod()) |
229 .setHeaders(buildObjectForHeaders(request.httpHeaderFields())); | 245 .setHeaders(buildObjectForHeaders(request.httpHeaderFields())) |
| 246 .setInitialPriority(resourcePriorityJSON(request.priority())); |
230 if (request.httpBody() && !request.httpBody()->isEmpty()) { | 247 if (request.httpBody() && !request.httpBody()->isEmpty()) { |
231 Vector<char> bytes; | 248 Vector<char> bytes; |
232 request.httpBody()->flatten(bytes); | 249 request.httpBody()->flatten(bytes); |
233 requestObject->setPostData(String::fromUTF8WithLatin1Fallback(bytes.data
(), bytes.size())); | 250 requestObject->setPostData(String::fromUTF8WithLatin1Fallback(bytes.data
(), bytes.size())); |
234 } | 251 } |
235 return requestObject; | 252 return requestObject; |
236 } | 253 } |
237 | 254 |
238 static PassRefPtr<TypeBuilder::Network::Response> buildObjectForResourceResponse
(const ResourceResponse& response) | 255 static PassRefPtr<TypeBuilder::Network::Response> buildObjectForResourceResponse
(const ResourceResponse& response) |
239 { | 256 { |
(...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1044 , m_removeFinishedReplayXHRTimer(this, &InspectorResourceAgent::removeFinish
edReplayXHRFired) | 1061 , m_removeFinishedReplayXHRTimer(this, &InspectorResourceAgent::removeFinish
edReplayXHRFired) |
1045 { | 1062 { |
1046 } | 1063 } |
1047 | 1064 |
1048 bool InspectorResourceAgent::shouldForceCORSPreflight() | 1065 bool InspectorResourceAgent::shouldForceCORSPreflight() |
1049 { | 1066 { |
1050 return m_state->getBoolean(ResourceAgentState::cacheDisabled); | 1067 return m_state->getBoolean(ResourceAgentState::cacheDisabled); |
1051 } | 1068 } |
1052 | 1069 |
1053 } // namespace blink | 1070 } // namespace blink |
OLD | NEW |