[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 0fdcfdc5248e1724b3de9f7f200cbced33276e0c
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 27 21:53:07 2010 +0000

    2010-10-27  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Dimitri Glazkov.
    
            [chromium] WebGL does not work with the compositor in test_shell
            https://bugs.webkit.org/show_bug.cgi?id=48470
    
            * src/WebGraphicsContext3DDefaultImpl.cpp:
            (WebKit::WebGraphicsContext3DDefaultImpl::resolveMultisampledFramebuffer):
             - Properly restore the draw framebuffer after resolving.
            (WebKit::WebGraphicsContext3DDefaultImpl::prepareTexture):
             - Make the context current before calling resolveMultisampledFramebuffer.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70717 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 783815a..b647fdd 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-27  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by Dimitri Glazkov.
+
+        [chromium] WebGL does not work with the compositor in test_shell
+        https://bugs.webkit.org/show_bug.cgi?id=48470
+
+        * src/WebGraphicsContext3DDefaultImpl.cpp:
+        (WebKit::WebGraphicsContext3DDefaultImpl::resolveMultisampledFramebuffer):
+         - Properly restore the draw framebuffer after resolving.
+        (WebKit::WebGraphicsContext3DDefaultImpl::prepareTexture):
+         - Make the context current before calling resolveMultisampledFramebuffer.
+
 2010-10-27  Stuart Morgan  <stuartmorgan at chromium.org>
 
         Reviewed by David Levin.
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
index 2296386..e805c55 100644
--- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
+++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
@@ -219,12 +219,10 @@ void WebGraphicsContext3DDefaultImpl::validateAttributes()
 void WebGraphicsContext3DDefaultImpl::resolveMultisampledFramebuffer(unsigned x, unsigned y, unsigned width, unsigned height)
 {
     if (m_attributes.antialias) {
-        bool mustRestoreFBO = (m_boundFBO != m_multisampleFBO);
         glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, m_multisampleFBO);
         glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, m_fbo);
         glBlitFramebufferEXT(x, y, x + width, y + height, x, y, x + width, y + height, GL_COLOR_BUFFER_BIT, GL_LINEAR);
-        if (mustRestoreFBO)
-            glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_boundFBO);
+        glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, m_boundFBO);
     }
 }
 
@@ -288,6 +286,7 @@ void WebGraphicsContext3DDefaultImpl::prepareTexture()
 {
     if (!m_renderDirectlyToWebView) {
         // We need to prepare our rendering results for the compositor.
+        makeContextCurrent();
         resolveMultisampledFramebuffer(0, 0, m_cachedWidth, m_cachedHeight);
     }
 }

-- 
WebKit Debian packaging