[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[andreas.kling at nokia.com]

The following commit has been merged in the webkit-1.3 branch:
commit 392be730e4b31f8fe5570010d252320c9e6e5dbd
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 28 13:16:31 2011 +0000

    2011-01-28  Andreas Kling  <kling at webkit.org>
    
            Rubber-stamped by Simon Hausmann.
    
            [Qt][WK2] Combine QWKPage::engine{Connected,Disconnected} into one signal.
    
            Having two signals for this is redundant, combine them into
            QWKPage::engineConnectionChanged(bool connected).
    
            * UIProcess/API/qt/qwkpage.cpp:
            (QWKPagePrivate::didRelaunchProcess):
            (QWKPagePrivate::processDidCrash):
            * UIProcess/API/qt/qwkpage.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76931 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 4dc337f..3be2bec 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-28  Andreas Kling  <kling at webkit.org>
+
+        Rubber-stamped by Simon Hausmann.
+
+        [Qt][WK2] Combine QWKPage::engine{Connected,Disconnected} into one signal.
+
+        Having two signals for this is redundant, combine them into
+        QWKPage::engineConnectionChanged(bool connected).
+
+        * UIProcess/API/qt/qwkpage.cpp:
+        (QWKPagePrivate::didRelaunchProcess):
+        (QWKPagePrivate::processDidCrash):
+        * UIProcess/API/qt/qwkpage.h:
+
 2011-01-27  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
 
         Reviewed by Maciej Stachowiak.
diff --git a/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp b/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp
index a0d31e8..42d20bd 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp
+++ b/Source/WebKit2/UIProcess/API/qt/qwkpage.cpp
@@ -395,13 +395,13 @@ void QWKPagePrivate::didRelaunchProcess()
         q->setViewportSize(wkView->size().toSize());
 
     isConnectedToEngine = true;
-    emit q->engineConnected();
+    emit q->engineConnectionChanged(true);
 }
 
 void QWKPagePrivate::processDidCrash()
 {
     isConnectedToEngine = false;
-    emit q->engineDisconnected();
+    emit q->engineConnectionChanged(false);
 }
 
 QWKPage::QWKPage(QWKContext* context)
diff --git a/Source/WebKit2/UIProcess/API/qt/qwkpage.h b/Source/WebKit2/UIProcess/API/qt/qwkpage.h
index bb0b154..cb7933a 100644
--- a/Source/WebKit2/UIProcess/API/qt/qwkpage.h
+++ b/Source/WebKit2/UIProcess/API/qt/qwkpage.h
@@ -135,8 +135,7 @@ public:
     Q_SIGNAL void zoomableAreaFound(const QRect&);
     Q_SIGNAL void focusNextPrevChild(bool);
     Q_SIGNAL void showContextMenu(QMenu*);
-    Q_SIGNAL void engineConnected();
-    Q_SIGNAL void engineDisconnected();
+    Q_SIGNAL void engineConnectionChanged(bool connected);
 
 protected:
     void timerEvent(QTimerEvent*);

-- 
WebKit Debian packaging