Title: [87824] trunk/Tools
- Revision
- 87824
- Author
- commit-qu...@webkit.org
- Date
- 2011-06-01 10:55:07 -0700 (Wed, 01 Jun 2011)
Log Message
2011-06-01 Viatcheslav Ostapenko <ostapenko.viatches...@nokia.com>
Reviewed by Andreas Kling.
[Qt][WK2] Add QGLWidget viewport support to MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=61802
Add command line parameter and menu item to MiniBrowser application
enabling use of QGLWidget for browser viewport.
* MiniBrowser/qt/BrowserWindow.cpp:
(BrowserWindow::BrowserWindow):
(BrowserWindow::toggleGLViewport):
* MiniBrowser/qt/BrowserWindow.h:
* MiniBrowser/qt/MiniBrowserApplication.cpp:
(MiniBrowserApplication::handleUserOptions):
* MiniBrowser/qt/MiniBrowserApplication.h:
(WindowOptions::WindowOptions):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (87823 => 87824)
--- trunk/Tools/ChangeLog 2011-06-01 17:41:25 UTC (rev 87823)
+++ trunk/Tools/ChangeLog 2011-06-01 17:55:07 UTC (rev 87824)
@@ -1,3 +1,22 @@
+2011-06-01 Viatcheslav Ostapenko <ostapenko.viatches...@nokia.com>
+
+ Reviewed by Andreas Kling.
+
+ [Qt][WK2] Add QGLWidget viewport support to MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=61802
+
+ Add command line parameter and menu item to MiniBrowser application
+ enabling use of QGLWidget for browser viewport.
+
+ * MiniBrowser/qt/BrowserWindow.cpp:
+ (BrowserWindow::BrowserWindow):
+ (BrowserWindow::toggleGLViewport):
+ * MiniBrowser/qt/BrowserWindow.h:
+ * MiniBrowser/qt/MiniBrowserApplication.cpp:
+ (MiniBrowserApplication::handleUserOptions):
+ * MiniBrowser/qt/MiniBrowserApplication.h:
+ (WindowOptions::WindowOptions):
+
2011-06-01 Martin Robinson <mrobin...@igalia.com>
Reviewed by Xan Lopez.
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp (87823 => 87824)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2011-06-01 17:41:25 UTC (rev 87823)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2011-06-01 17:55:07 UTC (rev 87824)
@@ -31,6 +31,10 @@
#include "UrlLoader.h"
#include "qwkpreferences.h"
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+#include <QGLWidget>
+#endif
+
static QWKPage* newPageFunction(QWKPage* page)
{
BrowserWindow* window = new BrowserWindow(page->context());
@@ -57,6 +61,11 @@
else
m_browser = new BrowserView(QGraphicsWKView::Simple, context);
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+ if (m_windowOptions.useQGLWidgetViewport)
+ m_browser->setViewport(new QGLWidget());
+#endif
+
setAttribute(Qt::WA_DeleteOnClose);
connect(m_browser->view(), SIGNAL(loadProgress(int)), SLOT(loadProgress(int)));
@@ -106,6 +115,11 @@
QAction* toggleFrameFlattening = toolsMenu->addAction("Toggle Frame Flattening", this, SLOT(toggleFrameFlattening(bool)));
toggleFrameFlattening->setCheckable(true);
toggleFrameFlattening->setChecked(false);
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+ QAction* toggleGLViewport = toolsMenu->addAction("Toggle GL Viewport", this, SLOT(toggleGLViewport(bool)));
+ toggleGLViewport->setCheckable(true);
+ toggleGLViewport->setChecked(m_windowOptions.useQGLWidgetViewport);
+#endif
toolsMenu->addSeparator();
toolsMenu->addAction("Change User Agent", this, SLOT(showUserAgentDialog()));
toolsMenu->addSeparator();
@@ -412,3 +426,10 @@
delete m_addressBar;
delete m_browser;
}
+
+void BrowserWindow::toggleGLViewport(bool useQGLWidgetViewport)
+{
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+ m_browser->setViewport(useQGLWidgetViewport ? new QGLWidget() : 0);
+#endif
+}
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.h (87823 => 87824)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.h 2011-06-01 17:41:25 UTC (rev 87823)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.h 2011-06-01 17:55:07 UTC (rev 87824)
@@ -77,6 +77,7 @@
void toggleAutoLoadImages(bool);
void toggleDisableJavaScript(bool);
+ void toggleGLViewport(bool);
private:
void updateUserAgentList();
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp (87823 => 87824)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2011-06-01 17:41:25 UTC (rev 87823)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.cpp 2011-06-01 17:55:07 UTC (rev 87824)
@@ -62,6 +62,9 @@
<< "[-chunked-drawing-area]"
<< "[-separate-web-process-per-window]"
<< "[-print-loaded-urls]"
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+ << "[-gl-viewport]"
+#endif
<< "URLs";
appQuit(0);
}
@@ -100,4 +103,9 @@
if (args.contains("-print-loaded-urls"))
m_windowOptions.printLoadedUrls = true;
+
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+ if (args.contains("-gl-viewport"))
+ m_windowOptions.useQGLWidgetViewport = true;
+#endif
}
Modified: trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h (87823 => 87824)
--- trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2011-06-01 17:41:25 UTC (rev 87823)
+++ trunk/Tools/MiniBrowser/qt/MiniBrowserApplication.h 2011-06-01 17:55:07 UTC (rev 87824)
@@ -42,6 +42,9 @@
#else
, startMaximized(false)
#endif
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+ , useQGLWidgetViewport(false)
+#endif
{
}
@@ -49,6 +52,9 @@
bool useSeparateWebProcessPerWindow;
bool printLoadedUrls;
bool startMaximized;
+#if defined(QT_CONFIGURED_WITH_OPENGL)
+ bool useQGLWidgetViewport;
+#endif
};
class MiniBrowserApplication : public QApplication {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
