| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 398 int intraPriorityValue) { | 398 int intraPriorityValue) { |
| 399 TRACE_EVENT1( | 399 TRACE_EVENT1( |
| 400 "devtools.timeline", "ResourceChangePriority", "data", | 400 "devtools.timeline", "ResourceChangePriority", "data", |
| 401 InspectorChangeResourcePriorityEvent::data(identifier, loadPriority)); | 401 InspectorChangeResourcePriorityEvent::data(identifier, loadPriority)); |
| 402 InspectorInstrumentation::didChangeResourcePriority(frame(), identifier, | 402 InspectorInstrumentation::didChangeResourcePriority(frame(), identifier, |
| 403 loadPriority); | 403 loadPriority); |
| 404 } | 404 } |
| 405 | 405 |
| 406 void FrameFetchContext::prepareRequest(ResourceRequest& request) { | 406 void FrameFetchContext::prepareRequest(ResourceRequest& request) { |
| 407 frame()->loader().applyUserAgent(request); | 407 frame()->loader().applyUserAgent(request); |
| 408 frameLoaderClient()->dispatchWillSendRequest(request); | 408 frameLoaderClient()->willSendRequest(request, |
| 409 masterDocumentLoader()->loadType()); |
| 409 } | 410 } |
| 410 | 411 |
| 411 void FrameFetchContext::dispatchWillSendRequest( | 412 void FrameFetchContext::dispatchWillSendRequest( |
| 412 unsigned long identifier, | 413 unsigned long identifier, |
| 413 ResourceRequest& request, | 414 ResourceRequest& request, |
| 414 const ResourceResponse& redirectResponse, | 415 const ResourceResponse& redirectResponse, |
| 415 const FetchInitiatorInfo& initiatorInfo) { | 416 const FetchInitiatorInfo& initiatorInfo) { |
| 416 TRACE_EVENT1("devtools.timeline", "ResourceSendRequest", "data", | 417 TRACE_EVENT1("devtools.timeline", "ResourceSendRequest", "data", |
| 417 InspectorSendRequestEvent::data(identifier, frame(), request)); | 418 InspectorSendRequestEvent::data(identifier, frame(), request)); |
| 418 // For initial requests, prepareRequest() is called in | 419 // For initial requests, prepareRequest() is called in |
| (...skipping 650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1069 response); | 1070 response); |
| 1070 } | 1071 } |
| 1071 | 1072 |
| 1072 DEFINE_TRACE(FrameFetchContext) { | 1073 DEFINE_TRACE(FrameFetchContext) { |
| 1073 visitor->trace(m_document); | 1074 visitor->trace(m_document); |
| 1074 visitor->trace(m_documentLoader); | 1075 visitor->trace(m_documentLoader); |
| 1075 FetchContext::trace(visitor); | 1076 FetchContext::trace(visitor); |
| 1076 } | 1077 } |
| 1077 | 1078 |
| 1078 } // namespace blink | 1079 } // namespace blink |
| OLD | NEW |