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 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
404 OwnPtr<TracedValue> value = TracedValue::create(); | 404 OwnPtr<TracedValue> value = TracedValue::create(); |
405 value->setString("requestId", requestId); | 405 value->setString("requestId", requestId); |
406 value->setString("url", url.getString()); | 406 value->setString("url", url.getString()); |
407 value->setInteger("priority", priority); | 407 value->setInteger("priority", priority); |
408 return value; | 408 return value; |
409 } | 409 } |
410 | 410 |
411 void FrameFetchContext::willStartLoadingResource(unsigned long identifier, Resou
rceRequest& request, Resource::Type type) | 411 void FrameFetchContext::willStartLoadingResource(unsigned long identifier, Resou
rceRequest& request, Resource::Type type) |
412 { | 412 { |
413 TRACE_EVENT_ASYNC_BEGIN1("blink.net", "Resource", identifier, "data", loadRe
sourceTraceData(identifier, request.url(), request.priority())); | 413 TRACE_EVENT_ASYNC_BEGIN1("blink.net", "Resource", identifier, "data", loadRe
sourceTraceData(identifier, request.url(), request.priority())); |
| 414 frame()->loader().progress().willStartLoading(identifier); |
414 prepareRequest(identifier, request, ResourceResponse()); | 415 prepareRequest(identifier, request, ResourceResponse()); |
415 | 416 |
416 if (!m_documentLoader || m_documentLoader->fetcher()->archive() || !request.
url().isValid()) | 417 if (!m_documentLoader || m_documentLoader->fetcher()->archive() || !request.
url().isValid()) |
417 return; | 418 return; |
418 if (type == Resource::MainResource) | 419 if (type == Resource::MainResource) |
419 m_documentLoader->applicationCacheHost()->willStartLoadingMainResource(r
equest); | 420 m_documentLoader->applicationCacheHost()->willStartLoadingMainResource(r
equest); |
420 else | 421 else |
421 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque
st); | 422 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque
st); |
422 } | 423 } |
423 | 424 |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
773 } | 774 } |
774 | 775 |
775 DEFINE_TRACE(FrameFetchContext) | 776 DEFINE_TRACE(FrameFetchContext) |
776 { | 777 { |
777 visitor->trace(m_document); | 778 visitor->trace(m_document); |
778 visitor->trace(m_documentLoader); | 779 visitor->trace(m_documentLoader); |
779 FetchContext::trace(visitor); | 780 FetchContext::trace(visitor); |
780 } | 781 } |
781 | 782 |
782 } // namespace blink | 783 } // namespace blink |
OLD | NEW |