Merge 92520 - [chromium] Accelerated canvas breaks when moving canvases or resources between Pages

Source/WebCore/platform/graphics/chromium/DrawingBufferChromium.cpp

 /*
  * Copyright (c) 2010, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #include "DrawingBuffer.h"
 
-#include "Extensions3DChromium.h"
 #include "GraphicsContext3D.h"
-
 #if USE(SKIA)
 #include "GrContext.h"
 #endif
 
 #if USE(ACCELERATED_COMPOSITING)
 #include "Canvas2DLayerChromium.h"
 #endif
 
 namespace WebCore {
 
 static unsigned generateColorTexture(GraphicsContext3D* context, const IntSize& size)
 {
     unsigned offscreenColorTexture = context->createTexture();
     if (!offscreenColorTexture)
         return 0;
 
     context->bindTexture(GraphicsContext3D::TEXTURE_2D, offscreenColorTexture);
     context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::NEAREST);
     context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::NEAREST);
     context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_S, GraphicsContext3D::CLAMP_TO_EDGE);
     context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_WRAP_T, GraphicsContext3D::CLAMP_TO_EDGE);
     context->texImage2DResourceSafe(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, size.width(), size.height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE);
     context->framebufferTexture2D(GraphicsContext3D::FRAMEBUFFER, GraphicsContext3D::COLOR_ATTACHMENT0, GraphicsContext3D::TEXTURE_2D, offscreenColorTexture, 0);
 
     return offscreenColorTexture;
 }
 
-
 DrawingBuffer::DrawingBuffer(GraphicsContext3D* context,
                              const IntSize& size,
                              bool multisampleExtensionSupported,
                              bool packedDepthStencilExtensionSupported)
     : m_context(context)
     , m_size(-1, -1)
     , m_multisampleExtensionSupported(multisampleExtensionSupported)
     , m_packedDepthStencilExtensionSupported(packedDepthStencilExtensionSupported)
     , m_fbo(0)
     , m_colorBuffer(0)
     , m_depthStencilBuffer(0)
     , m_depthBuffer(0)
     , m_stencilBuffer(0)
     , m_multisampleFBO(0)
     , m_multisampleColorBuffer(0)
 #if USE(SKIA)
     , m_grContext(0)
 #endif
 {
-    if (!m_context->getExtensions()->supports("GL_CHROMIUM_copy_texture_to_parent_texture")) {
-        m_context.clear();
-        return;
-    }
     m_fbo = context->createFramebuffer();
     context->bindFramebuffer(GraphicsContext3D::FRAMEBUFFER, m_fbo);
     m_colorBuffer = generateColorTexture(context, size);
     createSecondaryBuffers();
     if (!reset(size)) {
         m_context.clear();
         return;
     }
 }
 
 DrawingBuffer::~DrawingBuffer()
 {
 #if USE(ACCELERATED_COMPOSITING)
     if (m_platformLayer)
         m_platformLayer->setDrawingBuffer(0);
 #endif
 
     if (!m_context)
         return;
 
     clear();
 }
 
 #if USE(ACCELERATED_COMPOSITING)
 void DrawingBuffer::publishToPlatformLayer()
 {
     if (!m_context)
         return;
 
-    if (m_callback)
-        m_callback->willPublish();
     if (multisample())
         commit();
-    unsigned parentTexture = m_platformLayer->textureId();
-    // We do the copy in the canvas' (child) context so that it executes in the correct order relative to
-    // other commands in the child context. This ensures that the parent texture always contains a complete
-    // frame and not some intermediate result.
     m_context->makeContextCurrent();
 #if USE(SKIA)
     if (m_grContext)
         m_grContext->flush(0);
 #endif
-    static_cast<Extensions3DChromium*>(m_context->getExtensions())->copyTextureToParentTextureCHROMIUM(m_colorBuffer, parentTexture);
     m_context->flush();
 }
 #endif
 
-void DrawingBuffer::didReset()
-{
-#if USE(ACCELERATED_COMPOSITING)
-    if (m_platformLayer)
-        m_platformLayer->setTextureChanged();
-#endif
-}
-
 #if USE(ACCELERATED_COMPOSITING)
 PlatformLayer* DrawingBuffer::platformLayer()
 {
     if (!m_platformLayer)
         m_platformLayer = Canvas2DLayerChromium::create(this, 0);
     return m_platformLayer.get();
 }
 #endif
 
 Platform3DObject DrawingBuffer::platformColorBuffer() const
@@ skipping 27 matching lines @@
     desc->fWidth = m_size.width();
     desc->fHeight = m_size.height();
     desc->fConfig = kRGBA_8888_GrPixelConfig;
 
     desc->fStencilBits = (m_depthStencilBuffer || m_stencilBuffer) ? 8 : 0;
 }
 
 #endif
 
 }