From 4b09be3d945483290ccc42ab84a5d16757096a9e Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Date: Wed, 19 Jun 2013 15:29:51 +0200
Subject: [PATCH] Move RenderWidgetHostViewQt out of the content namespace.
---
lib/qquickwebcontentsview.cpp | 4 ++--
lib/qwebcontentsview.cpp | 2 +-
lib/qwebcontentsview_p.h | 2 +-
lib/render_widget_host_view_qt.cpp | 5 -----
lib/render_widget_host_view_qt.h | 4 ----
lib/render_widget_host_view_qt_delegate_quick.cpp | 2 +-
lib/render_widget_host_view_qt_delegate_quick.h | 9 +++------
lib/render_widget_host_view_qt_delegate_widget.cpp | 2 +-
lib/render_widget_host_view_qt_delegate_widget.h | 8 ++------
lib/web_contents_view_qt.h | 4 ++--
10 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/lib/qquickwebcontentsview.cpp b/lib/qquickwebcontentsview.cpp
index ee68301b0..2352b239c 100644
--- a/lib/qquickwebcontentsview.cpp
+++ b/lib/qquickwebcontentsview.cpp
@@ -66,7 +66,7 @@ class QQuickWebContentsViewPrivate : public WebContentsViewQtClient
public:
QQuickWebContentsViewPrivate();
- RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(content::RenderWidgetHostViewQt *view) Q_DECL_OVERRIDE;
+ RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQt *view) Q_DECL_OVERRIDE;
scoped_refptr<WebEngineContext> context;
scoped_ptr<WebContentsDelegateQt> webContentsDelegate;
@@ -187,7 +187,7 @@ QQuickWebContentsViewPrivate::QQuickWebContentsViewPrivate()
contents_view->SetClient(this);
}
-RenderWidgetHostViewQtDelegate *QQuickWebContentsViewPrivate::CreateRenderWidgetHostViewQtDelegate(content::RenderWidgetHostViewQt *view)
+RenderWidgetHostViewQtDelegate *QQuickWebContentsViewPrivate::CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQt *view)
{
Q_Q(QQuickWebContentsView);
// Parent the RWHV directly, this might have to be changed to handle popups and fullscreen.
diff --git a/lib/qwebcontentsview.cpp b/lib/qwebcontentsview.cpp
index 0920a5d7d..27abffe1f 100644
--- a/lib/qwebcontentsview.cpp
+++ b/lib/qwebcontentsview.cpp
@@ -160,7 +160,7 @@ void QWebContentsViewPrivate::_q_onLoadingStateChanged()
}
}
-RenderWidgetHostViewQtDelegate *QWebContentsViewPrivate::CreateRenderWidgetHostViewQtDelegate(content::RenderWidgetHostViewQt *view)
+RenderWidgetHostViewQtDelegate *QWebContentsViewPrivate::CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQt *view)
{
Q_Q(QWebContentsView);
RenderWidgetHostViewQtDelegateWidget *viewDelegate = new RenderWidgetHostViewQtDelegateWidget(view, q);
diff --git a/lib/qwebcontentsview_p.h b/lib/qwebcontentsview_p.h
index 20049587d..647600436 100644
--- a/lib/qwebcontentsview_p.h
+++ b/lib/qwebcontentsview_p.h
@@ -56,7 +56,7 @@ class QWebContentsViewPrivate : public WebContentsViewQtClient
public:
QWebContentsViewPrivate();
- RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(content::RenderWidgetHostViewQt *view) Q_DECL_OVERRIDE;
+ RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQt *view) Q_DECL_OVERRIDE;
void _q_onLoadingStateChanged();
diff --git a/lib/render_widget_host_view_qt.cpp b/lib/render_widget_host_view_qt.cpp
index 2d21410d0..dd3488f10 100644
--- a/lib/render_widget_host_view_qt.cpp
+++ b/lib/render_widget_host_view_qt.cpp
@@ -57,8 +57,6 @@
#include <QWheelEvent>
#include <QWindow>
-namespace content {
-
RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost* widget)
: m_host(content::RenderWidgetHostImpl::From(widget))
, m_delegate(0)
@@ -464,6 +462,3 @@ void RenderWidgetHostViewQt::handleFocusEvent(QFocusEvent *ev)
ev->accept();
}
}
-
-}
-
diff --git a/lib/render_widget_host_view_qt.h b/lib/render_widget_host_view_qt.h
index 9ff200c32..5a9d2c9e8 100644
--- a/lib/render_widget_host_view_qt.h
+++ b/lib/render_widget_host_view_qt.h
@@ -59,8 +59,6 @@ class QMouseEvent;
class QWheelEvent;
class RenderWidgetHostViewQtDelegate;
-namespace content {
-
class RenderWidgetHostViewQt
: public content::RenderWidgetHostViewBase
{
@@ -143,6 +141,4 @@ private:
gfx::Size m_requestedSize;
};
-}
-
#endif
diff --git a/lib/render_widget_host_view_qt_delegate_quick.cpp b/lib/render_widget_host_view_qt_delegate_quick.cpp
index c40a87a6e..e9a0ee71e 100644
--- a/lib/render_widget_host_view_qt_delegate_quick.cpp
+++ b/lib/render_widget_host_view_qt_delegate_quick.cpp
@@ -49,7 +49,7 @@
#include <QQuickWindow>
#include <QWindow>
-RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(content::RenderWidgetHostViewQt* view, QQuickItem *parent)
+RenderWidgetHostViewQtDelegateQuick::RenderWidgetHostViewQtDelegateQuick(RenderWidgetHostViewQt* view, QQuickItem *parent)
: QQuickPaintedItem(parent)
, m_backingStore(0)
, m_view(view)
diff --git a/lib/render_widget_host_view_qt_delegate_quick.h b/lib/render_widget_host_view_qt_delegate_quick.h
index 8364d0965..14c0b17f7 100644
--- a/lib/render_widget_host_view_qt_delegate_quick.h
+++ b/lib/render_widget_host_view_qt_delegate_quick.h
@@ -53,16 +53,13 @@ class QFocusEvent;
class QMouseEvent;
class QKeyEvent;
class QWheelEvent;
-
-namespace content {
- class RenderWidgetHostViewQt;
-}
+class RenderWidgetHostViewQt;
class RenderWidgetHostViewQtDelegateQuick : public QQuickPaintedItem, public RenderWidgetHostViewQtDelegate
{
Q_OBJECT
public:
- RenderWidgetHostViewQtDelegateQuick(content::RenderWidgetHostViewQt* view, QQuickItem *parent = 0);
+ RenderWidgetHostViewQtDelegateQuick(RenderWidgetHostViewQt* view, QQuickItem *parent = 0);
virtual QRectF screenRect() const;
virtual void show();
@@ -89,7 +86,7 @@ protected:
private:
BackingStoreQt* m_backingStore;
- content::RenderWidgetHostViewQt *m_view;
+ RenderWidgetHostViewQt *m_view;
};
diff --git a/lib/render_widget_host_view_qt_delegate_widget.cpp b/lib/render_widget_host_view_qt_delegate_widget.cpp
index 755679feb..e806824a3 100644
--- a/lib/render_widget_host_view_qt_delegate_widget.cpp
+++ b/lib/render_widget_host_view_qt_delegate_widget.cpp
@@ -49,7 +49,7 @@
#include <QResizeEvent>
#include <QPaintEvent>
-RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(content::RenderWidgetHostViewQt* view, QWidget *parent)
+RenderWidgetHostViewQtDelegateWidget::RenderWidgetHostViewQtDelegateWidget(RenderWidgetHostViewQt* view, QWidget *parent)
: QWidget(parent)
, m_painter(0)
, m_view(view)
diff --git a/lib/render_widget_host_view_qt_delegate_widget.h b/lib/render_widget_host_view_qt_delegate_widget.h
index 19119ed65..5f6bd95b0 100644
--- a/lib/render_widget_host_view_qt_delegate_widget.h
+++ b/lib/render_widget_host_view_qt_delegate_widget.h
@@ -49,14 +49,10 @@
class BackingStoreQt;
class QWindow;
-namespace content {
- class RenderWidgetHostViewQt;
-}
-
class RenderWidgetHostViewQtDelegateWidget : public QWidget, public RenderWidgetHostViewQtDelegate
{
public:
- RenderWidgetHostViewQtDelegateWidget(content::RenderWidgetHostViewQt* view, QWidget *parent = 0);
+ RenderWidgetHostViewQtDelegateWidget(RenderWidgetHostViewQt* view, QWidget *parent = 0);
virtual QRectF screenRect() const;
virtual void show();
@@ -74,7 +70,7 @@ protected:
private:
QPainter* m_painter;
- content::RenderWidgetHostViewQt *m_view;
+ RenderWidgetHostViewQt *m_view;
};
#endif
diff --git a/lib/web_contents_view_qt.h b/lib/web_contents_view_qt.h
index 08ffd4e78..b57683deb 100644
--- a/lib/web_contents_view_qt.h
+++ b/lib/web_contents_view_qt.h
@@ -53,7 +53,7 @@
class WebContentsViewQtClient {
public:
virtual ~WebContentsViewQtClient() { }
- virtual RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(content::RenderWidgetHostViewQt *view) = 0;
+ virtual RenderWidgetHostViewQtDelegate* CreateRenderWidgetHostViewQtDelegate(RenderWidgetHostViewQt *view) = 0;
};
class WebContentsViewQt
@@ -69,7 +69,7 @@ public:
virtual content::RenderWidgetHostView *CreateViewForWidget(content::RenderWidgetHost* render_widget_host)
{
- content::RenderWidgetHostViewQt *view = new content::RenderWidgetHostViewQt(render_widget_host);
+ RenderWidgetHostViewQt *view = new RenderWidgetHostViewQt(render_widget_host);
RenderWidgetHostViewQtDelegate *viewDelegate = m_client->CreateRenderWidgetHostViewQtDelegate(view);
view->SetDelegate(viewDelegate);
--
GitLab