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 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
413 std::unique_ptr<TracedValue> value = TracedValue::create(); | 413 std::unique_ptr<TracedValue> value = TracedValue::create(); |
414 value->setString("requestId", requestId); | 414 value->setString("requestId", requestId); |
415 value->setString("url", url.getString()); | 415 value->setString("url", url.getString()); |
416 value->setInteger("priority", priority); | 416 value->setInteger("priority", priority); |
417 return value; | 417 return value; |
418 } | 418 } |
419 | 419 |
420 void FrameFetchContext::willStartLoadingResource(unsigned long identifier, Resou
rceRequest& request, Resource::Type type) | 420 void FrameFetchContext::willStartLoadingResource(unsigned long identifier, Resou
rceRequest& request, Resource::Type type) |
421 { | 421 { |
422 TRACE_EVENT_ASYNC_BEGIN1("blink.net", "Resource", identifier, "data", loadRe
sourceTraceData(identifier, request.url(), request.priority())); | 422 TRACE_EVENT_ASYNC_BEGIN1("blink.net", "Resource", identifier, "data", loadRe
sourceTraceData(identifier, request.url(), request.priority())); |
| 423 frame()->loader().progress().willStartLoading(identifier); |
423 prepareRequest(identifier, request, ResourceResponse()); | 424 prepareRequest(identifier, request, ResourceResponse()); |
424 | 425 |
425 if (!m_documentLoader || m_documentLoader->fetcher()->archive() || !request.
url().isValid()) | 426 if (!m_documentLoader || m_documentLoader->fetcher()->archive() || !request.
url().isValid()) |
426 return; | 427 return; |
427 if (type == Resource::MainResource) | 428 if (type == Resource::MainResource) |
428 m_documentLoader->applicationCacheHost()->willStartLoadingMainResource(r
equest); | 429 m_documentLoader->applicationCacheHost()->willStartLoadingMainResource(r
equest); |
429 else | 430 else |
430 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque
st); | 431 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque
st); |
431 } | 432 } |
432 | 433 |
(...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
782 } | 783 } |
783 | 784 |
784 DEFINE_TRACE(FrameFetchContext) | 785 DEFINE_TRACE(FrameFetchContext) |
785 { | 786 { |
786 visitor->trace(m_document); | 787 visitor->trace(m_document); |
787 visitor->trace(m_documentLoader); | 788 visitor->trace(m_documentLoader); |
788 FetchContext::trace(visitor); | 789 FetchContext::trace(visitor); |
789 } | 790 } |
790 | 791 |
791 } // namespace blink | 792 } // namespace blink |
OLD | NEW |