diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-06-20 16:03:48 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-07-03 15:04:47 +0200 |
| commit | 82d8a5c81d79e0c38e4f593c1424f8b212cb750f (patch) | |
| tree | 991b25487e30f0f33002bc08502836cec890dc11 /Tools/QtTestBrowser | |
| parent | f57e518842e3b134fb7cf6fa145b219aed3ed465 (diff) | |
| download | qtwebkit-82d8a5c81d79e0c38e4f593c1424f8b212cb750f.tar.gz | |
Implement Accelerated 2D Canvas
Implements accelered 2d canvas and makes it an setting. Accelerated 2D
canvas can especially speed up image blitting and complex transforms on
embedded devices when using a QGLWidget viewport.
Change-Id: I98a03f3c76d4e87799830171c6df101ed9908de3
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Tools/QtTestBrowser')
| -rw-r--r-- | Tools/QtTestBrowser/launcherwindow.cpp | 13 | ||||
| -rw-r--r-- | Tools/QtTestBrowser/launcherwindow.h | 1 |
2 files changed, 12 insertions, 2 deletions
diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp index 8badf4688..54efa699a 100644 --- a/Tools/QtTestBrowser/launcherwindow.cpp +++ b/Tools/QtTestBrowser/launcherwindow.cpp @@ -379,8 +379,12 @@ void LauncherWindow::createChrome() QAction* toggleAcceleratedCompositing = graphicsViewMenu->addAction("Toggle Accelerated Compositing", this, SLOT(toggleAcceleratedCompositing(bool))); toggleAcceleratedCompositing->setCheckable(true); toggleAcceleratedCompositing->setChecked(settings->testAttribute(QWebSettings::AcceleratedCompositingEnabled)); - toggleAcceleratedCompositing->setEnabled(isGraphicsBased()); - toggleAcceleratedCompositing->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); + + QAction* toggleAccelerated2dCanvas = graphicsViewMenu->addAction("Toggle Accelerated 2D canvas", this, SLOT(toggleAccelerated2dCanvas(bool))); + toggleAccelerated2dCanvas->setCheckable(true); + toggleAccelerated2dCanvas->setEnabled(settings->testAttribute(QWebSettings::AcceleratedCompositingEnabled)); + toggleAccelerated2dCanvas->setChecked(settings->testAttribute(QWebSettings::Accelerated2dCanvasEnabled)); + toggleAccelerated2dCanvas->connect(toggleAcceleratedCompositing, SIGNAL(toggled(bool)), SLOT(setEnabled(bool))); QAction* toggleResizesToContents = graphicsViewMenu->addAction("Toggle Resizes To Contents Mode", this, SLOT(toggleResizesToContents(bool))); toggleResizesToContents->setCheckable(true); @@ -877,6 +881,11 @@ void LauncherWindow::toggleAcceleratedCompositing(bool toggle) page()->settings()->setAttribute(QWebSettings::AcceleratedCompositingEnabled, toggle); } +void LauncherWindow::toggleAccelerated2dCanvas(bool toggle) +{ + page()->settings()->setAttribute(QWebSettings::Accelerated2dCanvasEnabled, toggle); +} + void LauncherWindow::toggleTiledBackingStore(bool toggle) { page()->settings()->setAttribute(QWebSettings::TiledBackingStoreEnabled, toggle); diff --git a/Tools/QtTestBrowser/launcherwindow.h b/Tools/QtTestBrowser/launcherwindow.h index 185f21b74..4645c7e58 100644 --- a/Tools/QtTestBrowser/launcherwindow.h +++ b/Tools/QtTestBrowser/launcherwindow.h @@ -153,6 +153,7 @@ protected Q_SLOTS: void setTouchMocking(bool on); void toggleWebView(bool graphicsBased); void toggleAcceleratedCompositing(bool toggle); + void toggleAccelerated2dCanvas(bool toggle); void toggleTiledBackingStore(bool toggle); void toggleResizesToContents(bool toggle); void toggleWebGL(bool toggle); |