Merge 98185 - [chromium] Make setVisibility extension- and thread-correct

Source/WebCore/platform/graphics/chromium/LayerRendererChromium.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 148 matching lines @@
     m_context->makeContextCurrent();
     if (settings().acceleratePainting) {
         m_capabilities.usingAcceleratedPainting = true;
     }
 
     WebCore::Extensions3D* extensions = m_context->getExtensions();
     m_capabilities.usingMapSub = extensions->supports("GL_CHROMIUM_map_sub");
     if (m_capabilities.usingMapSub)
         extensions->ensureEnabled("GL_CHROMIUM_map_sub");
 
+    m_capabilities.usingSetVisibility = extensions->supports("GL_CHROMIUM_set_visibility");
+    if (m_capabilities.usingSetVisibility)
+        extensions->ensureEnabled("GL_CHROMIUM_set_visibility");
+
     GLC(m_context.get(), m_context->getIntegerv(GraphicsContext3D::MAX_TEXTURE_SIZE, &m_capabilities.maxTextureSize));
     m_capabilities.bestTextureFormat = PlatformColor::bestTextureFormat(m_context.get());
 
     if (!initializeSharedObjects())
         return false;
 
     m_headsUpDisplay = CCHeadsUpDisplay::create(this);
 
     // Make sure the viewport and context gets initialized, even if it is to zero.
     viewportChanged();
@@ skipping 26 matching lines @@
     return m_context.get();
 }
 
 void LayerRendererChromium::debugGLCall(GraphicsContext3D* context, const char* command, const char* file, int line)
 {
     unsigned long error = context->getError();
     if (error != GraphicsContext3D::NO_ERROR)
         LOG_ERROR("GL command failed: File: %s\n\tLine %d\n\tcommand: %s, error %x\n", file, line, command, static_cast<int>(error));
 }
 
+void LayerRendererChromium::setVisible(bool visible)
+{
+    if (!visible)
+        releaseRenderSurfaceTextures();
+    if (m_capabilities.usingSetVisibility) {
+        Extensions3DChromium* extensions3DChromium = static_cast<Extensions3DChromium*>(m_context->getExtensions());
+        extensions3DChromium->setVisibilityCHROMIUM(visible);
+    }
+}
+
 void LayerRendererChromium::releaseRenderSurfaceTextures()
 {
     m_renderSurfaceTextureManager->evictAndDeleteAllTextures(m_renderSurfaceTextureAllocator.get());
 }
 
 void LayerRendererChromium::viewportChanged()
 {
     if (m_context)
         m_context->reshape(std::max(1, viewportWidth()), std::max(1, viewportHeight()));
 
@@ skipping 640 matching lines @@
 }
 
 bool LayerRendererChromium::isContextLost()
 {
     return (m_context.get()->getExtensions()->getGraphicsResetStatusARB() != GraphicsContext3D::NO_ERROR);
 }
 
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)