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

[kbr at google.com]

The following commit has been merged in the debian/experimental branch:
commit b840ba843b718baa98c741784e11dc032f33666b
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 01:44:52 2010 +0000

    2010-07-19  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Nate Chapin.
    
            WebGL rendering results must be made available to Canvas.toDataURL and 2D drawImage
            https://bugs.webkit.org/show_bug.cgi?id=34719
    
            Fixed compiler warning introduced by original patch.
    
            * src/WebGraphicsContext3DDefaultImpl.cpp:
            (WebKit::WebGraphicsContext3DDefaultImpl::readBackFramebuffer):
    2010-07-19  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Nate Chapin.
    
            WebGL rendering results must be made available to Canvas.toDataURL and 2D drawImage
            https://bugs.webkit.org/show_bug.cgi?id=34719
    
            Fixed compiler warning introduced by original patch. No new tests;
            covered by existing tests.
    
            * platform/graphics/mac/GraphicsContext3DMac.mm:
            (WebCore::GraphicsContext3D::paintRenderingResultsToCanvas):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63705 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c208b1c..7ce7d30 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2010-07-19  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Nate Chapin.
+
+        WebGL rendering results must be made available to Canvas.toDataURL and 2D drawImage
+        https://bugs.webkit.org/show_bug.cgi?id=34719
+
+        Fixed compiler warning introduced by original patch. No new tests;
+        covered by existing tests.
+
+        * platform/graphics/mac/GraphicsContext3DMac.mm:
+        (WebCore::GraphicsContext3D::paintRenderingResultsToCanvas):
+
 2010-07-19  Anders Carlsson  <andersca at apple.com>
 
         Reviewed by Darin Adler, Adam Roben, Dan Bernstein and Sam Weinig.
diff --git a/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm b/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
index 57664b6..30c3b8e 100644
--- a/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
+++ b/WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
@@ -254,7 +254,7 @@ void GraphicsContext3D::paintRenderingResultsToCanvas(WebGLRenderingContext* con
 
     CGLSetCurrentContext(m_contextObj);
 
-    bool mustRestoreFBO;
+    bool mustRestoreFBO = false;
     if (m_attrs.antialias) {
         ::glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, m_multisampleFBO);
         ::glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, m_fbo);
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 351a71e..5039925 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-19  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Nate Chapin.
+
+        WebGL rendering results must be made available to Canvas.toDataURL and 2D drawImage
+        https://bugs.webkit.org/show_bug.cgi?id=34719
+
+        Fixed compiler warning introduced by original patch.
+
+        * src/WebGraphicsContext3DDefaultImpl.cpp:
+        (WebKit::WebGraphicsContext3DDefaultImpl::readBackFramebuffer):
+
 2010-07-19  Tony Chang  <tony at chromium.org>
 
         Reviewed by Kent Tamura.
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
index e4c6583..47bb5a0 100644
--- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
+++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
@@ -710,7 +710,7 @@ bool WebGraphicsContext3DDefaultImpl::readBackFramebuffer(unsigned char* pixels,
     // vertical flip is only a temporary solution anyway until Chrome
     // is fully GPU composited, it wasn't worth the complexity.
 
-    bool mustRestoreFBO;
+    bool mustRestoreFBO = false;
     if (m_attributes.antialias) {
         glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, m_multisampleFBO);
         glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, m_fbo);

-- 
WebKit Debian packaging