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 70 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)
+  if (widget_ == gfx::kNullAcceleratedWidget) {

[sky, 2015/08/18 17:42:26]

nit: nuke all {} here.

[Fady Samuel, 2015/08/18 19:16:49]

Hmm, CommandBufferDriver doesn't actually need widget_ anymore since it doesn't
deal with one directly anymore (that work is moved to CommandBufferLocal).

     surface_ = gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1));
-  else {
+  } else {
     surface_ = gfx::GLSurface::CreateViewGLSurface(widget_);
-    if (auto vsync_provider = surface_->GetVSyncProvider()) {
-      vsync_provider->GetVSyncParameters(
-          base::Bind(&CommandBufferDriver::OnUpdateVSyncParameters,
-                     weak_factory_.GetWeakPtr()));
-    }
   }
 
   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 208 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