Move context-related callbacks into OutputSurface

cc/gl_renderer.cc

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/gl_renderer.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 93 matching lines @@
     , m_isScissorEnabled(false)
 {
     DCHECK(m_context);
 }
 
 bool GLRenderer::initialize()
 {
     if (!m_context->makeContextCurrent())
         return false;
 
-    m_context->setContextLostCallback(this);
     m_context->pushGroupMarkerEXT("CompositorContext");
 
     std::string extensionsString = UTF16ToASCII(m_context->getString(GL_EXTENSIONS));
     std::vector<std::string> extensionsList;
     base::SplitString(extensionsString, ' ', &extensionsList);
     std::set<std::string> extensions(extensionsList.begin(), extensionsList.end());
 
     if (settings().acceleratePainting && extensions.count("GL_EXT_texture_format_BGRA8888")
                                       && extensions.count("GL_EXT_read_format_bgra"))
         m_capabilities.usingAcceleratedPainting = true;
     else
         m_capabilities.usingAcceleratedPainting = false;
 
     m_capabilities.usingPartialSwap = settings().partialSwapEnabled && extensions.count("GL_CHROMIUM_post_sub_buffer");
 
-    // Use the swapBuffers callback only with the threaded proxy.
-    if (m_client->hasImplThread())
-        m_capabilities.usingSwapCompleteCallback = extensions.count("GL_CHROMIUM_swapbuffers_complete_callback");
-    if (m_capabilities.usingSwapCompleteCallback)
-        m_context->setSwapBuffersCompleteCallbackCHROMIUM(this);
-
     m_capabilities.usingSetVisibility = extensions.count("GL_CHROMIUM_set_visibility");
 
     if (extensions.count("GL_CHROMIUM_iosurface"))
         DCHECK(extensions.count("GL_ARB_texture_rectangle"));
 
     m_capabilities.usingGpuMemoryManager = extensions.count("GL_CHROMIUM_gpu_memory_manager")
                                            && settings().useMemoryManagement;
     if (m_capabilities.usingGpuMemoryManager)
         m_context->setMemoryAllocationChangedCallbackCHROMIUM(this);
 
@@ skipping 20 matching lines @@
     if (!initializeSharedObjects())
         return false;
 
     // Make sure the viewport and context gets initialized, even if it is to zero.
     viewportChanged();
     return true;
 }
 
 GLRenderer::~GLRenderer()
 {
-    m_context->setSwapBuffersCompleteCallbackCHROMIUM(0);
     m_context->setMemoryAllocationChangedCallbackCHROMIUM(0);
-    m_context->setContextLostCallback(0);
     cleanupSharedObjects();
 }
 
 const RendererCapabilities& GLRenderer::capabilities() const
 {
     return m_capabilities;
 }
 
 WebGraphicsContext3D* GLRenderer::context()
 {
@@ skipping 1183 matching lines @@
     // assuming a double-buffered GPU pipeline. A texture can be
     // written to after one full frame has past since it was last read.
     if (m_lastSwapFence)
         static_cast<SimpleSwapFence*>(m_lastSwapFence.get())->setHasPassed();
     m_lastSwapFence = m_resourceProvider->GetReadLockFence();
     m_resourceProvider->SetReadLockFence(new SimpleSwapFence());
 
     return true;
 }
 
-void GLRenderer::receiveCompositorFrameAck(const CompositorFrameAck& ack) {
-    onSwapBuffersComplete();
-}
-
-void GLRenderer::onSwapBuffersComplete()
-{
-    m_client->onSwapBuffersComplete();
-}
-
 void GLRenderer::onMemoryAllocationChanged(WebGraphicsMemoryAllocation allocation)
 {
     // Just ignore the memory manager when it says to set the limit to zero
     // bytes. This will happen when the memory manager thinks that the renderer
     // is not visible (which the renderer knows better).
     if (allocation.bytesLimitWhenVisible) {
         ManagedMemoryPolicy policy(
             allocation.bytesLimitWhenVisible,
             priorityCutoff(allocation.priorityCutoffWhenVisible),
             allocation.bytesLimitWhenNotVisible,
@@ skipping 56 matching lines @@
 
 void GLRenderer::ensureBackbuffer()
 {
     if (!m_isBackbufferDiscarded)
         return;
 
     m_outputSurface->EnsureBackbuffer();
     m_isBackbufferDiscarded = false;
 }
 
-void GLRenderer::onContextLost()
-{
-    m_client->didLoseOutputSurface();
-}
-
-
 void GLRenderer::getFramebufferPixels(void *pixels, const gfx::Rect& rect)
 {
     DCHECK(rect.right() <= viewportWidth());
     DCHECK(rect.bottom() <= viewportHeight());
 
     if (!pixels)
         return;
 
     makeContextCurrent();
 
@@ skipping 379 matching lines @@
 
     releaseRenderPassTextures();
 }
 
 bool GLRenderer::isContextLost()
 {
     return (m_context->getGraphicsResetStatusARB() != GL_NO_ERROR);
 }
 
 }  // namespace cc