[Qt][WK2] Move non-api classes to WebKit namespace at WebKit2/UiProcess/qt
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 23 Apr 2012 14:43:41 +0000 (14:43 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 23 Apr 2012 14:43:41 +0000 (14:43 +0000)
https://bugs.webkit.org/show_bug.cgi?id=84528

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

Fix namespace usage in non-api classes for Qt.

* UIProcess/API/qt/qquickwebpage.cpp:
* UIProcess/API/qt/qquickwebpage_p.h:
(WebKit):
* UIProcess/API/qt/qquickwebpage_p_p.h:
(WebKit):
(QQuickWebPagePrivate):
* UIProcess/API/qt/qquickwebview.cpp:
* UIProcess/API/qt/qquickwebview_p.h:
(WebKit):
* UIProcess/API/qt/qquickwebview_p_p.h:
(WebKit):
(QQuickWebViewPrivate::viewportInteractionEngine):
(QQuickWebViewPrivate):
(QQuickWebViewFlickablePrivate::viewportInteractionEngine):
(QQuickWebViewFlickablePrivate):
* UIProcess/API/qt/qwebdownloaditem_p.h:
(WebKit):
* UIProcess/API/qt/qwebviewportinfo.cpp:
* UIProcess/qt/LayerBackingStore.cpp:
* UIProcess/qt/LayerBackingStore.h:
(WebKit):
* UIProcess/qt/QtDialogRunner.cpp:
(WebKit):
* UIProcess/qt/QtDialogRunner.h:
(WebKit):
* UIProcess/qt/QtDownloadManager.cpp:
* UIProcess/qt/QtDownloadManager.h:
(WebKit):
* UIProcess/qt/QtGestureRecognizer.cpp:
* UIProcess/qt/QtGestureRecognizer.h:
(WebKit):
* UIProcess/qt/QtPageClient.cpp:
(WebKit):
* UIProcess/qt/QtPageClient.h:
(WebKit):
(QtPageClient):
* UIProcess/qt/QtPanGestureRecognizer.cpp:
* UIProcess/qt/QtPanGestureRecognizer.h:
* UIProcess/qt/QtPinchGestureRecognizer.cpp:
* UIProcess/qt/QtPinchGestureRecognizer.h:
* UIProcess/qt/QtTapGestureRecognizer.h:
(WebKit):
* UIProcess/qt/QtViewportInteractionEngine.cpp:
* UIProcess/qt/QtViewportInteractionEngine.h:
* UIProcess/qt/QtWebContext.cpp:
* UIProcess/qt/QtWebContext.h:
* UIProcess/qt/QtWebError.cpp:
(WebKit):
* UIProcess/qt/QtWebError.h:
(WebKit):
* UIProcess/qt/QtWebIconDatabaseClient.cpp:
(WebKit):
* UIProcess/qt/QtWebIconDatabaseClient.h:
(WTF):
(WebKit):
(QtWebIconDatabaseClient):
* UIProcess/qt/QtWebPageEventHandler.cpp:
(WebKit):
* UIProcess/qt/QtWebPageEventHandler.h:
(WebCore):
(WebKit):
* UIProcess/qt/QtWebPageLoadClient.cpp:
(WebKit):
* UIProcess/qt/QtWebPageLoadClient.h:
(WebKit):
* UIProcess/qt/QtWebPagePolicyClient.cpp:
(WebKit):
* UIProcess/qt/QtWebPagePolicyClient.h:
(WebKit):
* UIProcess/qt/QtWebPageSGNode.cpp:
* UIProcess/qt/QtWebPageSGNode.h:
(WebKit):
* UIProcess/qt/QtWebPageUIClient.cpp:
* UIProcess/qt/QtWebPageUIClient.h:
(WebKit):
* UIProcess/qt/QtWebUndoController.cpp:
(WebKit):
* UIProcess/qt/QtWebUndoController.h:
(WebKit):
* UIProcess/qt/WebContextMenuProxyQt.cpp:
* UIProcess/qt/WebContextQt.cpp:
* UIProcess/qt/WebFullScreenManagerProxyQt.cpp:
* UIProcess/qt/WebGeolocationProviderQt.cpp:
(WebKit):
* UIProcess/qt/WebGeolocationProviderQt.h:
(WebKit):
* UIProcess/qt/WebPopupMenuProxyQt.cpp:
(WebKit):
* UIProcess/qt/WebPopupMenuProxyQt.h:

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

50 files changed:
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp
Source/WebKit2/UIProcess/API/qt/qquickwebpage_p.h
Source/WebKit2/UIProcess/API/qt/qquickwebpage_p_p.h
Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
Source/WebKit2/UIProcess/API/qt/qwebdownloaditem_p.h
Source/WebKit2/UIProcess/API/qt/qwebviewportinfo.cpp
Source/WebKit2/UIProcess/qt/LayerBackingStore.cpp
Source/WebKit2/UIProcess/qt/LayerBackingStore.h
Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp
Source/WebKit2/UIProcess/qt/QtDialogRunner.h
Source/WebKit2/UIProcess/qt/QtDownloadManager.cpp
Source/WebKit2/UIProcess/qt/QtDownloadManager.h
Source/WebKit2/UIProcess/qt/QtGestureRecognizer.cpp
Source/WebKit2/UIProcess/qt/QtGestureRecognizer.h
Source/WebKit2/UIProcess/qt/QtPageClient.cpp
Source/WebKit2/UIProcess/qt/QtPageClient.h
Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp
Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.h
Source/WebKit2/UIProcess/qt/QtPinchGestureRecognizer.cpp
Source/WebKit2/UIProcess/qt/QtPinchGestureRecognizer.h
Source/WebKit2/UIProcess/qt/QtTapGestureRecognizer.h
Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp
Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h
Source/WebKit2/UIProcess/qt/QtWebContext.cpp
Source/WebKit2/UIProcess/qt/QtWebContext.h
Source/WebKit2/UIProcess/qt/QtWebError.cpp
Source/WebKit2/UIProcess/qt/QtWebError.h
Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.cpp
Source/WebKit2/UIProcess/qt/QtWebIconDatabaseClient.h
Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp
Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h
Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.cpp
Source/WebKit2/UIProcess/qt/QtWebPageLoadClient.h
Source/WebKit2/UIProcess/qt/QtWebPagePolicyClient.cpp
Source/WebKit2/UIProcess/qt/QtWebPagePolicyClient.h
Source/WebKit2/UIProcess/qt/QtWebPageSGNode.cpp
Source/WebKit2/UIProcess/qt/QtWebPageSGNode.h
Source/WebKit2/UIProcess/qt/QtWebPageUIClient.cpp
Source/WebKit2/UIProcess/qt/QtWebPageUIClient.h
Source/WebKit2/UIProcess/qt/QtWebUndoController.cpp
Source/WebKit2/UIProcess/qt/QtWebUndoController.h
Source/WebKit2/UIProcess/qt/WebContextMenuProxyQt.cpp
Source/WebKit2/UIProcess/qt/WebContextQt.cpp
Source/WebKit2/UIProcess/qt/WebFullScreenManagerProxyQt.cpp
Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.cpp
Source/WebKit2/UIProcess/qt/WebGeolocationProviderQt.h
Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h

index 17fe1ec..48c67e6 100644 (file)
@@ -1,3 +1,102 @@
+2012-04-23  Zalan Bujtas  <zbujtas@gmail.com>
+
+        [Qt][WK2] Move non-api classes to WebKit namespace at WebKit2/UiProcess/qt
+        https://bugs.webkit.org/show_bug.cgi?id=84528
+
+        Reviewed by Simon Hausmann.
+
+        Fix namespace usage in non-api classes for Qt.
+
+        * UIProcess/API/qt/qquickwebpage.cpp:
+        * UIProcess/API/qt/qquickwebpage_p.h:
+        (WebKit):
+        * UIProcess/API/qt/qquickwebpage_p_p.h:
+        (WebKit):
+        (QQuickWebPagePrivate):
+        * UIProcess/API/qt/qquickwebview.cpp:
+        * UIProcess/API/qt/qquickwebview_p.h:
+        (WebKit):
+        * UIProcess/API/qt/qquickwebview_p_p.h:
+        (WebKit):
+        (QQuickWebViewPrivate::viewportInteractionEngine):
+        (QQuickWebViewPrivate):
+        (QQuickWebViewFlickablePrivate::viewportInteractionEngine):
+        (QQuickWebViewFlickablePrivate):
+        * UIProcess/API/qt/qwebdownloaditem_p.h:
+        (WebKit):
+        * UIProcess/API/qt/qwebviewportinfo.cpp:
+        * UIProcess/qt/LayerBackingStore.cpp:
+        * UIProcess/qt/LayerBackingStore.h:
+        (WebKit):
+        * UIProcess/qt/QtDialogRunner.cpp:
+        (WebKit):
+        * UIProcess/qt/QtDialogRunner.h:
+        (WebKit):
+        * UIProcess/qt/QtDownloadManager.cpp:
+        * UIProcess/qt/QtDownloadManager.h:
+        (WebKit):
+        * UIProcess/qt/QtGestureRecognizer.cpp:
+        * UIProcess/qt/QtGestureRecognizer.h:
+        (WebKit):
+        * UIProcess/qt/QtPageClient.cpp:
+        (WebKit):
+        * UIProcess/qt/QtPageClient.h:
+        (WebKit):
+        (QtPageClient):
+        * UIProcess/qt/QtPanGestureRecognizer.cpp:
+        * UIProcess/qt/QtPanGestureRecognizer.h:
+        * UIProcess/qt/QtPinchGestureRecognizer.cpp:
+        * UIProcess/qt/QtPinchGestureRecognizer.h:
+        * UIProcess/qt/QtTapGestureRecognizer.h:
+        (WebKit):
+        * UIProcess/qt/QtViewportInteractionEngine.cpp:
+        * UIProcess/qt/QtViewportInteractionEngine.h:
+        * UIProcess/qt/QtWebContext.cpp:
+        * UIProcess/qt/QtWebContext.h:
+        * UIProcess/qt/QtWebError.cpp:
+        (WebKit):
+        * UIProcess/qt/QtWebError.h:
+        (WebKit):
+        * UIProcess/qt/QtWebIconDatabaseClient.cpp:
+        (WebKit):
+        * UIProcess/qt/QtWebIconDatabaseClient.h:
+        (WTF):
+        (WebKit):
+        (QtWebIconDatabaseClient):
+        * UIProcess/qt/QtWebPageEventHandler.cpp:
+        (WebKit):
+        * UIProcess/qt/QtWebPageEventHandler.h:
+        (WebCore):
+        (WebKit):
+        * UIProcess/qt/QtWebPageLoadClient.cpp:
+        (WebKit):
+        * UIProcess/qt/QtWebPageLoadClient.h:
+        (WebKit):
+        * UIProcess/qt/QtWebPagePolicyClient.cpp:
+        (WebKit):
+        * UIProcess/qt/QtWebPagePolicyClient.h:
+        (WebKit):
+        * UIProcess/qt/QtWebPageSGNode.cpp:
+        * UIProcess/qt/QtWebPageSGNode.h:
+        (WebKit):
+        * UIProcess/qt/QtWebPageUIClient.cpp:
+        * UIProcess/qt/QtWebPageUIClient.h:
+        (WebKit):
+        * UIProcess/qt/QtWebUndoController.cpp:
+        (WebKit):
+        * UIProcess/qt/QtWebUndoController.h:
+        (WebKit):
+        * UIProcess/qt/WebContextMenuProxyQt.cpp:
+        * UIProcess/qt/WebContextQt.cpp:
+        * UIProcess/qt/WebFullScreenManagerProxyQt.cpp:
+        * UIProcess/qt/WebGeolocationProviderQt.cpp:
+        (WebKit):
+        * UIProcess/qt/WebGeolocationProviderQt.h:
+        (WebKit):
+        * UIProcess/qt/WebPopupMenuProxyQt.cpp:
+        (WebKit):
+        * UIProcess/qt/WebPopupMenuProxyQt.h:
+
 2012-04-23  Kent Tamura  <tkent@chromium.org>
 
         Add test function to get placeholder string
index 63953eb..203c72b 100644 (file)
 #include "QtWebPageSGNode.h"
 #include "TransformationMatrix.h"
 #include "WebLayerTreeRenderer.h"
+#include "WebPageProxy.h"
 #include "qquickwebpage_p_p.h"
 #include "qquickwebview_p.h"
 #include <QtQuick/QQuickCanvas>
 
+using namespace WebKit;
+
 QQuickWebPage::QQuickWebPage(QQuickWebView* viewportItem)
     : QQuickItem(viewportItem->contentItem())
     , d(new QQuickWebPagePrivate(this, viewportItem))
index 9d791ac..3a112d6 100644 (file)
 
 class QQuickWebPagePrivate;
 class QQuickWebView;
-class QtWebPageEventHandler;
 class QWebPreferences;
 
+namespace WebKit {
+class QtWebPageEventHandler;
+}
+
 class QWEBKIT_EXPORT QQuickWebPage : public QQuickItem {
     Q_OBJECT
 public:
@@ -45,7 +48,7 @@ public:
     QTransform transformFromItem() const;
     QTransform transformToItem() const;
 
-    QtWebPageEventHandler* eventHandler() const;
+    WebKit::QtWebPageEventHandler* eventHandler() const;
 
 protected:
     virtual QSGNode* updatePaintNode(QSGNode*, UpdatePaintNodeData*);
index 98ca60f..e4be373 100644 (file)
@@ -27,9 +27,8 @@
 namespace WebKit {
 class WebPageProxy;
 class QtViewportInteractionEngine;
-}
-
 class QtWebPageEventHandler;
+}
 
 class QQuickWebPagePrivate {
 public:
@@ -43,7 +42,7 @@ public:
     void paint(QPainter*);
     void resetPaintNode();
 
-    QScopedPointer<QtWebPageEventHandler> eventHandler;
+    QScopedPointer<WebKit::QtWebPageEventHandler> eventHandler;
     QQuickWebPage* const q;
     QQuickWebView* const viewportItem;
     WebKit::WebPageProxy* webPageProxy;
index 2b0c5f9..0e1a557 100644 (file)
 
 #include "DownloadProxy.h"
 #include "DrawingAreaProxyImpl.h"
+#include "QtDialogRunner.h"
 #include "QtDownloadManager.h"
+#include "QtViewportInteractionEngine.h"
 #include "QtWebContext.h"
 #include "QtWebIconDatabaseClient.h"
 #include "QtWebPageEventHandler.h"
+#include "QtWebPageLoadClient.h"
+#include "QtWebPagePolicyClient.h"
 #include "UtilsQt.h"
 #include "WebBackForwardList.h"
 #include "WebPageGroup.h"
@@ -55,6 +59,7 @@
 #include <wtf/text/WTFString.h>
 
 using namespace WebCore;
+using namespace WebKit;
 
 static bool s_flickableViewportEnabled = true;
 
index fc8e3b3..8492224 100644 (file)
@@ -48,6 +48,9 @@ class PlatformWebView;
 namespace WebKit {
 class QtRefCountedNetworkRequestData;
 class QtViewportInteractionEngine;
+class QtWebPageLoadClient;
+class QtWebPagePolicyClient;
+class QtWebPageUIClient;
 }
 
 namespace WTF {
@@ -208,9 +211,9 @@ private:
     QQuickWebViewExperimental* m_experimental;
 
     friend class WebKit::QtViewportInteractionEngine;
-    friend class QtWebPageLoadClient;
-    friend class QtWebPagePolicyClient;
-    friend class QtWebPageUIClient;
+    friend class WebKit::QtWebPageLoadClient;
+    friend class WebKit::QtWebPagePolicyClient;
+    friend class WebKit::QtWebPageUIClient;
     friend class WTR::PlatformWebView;
     friend class QQuickWebViewExperimental;
 };
@@ -339,7 +342,7 @@ private:
     QObject* schemeParent;
     QWebViewportInfo* m_viewportInfo;
 
-    friend class QtWebPageUIClient;
+    friend class WebKit::QtWebPageUIClient;
 
     Q_DECLARE_PRIVATE(QQuickWebView)
     Q_DECLARE_PUBLIC(QQuickWebView)
index ad7b2d0..5661183 100644 (file)
 #ifndef qquickwebview_p_p_h
 #define qquickwebview_p_p_h
 
-#include "DrawingAreaProxy.h"
-#include "QtDialogRunner.h"
 #include "QtPageClient.h"
-#include "QtViewportInteractionEngine.h"
-#include "QtWebPageLoadClient.h"
-#include "QtWebPagePolicyClient.h"
 #include "QtWebPageUIClient.h"
 #include "QtWebUndoController.h"
-#include "WebPageProxy.h"
 
 #include "qquickwebview_p.h"
 #include "qquickwebpage_p.h"
 
 namespace WebKit {
 class DownloadProxy;
+class DrawingAreaProxy;
+class QtDialogRunner;
+class QtViewportInteractionEngine;
 class QtWebContext;
+class QtWebPageLoadClient;
+class QtWebPagePolicyClient;
 class WebPageProxy;
 }
+
 class QWebNavigationHistory;
 class QWebViewportInfo;
 
@@ -82,7 +82,7 @@ public:
 
     void setNeedsDisplay();
 
-    virtual QtViewportInteractionEngine* viewportInteractionEngine() { return 0; }
+    virtual WebKit::QtViewportInteractionEngine* viewportInteractionEngine() { return 0; }
     virtual void updateViewportSize() { }
     void updateTouchViewportSize();
 
@@ -95,7 +95,7 @@ public:
     void _q_onReceivedResponseFromDownload(QWebDownloadItem*);
     void _q_onIconChangedForPageURL(const QUrl& pageURL, const QUrl& iconURLString);
 
-    void chooseFiles(WKOpenPanelResultListenerRef, const QStringList& selectedFileNames, QtWebPageUIClient::FileChooserType);
+    void chooseFiles(WKOpenPanelResultListenerRef, const QStringList& selectedFileNames, WebKit::QtWebPageUIClient::FileChooserType);
     quint64 exceededDatabaseQuota(const QString& databaseName, const QString& displayName, WKSecurityOriginRef securityOrigin, quint64 currentQuota, quint64 currentOriginUsage, quint64 currentDatabaseUsage, quint64 expectedUsage);
     void runJavaScriptAlert(const QString&);
     bool runJavaScriptConfirm(const QString&);
@@ -105,7 +105,7 @@ public:
     bool handleCertificateVerificationRequest(const QString& hostname);
     void handleProxyAuthenticationRequiredRequest(const QString& hostname, uint16_t port, const QString& prefilledUsername, QString& username, QString& password);
 
-    void execDialogRunner(QtDialogRunner&);
+    void execDialogRunner(WebKit::QtDialogRunner&);
 
     void setRenderToOffscreenBuffer(bool enable) { m_renderToOffscreenBuffer = enable; }
     void setTransparentBackground(bool);
@@ -131,22 +131,22 @@ public:
     virtual void didChangeContentsSize(const QSize& newSize) { }
     void processDidCrash();
     void didRelaunchProcess();
-    PassOwnPtr<DrawingAreaProxy> createDrawingAreaProxy();
-    void handleDownloadRequest(DownloadProxy*);
+    PassOwnPtr<WebKit::DrawingAreaProxy> createDrawingAreaProxy();
+    void handleDownloadRequest(WebKit::DownloadProxy*);
 
 protected:
     QQuickWebViewPrivate(QQuickWebView* viewport);
-    RefPtr<QtWebContext> context;
+    RefPtr<WebKit::QtWebContext> context;
     RefPtr<WebKit::WebPageProxy> webPageProxy;
 
-    QtPageClient pageClient;
-    QtWebUndoController undoController;
+    WebKit::QtPageClient pageClient;
+    WebKit::QtWebUndoController undoController;
     OwnPtr<QWebNavigationHistory> navigationHistory;
     OwnPtr<QWebPreferences> preferences;
 
-    QScopedPointer<QtWebPageLoadClient> pageLoadClient;
-    QScopedPointer<QtWebPagePolicyClient> pagePolicyClient;
-    QScopedPointer<QtWebPageUIClient> pageUIClient;
+    QScopedPointer<WebKit::QtWebPageLoadClient> pageLoadClient;
+    QScopedPointer<WebKit::QtWebPagePolicyClient> pagePolicyClient;
+    QScopedPointer<WebKit::QtWebPageUIClient> pageUIClient;
 
     QScopedPointer<QQuickWebPage> pageView;
     QQuickWebView* q_ptr;
@@ -198,7 +198,7 @@ public:
     virtual void loadDidCommit();
     virtual void didFinishFirstNonEmptyLayout();
     virtual void didChangeViewportProperties(const WebCore::ViewportAttributes&);
-    virtual QtViewportInteractionEngine* viewportInteractionEngine() { return interactionEngine.data(); }
+    virtual WebKit::QtViewportInteractionEngine* viewportInteractionEngine() { return interactionEngine.data(); }
     virtual void updateViewportSize();
 
     virtual void _q_suspend();
@@ -209,7 +209,7 @@ public:
     virtual void didChangeContentsSize(const QSize& newSize);
 
 private:
-    QScopedPointer<QtViewportInteractionEngine> interactionEngine;
+    QScopedPointer<WebKit::QtViewportInteractionEngine> interactionEngine;
     bool pageIsSuspended;
     bool loadSuccessDispatchIsPending;
 };
index 7965975..69bb3df 100644 (file)
@@ -26,7 +26,6 @@
 #include <QUrl>
 
 class QWebDownloadItemPrivate;
-class QtWebError;
 
 QT_BEGIN_NAMESPACE
 class QString;
@@ -34,6 +33,7 @@ QT_END_NAMESPACE
 
 namespace WebKit {
 class QtDownloadManager;
+class QtWebError;
 }
 
 class QWEBKIT_EXPORT QWebDownloadItem : public QObject {
index 6370b80..56b1327 100644 (file)
  */
 
 #include "config.h"
+#include "QtViewportInteractionEngine.h"
 #include "qwebviewportinfo_p.h"
 
 #include "qquickwebview_p.h"
 #include "qquickwebview_p_p.h"
 
+using namespace WebKit;
+
 QWebViewportInfo::QWebViewportInfo(QQuickWebViewPrivate* webViewPrivate, QObject* parent)
     : QObject(parent)
     , m_webViewPrivate(webViewPrivate)
index 799c953..caaffe9 100644 (file)
@@ -22,6 +22,7 @@
 
 #if USE(UI_SIDE_COMPOSITING)
 #include "GraphicsLayer.h"
+#include "ShareableSurface.h"
 #include "TextureMapper.h"
 #include "TextureMapperGL.h"
 
@@ -136,5 +137,5 @@ void LayerBackingStore::commitTileOperations(TextureMapper* textureMapper)
         it->second.swapBuffers(textureMapper);
 }
 
-}
+} // namespace WebKit
 #endif
