From 92451d3c3cebc17dfa2908de5836d2dae50d4a42 Mon Sep 17 00:00:00 2001 From: Iain Merrick Date: Mon, 13 Sep 2010 17:10:07 +0100 Subject: Merge WebKit at r67178 : Fix conflicts. V8DOMWindowShell::initContextIfNeeded now has a return value: http://trac.webkit.org/changeset/66840 DocLoader renamed to CachedResourceLoader. This affects loader/*, ResourceHandleAndroid.cpp and WebSettings.cpp http://trac.webkit.org/changeset/66963 Change-Id: I3ea74336a4a0236f7487b794982b9d19e08c1c45 --- WebKit/android/jni/WebSettings.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'WebKit') diff --git a/WebKit/android/jni/WebSettings.cpp b/WebKit/android/jni/WebSettings.cpp index 87f1b54..9b441c8 100644 --- a/WebKit/android/jni/WebSettings.cpp +++ b/WebKit/android/jni/WebSettings.cpp @@ -30,9 +30,9 @@ #include "ApplicationCacheStorage.h" #include "BitmapAllocatorAndroid.h" +#include "CachedResourceLoader.h" #include "DatabaseTracker.h" #include "Database.h" -#include "DocLoader.h" #include "Document.h" #include "Frame.h" #include "FrameLoader.h" @@ -251,7 +251,7 @@ public: WebCore::Settings* s = pFrame->settings(); if (!s) return; - WebCore::DocLoader* docLoader = pFrame->document()->docLoader(); + WebCore::CachedResourceLoader* cachedResourceLoader = pFrame->document()->cachedResourceLoader(); #ifdef ANDROID_LAYOUT jobject layout = env->GetObjectField(obj, gFieldIds->mLayoutAlgorithm); @@ -322,13 +322,13 @@ public: jboolean flag = env->GetBooleanField(obj, gFieldIds->mLoadsImagesAutomatically); s->setLoadsImagesAutomatically(flag); if (flag) - docLoader->setAutoLoadImages(true); + cachedResourceLoader->setAutoLoadImages(true); #ifdef ANDROID_BLOCK_NETWORK_IMAGE flag = env->GetBooleanField(obj, gFieldIds->mBlockNetworkImage); s->setBlockNetworkImage(flag); if(!flag) - docLoader->setBlockNetworkImage(false); + cachedResourceLoader->setBlockNetworkImage(false); #endif flag = env->GetBooleanField(obj, gFieldIds->mJavaScriptEnabled); -- cgit v1.1