[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[commit-queue at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit d9ec95879a2d00fa387b3f349bc4ca29a84d3211
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 26 17:32:54 2011 +0000

    2011-01-26  Mansi Mithal  <mansi.mithal at nokia.com>
    
            Reviewed by Antonio Gomes.
    
            QtTestBrowser should have a UI Setting to disable plugins
            https://bugs.webkit.org/show_bug.cgi?id=52408
    
            Added a new action item named "Disable Plugins"
            under the "Settings" menu.
    
            * QtTestBrowser/launcherwindow.cpp:
            (LauncherWindow::createChrome):
            (LauncherWindow::togglePlugins):
            * QtTestBrowser/launcherwindow.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76693 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c5f7178..876981a 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-26  Mansi Mithal  <mansi.mithal at nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        QtTestBrowser should have a UI Setting to disable plugins
+        https://bugs.webkit.org/show_bug.cgi?id=52408
+        
+        Added a new action item named "Disable Plugins"
+        under the "Settings" menu. 
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::createChrome):
+        (LauncherWindow::togglePlugins):
+        * QtTestBrowser/launcherwindow.h:
+
 2011-01-25  Patrick Gansterer  <paroga at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp
index 9c4815f..092bba7 100644
--- a/Tools/QtTestBrowser/launcherwindow.cpp
+++ b/Tools/QtTestBrowser/launcherwindow.cpp
@@ -371,6 +371,10 @@ void LauncherWindow::createChrome()
     toggleAutoLoadImages->setCheckable(true);
     toggleAutoLoadImages->setChecked(false);
 
+    QAction* togglePlugins = settingsMenu->addAction("Disable Plugins", this, SLOT(togglePlugins(bool)));
+    togglePlugins->setCheckable(true);
+    togglePlugins->setChecked(false);
+
     QAction* toggleInterruptingJavaScripteEnabled = settingsMenu->addAction("Enable interrupting js scripts", this, SLOT(toggleInterruptingJavaScriptEnabled(bool)));
     toggleInterruptingJavaScripteEnabled->setCheckable(true);
     toggleInterruptingJavaScripteEnabled->setChecked(false);
@@ -779,6 +783,11 @@ void LauncherWindow::toggleAutoLoadImages(bool enable)
     page()->settings()->setAttribute(QWebSettings::AutoLoadImages, !enable);
 }
 
+void LauncherWindow::togglePlugins(bool enable)
+{
+    page()->settings()->setAttribute(QWebSettings::PluginsEnabled, !enable);
+}
+
 #if defined(QT_CONFIGURED_WITH_OPENGL)
 void LauncherWindow::toggleQGLWidgetViewport(bool enable)
 {
diff --git a/Tools/QtTestBrowser/launcherwindow.h b/Tools/QtTestBrowser/launcherwindow.h
index 82a5d5e..2567135 100644
--- a/Tools/QtTestBrowser/launcherwindow.h
+++ b/Tools/QtTestBrowser/launcherwindow.h
@@ -164,6 +164,7 @@ protected slots:
     void toggleInterruptingJavaScriptEnabled(bool enable);
     void toggleJavascriptCanOpenWindows(bool enable);
     void toggleAutoLoadImages(bool enable);
+    void togglePlugins(bool enable);
 
 #if defined(QT_CONFIGURED_WITH_OPENGL)
     void toggleQGLWidgetViewport(bool enable);

-- 
WebKit Debian packaging