index 2852bca..a3e219b 100644 (file)
 
 #if USE(UI_SIDE_COMPOSITING)
 
-#include "ShareableSurface.h"
 #include "TextureMapper.h"
 #include "TextureMapperBackingStore.h"
 #include <wtf/HashMap.h>
 
 namespace WebKit {
 
+class ShareableSurface;
+
 class LayerBackingStoreTile : public WebCore::TextureMapperTile {
 public:
     LayerBackingStoreTile(float scale = 1)
@@ -68,7 +69,7 @@ private:
     float m_scale;
 };
 
-}
+} // namespace WebKit
 #endif
 
 #endif // LayerBackingStore_h
index a9940a3..6e41c8b 100644 (file)
 
 #include "config.h"
 #include "QtDialogRunner.h"
+
 #include "WKRetainPtr.h"
 #include "WKStringQt.h"
 #include "qwebpermissionrequest_p.h"
-
 #include <QtQml/QQmlComponent>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlEngine>
 #include <QtQuick/QQuickItem>
 #include <wtf/PassOwnPtr.h>
 
+namespace WebKit {
+
 QtDialogRunner::QtDialogRunner()
     : QEventLoop()
     , m_wasAccepted(false)
@@ -378,5 +380,8 @@ bool QtDialogRunner::createDialog(QQmlComponent* component, QQuickItem* dialogPa
     return true;
 }
 
+} // namespace WebKit
+
 #include "QtDialogRunner.moc"
 #include "moc_QtDialogRunner.cpp"
