Merge WebKit at r67178 : Add FrameNetworkingContextAndroid.

This is needed to implement a new callback in FrameLoaderClient
which was added in http://trac.webkit.org/changeset/66794

Implementation copied from chromium's FrameNetworkingContextImpl.
(We can't just call FrameNetworkingContext's constructor directly
because it's protected.)

Change-Id: I10a318daed219a1b05972052aaea286c719b4b3c

3 files changed, 57 insertions, 0 deletions

diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
index d4f45a8..78a5db8 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.cpp
@@ -38,6 +38,7 @@
 #include "DocumentLoader.h"
 #include "Frame.h"
 #include "FrameLoader.h"
+#include "FrameNetworkingContextAndroid.h"
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "GraphicsContext.h"
@@ -1319,4 +1320,9 @@ void FrameLoaderClientAndroid::dispatchDidChangeIcons() {
     notImplemented();
 }
 
+PassRefPtr<FrameNetworkingContext> FrameLoaderClientAndroid::createNetworkingContext()
+{
+    return FrameNetworkingContextAndroid::create(getFrame());
+}
+
 }
diff --git a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
index ce711a0..645fcf3 100644
--- a/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
+++ b/WebKit/android/WebCoreSupport/FrameLoaderClientAndroid.h
@@ -202,6 +202,8 @@ namespace android {
 
         virtual void dispatchDidReceiveTouchIconURL(const String& url, bool precomposed);
 
+        virtual PassRefPtr<FrameNetworkingContext> createNetworkingContext();
+
         // WebIconDatabaseClient api
         virtual void didAddIconForPageUrl(const String& pageUrl);
         
diff --git a/WebKit/android/WebCoreSupport/FrameNetworkingContextAndroid.h b/WebKit/android/WebCoreSupport/FrameNetworkingContextAndroid.h
new file mode 100644
index 0000000..01a3c3e
--- /dev/null
+++ b/WebKit/android/WebCoreSupport/FrameNetworkingContextAndroid.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2010, The Android Open Source Project
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *  * Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef FrameNetworkingContextAndroid_h
+#define FrameNetworkingContextAndroid_h
+
+#include "FrameNetworkingContext.h"
+
+namespace android {
+
+class FrameNetworkingContextAndroid : public WebCore::FrameNetworkingContext {
+public:
+    static PassRefPtr<FrameNetworkingContextAndroid> create(WebCore::Frame* frame)
+    {
+        return adoptRef(new FrameNetworkingContextAndroid(frame));
+    }
+
+private:
+    FrameNetworkingContextAndroid(WebCore::Frame* frame)
+        : WebCore::FrameNetworkingContext(frame)
+    {
+    }
+};
+
+}
+
+#endif