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

cmarrin at apple.com cmarrin at apple.com
Wed Dec 22 14:13:52 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 76fbec0ecac5cf1f4624cbc6f096ee26de1c6b67
Author: cmarrin at apple.com <cmarrin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 18:20:06 2010 +0000

    2010-10-05  Chris Marrin  <cmarrin at apple.com>
    
            Reviewed by Adam Roben.
    
            Fix ownership of GraphicsContext3D in SharedGraphicsContext3D to prevent early deallocation and crash
            https://bugs.webkit.org/show_bug.cgi?id=47197
    
            This is work in progress and the crash only happens with ACCELERATED_2D_CANVAS turned on (which is off
            by default). Many existing test cases will crash before and after this patch.
    
            * platform/graphics/gpu/SharedGraphicsContext3D.cpp:
            (WebCore::SharedGraphicsContext3D::create):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69127 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ad28d7e..bc163d6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-05  Chris Marrin  <cmarrin at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Fix ownership of GraphicsContext3D in SharedGraphicsContext3D to prevent early deallocation and crash
+        https://bugs.webkit.org/show_bug.cgi?id=47197
+
+        This is work in progress and the crash only happens with ACCELERATED_2D_CANVAS turned on (which is off
+        by default). Many existing test cases will crash before and after this patch.
+
+        * platform/graphics/gpu/SharedGraphicsContext3D.cpp:
+        (WebCore::SharedGraphicsContext3D::create):
+
 2010-10-05  Tony Chang  <tony at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp b/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp
index 7b4e5fb..bb10bb1 100644
--- a/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp
+++ b/WebCore/platform/graphics/gpu/SharedGraphicsContext3D.cpp
@@ -55,7 +55,7 @@ PassRefPtr<SharedGraphicsContext3D> SharedGraphicsContext3D::create(HostWindow*
     OwnPtr<GraphicsContext3D> context = GraphicsContext3D::create(attr, hostWindow);
     if (!context)
         return 0;
-    return adoptRef(new SharedGraphicsContext3D(context.get()));
+    return adoptRef(new SharedGraphicsContext3D(context.release()));
 }
 
 SharedGraphicsContext3D::SharedGraphicsContext3D(PassOwnPtr<GraphicsContext3D> context)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list