+
index e96600e..f53fc92 100644 (file)
 #include <QtCore/QStringList>
 #include <wtf/OwnPtr.h>
 
+QT_BEGIN_NAMESPACE
 class QDeclarativeComponent;
 class QDeclarativeContext;
 class QQuickItem;
+QT_END_NAMESPACE
+
+namespace WebKit {
 
 class QtDialogRunner : public QEventLoop {
     Q_OBJECT
@@ -97,4 +101,6 @@ private:
     quint64 m_databaseQuota;
 };
 
+} // namespace WebKit
+
 #endif // QtDialogRunner_h
index 99c4dc5..eb76f1a 100644 (file)
@@ -142,4 +142,4 @@ void QtDownloadManager::didReceiveDataForDownload(WKContextRef, WKDownloadRef do
     toQtDownloadManager(clientInfo)->downloadDataReceived(toImpl(download), length);
 }
 
-}
+} // namespace WebKit
index 5e8d5ee..a49f5e2 100644 (file)
@@ -24,7 +24,6 @@
 #include <QMap>
 #include <WKContext.h>
 
-class QtWebError;
 class QWebDownloadItem;
 
 namespace WebCore {
@@ -34,6 +33,7 @@ class ResourceResponse;
 namespace WebKit {
 
 class DownloadProxy;
+class QtWebError;
 class WebContext;
 
 class QtDownloadManager {
@@ -60,5 +60,6 @@ private:
     QMap<uint64_t, QWebDownloadItem*> m_downloads;
 };
 
-}
+} // namespace WebKit
+
 #endif /* QtDownloadManager_h */
