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

andersca at apple.com andersca at apple.com
Wed Dec 22 15:42:35 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 84fa99870073daf869260d2cf11ae20591a56b54
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 10 20:30:05 2010 +0000

    Closing tabs sometimes crashes the WebProcess in invalidateContentsAndWindow
    https://bugs.webkit.org/show_bug.cgi?id=49335
    <rdar://problem/8646621>
    
    Reviewed by Dan Bernstein.
    
    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::changeAcceleratedCompositingMode):
    If we fail to send the DidChangeAcceleratedCompositing message, don't null out the
    drawing area. This will happen during page teardown.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71761 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 605c650..b731806 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,16 @@
+2010-11-10  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Closing tabs sometimes crashes the WebProcess in invalidateContentsAndWindow
+        https://bugs.webkit.org/show_bug.cgi?id=49335
+        <rdar://problem/8646621>
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::changeAcceleratedCompositingMode):
+        If we fail to send the DidChangeAcceleratedCompositing message, don't null out the
+        drawing area. This will happen during page teardown.
+
 2010-11-10  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by David Hyatt.
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 2ce51c8..1dfb376 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -256,7 +256,8 @@ void WebPage::changeAcceleratedCompositingMode(WebCore::GraphicsLayer* layer)
     // drawing area types.
     DrawingArea::DrawingAreaInfo newDrawingAreaInfo;
 
-    WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::DidChangeAcceleratedCompositing(compositing), Messages::WebPageProxy::DidChangeAcceleratedCompositing::Reply(newDrawingAreaInfo), m_pageID);
+    if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::DidChangeAcceleratedCompositing(compositing), Messages::WebPageProxy::DidChangeAcceleratedCompositing::Reply(newDrawingAreaInfo), m_pageID))
+        return;
     
     if (newDrawingAreaInfo.type != drawingArea()->info().type) {
         m_drawingArea = 0;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list