diff options
| author | Iain Merrick <husky@google.com> | 2010-09-13 17:10:07 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-09-16 12:10:43 +0100 |
| commit | 92451d3c3cebc17dfa2908de5836d2dae50d4a42 (patch) | |
| tree | a1928379089f64399420a8e6f2cc4a9c52b08337 /WebKit/android/jni/WebSettings.cpp | |
| parent | 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 (diff) | |
| download | external_webkit-92451d3c3cebc17dfa2908de5836d2dae50d4a42.zip external_webkit-92451d3c3cebc17dfa2908de5836d2dae50d4a42.tar.gz external_webkit-92451d3c3cebc17dfa2908de5836d2dae50d4a42.tar.bz2 | |
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
Diffstat (limited to 'WebKit/android/jni/WebSettings.cpp')
| -rw-r--r-- | WebKit/android/jni/WebSettings.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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); |