index 0c62452..3c2196b 100644 (file)
@@ -46,4 +46,4 @@ QtViewportInteractionEngine* QtGestureRecognizer::interactionEngine()
     return m_eventHandler->interactionEngine();
 }
 
-}
+} // namespace WebKit
index 4c191f6..5af3ba6 100644 (file)
 #ifndef QtGestureRecognizer_h
 #define QtGestureRecognizer_h
 
-class QtWebPageEventHandler;
-
 namespace WebKit {
 
 class QtViewportInteractionEngine;
+class QtWebPageEventHandler;
 
 class QtGestureRecognizer {
 public:
@@ -50,6 +49,6 @@ protected:
     QtViewportInteractionEngine* interactionEngine();
 };
 
-}
+} // namespace WebKit
 
 #endif /* QtGestureRecognizer_h */
index 122ab4c..8e9ab2e 100644 (file)
 #include "config.h"
 #include "QtPageClient.h"
 
+#include "DrawingAreaProxy.h"
+#include "LayerTreeContext.h"
 #include "QtWebPageEventHandler.h"
 #include "QtWebUndoController.h"
+#include "ShareableBitmap.h"
 #include "WebContextMenuProxyQt.h"
 #include "WebEditCommandProxy.h"
 #include "WebPopupMenuProxyQt.h"
 #include <WebCore/FloatRect.h>
 #include <WebCore/NotImplemented.h>
 
