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

eric.carlson at apple.com eric.carlson at apple.com
Wed Dec 22 14:48:13 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit f412e4af01bb6164e45c3b53731cb4aaa5208d0e
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 20 20:51:57 2010 +0000

    2010-10-20  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Simon Fraser.
    
            Crash closing page with <video> element
            https://bugs.webkit.org/show_bug.cgi?id=47960
            <rdar://problem/8573297>
    
            I couldn't think of a good way to make a layout test for this because the
            crash isn't triggered by closing an iframe.
    
            * WebProcess/WebCoreSupport/WebChromeClient.cpp:
            (WebKit::WebChromeClient::scheduleCompositingLayerSync): NULL check drawingArea().
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70173 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 8734c91..fdd9458 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-20  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Crash closing page with <video> element
+        https://bugs.webkit.org/show_bug.cgi?id=47960
+        <rdar://problem/8573297>
+
+        I couldn't think of a good way to make a layout test for this because the
+        crash isn't triggered by closing an iframe.
+
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::scheduleCompositingLayerSync): NULL check drawingArea().
+
 2010-10-20  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
index 8810959..5446274 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
@@ -546,7 +546,8 @@ void WebChromeClient::setNeedsOneShotDrawingSynchronization()
 
 void WebChromeClient::scheduleCompositingLayerSync()
 {
-    m_page->drawingArea()->scheduleCompositingLayerSync();
+    if (m_page->drawingArea())
+        m_page->drawingArea()->scheduleCompositingLayerSync();
 }
 
 #endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list