[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 13aa06647346534e4ea624cd97e6776940ec1516
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 25 23:20:37 2011 +0000

    2011-01-25  Mansi Mithal  <mansi.mithal at nokia.com>
    
            Reviewed by Antonio Gomes.
    
            QtTestBrowser should have a UI Settings to prevent loading images
            https://bugs.webkit.org/show_bug.cgi?id=52409
    
            Added a new action item named "DisableAutoLoadImages"
            under the "Settings" menu
    
            * QtTestBrowser/launcherwindow.cpp:
            (LauncherWindow::createChrome):
            (LauncherWindow::toggleAutoLoadImages):
            * QtTestBrowser/launcherwindow.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76646 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 8486da0..911f9bb 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-25  Mansi Mithal  <mansi.mithal at nokia.com>
+
+        Reviewed by Antonio Gomes.
+
+        QtTestBrowser should have a UI Settings to prevent loading images
+        https://bugs.webkit.org/show_bug.cgi?id=52409
+        
+        Added a new action item named "DisableAutoLoadImages"
+        under the "Settings" menu 
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::createChrome):
+        (LauncherWindow::toggleAutoLoadImages):
+        * QtTestBrowser/launcherwindow.h:
+
 2011-01-25  Dirk Pranke  <dpranke at chromium.org>
 
         Reviewed by Tony Chang.
diff --git a/Tools/QtTestBrowser/launcherwindow.cpp b/Tools/QtTestBrowser/launcherwindow.cpp
index 067b146..9c4815f 100644
--- a/Tools/QtTestBrowser/launcherwindow.cpp
+++ b/Tools/QtTestBrowser/launcherwindow.cpp
@@ -367,6 +367,10 @@ void LauncherWindow::createChrome()
 
     QMenu* settingsMenu = menuBar()->addMenu("&Settings");
 
+    QAction* toggleAutoLoadImages = settingsMenu->addAction("Disable Auto Load Images", this, SLOT(toggleAutoLoadImages(bool)));
+    toggleAutoLoadImages->setCheckable(true);
+    toggleAutoLoadImages->setChecked(false);
+
     QAction* toggleInterruptingJavaScripteEnabled = settingsMenu->addAction("Enable interrupting js scripts", this, SLOT(toggleInterruptingJavaScriptEnabled(bool)));
     toggleInterruptingJavaScripteEnabled->setCheckable(true);
     toggleInterruptingJavaScripteEnabled->setChecked(false);
@@ -770,6 +774,11 @@ void LauncherWindow::toggleJavascriptCanOpenWindows(bool enable)
     page()->settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, enable);
 }
 
+void LauncherWindow::toggleAutoLoadImages(bool enable)
+{
+    page()->settings()->setAttribute(QWebSettings::AutoLoadImages, !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 849b15d..82a5d5e 100644
--- a/Tools/QtTestBrowser/launcherwindow.h
+++ b/Tools/QtTestBrowser/launcherwindow.h
@@ -163,6 +163,7 @@ protected slots:
     void toggleFrameFlattening(bool toggle);
     void toggleInterruptingJavaScriptEnabled(bool enable);
     void toggleJavascriptCanOpenWindows(bool enable);
+    void toggleAutoLoadImages(bool enable);
 
 #if defined(QT_CONFIGURED_WITH_OPENGL)
     void toggleQGLWidgetViewport(bool enable);

-- 
WebKit Debian packaging