-using namespace WebKit;
 using namespace WebCore;
 
+namespace WebKit {
+
 QtPageClient::QtPageClient()
     : m_webView(0)
     , m_eventHandler(0)
@@ -300,3 +304,4 @@ void QtPageClient::updateAcceleratedCompositingMode(const LayerTreeContext&)
     // FIXME: Implement.
 }
 
+} // namespace WebKit
index a458614..e33dadf 100644 (file)
 #ifndef QtPageClient_h
 #define QtPageClient_h
 
-#include "DrawingAreaProxy.h"
-#include "LayerTreeContext.h"
 #include "PageClient.h"
-#include "ShareableBitmap.h"
-#include "ViewportArguments.h"
 
-class QtWebPageEventHandler;
-class QtWebUndoController;
 class QQuickWebView;
 
-using namespace WebKit;
+namespace WebKit {
+
+class DrawingAreaProxy;
+class LayerTreeContext;
+class QtWebPageEventHandler;
+class QtWebUndoController;
+class ShareableBitmap;
 
-class QtPageClient : public WebKit::PageClient {
+class QtPageClient : public PageClient {
 public:
     QtPageClient();
     ~QtPageClient();
 
-    void initialize(QQuickWebView*, QtWebPageEventHandler*, QtWebUndoController*);
+    void initialize(QQuickWebView*, QtWebPageEventHandler*, WebKit::QtWebUndoController*);
 
     // QQuickWebView.
     virtual void setViewNeedsDisplay(const WebCore::IntRect&);
@@ -108,4 +108,6 @@ private:
     QtWebUndoController* m_undoController;
 };
 
+} // namespace WebKit
+
 #endif /* QtPageClient_h */
index 0c0dc9c..1183738 100644 (file)
@@ -23,9 +23,9 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "config.h"
-
 #include "QtPanGestureRecognizer.h"
 
+#include "QtViewportInteractionEngine.h"
 #include "QtWebPageEventHandler.h"
 
 namespace WebKit {
index c355198..bf3da4c 100644 (file)
@@ -27,9 +27,7 @@
 #define QtPanGestureRecognizer_h
 
 #include "QtGestureRecognizer.h"
-
 #include <QPointF>
-#include <QScopedPointer>
 #include <QTouchEvent>
 
 namespace WebKit {
index 987d354..0d57ffa 100644 (file)
@@ -26,6 +26,7 @@
 #include "config.h"
 #include "QtPinchGestureRecognizer.h"
 
+#include "QtViewportInteractionEngine.h"
 #include "QtWebPageEventHandler.h"
 #include <QtCore/QLineF>
 
@@ -99,4 +100,5 @@ void QtPinchGestureRecognizer::cancel()
     reset();
 }
 
-}
+} // namespace WebKit
+
index 818eed0..5fbfc09 100644 (file)
@@ -27,9 +27,7 @@
 #define QtPinchGestureRecognizer_h
 
 #include "QtGestureRecognizer.h"
