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 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
392 OwnPtr<TracedValue> value = TracedValue::create(); | 392 OwnPtr<TracedValue> value = TracedValue::create(); |
393 value->setString("requestId", requestId); | 393 value->setString("requestId", requestId); |
394 value->setString("url", url.getString()); | 394 value->setString("url", url.getString()); |
395 value->setInteger("priority", priority); | 395 value->setInteger("priority", priority); |
396 return value.release(); | 396 return value.release(); |
397 } | 397 } |
398 | 398 |
399 void FrameFetchContext::willStartLoadingResource(Resource* resource, ResourceReq
uest& request) | 399 void FrameFetchContext::willStartLoadingResource(Resource* resource, ResourceReq
uest& request) |
400 { | 400 { |
401 TRACE_EVENT_ASYNC_BEGIN1("blink.net", "Resource", resource, "data", loadReso
urceTraceData(resource->identifier(), resource->url(), resource->resourceRequest
().priority())); | 401 TRACE_EVENT_ASYNC_BEGIN1("blink.net", "Resource", resource, "data", loadReso
urceTraceData(resource->identifier(), resource->url(), resource->resourceRequest
().priority())); |
| 402 frame()->loader().progress().willStartLoading(resource); |
402 | 403 |
403 if (!m_documentLoader) | 404 if (!m_documentLoader) |
404 return; | 405 return; |
405 if (resource->getType() == Resource::MainResource) | 406 if (resource->getType() == Resource::MainResource) |
406 m_documentLoader->applicationCacheHost()->willStartLoadingMainResource(r
equest); | 407 m_documentLoader->applicationCacheHost()->willStartLoadingMainResource(r
equest); |
407 else | 408 else |
408 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque
st); | 409 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque
st); |
409 } | 410 } |
410 | 411 |
411 void FrameFetchContext::didLoadResource(Resource* resource) | 412 void FrameFetchContext::didLoadResource(Resource* resource) |
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
814 } | 815 } |
815 | 816 |
816 DEFINE_TRACE(FrameFetchContext) | 817 DEFINE_TRACE(FrameFetchContext) |
817 { | 818 { |
818 visitor->trace(m_document); | 819 visitor->trace(m_document); |
819 visitor->trace(m_documentLoader); | 820 visitor->trace(m_documentLoader); |
820 FetchContext::trace(visitor); | 821 FetchContext::trace(visitor); |
821 } | 822 } |
822 | 823 |
823 } // namespace blink | 824 } // namespace blink |
OLD | NEW |