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

[senorblanco at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 3cb5b10d0b469f563216b762e39fd79b8d2c770d
Author: senorblanco at chromium.org <senorblanco at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 21:51:47 2010 +0000

    2010-08-24  Stephen White  <senorblanco at chromium.org>
    
            Reviewed by Dumitru Daniliuc.
    
            Speculative fix for layout test failures on Chrome/Linux.
            https://bugs.webkit.org/show_bug.cgi?id=44550
    
            Tests fast/canvas/arc-crash.html, fast/canvas/canvas-state-intact-after-putImageData.html, and fast/canvas/toDataURL-supportedTypes.html are failing on Chrome/Linux.  Can't repro the failure locally, but this fix can't hurt.
    
            * html/canvas/CanvasRenderingContext2D.cpp:
            (WebCore::CanvasRenderingContext2D::paintRenderingResultsToCanvas):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65938 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2f5a889..2355ce4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-24  Stephen White  <senorblanco at chromium.org>
+
+        Reviewed by Dumitru Daniliuc.
+
+        Speculative fix for layout test failures on Chrome/Linux.
+        https://bugs.webkit.org/show_bug.cgi?id=44550
+
+        Tests fast/canvas/arc-crash.html, fast/canvas/canvas-state-intact-after-putImageData.html, and fast/canvas/toDataURL-supportedTypes.html are failing on Chrome/Linux.  Can't repro the failure locally, but this fix can't hurt.
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::paintRenderingResultsToCanvas):
+
 2010-08-24  Dumitru Daniliuc  <dumi at chromium.org>
 
         Reviewed by Dimitri Glazkov.
diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index 08b38a9..2a7b96a 100644
--- a/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -1874,7 +1874,8 @@ const Font& CanvasRenderingContext2D::accessFont()
 void CanvasRenderingContext2D::paintRenderingResultsToCanvas()
 {
 #if ENABLE(ACCELERATED_2D_CANVAS)
-    drawingContext()->syncSoftwareCanvas();
+    if (GraphicsContext* c = drawingContext())
+        c->syncSoftwareCanvas();
 #endif
 }
 

-- 
WebKit Debian packaging