-
 #include <QTouchEvent>
-#include <QtCore/QList>
 #include <QtCore/QPointF>
 
 namespace WebKit {
@@ -55,6 +53,6 @@ private:
     qreal m_initialFingerDistance;
 };
 
-}
+} // namespace WebKit
 
 #endif /* QtPinchGestureRecognizer_h */
index ae2ecd4..de1f641 100644 (file)
 #define QtTapGestureRecognizer_h
 
 #include "QtGestureRecognizer.h"
-
 #include <QTouchEvent>
 #include <QtCore/QBasicTimer>
 #include <QtCore/QObject>
-#include <QtCore/QtGlobal>
-#include <wtf/OwnPtr.h>
 
 // FIXME: These constants should possibly depend on DPI.
 const int maxPanDistance = 5;
@@ -40,10 +37,10 @@ const int maxDoubleTapDistance = 120;
 const int tapAndHoldTime = 800;
 const int maxDoubleTapInterval = 400;
 
-class QtWebPageEventHandler;
-
 namespace WebKit {
 
+class QtWebPageEventHandler;
+
 class QtTapGestureRecognizer : public QObject, private QtGestureRecognizer {
 public:
     QtTapGestureRecognizer(QtWebPageEventHandler*);
index 1390356..c7f9930 100644 (file)
@@ -611,6 +611,8 @@ void QtViewportInteractionEngine::scaleContent(const QPointF& centerInCSSCoordin
     m_viewport->setContentPos(m_viewport->contentPos() + (newPinchCenterOnViewport - oldPinchCenterOnViewport));
 }
 
+} // namespace WebKit
+
 #include "moc_QtViewportInteractionEngine.cpp"
 
-}
+
index d7dd4f7..18c8635 100644 (file)
@@ -22,8 +22,6 @@
 #ifndef QtViewportInteractionEngine_h
 #define QtViewportInteractionEngine_h
 
-#include "qwebkitglobal.h"
-#include <QTouchEvent>
 #include <QtCore/QObject>
 #include <QtCore/QRectF>
 #include <QtCore/QVariant>
@@ -32,7 +30,6 @@
 
 QT_BEGIN_NAMESPACE
 class QPointF;
-class QQuickItem;
 class QQuickWebPage;
 class QQuickWebView;
 class QWheelEvent;
@@ -166,6 +163,6 @@ private:
     QList<qreal> m_scaleStack;
 };
 
-}
+} // namespace WebKit
 
 #endif // QtViewportInteractionEngine_h
index 46117af..30d59c2 100644 (file)
@@ -192,4 +192,5 @@ void QtWebContext::didReceiveMessageFromInjectedBundle(WKStringRef messageName,
     toImpl(page)->didReceiveMessageFromNavigatorQtObject(toImpl(str)->string());
 }
 
-}
+} // namespace WebKit
+
index 7703db4..a1e12ff 100644 (file)
 #ifndef QtWebContext_h
 #define QtWebContext_h
 
+#include <QtGlobal>
 #include <WKContext.h>
 #include <wtf/OwnPtr.h>
+#include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
-#include <qglobal.h>
 
 QT_BEGIN_NAMESPACE
 class QString;
@@ -76,6 +77,6 @@ private:
     OwnPtr<QtWebIconDatabaseClient> m_iconDatabase;
 };
 
-}
+} // namespace WebKit
 
 #endif // QtWebContext_h
index d5b1cbd..87ac17e 100644 (file)
@@ -29,7 +29,7 @@
 #include <WKURL.h>
 #include <WKURLQt.h>
 
-using namespace WebKit;
+namespace WebKit {
 
 QtWebError::QtWebError(WKErrorRef errorRef)
     : error(errorRef)
@@ -65,3 +65,5 @@ QString QtWebError::description() const
 {
     return WKStringCopyQString(WKErrorCopyLocalizedDescription(error.get()));
 }
+
+} // namespace WebKit
index 3fe9eb9..3c36f70 100644 (file)
@@ -22,7 +22,6 @@
 #define QtWebError_h
 
 #include "qwebdownloaditem_p.h"
-#include "qwebkitglobal.h"
 #include <QtNetwork/QNetworkReply>
 #include <WKError.h>
 #include <WKRetainPtr.h>
@@ -31,6 +30,8 @@ QT_BEGIN_NAMESPACE
 class QUrl;
 QT_END_NAMESPACE
 
