diff options
| author | Feng Qian <> | 2009-04-10 18:11:29 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-04-10 18:11:29 -0700 |
| commit | 8f72e70a9fd78eec56623b3a62e68f16b7b27e28 (patch) | |
| tree | 181bf9a400c30a1bf34ea6d72560e8d00111d549 /WebCore/loader/mac | |
| parent | 7ed56f225e0ade046e1c2178977f72b2d896f196 (diff) | |
| download | external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.zip external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.gz external_webkit-8f72e70a9fd78eec56623b3a62e68f16b7b27e28.tar.bz2 | |
AI 145796: Land the WebKit merge @r42026.
Automated import of CL 145796
Diffstat (limited to 'WebCore/loader/mac')
| -rw-r--r-- | WebCore/loader/mac/ResourceLoaderMac.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/WebCore/loader/mac/ResourceLoaderMac.mm b/WebCore/loader/mac/ResourceLoaderMac.mm index d6ee923..25fe7bd 100644 --- a/WebCore/loader/mac/ResourceLoaderMac.mm +++ b/WebCore/loader/mac/ResourceLoaderMac.mm @@ -37,6 +37,8 @@ namespace WebCore { NSCachedURLResponse* ResourceLoader::willCacheResponse(ResourceHandle*, NSCachedURLResponse* response) { + if (!m_sendResourceLoadCallbacks) + return 0; return frameLoader()->client()->willCacheResponse(documentLoader(), identifier(), response); } |