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

7 files changed, 11 insertions, 35 deletions

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index 196ec69..67fd588 100644
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -295,13 +295,10 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
 	html/ImageDocument.cpp \
   html/MediaDocument.cpp \
 	html/ImageResizerThread.cpp \
-<<<<<<< HEAD
 	html/LabelsNodeList.cpp \
 	html/StepRange.cpp \
-=======
 	html/PluginDocument.cpp \
 	html/TextDocument.cpp \
->>>>>>> webkit.org at r67178
 	html/TimeRanges.cpp \
 	html/ValidityState.cpp \
 	\
diff --git a/WebCore/bindings/v8/V8DOMWindowShell.cpp b/WebCore/bindings/v8/V8DOMWindowShell.cpp
index a69eab4..f0f473d 100644
--- a/WebCore/bindings/v8/V8DOMWindowShell.cpp
+++ b/WebCore/bindings/v8/V8DOMWindowShell.cpp
@@ -319,13 +319,11 @@ bool V8DOMWindowShell::initContextIfNeeded()
     // we do isolated worlds the WebCore way.
     m_frame->loader()->dispatchDidClearWindowObjectInWorld(0);
 
-<<<<<<< HEAD
 #ifdef ANDROID_INSTRUMENT
     android::TimeCounter::record(android::TimeCounter::JavaScriptInitTimeCounter, __FUNCTION__);
 #endif
-=======
+
     return true;
->>>>>>> webkit.org at r67178
 }
 
 v8::Persistent<v8::Context> V8DOMWindowShell::createNewContext(v8::Handle<v8::Object> global, int extensionGroup)
diff --git a/WebCore/loader/CachedImage.cpp b/WebCore/loader/CachedImage.cpp
index 4dd8ea3..908c425 100644
--- a/WebCore/loader/CachedImage.cpp
+++ b/WebCore/loader/CachedImage.cpp
@@ -82,17 +82,12 @@ void CachedImage::decodedDataDeletionTimerFired(Timer<CachedImage>*)
 
 void CachedImage::load(CachedResourceLoader* cachedResourceLoader)
 {
-<<<<<<< HEAD
 #ifdef ANDROID_BLOCK_NETWORK_IMAGE
-    if (!docLoader || (docLoader->autoLoadImages() && !docLoader->shouldBlockNetworkImage(m_url)))
+    if (!cachedResourceLoader || (cachedResourceLoader->autoLoadImages() && !cachedResourceLoader->shouldBlockNetworkImage(m_url)))
 #else
-    if (!docLoader || docLoader->autoLoadImages())
-#endif
-        CachedResource::load(docLoader, true, DoSecurityCheck, true);
-=======
     if (!cachedResourceLoader || cachedResourceLoader->autoLoadImages())
+#endif
         CachedResource::load(cachedResourceLoader, true, DoSecurityCheck, true);
->>>>>>> webkit.org at r67178
     else
         setLoading(false);
 }
diff --git a/WebCore/loader/CachedResourceLoader.cpp b/WebCore/loader/CachedResourceLoader.cpp
index 68cd7ec..e2edb3a 100644
--- a/WebCore/loader/CachedResourceLoader.cpp
+++ b/WebCore/loader/CachedResourceLoader.cpp
@@ -334,9 +334,8 @@ void CachedResourceLoader::setAutoLoadImages(bool enable)
     }
 }
 
-<<<<<<< HEAD:WebCore/loader/DocLoader.cpp
 #ifdef ANDROID_BLOCK_NETWORK_IMAGE
-bool DocLoader::shouldBlockNetworkImage(const String& url) const
+bool CachedResourceLoader::shouldBlockNetworkImage(const String& url) const
 {
     if (!m_blockNetworkImage)
         return false;
@@ -348,7 +347,7 @@ bool DocLoader::shouldBlockNetworkImage(const String& url) const
     return false;
 }
 
-void DocLoader::setBlockNetworkImage(bool block)
+void CachedResourceLoader::setBlockNetworkImage(bool block)
 {
     if (block == m_blockNetworkImage)
         return;
@@ -370,10 +369,7 @@ void DocLoader::setBlockNetworkImage(bool block)
 }
 #endif
 
-CachePolicy DocLoader::cachePolicy() const
-=======
 CachePolicy CachedResourceLoader::cachePolicy() const
->>>>>>> webkit.org at r67178:WebCore/loader/CachedResourceLoader.cpp
 {
     return frame() ? frame()->loader()->subresourceCachePolicy() : CachePolicyVerify;
 }
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 4cbfb00..17db3fa 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -676,14 +676,10 @@ void FrameLoader::didBeginDocument(bool dispatch)
     updateFirstPartyForCookies();
 
     Settings* settings = m_frame->document()->settings();
-<<<<<<< HEAD
-    m_frame->document()->docLoader()->setAutoLoadImages(settings && settings->loadsImagesAutomatically());
+    m_frame->document()->cachedResourceLoader()->setAutoLoadImages(settings && settings->loadsImagesAutomatically());
 #ifdef ANDROID_BLOCK_NETWORK_IMAGE
-    m_frame->document()->docLoader()->setBlockNetworkImage(settings && settings->blockNetworkImage());
+    m_frame->document()->cachedResourceLoader()->setBlockNetworkImage(settings && settings->blockNetworkImage());
 #endif
-=======
-    m_frame->document()->cachedResourceLoader()->setAutoLoadImages(settings && settings->loadsImagesAutomatically());
->>>>>>> webkit.org at r67178
 
     if (m_documentLoader) {
         String dnsPrefetchControl = m_documentLoader->response().httpHeaderField("X-DNS-Prefetch-Control");
diff --git a/WebCore/platform/network/android/ResourceHandleAndroid.cpp b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
index 2a2ea74..c684da3 100644
--- a/WebCore/platform/network/android/ResourceHandleAndroid.cpp
+++ b/WebCore/platform/network/android/ResourceHandleAndroid.cpp
@@ -51,7 +51,6 @@ ResourceHandle::~ResourceHandle()
 
 bool ResourceHandle::start(Frame* frame)
 {
-<<<<<<< HEAD
     DocumentLoader* docLoader = frame->loader()->activeDocumentLoader();
     MainResourceLoader* mainLoader = docLoader->mainResourceLoader();
     bool isMainResource =
@@ -59,11 +58,6 @@ bool ResourceHandle::start(Frame* frame)
     bool isPrivateBrowsing = false;
     if (frame->settings())
         isPrivateBrowsing = frame->settings()->privateBrowsingEnabled();
-=======
-    DocumentLoader* documentLoader = frame->loader()->activeDocumentLoader();
-    MainResourceLoader* mainLoader = documentLoader->mainResourceLoader();
-    bool isMainResource = mainLoader && (mainLoader->handle() == this);
->>>>>>> webkit.org at r67178
 
     PassRefPtr<ResourceLoaderAndroid> loader = ResourceLoaderAndroid::start(this, d->m_firstRequest, frame->loader()->client(), isMainResource, false, isPrivateBrowsing);
 
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);