[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 07bd6f0494297e1d06db7a55529dc7a595042f71
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 18:44:37 2010 +0000

    2010-07-29 Antonio Gomes <tonikitoo at webkit.org>
    
            Reviewed by Kenneth Christiansen.
    
            [Qt] QtTestBrowser: Move WebPage class methods definitions from main.cpp to webpage.cpp
            https://bugs.webkit.org/show_bug.cgi?id=43199
    
            There is no sense in keeping WebPage method definitions in main.cpp once
            webpage.cpp already exists.
    
            No behavior change.
    
            * QtTestBrowser/main.cpp:
            * QtTestBrowser/webpage.cpp:
            (WebPage::createWindow):
            (WebPage::createPlugin):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64297 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index efafd2b..d9dbe51 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,23 @@
 
         Reviewed by Kenneth Christiansen.
 
+        [Qt] QtTestBrowser: Move WebPage class methods definitions from main.cpp to webpage.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=43199
+
+        There is no sense in keeping WebPage method definitions in main.cpp once
+        webpage.cpp already exists.
+
+        No behavior change.
+
+        * QtTestBrowser/main.cpp:
+        * QtTestBrowser/webpage.cpp:
+        (WebPage::createWindow):
+        (WebPage::createPlugin):
+
+2010-07-29  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Reviewed by Kenneth Christiansen.
+
         [Qt] Factor out LauncherWindow class out of main.cpp (QtTestBrowser)
         https://bugs.webkit.org/show_bug.cgi?id=43170
 
diff --git a/WebKitTools/QtTestBrowser/main.cpp b/WebKitTools/QtTestBrowser/main.cpp
index aead231..33a6416 100644
--- a/WebKitTools/QtTestBrowser/main.cpp
+++ b/WebKitTools/QtTestBrowser/main.cpp
@@ -33,32 +33,6 @@
 #include "launcherwindow.h"
 #include "urlloader.h"
 
-QWebPage* WebPage::createWindow(QWebPage::WebWindowType type)
-{
-    LauncherWindow* mw = new LauncherWindow;
-    if (type == WebModalDialog)
-        mw->setWindowModality(Qt::ApplicationModal);
-    mw->show();
-    return mw->page();
-}
-
-QObject* WebPage::createPlugin(const QString &classId, const QUrl&, const QStringList&, const QStringList&)
-{
-    if (classId == "alien_QLabel") {
-        QLabel* l = new QLabel;
-        l->winId();
-        return l;
-    }
-
-#ifndef QT_NO_UITOOLS
-    QUiLoader loader;
-    return loader.createWidget(classId, view());
-#else
-    Q_UNUSED(classId);
-    return 0;
-#endif
-}
-
 int launcherMain(const QApplication& app)
 {
 #ifndef NDEBUG
diff --git a/WebKitTools/QtTestBrowser/webpage.cpp b/WebKitTools/QtTestBrowser/webpage.cpp
index ee0232b..137c65c 100644
--- a/WebKitTools/QtTestBrowser/webpage.cpp
+++ b/WebKitTools/QtTestBrowser/webpage.cpp
@@ -32,6 +32,8 @@
 
 #include "webpage.h"
 
+#include "launcherwindow.h"
+
 #include <QAuthenticator>
 #include <QDesktopServices>
 #include <QtGui>
@@ -185,3 +187,30 @@ void WebPage::checkPermission(QWebFrame* frame, QWebPage::PermissionDomain domai
 void WebPage::cancelRequestsForPermission(QWebFrame*, QWebPage::PermissionDomain)
 {
 }
+
+QWebPage* WebPage::createWindow(QWebPage::WebWindowType type)
+{
+    LauncherWindow* mw = new LauncherWindow;
+    if (type == WebModalDialog)
+        mw->setWindowModality(Qt::ApplicationModal);
+    mw->show();
+    return mw->page();
+}
+
+QObject* WebPage::createPlugin(const QString &classId, const QUrl&, const QStringList&, const QStringList&)
+{
+    if (classId == "alien_QLabel") {
+        QLabel* l = new QLabel;
+        l->winId();
+        return l;
+    }
+
+#ifndef QT_NO_UITOOLS
+    QUiLoader loader;
+    return loader.createWidget(classId, view());
+#else
+    Q_UNUSED(classId);
+    return 0;
+#endif
+}
+

-- 
WebKit Debian packaging