| 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 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 | 337 |
| 338 void FrameFetchContext::willStartLoadingResource(ResourceRequest& request) | 338 void FrameFetchContext::willStartLoadingResource(ResourceRequest& request) |
| 339 { | 339 { |
| 340 if (m_documentLoader) | 340 if (m_documentLoader) |
| 341 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque
st); | 341 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque
st); |
| 342 } | 342 } |
| 343 | 343 |
| 344 void FrameFetchContext::didLoadResource(Resource* resource) | 344 void FrameFetchContext::didLoadResource(Resource* resource) |
| 345 { | 345 { |
| 346 if (resource->isLoadEventBlockingResourceType()) | 346 if (resource->isLoadEventBlockingResourceType()) |
| 347 frame()->loader().checkCompleted(); | 347 frame()->loader().checkCompleted(6); |
| 348 } | 348 } |
| 349 | 349 |
| 350 void FrameFetchContext::addResourceTiming(const ResourceTimingInfo& info) | 350 void FrameFetchContext::addResourceTiming(const ResourceTimingInfo& info) |
| 351 { | 351 { |
| 352 Document* initiatorDocument = m_document && info.isMainResource() ? m_docume
nt->parentDocument() : m_document.get(); | 352 Document* initiatorDocument = m_document && info.isMainResource() ? m_docume
nt->parentDocument() : m_document.get(); |
| 353 if (!initiatorDocument || !initiatorDocument->domWindow()) | 353 if (!initiatorDocument || !initiatorDocument->domWindow()) |
| 354 return; | 354 return; |
| 355 DOMWindowPerformance::performance(*initiatorDocument->domWindow())->addResou
rceTiming(info); | 355 DOMWindowPerformance::performance(*initiatorDocument->domWindow())->addResou
rceTiming(info); |
| 356 } | 356 } |
| 357 | 357 |
| (...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 802 } | 802 } |
| 803 | 803 |
| 804 DEFINE_TRACE(FrameFetchContext) | 804 DEFINE_TRACE(FrameFetchContext) |
| 805 { | 805 { |
| 806 visitor->trace(m_document); | 806 visitor->trace(m_document); |
| 807 visitor->trace(m_documentLoader); | 807 visitor->trace(m_documentLoader); |
| 808 FetchContext::trace(visitor); | 808 FetchContext::trace(visitor); |
| 809 } | 809 } |
| 810 | 810 |
| 811 } // namespace blink | 811 } // namespace blink |
| OLD | NEW |