| 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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 | 294 |
| 295 bool FrameFetchContext::shouldLoadNewResource(Resource::Type type) const | 295 bool FrameFetchContext::shouldLoadNewResource(Resource::Type type) const |
| 296 { | 296 { |
| 297 if (!m_documentLoader) | 297 if (!m_documentLoader) |
| 298 return true; | 298 return true; |
| 299 if (type == Resource::MainResource) | 299 if (type == Resource::MainResource) |
| 300 return m_documentLoader == frame()->loader().provisionalDocumentLoader()
; | 300 return m_documentLoader == frame()->loader().provisionalDocumentLoader()
; |
| 301 return m_documentLoader == frame()->loader().documentLoader(); | 301 return m_documentLoader == frame()->loader().documentLoader(); |
| 302 } | 302 } |
| 303 | 303 |
| 304 void FrameFetchContext::dispatchWillRequestResource(FetchRequest* request) | |
| 305 { | |
| 306 frame()->loader().client()->dispatchWillRequestResource(request); | |
| 307 } | |
| 308 | |
| 309 void FrameFetchContext::willStartLoadingResource(ResourceRequest& request) | 304 void FrameFetchContext::willStartLoadingResource(ResourceRequest& request) |
| 310 { | 305 { |
| 311 if (m_documentLoader) | 306 if (m_documentLoader) |
| 312 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque
st); | 307 m_documentLoader->applicationCacheHost()->willStartLoadingResource(reque
st); |
| 313 } | 308 } |
| 314 | 309 |
| 315 void FrameFetchContext::didLoadResource() | 310 void FrameFetchContext::didLoadResource() |
| 316 { | 311 { |
| 317 frame()->loader().checkCompleted(); | 312 frame()->loader().checkCompleted(); |
| 318 } | 313 } |
| (...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 692 | 687 |
| 693 | 688 |
| 694 DEFINE_TRACE(FrameFetchContext) | 689 DEFINE_TRACE(FrameFetchContext) |
| 695 { | 690 { |
| 696 visitor->trace(m_document); | 691 visitor->trace(m_document); |
| 697 visitor->trace(m_documentLoader); | 692 visitor->trace(m_documentLoader); |
| 698 FetchContext::trace(visitor); | 693 FetchContext::trace(visitor); |
| 699 } | 694 } |
| 700 | 695 |
| 701 } // namespace blink | 696 } // namespace blink |
| OLD | NEW |