diff options
Diffstat (limited to 'WebCore/loader/FrameLoader.cpp')
| -rw-r--r-- | WebCore/loader/FrameLoader.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp index 5e592a5..63b00e8 100644 --- a/WebCore/loader/FrameLoader.cpp +++ b/WebCore/loader/FrameLoader.cpp @@ -832,16 +832,11 @@ void FrameLoader::didBeginDocument(bool dispatch) updateFirstPartyForCookies(); -<<<<<<< HEAD - Settings* settings = document->settings(); - document->docLoader()->setAutoLoadImages(settings && settings->loadsImagesAutomatically()); -#ifdef ANDROID_BLOCK_NETWORK_IMAGE - document->docLoader()->setBlockNetworkImage(settings && settings->blockNetworkImage()); -#endif -======= Settings* settings = m_frame->document()->settings(); m_frame->document()->docLoader()->setAutoLoadImages(settings && settings->loadsImagesAutomatically()); ->>>>>>> webkit.org at r58033 +#ifdef ANDROID_BLOCK_NETWORK_IMAGE + m_frame->document()->docLoader()->setBlockNetworkImage(settings && settings->blockNetworkImage()); +#endif if (m_documentLoader) { String dnsPrefetchControl = m_documentLoader->response().httpHeaderField("X-DNS-Prefetch-Control"); |