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

Source/WebCore/platform/graphics/chromium/Canvas2DLayerChromium.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 36 matching lines @@
 }
 
 Canvas2DLayerChromium::Canvas2DLayerChromium(DrawingBuffer* drawingBuffer, GraphicsLayerChromium* owner)
     : CanvasLayerChromium(owner)
     , m_drawingBuffer(drawingBuffer)
 {
 }
 
 Canvas2DLayerChromium::~Canvas2DLayerChromium()
 {
-    if (m_textureId)
-        layerRendererContext()->deleteTexture(m_textureId);
     if (m_drawingBuffer && layerRenderer())
         layerRenderer()->removeChildContext(m_drawingBuffer->graphicsContext3D().get());
 }
 
 bool Canvas2DLayerChromium::drawsContent() const
 {
     GraphicsContext3D* context;
     return (m_drawingBuffer
             && (context = m_drawingBuffer->graphicsContext3D().get())
             && (context->getExtensions()->getGraphicsResetStatusARB() == GraphicsContext3D::NO_ERROR));
 }
 
 void Canvas2DLayerChromium::updateCompositorResources()
 {
     if (!m_contentsDirty || !drawsContent())
         return;
-    if (m_textureChanged) { // We have to generate a new backing texture.
-        GraphicsContext3D* context = layerRendererContext();
-        if (m_textureId)
-            context->deleteTexture(m_textureId);
-        m_textureId = context->createTexture();
-        context->activeTexture(GraphicsContext3D::TEXTURE0);
-        context->bindTexture(GraphicsContext3D::TEXTURE_2D, m_textureId);
-        IntSize size = m_drawingBuffer->size();
-        context->texImage2DResourceSafe(GraphicsContext3D::TEXTURE_2D, 0, GraphicsContext3D::RGBA, size.width(), size.height(), 0, GraphicsContext3D::RGBA, GraphicsContext3D::UNSIGNED_BYTE);
-        // Set the min-mag filters to linear and wrap modes to GraphicsContext3D::CLAMP_TO_EDGE
-        // to get around NPOT texture limitations of GLES.
-        context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MIN_FILTER, GraphicsContext3D::LINEAR);
-        context->texParameteri(GraphicsContext3D::TEXTURE_2D, GraphicsContext3D::TEXTURE_MAG_FILTER, GraphicsContext3D::LINEAR);
-        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);
-        m_textureChanged = false;
-        // The flush() here is required because we have to make sure that the texture created in this
-        // context (the compositor context) is actually created by the service side before the child context
-        // attempts to use it (in publishToPlatformLayer).
-        context->flush();
-    }
     // Update the contents of the texture used by the compositor.
     if (m_contentsDirty) {
         m_drawingBuffer->publishToPlatformLayer();
         m_contentsDirty = false;
     }
 }
 
-void Canvas2DLayerChromium::setTextureChanged()
-{
-    m_textureChanged = true;
-}
-
 unsigned Canvas2DLayerChromium::textureId() const
 {
-    return m_textureId;
+    return m_drawingBuffer ? m_drawingBuffer->platformColorBuffer() : 0;
 }
 
 void Canvas2DLayerChromium::setDrawingBuffer(DrawingBuffer* drawingBuffer)
 {
     if (drawingBuffer != m_drawingBuffer) {
         if (m_drawingBuffer && layerRenderer())
             layerRenderer()->removeChildContext(m_drawingBuffer->graphicsContext3D().get());
 
         m_drawingBuffer = drawingBuffer;
-        m_textureChanged = true;
 
         if (drawingBuffer && layerRenderer())
             layerRenderer()->addChildContext(m_drawingBuffer->graphicsContext3D().get());
     }
 }
 
 void Canvas2DLayerChromium::setLayerRenderer(LayerRendererChromium* newLayerRenderer)
 {
     if (layerRenderer() != newLayerRenderer && m_drawingBuffer) {
         if (m_drawingBuffer->graphicsContext3D()) {
             if (layerRenderer())
                 layerRenderer()->removeChildContext(m_drawingBuffer->graphicsContext3D().get());
             if (newLayerRenderer)
                 newLayerRenderer->addChildContext(m_drawingBuffer->graphicsContext3D().get());
         }
 
         LayerChromium::setLayerRenderer(newLayerRenderer);
     }
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)