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