Mandoline: Merge Surfaces and Views apps

components/view_manager/gles2/command_buffer_driver.cc

 // Copyright 2013 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 "components/view_manager/gles2/command_buffer_driver.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "components/view_manager/gles2/command_buffer_type_conversions.h"
@@ skipping 19 matching lines @@
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_image_shared_memory.h"
 #include "ui/gl/gl_surface.h"
 
 namespace gles2 {
 
 CommandBufferDriver::Client::~Client() {
 }
 
 CommandBufferDriver::CommandBufferDriver(scoped_refptr<GpuState> gpu_state)
-    : CommandBufferDriver(gfx::kNullAcceleratedWidget,
-                          gpu_state,
-                          base::Callback<void(CommandBufferDriver*)>()) {}
-
-CommandBufferDriver::CommandBufferDriver(
-    gfx::AcceleratedWidget widget,
-    scoped_refptr<GpuState> gpu_state,
-    const base::Callback<void(CommandBufferDriver*)>& destruct_callback)
     : client_(nullptr),
-      widget_(widget),
       gpu_state_(gpu_state),
-      destruct_callback_(destruct_callback),
       weak_factory_(this) {
 }
 
 CommandBufferDriver::~CommandBufferDriver() {
   DestroyDecoder();
-  if (!destruct_callback_.is_null())
-    destruct_callback_.Run(this);
 }
 
 void CommandBufferDriver::Initialize(
     mojo::CommandBufferSyncClientPtr sync_client,
     mojo::CommandBufferLostContextObserverPtr loss_observer,
     mojo::ScopedSharedBufferHandle shared_state) {
   sync_client_ = sync_client.Pass();
   loss_observer_ = loss_observer.Pass();
   bool success = DoInitialize(shared_state.Pass());
   mojo::GpuCapabilitiesPtr capabilities =
@@ skipping 12 matching lines @@
       static_cast<gpu::error::ContextLostReason>(
           decoder_->GetContextLostReason());
   command_buffer_->SetContextLostReason(reason);
   command_buffer_->SetParseError(gpu::error::kLostContext);
   OnContextLost(reason);
   return false;
 }
 
 bool CommandBufferDriver::DoInitialize(
     mojo::ScopedSharedBufferHandle shared_state) {
-  if (widget_ == gfx::kNullAcceleratedWidget)
-    surface_ = gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1));
-  else {
-    surface_ = gfx::GLSurface::CreateViewGLSurface(widget_);
-    if (auto vsync_provider = surface_->GetVSyncProvider()) {
-      vsync_provider->GetVSyncParameters(
-          base::Bind(&CommandBufferDriver::OnUpdateVSyncParameters,
-                     weak_factory_.GetWeakPtr()));
-    }
-  }
+  surface_ = gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1));
 
   if (!surface_.get())
     return false;
 
   // TODO(piman): virtual contexts, gpu preference.
   context_ = gfx::GLContext::CreateGLContext(
       gpu_state_->share_group(), surface_.get(), gfx::PreferIntegratedGpu);
   if (!context_.get())
     return false;
 
@@ skipping 59 matching lines @@
   if (!context_)
     return;
   if (!context_->MakeCurrent(surface_.get())) {
     DLOG(WARNING) << "Context lost";
     OnContextLost(gpu::error::kUnknown);
     return;
   }
   command_buffer_->Flush(put_offset);
 }
 
-void CommandBufferDriver::DestroyWindow() {
-  DestroyDecoder();
-  surface_ = nullptr;
-  context_ = nullptr;
-  destruct_callback_.Reset();
-}
-
 void CommandBufferDriver::MakeProgress(int32_t last_get_offset) {
   // TODO(piman): handle out-of-order.
   sync_client_->DidMakeProgress(
       mojo::CommandBufferState::From(command_buffer_->GetLastState()));
 }
 
 void CommandBufferDriver::RegisterTransferBuffer(
     int32_t id,
     mojo::ScopedSharedBufferHandle transfer_buffer,
     uint32_t size) {
@@ skipping 121 matching lines @@
 
 void CommandBufferDriver::OnSyncPointRetired() {
   scheduler_->SetScheduled(true);
 }
 
 void CommandBufferDriver::OnContextLost(uint32_t reason) {
   loss_observer_->DidLoseContext(reason);
   client_->DidLoseContext();
 }
 
-void CommandBufferDriver::OnUpdateVSyncParameters(
-    const base::TimeTicks timebase,
-    const base::TimeDelta interval) {
-  client_->UpdateVSyncParameters(timebase, interval);
-}
-
 void CommandBufferDriver::DestroyDecoder() {
   if (decoder_) {
     bool have_context = decoder_->MakeCurrent();
     decoder_->Destroy(have_context);
     decoder_.reset();
   }
 }
 
 }  // namespace gles2