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

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

Index: Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp
===================================================================
--- Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp	(revision 89959)
+++ Source/WebCore/platform/graphics/chromium/WebGLLayerChromium.cpp	(working copy)
@@ -61,9 +61,14 @@
         layerRenderer()->removeChildContext(m_context);
 }
 
+bool WebGLLayerChromium::drawsContent() const
+{
+    return (m_context && m_context->getExtensions()->getGraphicsResetStatusARB() == GraphicsContext3D::NO_ERROR);
+}
+
 void WebGLLayerChromium::updateCompositorResources()
 {
-    if (!m_context)
+    if (!drawsContent())
         return;
 
     if (!m_contentsDirty)
@@ -103,7 +108,8 @@
 
 void WebGLLayerChromium::setContext(const GraphicsContext3D* context)
 {
-    if (m_context != context && layerRenderer()) {
+    bool contextChanged = (m_context != context);
+    if (contextChanged && layerRenderer()) {
         if (m_context)
             layerRenderer()->removeChildContext(m_context);
         if (context)
@@ -116,7 +122,7 @@
         return;
 
     unsigned int textureId = m_context->platformTexture();
-    if (textureId != m_textureId) {
+    if (textureId != m_textureId || contextChanged) {
         m_textureChanged = true;
         m_textureUpdated = true;
     }