Merge 91736 - Source/WebCore: Removed support for the GL_latch_CHROMIUM extension which Chromium ...

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 129 matching lines @@
                                              PassOwnPtr<LayerPainterChromium> contentPaint,
                                              bool accelerateDrawing)
     : CCLayerTreeHost(client)
     , m_viewportScrollPosition(IntPoint(-1, -1))
     , m_rootLayer(0)
     , m_accelerateDrawing(false)
     , m_currentRenderSurface(0)
     , m_offscreenFramebufferId(0)
     , m_compositeOffscreen(false)
     , m_context(context)
-    , m_contextSupportsLatch(false)
     , m_contextSupportsTextureFormatBGRA(false)
     , m_contextSupportsReadFormatBGRA(false)
     , m_animating(false)
     , m_defaultRenderSurface(0)
 {
     WebCore::Extensions3D* extensions = m_context->getExtensions();
-    m_contextSupportsLatch = extensions->supports("GL_CHROMIUM_latch");
     m_contextSupportsMapSub = extensions->supports("GL_CHROMIUM_map_sub");
     if (m_contextSupportsMapSub)
         extensions->ensureEnabled("GL_CHROMIUM_map_sub");
     m_contextSupportsTextureFormatBGRA = extensions->supports("GL_EXT_texture_format_BGRA8888");
     if (m_contextSupportsTextureFormatBGRA)
         extensions->ensureEnabled("GL_EXT_texture_format_BGRA8888");
     m_contextSupportsReadFormatBGRA = extensions->supports("GL_EXT_read_format_bgra");
     if (m_contextSupportsReadFormatBGRA)
         extensions->ensureEnabled("GL_EXT_read_format_bgra");
 
@@ skipping 125 matching lines @@
 
     m_computedRenderSurfaceLayerList = adoptPtr(new LayerList());
     updateLayers(*m_computedRenderSurfaceLayerList);
 }
 
 void LayerRendererChromium::drawLayers()
 {
     ASSERT(m_hardwareCompositing);
     ASSERT(m_computedRenderSurfaceLayerList);
     // Before drawLayers:
-    if (hardwareCompositing() && m_contextSupportsLatch) {
+    if (hardwareCompositing()) {
         // FIXME: The multithreaded compositor case will not work as long as
         // copyTexImage2D resolves to the parent texture, because the main
         // thread can execute WebGL calls on the child context at any time,
         // potentially clobbering the parent texture that is being renderered
         // by the compositor thread.
-        Extensions3DChromium* parentExt = static_cast<Extensions3DChromium*>(m_context->getExtensions());
-        // For each child context:
-        //   glWaitLatch(Offscreen->Compositor);
         ChildContextMap::iterator i = m_childContexts.begin();
         for (; i != m_childContexts.end(); ++i) {
-            Extensions3DChromium* childExt = static_cast<Extensions3DChromium*>(i->first->getExtensions());
-            if (childExt->getGraphicsResetStatusARB() == GraphicsContext3D::NO_ERROR) {
-                GC3Duint childToParentLatchId;
-                childExt->getChildToParentLatchCHROMIUM(&childToParentLatchId);
-                childExt->setLatchCHROMIUM(childToParentLatchId);
-                parentExt->waitLatchCHROMIUM(childToParentLatchId);
-            }
+            i->first->flush();
         }
     }
 
     m_renderSurfaceTextureManager->setMemoryLimitBytes(textureMemoryHighLimitBytes - m_contentsTextureManager->currentMemoryUseBytes());
     drawLayers(*m_computedRenderSurfaceLayerList);
 
     m_contentsTextureManager->unprotectAllTextures();
     m_contentsTextureManager->reduceMemoryToLimit(textureMemoryReclaimLimitBytes);
 
     if (textureMemoryReclaimLimitBytes > m_contentsTextureManager->currentMemoryUseBytes())
         m_renderSurfaceTextureManager->reduceMemoryToLimit(textureMemoryReclaimLimitBytes - m_contentsTextureManager->currentMemoryUseBytes());
     else
         m_renderSurfaceTextureManager->reduceMemoryToLimit(0);
 
-    // After drawLayers:
-    if (hardwareCompositing() && m_contextSupportsLatch) {
-        Extensions3DChromium* parentExt = static_cast<Extensions3DChromium*>(m_context->getExtensions());
-        // For each child context:
-        //   glSetLatch(Compositor->Offscreen);
-        ChildContextMap::iterator i = m_childContexts.begin();
-        for (; i != m_childContexts.end(); ++i) {
-            Extensions3DChromium* childExt = static_cast<Extensions3DChromium*>(i->first->getExtensions());
-            if (childExt->getGraphicsResetStatusARB() == GraphicsContext3D::NO_ERROR) {
-                GC3Duint parentToChildLatchId;
-                childExt->getParentToChildLatchCHROMIUM(&parentToChildLatchId);
-                parentExt->setLatchCHROMIUM(parentToChildLatchId);
-                childExt->waitLatchCHROMIUM(parentToChildLatchId);
-            }
-        }
-    }
-
     if (isCompositingOffscreen())
         copyOffscreenTextureToDisplay();
 }
 
 void LayerRendererChromium::updateLayers(LayerList& renderSurfaceLayerList)
 {
     TRACE_EVENT("LayerRendererChromium::updateLayers", this, 0);
     CCLayerImpl* rootDrawLayer = m_rootLayer->ccLayerImpl();
 
     if (!rootDrawLayer->renderSurface())
@@ skipping 1000 matching lines @@
     if (m_rootLayer.get()) {
         ts << m_rootLayer->layerTreeAsText();
         ts << "RenderSurfaces:\n";
         dumpRenderSurfaces(ts, 1, m_rootLayer.get());
     }
     return ts.release();
 }
 
 void LayerRendererChromium::addChildContext(GraphicsContext3D* ctx)
 {
-    if (!ctx->getExtensions()->supports("GL_CHROMIUM_latch"))
-        return;
-
     // This is a ref-counting map, because some contexts are shared by multiple
     // layers (specifically, Canvas2DLayerChromium).
 
     // Insert the ctx with a count of 1, or return the existing iterator.
     std::pair<ChildContextMap::iterator, bool> insert_result = m_childContexts.add(ctx, 1);
     if (!insert_result.second) {
         // Already present in map, so increment.
         ++insert_result.first->second;
     } else {
 // FIXME(jbates): when compositor is multithreaded and copyTexImage2D bug is fixed,
 // uncomment this block:
 //      // This is a new child context - set the parentToChild latch so that it
 //      // can continue past its first wait latch.
 //      Extensions3DChromium* ext = static_cast<Extensions3DChromium*>(ctx->getExtensions());
 //      GC3Duint latchId;
 //      ext->getParentToChildLatchCHROMIUM(&latchId);
 //      ext->setLatchCHROMIUM(0, latchId);
     }
 }
 
 void LayerRendererChromium::removeChildContext(GraphicsContext3D* ctx)
 {
-    if (!ctx->getExtensions()->supports("GL_CHROMIUM_latch"))
-        return;
-
     ChildContextMap::iterator i = m_childContexts.find(ctx);
     if (i != m_childContexts.end()) {
         if (--i->second <= 0) {
             // Count reached zero, so remove from map.
             m_childContexts.remove(i);
         }
     } else {
         // error
         ASSERT(0 && "m_childContexts map has mismatched add/remove calls");
     }
@@ skipping 77 matching lines @@
 PassOwnPtr<CCLayerTreeHostImplProxy> LayerRendererChromium::createLayerTreeHostImplProxy()
 {
     OwnPtr<CCLayerTreeHostImplProxy> proxy = LayerRendererChromiumImplProxy::create(this);
     proxy->start();
     return proxy.release();
 }
 
 } // namespace WebCore
 
 #endif // USE(ACCELERATED_COMPOSITING)