+namespace WebKit {
+
 class QtWebError {
 public:
     enum Type {
@@ -58,4 +59,6 @@ private:
     WKRetainPtr<WKErrorRef> error;
 };
 
+} // namespace WebKit
+
 #endif /* QtWebError_h */
index 19ba336..d94b634 100644 (file)
@@ -32,7 +32,7 @@
 #include <QtCore/QUrl>
 #include <QtGui/QImage>
 
-using namespace WebKit;
+namespace WebKit {
 
 static inline QtWebIconDatabaseClient* toQtWebIconDatabaseClient(const void* clientInfo)
 {
@@ -120,4 +120,7 @@ void QtWebIconDatabaseClient::releaseIconForPageURL(const String& pageURL)
     m_iconDatabase->releaseIconForPageURL(pageURL);
 }
 
+} // namespace WebKit
+
 #include "moc_QtWebIconDatabaseClient.cpp"
+
index b2c00a8..933ad9a 100644 (file)
 #include "qwebkitglobal.h"
 #include <QtCore/QObject>
 #include <QtCore/QSize>
+#include <wtf/RefPtr.h>
 #include <wtf/Threading.h>
-#include <wtf/text/WTFString.h>
 
 QT_BEGIN_NAMESPACE
 class QImage;
 class QUrl;
 QT_END_NAMESPACE
 
+namespace WTF {
+class String;
+}
+
 namespace WebKit {
+
 class QtWebContext;
 class WebIconDatabase;
 
@@ -44,9 +49,9 @@ public:
     QtWebIconDatabaseClient(QtWebContext*);
     ~QtWebIconDatabaseClient();
 
-    QImage iconImageForPageURL(const String& pageURL, const QSize& iconSize = QSize(32, 32));
-    void retainIconForPageURL(const String&);
-    void releaseIconForPageURL(const String&);
+    QImage iconImageForPageURL(const WTF::String& pageURL, const QSize& iconSize = QSize(32, 32));
+    void retainIconForPageURL(const WTF::String&);
+    void releaseIconForPageURL(const WTF::String&);
 
 public Q_SLOTS:
     void requestIconForPageURL(const QUrl&);
@@ -55,13 +60,13 @@ public:
     Q_SIGNAL void iconChangedForPageURL(const QUrl& pageURL, const QUrl& iconURL);
 
 private:
-    unsigned iconURLHashForPageURL(const String&);
+    unsigned iconURLHashForPageURL(const WTF::String&);
     static void didChangeIconForPageURL(WKIconDatabaseRef, WKURLRef pageURL, const void* clientInfo);
     uint64_t m_contextId;
     RefPtr<WebKit::WebIconDatabase> m_iconDatabase;
     Mutex m_imageLock;
 };
 
-}
+} // namespace WebKit
 
 #endif
index b7836dd..dc31382 100644 (file)
@@ -25,6 +25,7 @@
 #include "NativeWebMouseEvent.h"
 #include "NativeWebWheelEvent.h"
 #include "QtViewportInteractionEngine.h"
+#include "WebPageProxy.h"
 #include "qquickwebpage_p.h"
 #include "qquickwebview_p.h"
 #include <QCursor>
 #include <WebCore/DragData.h>
 #include <WebCore/Editor.h>
 
-using namespace WebKit;
 using namespace WebCore;
 
+namespace WebKit {
+
 static inline Qt::DropAction dragOperationToDropAction(unsigned dragOperation)
 {
     Qt::DropAction result = Qt::IgnoreAction;
@@ -547,4 +549,7 @@ void QtWebPageEventHandler::startDrag(const WebCore::DragData& dragData, PassRef
     m_webPageProxy->dragEnded(clientPosition, globalPosition, dropActionToDragOperation(actualDropAction));
 }
 
+} // namespace WebKit
+
 #include "moc_QtWebPageEventHandler.cpp"
+
index 2040d28..74acdb7 100644 (file)
 #include "QtPanGestureRecognizer.h"
 #include "QtPinchGestureRecognizer.h"
 #include "QtTapGestureRecognizer.h"
-#include "QtViewportInteractionEngine.h"
-#include "WebPageProxy.h"
 #include <QBasicTimer>
-#include <QKeyEvent>
-#include <QInputMethodEvent>
 #include <QTouchEvent>
 #include <WKPage.h>
+#include <wtf/PassRefPtr.h>
+
+QT_BEGIN_NAMESPACE
+class QInputMethodEvent;
+class QKeyEvent;
+QT_END_NAMESPACE
 
 class QQuickWebPage;
+class QQuickWebView;
+
+namespace WebCore {
+class DragData;
+class IntPoint;
+class IntRect;
+}
 
-using namespace WebKit;
+namespace WebKit {
+
+class NativeWebTouchEvent;
+class QtViewportInteractionEngine;
+class ShareableBitmap;
+class WebGestureEvent;
+class WebPageProxy;
 
 class QtWebPageEventHandler : public QObject {
     Q_OBJECT
@@ -100,4 +115,6 @@ private:
     bool m_postponeTextInputStateChanged;
 };
 
+} // namespace WebKit
+
 #endif /* QtWebPageEventHandler_h */
index 0373ef4..9d26c3f 100644 (file)
 #include "config.h"
 #include "QtWebPageLoadClient.h"
 
+#include "QtWebError.h"
 #include "WKStringQt.h"
 #include "qquickwebview_p.h"
 #include "qquickwebview_p_p.h"
 #include "qwebloadrequest_p.h"
 #include <WKFrame.h>
 
+namespace WebKit {
+
 QtWebPageLoadClient::QtWebPageLoadClient(WKPageRef pageRef, QQuickWebView* webView)
     : m_webView(webView)
     , m_loadProgress(0)
@@ -194,3 +197,5 @@ void QtWebPageLoadClient::didChangeBackForwardList(WKPageRef, WKBackForwardListI
 {
     toQtWebPageLoadClient(clientInfo)->didChangeBackForwardList();
 }
+
+} // namespace Webkit
index 672597a..6165ce2 100644 (file)
 #ifndef QtWebPageLoadClient_h
 #define QtWebPageLoadClient_h
 
-#include "QtWebError.h"
-#include <QtCore/QString>
-#include <QtCore/QUrl>
+#include <QtGlobal>
 #include <WKPage.h>
 
+QT_BEGIN_NAMESPACE
+class QUrl;
+QT_END_NAMESPACE
+
 class QQuickWebView;
 
+namespace WebKit {
+
 class QtWebPageLoadClient {
 public:
     QtWebPageLoadClient(WKPageRef, QQuickWebView*);
@@ -64,4 +68,6 @@ private:
     int m_loadProgress;
 };
 
+} // namespace Webkit
+
 #endif // QtWebPageLoadClient_h
index ad5f6aa..1f0ad14 100644 (file)
 #include "qwebnavigationrequest_p.h"
 #include <QtCore/QObject>
 #include <WKFramePolicyListener.h>
+#include <WKRetainPtr.h>
 #include <WKURLRequest.h>
 
+namespace WebKit {
+
 QtWebPagePolicyClient::QtWebPagePolicyClient(WKPageRef pageRef, QQuickWebView* webView)
     : m_webView(webView)
 {
@@ -152,3 +155,6 @@ void QtWebPagePolicyClient::decidePolicyForResponse(WKPageRef page, WKFrameRef f
 
     WKFramePolicyListenerUse(listener);
 }
+
+} // namespace WebKit
+
index 9e397fb..9515c02 100644 (file)
 #define QtWebPagePolicyClient_h
 
 #include "qquickwebview_p.h"
-#include <QtCore/QUrl>
+#include <QtGlobal>
 #include <WKPage.h>
 
-class QQuickWebView;
+QT_BEGIN_NAMESPACE
+class QUrl;
+QT_END_NAMESPACE
+
+namespace WebKit {
+
 class QtWebPagePolicyClient {
 public:
     QtWebPagePolicyClient(WKPageRef, QQuickWebView*);
@@ -40,4 +45,6 @@ private:
     QQuickWebView* m_webView;
 };
 
+} // namespace WebKit
+
 #endif // QtWebPagePolicyClient_h
index f70034e..4de77f7 100644 (file)
@@ -138,4 +138,4 @@ void QtWebPageSGNode::setRenderer(PassRefPtr<WebLayerTreeRenderer> renderer)
     appendChildNode(m_contentsNode);
 }
 
-}
+} // namespace WebKit
index 36e5c88..4c0fcfc 100644 (file)
@@ -41,7 +41,8 @@ class QtWebPageSGNode : public QSGTransformNode {
     private:
         ContentsSGNode* m_contentsNode;
         QSGSimpleRectNode* m_backgroundNode;
-    };
-}
+};
+
+} // namespace WebKit
 
 #endif /* QtWebPageSGNode_h */
