Merge 89635 - 2011-06-23 John Bates <jbates@google.com>

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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #if USE(ACCELERATED_COMPOSITING)
 
 #include "Canvas2DLayerChromium.h"
 
 #include "DrawingBuffer.h"
+#include "Extensions3DChromium.h"
 #include "GraphicsContext3D.h"
 #include "LayerRendererChromium.h"
 
 namespace WebCore {
 
 PassRefPtr<Canvas2DLayerChromium> Canvas2DLayerChromium::create(DrawingBuffer* drawingBuffer, GraphicsLayerChromium* owner)
 {
     return adoptRef(new Canvas2DLayerChromium(drawingBuffer, owner));
 }
 
 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 || !m_drawingBuffer)
+    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);
@@ skipping 51 matching lines @@
             if (newLayerRenderer)
                 newLayerRenderer->addChildContext(m_drawingBuffer->graphicsContext3D().get());
         }
 
         LayerChromium::setLayerRenderer(newLayerRenderer);
     }
 }
 
 }
 #endif // USE(ACCELERATED_COMPOSITING)