Mandoline: Merge Surfaces and Views apps

components/view_manager/gles2/command_buffer_driver.cc

Index: components/view_manager/gles2/command_buffer_driver.cc
diff --git a/components/view_manager/gles2/command_buffer_driver.cc b/components/view_manager/gles2/command_buffer_driver.cc
index 5a4ac83fb4943738eae6efe524845352e6ee23a7..de60d5d7d57697bf9625c8da9fe041e1cf5e8939 100644
--- a/components/view_manager/gles2/command_buffer_driver.cc
+++ b/components/view_manager/gles2/command_buffer_driver.cc
@@ -88,15 +88,10 @@ bool CommandBufferDriver::MakeCurrent() {
 
 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())
@@ -325,12 +320,6 @@ void CommandBufferDriver::OnContextLost(uint32_t 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();