[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tonikitoo at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 380362a2f2e4fb54ef2e98c7b8aacd4317bc5bbb
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jul 30 13:31:53 2010 +0000

    2010-07-29  Antonio Gomes  <tonikitoo at webkit.org>
    
            Reviewed by Kenneth Christiansen.
    
            [Qt] QtTestBrowser: -resizes-to-contents command line parameter is broken
            https://bugs.webkit.org/show_bug.cgi?id=43209
    
            When -resizes-to-content was being passed as a command line parameter it was simply
            not being set (although the corresponding menu item was marked as ON).
            User had to toggle the menu OFF and then ON again for it to take place.
    
            Reason: LauncherWindow::applyPrefs method sets many user options passed in from
            the command line, but not resizesToContents. Patch addresses that.
    
            * QtTestBrowser/launcherwindow.cpp:
            (LauncherWindow::createChrome):
            (LauncherWindow::applyPrefs):
            (LauncherWindow::toggleResizesToContents):
            * QtTestBrowser/webview.h:
            (WebViewGraphicsBased::resizesToContents):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64354 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3bd8cd1..1244b51 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,26 @@
 2010-07-29  Antonio Gomes  <tonikitoo at webkit.org>
 
+        Reviewed by Kenneth Christiansen.
+
+        [Qt] QtTestBrowser: -resizes-to-contents command line parameter is broken
+        https://bugs.webkit.org/show_bug.cgi?id=43209
+
+        When -resizes-to-content was being passed as a command line parameter it was simply
+        not being set (although the corresponding menu item was marked as ON).
+        User had to toggle the menu OFF and then ON again for it to take place.
+
+        Reason: LauncherWindow::applyPrefs method sets many user options passed in from
+        the command line, but not resizesToContents. Patch addresses that.
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::createChrome):
+        (LauncherWindow::applyPrefs):
+        (LauncherWindow::toggleResizesToContents):
+        * QtTestBrowser/webview.h:
+        (WebViewGraphicsBased::resizesToContents):
+
+2010-07-29  Antonio Gomes  <tonikitoo at webkit.org>
+
         Rubber-stamped by Simon Fraser.
 
         [Qt] QtTestBrowser: more method grouping and clean ups.
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.cpp b/WebKitTools/QtTestBrowser/launcherwindow.cpp
index c3bffdf..177adea 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.cpp
+++ b/WebKitTools/QtTestBrowser/launcherwindow.cpp
@@ -277,7 +277,7 @@ void LauncherWindow::createChrome()
 
     QAction* toggleResizesToContents = graphicsViewMenu->addAction("Toggle Resizes To Contents Mode", this, SLOT(toggleResizesToContents(bool)));
     toggleResizesToContents->setCheckable(true);
-    toggleResizesToContents->setChecked(false);
+    toggleResizesToContents->setChecked(gResizesToContents);
     toggleResizesToContents->setEnabled(isGraphicsBased());
     toggleResizesToContents->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
 
@@ -399,10 +399,13 @@ void LauncherWindow::applyPrefs(LauncherWindow* source)
     view->setViewportUpdateMode(otherView ? otherView->viewportUpdateMode() : gViewportUpdateMode);
     view->setFrameRateMeasurementEnabled(otherView ? otherView->frameRateMeasurementEnabled() : gShowFrameRate);
 
-    if (otherView)
+    if (otherView) {
         view->setItemCacheMode(otherView->itemCacheMode());
-    else
+        view->setResizesToContents(otherView->resizesToContents());
+    } else {
         view->setItemCacheMode(gCacheWebView ? QGraphicsItem::DeviceCoordinateCache : QGraphicsItem::NoCache);
+        view->setResizesToContents(gResizesToContents);
+    }
 }
 
 void LauncherWindow::keyPressEvent(QKeyEvent* event)
@@ -719,6 +722,7 @@ void LauncherWindow::toggleTiledBackingStore(bool toggle)
 
 void LauncherWindow::toggleResizesToContents(bool toggle)
 {
+    gResizesToContents = toggle;
     static_cast<WebViewGraphicsBased*>(m_view)->setResizesToContents(toggle);
 }
 
diff --git a/WebKitTools/QtTestBrowser/webview.h b/WebKitTools/QtTestBrowser/webview.h
index 30161bb..9b533b3 100644
--- a/WebKitTools/QtTestBrowser/webview.h
+++ b/WebKitTools/QtTestBrowser/webview.h
@@ -82,6 +82,7 @@ public:
     virtual void paintEvent(QPaintEvent* event);
 
     void setResizesToContents(bool b);
+    bool resizesToContents() const { return m_resizesToContents; }
 
     void setYRotation(qreal angle)
     {

-- 
WebKit Debian packaging