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

andreas.kling at nokia.com andreas.kling at nokia.com
Wed Dec 22 15:54:04 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 2da6642704ef684cf940b6d314b345566a0b09bd
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 16 11:53:48 2010 +0000

    2010-11-16  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt][WK2] Emit windowCloseRequested signal on window.close()
    
            Original patch by Zalan Bujtas.
    
            * UIProcess/API/qt/ClientImpl.cpp:
            (qt_wk_close):
            * UIProcess/API/qt/qwkpage.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72078 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 656d354..d67bb52 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-16  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt][WK2] Emit windowCloseRequested signal on window.close()
+
+        Original patch by Zalan Bujtas.
+
+        * UIProcess/API/qt/ClientImpl.cpp:
+        (qt_wk_close):
+        * UIProcess/API/qt/qwkpage.h:
+
 2010-11-15  Andreas Kling  <kling at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKit2/UIProcess/API/qt/ClientImpl.cpp b/WebKit2/UIProcess/API/qt/ClientImpl.cpp
index 865e365..5b60728 100644
--- a/WebKit2/UIProcess/API/qt/ClientImpl.cpp
+++ b/WebKit2/UIProcess/API/qt/ClientImpl.cpp
@@ -155,6 +155,7 @@ void qt_wk_showPage(WKPageRef page, const void* clientInfo)
 
 void qt_wk_close(WKPageRef page, const void* clientInfo)
 {
+    emit toQWKPage(clientInfo)->windowCloseRequested();
 }
 
 void qt_wk_runJavaScriptAlert(WKPageRef page, WKStringRef alertText, WKFrameRef frame, const void* clientInfo)
diff --git a/WebKit2/UIProcess/API/qt/qwkpage.h b/WebKit2/UIProcess/API/qt/qwkpage.h
index 958cfb9..29583cc 100644
--- a/WebKit2/UIProcess/API/qt/qwkpage.h
+++ b/WebKit2/UIProcess/API/qt/qwkpage.h
@@ -112,6 +112,7 @@ public:
     Q_SIGNAL void scrollRequested(int dx, int dy);
     Q_SIGNAL void cursorChanged(const QCursor&);
     Q_SIGNAL void viewportChangeRequested();
+    Q_SIGNAL void windowCloseRequested();
 
 protected:
     void timerEvent(QTimerEvent*);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list