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 af7828faeb7a8c7c1dce6ba1962d8735fc6e0dd9..443bfe0e62839f017cd3c341560d59710109b785 100644
--- a/components/view_manager/gles2/command_buffer_driver.cc
+++ b/components/view_manager/gles2/command_buffer_driver.cc
@@ -8,6 +8,7 @@
 #include "base/macros.h"
 #include "base/memory/shared_memory.h"
 #include "components/view_manager/gles2/command_buffer_type_conversions.h"
+#include "components/view_manager/gles2/gpu_memory_tracker.h"
 #include "components/view_manager/gles2/gpu_state.h"
 #include "components/view_manager/gles2/mojo_buffer_backing.h"
 #include "gpu/command_buffer/common/constants.h"
@@ -32,29 +33,6 @@
 
 namespace gles2 {
 
-namespace {
-
-class MemoryTrackerStub : public gpu::gles2::MemoryTracker {
- public:
-  MemoryTrackerStub() {}
-
-  void TrackMemoryAllocatedChange(
-      size_t old_size,
-      size_t new_size,
-      gpu::gles2::MemoryTracker::Pool pool) override {}
-
-  bool EnsureGPUMemoryAvailable(size_t size_needed) override { return true; };
-  uint64_t ClientTracingId() const override { return 0; }
-  int ClientId() const override { return 0; }
-
- private:
-  ~MemoryTrackerStub() override {}
-
-  DISALLOW_COPY_AND_ASSIGN(MemoryTrackerStub);
-};
-
-}  // anonymous namespace
-
 CommandBufferDriver::Client::~Client() {
 }
 
@@ -110,15 +88,10 @@ bool CommandBufferDriver::MakeCurrent() {
 
 bool CommandBufferDriver::DoInitialize(
     mojo::ScopedSharedBufferHandle shared_state) {
-  if (widget_ == gfx::kNullAcceleratedWidget)
+  if (widget_ == gfx::kNullAcceleratedWidget) {
     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())
@@ -138,7 +111,7 @@ bool CommandBufferDriver::DoInitialize(
   bool bind_generates_resource = false;
   scoped_refptr<gpu::gles2::ContextGroup> context_group =
       new gpu::gles2::ContextGroup(
-          gpu_state_->mailbox_manager(), new MemoryTrackerStub,
+          gpu_state_->mailbox_manager(), new GpuMemoryTracker,
           new gpu::gles2::ShaderTranslatorCache, nullptr, nullptr, nullptr,
           bind_generates_resource);
 
@@ -347,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();