Diff
Modified: trunk/Source/WebKit2/ChangeLog (112272 => 112273)
--- trunk/Source/WebKit2/ChangeLog 2012-03-27 15:17:42 UTC (rev 112272)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-27 15:22:56 UTC (rev 112273)
@@ -1,3 +1,23 @@
+2012-03-27 Carlos Garcia Campos <cgar...@igalia.com>
+
+ Implement WebFrameNetworkingContext for soup in WebKit2
+
+ [SOUP] Implement WebFrameNetworkingContext for soup in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=82081
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am: Add new files to compilation
+ * WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp: Copied from Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h.
+ (WebKit::WebFrameNetworkingContext::soupSession): Return the
+ default SoupSession.
+ * WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h: Renamed from Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h.
+ (WebKit):
+ (WebFrameNetworkingContext):
+ (WebKit::WebFrameNetworkingContext::create): Create a new
+ WebFrameNetworkingContext().
+ (WebKit::WebFrameNetworkingContext::WebFrameNetworkingContext):
+
2012-03-27 Yael Aharon <yael.aha...@nokia.com>
[Qt][WK2] Merge setVisibleContentsRect with setFixedVisibleContentRect
Modified: trunk/Source/WebKit2/GNUmakefile.am (112272 => 112273)
--- trunk/Source/WebKit2/GNUmakefile.am 2012-03-27 15:17:42 UTC (rev 112272)
+++ trunk/Source/WebKit2/GNUmakefile.am 2012-03-27 15:22:56 UTC (rev 112273)
@@ -909,8 +909,9 @@
Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebDragClientGtk.cpp \
Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebEditorClientGtk.cpp \
Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp \
- Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h \
Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebPopupMenuGtk.cpp \
+ Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp \
+ Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h \
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp \
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h \
Source/WebKit2/WebProcess/WebCoreSupport/WebContextMenuClient.cpp \
@@ -1045,6 +1046,7 @@
-I$(srcdir)/Source/WebKit2/WebProcess/Plugins/Netscape/gtk \
-I$(srcdir)/Source/WebKit2/WebProcess/WebCoreSupport \
-I$(srcdir)/Source/WebKit2/WebProcess/WebCoreSupport/gtk \
+ -I$(srcdir)/Source/WebKit2/WebProcess/WebCoreSupport/soup \
-I$(srcdir)/Source/WebKit2/WebProcess/WebPage \
-I$(srcdir)/Source/WebKit2/WebProcess/WebPage/gtk \
-I$(top_builddir)/DerivedSources/WebKit2 \
Deleted: trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h (112272 => 112273)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h 2012-03-27 15:17:42 UTC (rev 112272)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h 2012-03-27 15:22:56 UTC (rev 112273)
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. 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 APPLE INC. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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 WebFrameNetworkingContext_h
-#define WebFrameNetworkingContext_h
-
-#include "WebFrame.h"
-
-#include <WebCore/FrameNetworkingContext.h>
-
-class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
-public:
- static PassRefPtr<WebFrameNetworkingContext> create(WebKit::WebFrame*)
- {
- return 0;
- }
-
-private:
- WebFrameNetworkingContext(WebKit::WebFrame* frame)
- : WebCore::FrameNetworkingContext(frame->coreFrame())
- {
- }
-
- virtual WTF::String userAgent() const;
- virtual WTF::String referrer() const;
-
- WTF::String m_userAgent;
-};
-
-#endif // WebFrameNetworkingContext_h
Copied: trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp (from rev 112272, trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h) (0 => 112273)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.cpp 2012-03-27 15:22:56 UTC (rev 112273)
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2012 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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 APPLE INC. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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.
+ */
+
+#include "config.h"
+#include "WebFrameNetworkingContext.h"
+
+#include <WebCore/ResourceHandle.h>
+
+using namespace WebCore;
+
+namespace WebKit {
+
+SoupSession* WebFrameNetworkingContext::soupSession() const
+{
+ return ResourceHandle::defaultSession();
+}
+
+}
+
Copied: trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h (from rev 112272, trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebFrameNetworkingContext.h) (0 => 112273)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h (rev 0)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/soup/WebFrameNetworkingContext.h 2012-03-27 15:22:56 UTC (rev 112273)
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
+ * Copyright (C) 2012 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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 APPLE INC. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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 WebFrameNetworkingContext_h
+#define WebFrameNetworkingContext_h
+
+#include "WebFrame.h"
+
+#include <WebCore/FrameNetworkingContext.h>
+
+namespace WebKit {
+
+class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
+public:
+ static PassRefPtr<WebFrameNetworkingContext> create(WebFrame* frame)
+ {
+ return adoptRef(new WebFrameNetworkingContext(frame));
+ }
+
+private:
+ WebFrameNetworkingContext(WebFrame* frame)
+ : WebCore::FrameNetworkingContext(frame->coreFrame())
+ {
+ }
+
+ virtual SoupSession* soupSession() const;
+};
+
+}
+
+#endif // WebFrameNetworkingContext_h
