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