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

weinig at apple.com weinig at apple.com
Wed Dec 22 11:56:55 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 085b243af1140d940161736a7e5757bb3ad1eb1c
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 12 00:39:56 2010 +0000

    WKPageStopLoading always asserts
    
    Reviewed by Gavin Barraclough.
    
    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::didReceiveMessage): Switch break to return, break made us
    hit the ASSERT_NOT_REACHED at the end of the function.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65202 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 7a05293..9170b3d 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-11  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Gavin Barraclough.
+
+        WKPageStopLoading always asserts
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::didReceiveMessage): Switch break to return, break made us
+        hit the ASSERT_NOT_REACHED at the end of the function.
+
 2010-08-11  Balazs Kelemen  <kb at inf.u-szeged.hu>
 
         Unreviewed build fix.
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index f06d51e..95c163f 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -584,7 +584,7 @@ void WebPage::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::Messag
         }
         case WebPageMessage::StopLoading:
             stopLoading();
-            break;
+            return;
         case WebPageMessage::Reload: {
             bool reloadFromOrigin;
             if (!arguments->decode(CoreIPC::Out(reloadFromOrigin)))

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list