[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e3bd5e08b40c7ccfed438908e852b5740ce4a42f
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 23 21:13:38 2010 +0000

    2010-02-23  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] Need a final integration between QtLauncher and QGVLauncher
            https://bugs.webkit.org/show_bug.cgi?id=35292
    
            WebKit coding style fixes.
    
            * QtLauncher/main.cpp:
            (LauncherWindow::resetZoom):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55164 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7111b85..191f82c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -5,6 +5,18 @@
         [Qt] Need a final integration between QtLauncher and QGVLauncher
         https://bugs.webkit.org/show_bug.cgi?id=35292
 
+        WebKit coding style fixes.
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::resetZoom):
+
+2010-02-23  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Need a final integration between QtLauncher and QGVLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=35292
+
         Add cloneWindow feature to QtLauncher, when running on QGraphicsView mode.
 
         * QtLauncher/main.cpp:
diff --git a/WebKitTools/QtLauncher/main.cpp b/WebKitTools/QtLauncher/main.cpp
index af99487..b29710d 100644
--- a/WebKitTools/QtLauncher/main.cpp
+++ b/WebKitTools/QtLauncher/main.cpp
@@ -43,7 +43,6 @@
 #include <QDebug>
 
 #include <cstdio>
-#include "mainwindow.h"
 #include <qevent.h>
 #include <qwebelement.h>
 #include <qwebframe.h>
@@ -54,6 +53,7 @@
 #include <qx11info_x11.h>
 #endif
 
+#include "mainwindow.h"
 #include "urlloader.h"
 #include "utils.h"
 #include "webinspector.h"
@@ -377,8 +377,8 @@ void LauncherWindow::zoomOut()
 
 void LauncherWindow::resetZoom()
 {
-   currentZoom = 100;
-   page()->mainFrame()->setZoomFactor(1.0);
+    currentZoom = 100;
+    page()->mainFrame()->setZoomFactor(1.0);
 }
 
 void LauncherWindow::toggleZoomTextOnly(bool b)

-- 
WebKit Debian packaging