[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 3bf8cf8fdc3b241a032517a86ad3af4e94cfa46f
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 03:57:38 2010 +0000

    2010-08-09  Antonio Gomes  <tonikitoo at webkit.org>
    
            Reviewed by Ariya Hidayat.
    
            [Qt] QtTestBrowser:: make m_zoomLevels a static member.
    
            Not all instances of LauncherWindow need its own m_zoomLevel.
    
            * QtTestBrowser/launcherwindow.cpp:
            * QtTestBrowser/launcherwindow.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65047 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 616bd14..ddd662a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-08-09  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] QtTestBrowser:: make m_zoomLevels a static member.
+
+        Not all instances of LauncherWindow need its own m_zoomLevel.
+
+        * QtTestBrowser/launcherwindow.cpp:
+        * QtTestBrowser/launcherwindow.h:
+
 2010-08-09  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Geoffrey Garen.
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.cpp b/WebKitTools/QtTestBrowser/launcherwindow.cpp
index 9c7bf82..83c61d9 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.cpp
+++ b/WebKitTools/QtTestBrowser/launcherwindow.cpp
@@ -33,6 +33,7 @@
 #include "launcherwindow.h"
 
 const int gExitClickArea = 80;
+QVector<int> LauncherWindow::m_zoomLevels;
 
 LauncherWindow::LauncherWindow(WindowOptions* data, QGraphicsScene* sharedScene)
     : MainWindow()
@@ -90,9 +91,11 @@ void LauncherWindow::init()
     connect(this, SIGNAL(destroyed()), m_inspector, SLOT(deleteLater()));
 
     // the zoom values are chosen to be like in Mozilla Firefox 3
-    m_zoomLevels << 30 << 50 << 67 << 80 << 90;
-    m_zoomLevels << 100;
-    m_zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300;
+    if (!m_zoomLevels.count()) {
+        m_zoomLevels << 30 << 50 << 67 << 80 << 90;
+        m_zoomLevels << 100;
+        m_zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300;
+    }
 
     grabZoomKeys(true);
 }
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.h b/WebKitTools/QtTestBrowser/launcherwindow.h
index 9efee1e..9319d24 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.h
+++ b/WebKitTools/QtTestBrowser/launcherwindow.h
@@ -186,7 +186,7 @@ private:
     void applyZoom();
 
 private:
-    QVector<int> m_zoomLevels;
+    static QVector<int> m_zoomLevels;
     int m_currentZoom;
 
     QWidget* m_view;

-- 
WebKit Debian packaging