Changeset 56618 in webkit

Timestamp:

Mar 26, 2010 5:52:49 AM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

Reviewed by Simon Hausmann.

Add an option to QtLauncher to enable/disable a QGLWidget as Viewport
of the QGraphicsView when the launcher is running on graphicsview mode.

[Qt] QtLauncher needs an option to Enable/Disable a QGLWidget as Viewport
​https://bugs.webkit.org/show_bug.cgi?id=36270

• QtLauncher/QtLauncher.pro:
• QtLauncher/main.cpp:

(LauncherWindow::toggleQGLWidgetViewport):
(LauncherWindow::createChrome):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtLauncher/QtLauncher.pro (modified) (1 diff)
• QtLauncher/main.cpp (modified) (9 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-23  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Reviewed by Simon Hausmann.
+
+        Add an option to QtLauncher to enable/disable a QGLWidget as Viewport
+        of the QGraphicsView when the launcher is running on graphicsview mode.
+
+        [Qt] QtLauncher needs an option to Enable/Disable a QGLWidget as Viewport
+        https://bugs.webkit.org/show_bug.cgi?id=36270
+
+        * QtLauncher/QtLauncher.pro:
+        * QtLauncher/main.cpp:
+        (LauncherWindow::toggleQGLWidgetViewport):
+        (LauncherWindow::createChrome):
+
 2010-03-26  Fumitoshi Ukai  <ukai@chromium.org>
 

trunk/WebKitTools/QtLauncher/QtLauncher.pro

@@ -47 +47 @@
     TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
 }
+
+contains(QT_CONFIG, opengl) {
+    QT += opengl
+    DEFINES += QT_CONFIGURED_WITH_OPENGL
+}

trunk/WebKitTools/QtLauncher/main.cpp

@@ -33 +33 @@
 #include <QtGui>
 #include <QtNetwork/QNetworkRequest>
+
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+#include <QtOpenGL/QGLWidget>
+#endif
+
 #if !defined(QT_NO_PRINTER)
 #include <QPrintPreviewDialog>
@@ -87 +92 @@
 #endif
 
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+static bool gUseQGLWidgetViewport = false;
+#endif
+
 
 class LauncherWindow : public MainWindow {
@@ -130 +139 @@
     void toggleTiledBackingStore(bool toggle);
     void toggleResizesToContents(bool toggle);
-    
+
     void toggleWebGL(bool toggle);
     void initializeView(bool useGraphicsView = false);
@@ -138 +147 @@
     void changeViewportUpdateMode(int mode);
     void toggleFrameFlattening(bool toggle);
+
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+    void toggleQGLWidgetViewport(bool enable);
+#endif
 
 public slots:
@@ -490 +503 @@
     if (i > 0)
         m_currentZoom = m_zoomLevels[i - 1];
-    
+
     applyZoom();
 }
@@ -687 +700 @@
     page()->settings()->setAttribute(QWebSettings::FrameFlatteningEnabled, toggle);
 }
+
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+void LauncherWindow::toggleQGLWidgetViewport(bool enable)
+{
+    if (!isGraphicsBased())
+        return;
+
+    gUseQGLWidgetViewport = enable;
+    WebViewGraphicsBased* view = static_cast<WebViewGraphicsBased*>(m_view);
+
+    view->setViewport(enable ? new QGLWidget() : 0);
+}
+#endif
 
 void LauncherWindow::newWindow()
@@ -800 +826 @@
     toggleAcceleratedCompositing->setEnabled(isGraphicsBased());
     toggleAcceleratedCompositing->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
-    
+
     QAction* toggleResizesToContents = graphicsViewMenu->addAction("Toggle Resizes To Contents Mode", this, SLOT(toggleResizesToContents(bool)));
     toggleResizesToContents->setCheckable(true);
@@ -806 +832 @@
     toggleResizesToContents->setEnabled(false);
     toggleResizesToContents->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
-    
+
     QAction* toggleTiledBackingStore = graphicsViewMenu->addAction("Toggle Tiled Backing Store", this, SLOT(toggleTiledBackingStore(bool)));
     toggleTiledBackingStore->setCheckable(true);
@@ -820 +846 @@
     toggleFrameFlattening->setCheckable(true);
     toggleFrameFlattening->setChecked(settings->testAttribute(QWebSettings::FrameFlatteningEnabled));
+
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+    QAction* toggleQGLWidgetViewport = graphicsViewMenu->addAction("Toggle use of QGLWidget Viewport", this, SLOT(toggleQGLWidgetViewport(bool)));
+    toggleQGLWidgetViewport->setCheckable(true);
+    toggleQGLWidgetViewport->setChecked(gUseQGLWidgetViewport);
+    toggleQGLWidgetViewport->setEnabled(isGraphicsBased());
+    toggleQGLWidgetViewport->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
+#endif
 
     graphicsViewMenu->addSeparator();