Revert "Move UseGpuVsync out of PassThroughImageTransport"

Reason for revert: see #101

This reverts commit e2f6d5d.

Author: zakharvoit

gpu/ipc/service/gles2_command_buffer_stub.cc

@@ -46,7 +46,6 @@
 #include "ui/gfx/switches.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
-#include "ui/gl/gl_features.h"
 #include "ui/gl/gl_implementation.h"
 #include "ui/gl/gl_surface_egl.h"
 #include "ui/gl/gl_switches.h"
@@ -202,9 +201,6 @@ gpu::ContextResult GLES2CommandBufferStub::Initialize(
       LOG(ERROR) << "ContextResult::kSurfaceFailure: Failed to create surface.";
       return gpu::ContextResult::kSurfaceFailure;
     }
-    if (!features::UseGpuVsync()) {
-      surface_->SetVSyncEnabled(false);
-    }
   } else
 #endif
   {

gpu/ipc/service/image_transport_surface_android.cc

@@ -17,7 +17,7 @@
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/config/gpu_finch_features.h"
 #include "gpu/ipc/common/gpu_surface_lookup.h"
-#include "gpu/ipc/service/image_transport_surface_delegate.h"
+#include "gpu/ipc/service/pass_through_image_transport_surface.h"
 #include "third_party/abseil-cpp/absl/types/variant.h"
 #include "ui/gl/android/scoped_a_native_window.h"
 #include "ui/gl/gl_surface_egl.h"
@@ -125,7 +125,8 @@ scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeGLSurface(
   if (!initialize_success)
     return scoped_refptr<gl::GLSurface>();
 
-  return surface;
+  return scoped_refptr<gl::GLSurface>(
+      new PassThroughImageTransportSurface(delegate, surface.get(), false));
 }
 
 }  // namespace gpu

gpu/ipc/service/image_transport_surface_fuchsia.cc

@@ -4,6 +4,7 @@
 
 #include "gpu/ipc/service/image_transport_surface.h"
 
+#include "gpu/ipc/service/pass_through_image_transport_surface.h"
 #include "ui/gl/gl_surface.h"
 #include "ui/gl/gl_surface_stub.h"
 #include "ui/gl/init/gl_factory.h"
@@ -29,7 +30,13 @@ scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeGLSurface(
     return new gl::GLSurfaceStub;
   }
 
-  return gl::init::CreateViewGLSurface(display, surface_handle);
+  scoped_refptr<gl::GLSurface> surface =
+      gl::init::CreateViewGLSurface(display, surface_handle);
+
+  if (!surface)
+    return surface;
+  return base::MakeRefCounted<PassThroughImageTransportSurface>(
+      delegate, surface.get(), false);
 }
 
 }  // namespace gpu

gpu/ipc/service/pass_through_image_transport_surface.cc

@@ -139,12 +139,15 @@ void PassThroughImageTransportSurface::TrackMultiSurfaceSwap() {
 
 void PassThroughImageTransportSurface::UpdateVSyncEnabled() {
   if (is_gpu_vsync_disabled_) {
+    SetVSyncEnabled(false);
     return;
   }
 
+  bool should_override_vsync = false;
   if (is_multi_window_swap_vsync_override_enabled_) {
-    SetVSyncEnabled(!multiple_surfaces_swapped_);
+    should_override_vsync = multiple_surfaces_swapped_;
   }
+  SetVSyncEnabled(!should_override_vsync);
 }
 
 void PassThroughImageTransportSurface::StartSwapBuffers() {

ui/gl/gl_surface.cc

@@ -497,4 +497,11 @@ scoped_refptr<GLSurface> InitializeGLSurfaceWithFormat(
   return surface;
 }
 
+scoped_refptr<GLSurface> InitializeGLSurface(scoped_refptr<GLSurface> surface) {
+  if (!surface->Initialize(GLSurfaceFormat())) {
+    return nullptr;
+  }
+  return surface;
+}
+
 }  // namespace gl