services/ui: Revert CLs that broke Windows.

services/ui/surfaces/direct_output_surface_ozone.cc

 // Copyright 2016 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 "services/ui/surfaces/direct_output_surface_ozone.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 17 matching lines @@
     scoped_refptr<SurfacesContextProvider> context_provider,
     gfx::AcceleratedWidget widget,
     cc::SyntheticBeginFrameSource* synthetic_begin_frame_source,
     uint32_t target,
     uint32_t internalformat)
     : cc::OutputSurface(context_provider, nullptr, nullptr),
       gl_helper_(context_provider->ContextGL(),
                  context_provider->ContextSupport()),
       synthetic_begin_frame_source_(synthetic_begin_frame_source),
       weak_ptr_factory_(this) {
-  buffer_queue_.reset(new BufferQueue(
-      context_provider->ContextGL(), target, internalformat, &gl_helper_,
-      MusGpuMemoryBufferManager::current(), widget));
+  if (!GpuService::UseChromeGpuCommandBuffer()) {
+    ozone_gpu_memory_buffer_manager_.reset(new OzoneGpuMemoryBufferManager());
+    buffer_queue_.reset(new BufferQueue(
+        context_provider->ContextGL(), target, internalformat, &gl_helper_,
+        ozone_gpu_memory_buffer_manager_.get(), widget));
+  } else {
+    buffer_queue_.reset(new BufferQueue(
+        context_provider->ContextGL(), target, internalformat, &gl_helper_,
+        MusGpuMemoryBufferManager::current(), widget));
+  }
 
   capabilities_.uses_default_gl_framebuffer = false;
   capabilities_.flipped_output_surface = true;
   // Set |max_frames_pending| to 2 for surfaceless, which aligns scheduling
   // more closely with the previous surfaced behavior.
   // With a surface, swap buffer ack used to return early, before actually
   // presenting the back buffer, enabling the browser compositor to run ahead.
   // Surfaceless implementation acks at the time of actual buffer swap, which
   // shifts the start of the new frame forward relative to the old
   // implementation.
@@ skipping 97 matching lines @@
 void DirectOutputSurfaceOzone::Reshape(const gfx::Size& size,
                                        float scale_factor,
                                        const gfx::ColorSpace& color_space,
                                        bool alpha) {
   OutputSurface::Reshape(size, scale_factor, color_space, alpha);
   DCHECK(buffer_queue_);
   buffer_queue_->Reshape(SurfaceSize(), scale_factor, color_space);
 }
 
 }  // namespace ui