Skip to content
Permalink
Browse files
2010-07-19 Kenneth Russell <kbr@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@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):


Canonical link: https://commits.webkit.org/54543@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@63705 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
kenrussell committed Jul 20, 2010
1 parent 9037abe commit 1b6b70fd1cc34b65e62027ebd1a2b926ab50a4c6
Showing with 27 additions and 2 deletions.
  1. +13 −0 WebCore/ChangeLog
  2. +1 −1 WebCore/platform/graphics/mac/GraphicsContext3DMac.mm
  3. +12 −0 WebKit/chromium/ChangeLog
  4. +1 −1 WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
@@ -1,3 +1,16 @@
2010-07-19 Kenneth Russell <kbr@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@apple.com>

Reviewed by Darin Adler, Adam Roben, Dan Bernstein and Sam Weinig.
@@ -254,7 +254,7 @@ static void setPixelFormat(Vector<CGLPixelFormatAttribute>& attribs, int colorBi

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);
@@ -1,3 +1,15 @@
2010-07-19 Kenneth Russell <kbr@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@chromium.org>

Reviewed by Kent Tamura.
@@ -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);

0 comments on commit 1b6b70f

Please sign in to comment.