Changeset 54708 in webkit

Timestamp:

Feb 12, 2010, 12:59:52 AM (16 years ago)

Author:

eric@webkit.org

Message:

2010-02-12 Simon Hausmann <​simon.hausmann@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Make it possible to toggle the use of QGraphicsView in QtLauncher at run-time
​https://bugs.webkit.org/show_bug.cgi?id=34844

• QtLauncher/main.cpp: (LauncherWindow::LauncherWindow): (LauncherWindow::initializeView): (LauncherWindow::setupUI):
• QtLauncher/webview.cpp: (WebViewGraphicsBased::WebViewGraphicsBased):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/main.cpp (modified) (4 diffs)
• QtLauncher/webview.cpp (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-02-12  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Make it possible to toggle the use of QGraphicsView in QtLauncher at run-time
+        https://bugs.webkit.org/show_bug.cgi?id=34844
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::LauncherWindow):
+        (LauncherWindow::initializeView):
+        (LauncherWindow::setupUI):
+        * QtLauncher/webview.cpp:
+        (WebViewGraphicsBased::WebViewGraphicsBased):
+
 2010-02-11  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/WebKitTools/QtLauncher/main.cpp

@@ -117 +117 @@
     void setTouchMocking(bool on);
     void toggleAcceleratedCompositing(bool toggle);
+    void initializeView(bool useGraphicsView = false);
 
 public slots:
@@ -150 +151 @@
     resize(800, 600);
 
-    if (!gUseGraphicsView) {
-        WebViewTraditional* view = new WebViewTraditional(splitter);
-        view->setPage(page());
-        m_view = view;
-    } else {
-        WebViewGraphicsBased* view = new WebViewGraphicsBased(splitter);
-        view->setPage(page());
-        view->setViewportUpdateMode(gViewportUpdateMode);
-        view->setItemCacheMode(gCacheWebView ? QGraphicsItem::DeviceCoordinateCache : QGraphicsItem::NoCache);
-        if (gShowFrameRate)
-            view->enableFrameRateMeasurement();
-        page()->settings()->setAttribute(QWebSettings::AcceleratedCompositingEnabled, gUseCompositing);
-        m_view = view;
-    }
-
-#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
-    m_view->installEventFilter(this);
-    touchMocking = false;
-#endif
+    m_view = 0;
+    initializeView();
 
     connect(page(), SIGNAL(loadStarted()), this, SLOT(loadStarted()));
@@ -456 +440 @@
 }
 
+void LauncherWindow::initializeView(bool useGraphicsView)
+{
+    delete m_view;
+
+    QSplitter* splitter = static_cast<QSplitter*>(centralWidget());
+
+    if (!useGraphicsView) {
+        WebViewTraditional* view = new WebViewTraditional(splitter);
+        view->setPage(page());
+        m_view = view;
+    } else {
+        WebViewGraphicsBased* view = new WebViewGraphicsBased(splitter);
+        view->setPage(page());
+        view->setViewportUpdateMode(gViewportUpdateMode);
+        view->setItemCacheMode(gCacheWebView ? QGraphicsItem::DeviceCoordinateCache : QGraphicsItem::NoCache);
+        if (gShowFrameRate)
+            view->enableFrameRateMeasurement();
+        page()->settings()->setAttribute(QWebSettings::AcceleratedCompositingEnabled, gUseCompositing);
+        m_view = view;
+    }
+
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    m_view->installEventFilter(this);
+    touchMocking = false;
+#endif
+}
+
 void LauncherWindow::newWindow(const QString& url)
 {
@@ -529 +540 @@
     toggleAcceleratedCompositing->setCheckable(true);
     toggleAcceleratedCompositing->setChecked(false);
+
+    QAction* toggleGraphicsView = toolsMenu->addAction("Toggle use of QGraphicsView", this, SLOT(initializeView(bool)));
+    toggleGraphicsView->setCheckable(true);
+    toggleGraphicsView->setChecked(false);
 }
 

trunk/WebKitTools/QtLauncher/webview.cpp

@@ -43 +43 @@
     , m_measureFps(false)
 {
-    setScene(new QGraphicsScene);
+    setScene(new QGraphicsScene(this));
     scene()->addItem(m_item);