[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
hausmann at webkit.org
hausmann at webkit.org
Thu Apr 8 01:44:45 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 0b7e57aa64bfe3b4e399a05e066b8b7b6eaa1ee1
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 11 15:44:45 2010 +0000
Make it possible to toggle accelerated compositing from the menu
at run-time.
Reviewed by Tor Arne Vestbø.
* QtLauncher/main.cpp:
(LauncherWindow::toggleAcceleratedCompositing):
(LauncherWindow::setupUI):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54654 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index bf37319..f9df2d7 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-11 Simon Hausmann <simon.hausmann at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
+ Make it possible to toggle accelerated compositing from the menu
+ at run-time.
+
+ * QtLauncher/main.cpp:
+ (LauncherWindow::toggleAcceleratedCompositing):
+ (LauncherWindow::setupUI):
+
2010-02-08 Maciej Stachowiak <mjs at apple.com>
Reviewed by Cameron Zwarich.
diff --git a/WebKitTools/QtLauncher/main.cpp b/WebKitTools/QtLauncher/main.cpp
index b8c81bf..f8fcec6 100644
--- a/WebKitTools/QtLauncher/main.cpp
+++ b/WebKitTools/QtLauncher/main.cpp
@@ -115,6 +115,7 @@ protected slots:
void selectElements();
void setTouchMocking(bool on);
+ void toggleAcceleratedCompositing(bool toggle);
public slots:
void newWindow(const QString& url = QString());
@@ -449,6 +450,11 @@ void LauncherWindow::setTouchMocking(bool on)
#endif
}
+void LauncherWindow::toggleAcceleratedCompositing(bool toggle)
+{
+ page()->settings()->setAttribute(QWebSettings::AcceleratedCompositingEnabled, toggle);
+}
+
void LauncherWindow::newWindow(const QString& url)
{
LauncherWindow* mw = new LauncherWindow(url);
@@ -518,6 +524,10 @@ void LauncherWindow::setupUI()
touchMockAction->setCheckable(true);
touchMockAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_T));
#endif
+
+ QAction* toggleAcceleratedCompositing = toolsMenu->addAction("Toggle Accelerated Compositing", this, SLOT(toggleAcceleratedCompositing(bool)));
+ toggleAcceleratedCompositing->setCheckable(true);
+ toggleAcceleratedCompositing->setChecked(false);
}
QWebPage* WebPage::createWindow(QWebPage::WebWindowType type)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list