[Qt][WK2] Move WebFrameNetworkingContext to WebKit namespace.

https://bugs.webkit.org/show_bug.cgi?id=86590

Patch by Zalan Bujtas <zbujtas@gmail.com> on 2012-05-16
Reviewed by Simon Hausmann.

* WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp:
(WebKit::WebFrameNetworkingContext::WebFrameNetworkingContext):
(WebKit::WebFrameNetworkingContext::create):
* WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.h:
(WebKit):
(WebFrameNetworkingContext):
(WebKit::WebFrameNetworkingContext::originatingObject):
(WebKit::WebFrameNetworkingContext::~WebFrameNetworkingContext):
(WebKit::WebFrameNetworkingContext::networkAccessManager):
(WebKit::WebFrameNetworkingContext::mimeSniffingEnabled):
(WebKit::WebFrameNetworkingContext::thirdPartyCookiePolicyPermission):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@117254 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 2885b20..7c5ab7e 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,22 @@
+2012-05-16  Zalan Bujtas  <zbujtas@gmail.com>
+
+        [Qt][WK2] Move WebFrameNetworkingContext to WebKit namespace.
+        https://bugs.webkit.org/show_bug.cgi?id=86590
+
+        Reviewed by Simon Hausmann.
+
+        * WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp:
+        (WebKit::WebFrameNetworkingContext::WebFrameNetworkingContext):
+        (WebKit::WebFrameNetworkingContext::create):
+        * WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.h:
+        (WebKit):
+        (WebFrameNetworkingContext):
+        (WebKit::WebFrameNetworkingContext::originatingObject):
+        (WebKit::WebFrameNetworkingContext::~WebFrameNetworkingContext):
+        (WebKit::WebFrameNetworkingContext::networkAccessManager):
+        (WebKit::WebFrameNetworkingContext::mimeSniffingEnabled):
+        (WebKit::WebFrameNetworkingContext::thirdPartyCookiePolicyPermission):
+
 2012-05-16  Andras Becsi  <andras.becsi@nokia.com>
 
         [WTR] Visited link tracking is not disabled properly

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp
index 387304f..7d8a790 100644 (file)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.cpp
@@ -22,14 +22,12 @@
 
 #include "WebFrame.h"
 #include "WebPage.h"
-#include "WebProcess.h"
-#include <QNetworkAccessManager>
 #include <QObject>
 #include <QVariant>
 
-namespace WebCore {
+namespace WebKit {
 
-WebFrameNetworkingContext::WebFrameNetworkingContext(WebKit::WebFrame* frame)
+WebFrameNetworkingContext::WebFrameNetworkingContext(WebFrame* frame)
     : FrameNetworkingContext(frame->coreFrame())
     , m_mimeSniffingEnabled(true)
 {
@@ -40,34 +38,9 @@ WebFrameNetworkingContext::WebFrameNetworkingContext(WebKit::WebFrame* frame)
     }
 }
 
-WebFrameNetworkingContext::~WebFrameNetworkingContext()
-{
-}
-
-PassRefPtr<WebFrameNetworkingContext> WebFrameNetworkingContext::create(WebKit::WebFrame* frame)
+PassRefPtr<WebFrameNetworkingContext> WebFrameNetworkingContext::create(WebFrame* frame)
 {
     return adoptRef(new WebFrameNetworkingContext(frame));
 }
 
-QObject* WebFrameNetworkingContext::originatingObject() const
-{
-    return m_originatingObject.get();
-}
-
-QNetworkAccessManager* WebFrameNetworkingContext::networkAccessManager() const
-{
-    return WebKit::WebProcess::shared().networkAccessManager();
-}
-
-bool WebFrameNetworkingContext::mimeSniffingEnabled() const
-{
-    return m_mimeSniffingEnabled;
-}
-
-bool WebFrameNetworkingContext::thirdPartyCookiePolicyPermission(const QUrl &) const
-{
-    // ### TODO. Used QWebSettings in WK1.
-    return true;
-}
-
 }

diff --git a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.h b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.h
index 7ec6264..966e6d2 100644 (file)
--- a/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.h
+++ b/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebFrameNetworkingContext.h
@@ -20,28 +20,26 @@
 #ifndef WebFrameNetworkingContext_h
 #define WebFrameNetworkingContext_h
 
+#include "WebProcess.h"
 #include <WebCore/FrameNetworkingContext.h>
-
 #include <wtf/OwnPtr.h>
 
 namespace WebKit {
-class WebFrame;
-}
 
-namespace WebCore {
+class WebFrame;
 
-class WebFrameNetworkingContext : public FrameNetworkingContext {
+class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
 public:
-    static PassRefPtr<WebFrameNetworkingContext> create(WebKit::WebFrame*);
-    virtual QObject* originatingObject() const;
+    static PassRefPtr<WebFrameNetworkingContext> create(WebFrame*);
+    QObject* originatingObject() const { return m_originatingObject.get(); }
 
 private:
-    WebFrameNetworkingContext(WebKit::WebFrame*);
-    virtual ~WebFrameNetworkingContext();
+    WebFrameNetworkingContext(WebFrame*);
+    ~WebFrameNetworkingContext() { }
 
-    virtual QNetworkAccessManager* networkAccessManager() const;
-    virtual bool mimeSniffingEnabled() const;
-    virtual bool thirdPartyCookiePolicyPermission(const QUrl&) const;
+    QNetworkAccessManager* networkAccessManager() const { return WebProcess::shared().networkAccessManager(); }
+    bool mimeSniffingEnabled() const { return m_mimeSniffingEnabled; }
+    bool thirdPartyCookiePolicyPermission(const QUrl&) const { /*TODO. Used QWebSettings in WK1.*/ return true; }
 
     OwnPtr<QObject> m_originatingObject;
     bool m_mimeSniffingEnabled;