index f038059..6d3447b 100644 (file)
@@ -30,6 +30,9 @@
 #include <WKHitTestResult.h>
 #include <WKOpenPanelParameters.h>
 #include <WKOpenPanelResultListener.h>
+#include <WKRetainPtr.h>
+
+namespace WebKit {
 
 QtWebPageUIClient::QtWebPageUIClient(WKPageRef pageRef, QQuickWebView* webView)
     : m_webView(webView)
@@ -158,3 +161,4 @@ void QtWebPageUIClient::policyForGeolocationPermissionRequest(WKPageRef page, WK
     toQtWebPageUIClient(clientInfo)->permissionRequest(req);
 }
 
+} // namespace WebKit
index 0579414..cdd7e40 100644 (file)
@@ -31,6 +31,8 @@
 class QQuickWebView;
 class QWebPermissionRequest;
 
+namespace WebKit {
+
 class QtWebPageUIClient {
 public:
     enum FileChooserType {
@@ -63,4 +65,6 @@ private:
     QString m_lastHoveredTitle;
 };
 
+} // namespace WebKit
+
 #endif // QtWebPageUIClient_h
index 62d31e8..e52eb28 100644 (file)
 #include "config.h"
 #include "QtWebUndoController.h"
 
-#include <qglobal.h>
+#include "WebEditCommandProxy.h"
+#include <QtGlobal>
 #include <wtf/RefPtr.h>
 
-using namespace WebKit;
+namespace WebKit {
 
 void QtWebUndoController::registerEditCommand(PassRefPtr<WebEditCommandProxy> command, WebPageProxy::UndoOrRedo undoOrRedo)
 {
@@ -61,3 +62,5 @@ void QtWebUndoController::executeUndoRedo(WebPageProxy::UndoOrRedo undoOrRedo)
         command->reapply();
     }
 }
+
+} // namespace WebKit
index a260ca2..3274ce1 100644 (file)
 #ifndef QtWebUndoController_h
 #define QtWebUndoController_h
 
-#include "PageClient.h"
 #include "WebEditCommandProxy.h"
 #include "WebPageProxy.h"
 
+namespace WebKit {
+
 class QtWebUndoController {
 public:
     // Page Client.
@@ -38,4 +39,6 @@ public:
     CommandVector m_redoStack;
 };
 
+} // namespace WebKit
+
 #endif // QtWebUndoController_h
index b009510..d510c53 100644 (file)
@@ -51,3 +51,4 @@ void WebContextMenuProxyQt::hideContextMenu()
 #include "moc_WebContextMenuProxyQt.cpp"
 
 } // namespace WebKit
+
index b0d5ac4..5da97cb 100644 (file)
@@ -34,7 +34,6 @@
 #include "WebGeolocationProviderQt.h"
 #endif
 #include "WebProcessCreationParameters.h"
-
 #include <QCoreApplication>
 #include <QStandardPaths>
 #include <QDir>
index e4ec808..f687ab4 100644 (file)
@@ -26,7 +26,6 @@
 #include "WebFullScreenManagerMessages.h"
 #include "WebFullScreenManagerProxyMessages.h"
 #include "WebProcess.h"
-
 #include <WebCore/NotImplemented.h>
 
 using namespace WebCore;
index 70d7b57..8b87f0a 100644 (file)
 #include "WebGeolocationProviderQt.h"
 
 #if ENABLE(GEOLOCATION)
-
 #include <QtLocation/QGeoPositionInfoSource>
 
-using namespace WebKit;
+namespace WebKit {
 
 static inline const WebGeolocationProviderQt* toLocationProvider(const void* clientInfo)
 {
@@ -114,6 +113,8 @@ void WebGeolocationProviderQt::stopUpdating() const
         m_source->stopUpdates();
 }
 
+} // namespace WebKit
+
 #include "moc_WebGeolocationProviderQt.cpp"
 
 #endif // ENABLE(GEOLOCATION)
index e59e3d7..598c74a 100644 (file)
@@ -29,6 +29,8 @@
 class QGeoPositionInfoSource;
 class QGeoPositionInfo;
 
+namespace WebKit {
+
 class WebGeolocationProviderQt : public QObject {
     Q_OBJECT
 public:
@@ -53,4 +55,6 @@ private:
     mutable QGeoPositionInfoSource* m_source;
 };
 
+} // namespace WebKit
+
 #endif /* WebGeolocationProviderQt_h */
index ea22bbd..d231340 100644 (file)
@@ -28,7 +28,6 @@
 #define WebPopupMenuProxyQt_h
 
 #include "WebPopupMenuProxy.h"
-
 #include <QtCore/QObject>
 #include <wtf/OwnPtr.h>