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

[jamesr at google.com]

The following commit has been merged in the debian/experimental branch:
commit c8aa73aa48729959f5ffb504b31fe5a196468db5
Author: jamesr at google.com <jamesr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 11 22:10:01 2010 +0000

    2010-10-11  James Robinson  <jamesr at chromium.org>
    
            Reviewed by Kenneth Russell.
    
            [chromium] DRT crash in fast/canvas tests w/accel 2D canvas due to NULL DrawingBuffer
            https://bugs.webkit.org/show_bug.cgi?id=47241
    
            Avoid initializing accelerated graphics objects on CanvasRenderingContext2D
            if there is no drawingContext associated with the canvas.
    
            Test: fast/canvas/access-zero-sized-canvas.html
                  fast/canvas/canvas-skia-excessive-size.html
                  fast/canvas/toDataURL-noData.html
            with --accelerated-compositing and --accelerated-2d-canvas
    
            * html/canvas/CanvasRenderingContext2D.cpp:
            (WebCore::CanvasRenderingContext2D::CanvasRenderingContext2D):
            (WebCore::CanvasRenderingContext2D::reset):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69529 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 96d94f8..c937a47 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2010-10-11  James Robinson  <jamesr at chromium.org>
+
+        Reviewed by Kenneth Russell.
+
+        [chromium] DRT crash in fast/canvas tests w/accel 2D canvas due to NULL DrawingBuffer
+        https://bugs.webkit.org/show_bug.cgi?id=47241
+
+        Avoid initializing accelerated graphics objects on CanvasRenderingContext2D
+        if there is no drawingContext associated with the canvas.
+
+        Test: fast/canvas/access-zero-sized-canvas.html
+              fast/canvas/canvas-skia-excessive-size.html
+              fast/canvas/toDataURL-noData.html
+        with --accelerated-compositing and --accelerated-2d-canvas
+
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::CanvasRenderingContext2D::CanvasRenderingContext2D):
+        (WebCore::CanvasRenderingContext2D::reset):
+
 2010-10-11  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebCore/html/canvas/CanvasRenderingContext2D.cpp b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
index ebef507..5f4b4b7 100644
--- a/WebCore/html/canvas/CanvasRenderingContext2D.cpp
+++ b/WebCore/html/canvas/CanvasRenderingContext2D.cpp
@@ -128,9 +128,9 @@ CanvasRenderingContext2D::CanvasRenderingContext2D(HTMLCanvasElement* canvas, bo
         return;
     if (!p->settings()->accelerated2dCanvasEnabled())
         return;
-    m_context3D = p->sharedGraphicsContext3D();
-    if (m_context3D) {
-        if (GraphicsContext* c = drawingContext()) {
+    if (GraphicsContext* c = drawingContext()) {
+        m_context3D = p->sharedGraphicsContext3D();
+        if (m_context3D) {
             m_drawingBuffer = DrawingBuffer::create(m_context3D.get(), IntSize(canvas->width(), canvas->height()));
             c->setSharedGraphicsContext3D(m_context3D.get(), m_drawingBuffer.get(), IntSize(canvas->width(), canvas->height()));
         }
@@ -167,8 +167,8 @@ void CanvasRenderingContext2D::reset()
     m_stateStack.first() = State();
     m_path.clear();
 #if ENABLE(ACCELERATED_2D_CANVAS)
-    if (m_context3D) {
-        if (GraphicsContext* c = drawingContext()) {
+    if (GraphicsContext* c = drawingContext()) {
+        if (m_context3D) {
             m_drawingBuffer->reset(IntSize(canvas()->width(), canvas()->height()));
             c->setSharedGraphicsContext3D(m_context3D.get(), m_drawingBuffer.get(), IntSize(canvas()->width(), canvas()->height()));
         }

-- 
WebKit Debian packaging