Deletes NativeViewGLSurfaceEGL::Initialize(gfx::VSyncProvider).

gpu/ipc/service/direct_composition_surface_win_unittest.cc

 // Copyright 2017 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 "gpu/ipc/service/direct_composition_surface_win.h"
 #include "base/memory/weak_ptr.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/win/scoped_gdi_object.h"
@@ skipping 112 matching lines @@
   return texture;
 }
 
 TEST(DirectCompositionSurfaceTest, TestMakeCurrent) {
   if (!CheckIfDCSupported())
     return;
 
   TestImageTransportSurfaceDelegate delegate;
 
   scoped_refptr<DirectCompositionSurfaceWin> surface1(
-      new DirectCompositionSurfaceWin(delegate.AsWeakPtr(),
+      new DirectCompositionSurfaceWin(nullptr, delegate.AsWeakPtr(),
                                       ui::GetHiddenWindow()));
   EXPECT_TRUE(surface1->Initialize());
   surface1->SetEnableDCLayers(true);
 
   scoped_refptr<gl::GLContext> context1 = gl::init::CreateGLContext(
       nullptr, surface1.get(), gl::GLContextAttribs());
   EXPECT_TRUE(surface1->Resize(gfx::Size(100, 100), 1.0, true));
 
   // First SetDrawRectangle must be full size of surface.
   EXPECT_FALSE(surface1->SetDrawRectangle(gfx::Rect(0, 0, 50, 50)));
@@ skipping 11 matching lines @@
   EXPECT_FALSE(surface1->SetDrawRectangle(gfx::Rect(0, 0, 101, 101)));
   EXPECT_TRUE(surface1->SetDrawRectangle(gfx::Rect(0, 0, 100, 100)));
   EXPECT_TRUE(context1->IsCurrent(surface1.get()));
 
   EXPECT_TRUE(surface1->Resize(gfx::Size(50, 50), 1.0, true));
   EXPECT_TRUE(context1->IsCurrent(surface1.get()));
   EXPECT_TRUE(surface1->SetDrawRectangle(gfx::Rect(0, 0, 50, 50)));
   EXPECT_TRUE(context1->IsCurrent(surface1.get()));
 
   scoped_refptr<DirectCompositionSurfaceWin> surface2(
-      new DirectCompositionSurfaceWin(delegate.AsWeakPtr(),
+      new DirectCompositionSurfaceWin(nullptr, delegate.AsWeakPtr(),
                                       ui::GetHiddenWindow()));
   EXPECT_TRUE(surface2->Initialize());
 
   scoped_refptr<gl::GLContext> context2 = gl::init::CreateGLContext(
       nullptr, surface2.get(), gl::GLContextAttribs());
   surface2->SetEnableDCLayers(true);
   EXPECT_TRUE(context2->MakeCurrent(surface2.get()));
   EXPECT_TRUE(surface2->Resize(gfx::Size(100, 100), 1.0, true));
   // The previous IDCompositionSurface should be suspended when another
   // surface is being drawn to.
@@ skipping 11 matching lines @@
 }
 
 // Tests that switching using EnableDCLayers works.
 TEST(DirectCompositionSurfaceTest, DXGIDCLayerSwitch) {
   if (!CheckIfDCSupported())
     return;
 
   TestImageTransportSurfaceDelegate delegate;
 
   scoped_refptr<DirectCompositionSurfaceWin> surface(
-      new DirectCompositionSurfaceWin(delegate.AsWeakPtr(),
+      new DirectCompositionSurfaceWin(nullptr, delegate.AsWeakPtr(),
                                       ui::GetHiddenWindow()));
   EXPECT_TRUE(surface->Initialize());
 
   scoped_refptr<gl::GLContext> context =
       gl::init::CreateGLContext(nullptr, surface.get(), gl::GLContextAttribs());
   EXPECT_TRUE(surface->Resize(gfx::Size(100, 100), 1.0, true));
   EXPECT_FALSE(surface->swap_chain());
 
   // First SetDrawRectangle must be full size of surface for DXGI
   // swapchain.
@@ skipping 33 matching lines @@
 }
 
 // Ensure that the swapchain's alpha is correct.
 TEST(DirectCompositionSurfaceTest, SwitchAlpha) {
   if (!CheckIfDCSupported())
     return;
 
   TestImageTransportSurfaceDelegate delegate;
 
   scoped_refptr<DirectCompositionSurfaceWin> surface(
-      new DirectCompositionSurfaceWin(delegate.AsWeakPtr(),
+      new DirectCompositionSurfaceWin(nullptr, delegate.AsWeakPtr(),
                                       ui::GetHiddenWindow()));
   EXPECT_TRUE(surface->Initialize());
 
   scoped_refptr<gl::GLContext> context =
       gl::init::CreateGLContext(nullptr, surface.get(), gl::GLContextAttribs());
   EXPECT_TRUE(surface->Resize(gfx::Size(100, 100), 1.0, true));
   EXPECT_FALSE(surface->swap_chain());
 
   EXPECT_TRUE(surface->SetDrawRectangle(gfx::Rect(0, 0, 100, 100)));
   base::win::ScopedComPtr<IDXGISwapChain1> swap_chain = surface->swap_chain();
@@ skipping 20 matching lines @@
   DestroySurface(std::move(surface));
 }
 
 // Ensure that the GLImage isn't presented again unless it changes.
 TEST(DirectCompositionSurfaceTest, NoPresentTwice) {
   if (!CheckIfDCSupported())
     return;
 
   TestImageTransportSurfaceDelegate delegate;
   scoped_refptr<DirectCompositionSurfaceWin> surface(
-      new DirectCompositionSurfaceWin(delegate.AsWeakPtr(),
+      new DirectCompositionSurfaceWin(nullptr, delegate.AsWeakPtr(),
                                       ui::GetHiddenWindow()));
   EXPECT_TRUE(surface->Initialize());
   surface->SetEnableDCLayers(true);
   gfx::Size window_size(100, 100);
 
   scoped_refptr<gl::GLContext> context =
       gl::init::CreateGLContext(nullptr, surface.get(), gl::GLContextAttribs());
 
   base::win::ScopedComPtr<ID3D11Device> d3d11_device =
       gl::QueryD3D11DeviceObjectFromANGLE();
@@ skipping 86 matching lines @@
 
 class DirectCompositionPixelTest : public testing::Test {
  public:
   DirectCompositionPixelTest()
       : window_(&platform_delegate_, gfx::Rect(0, 0, 100, 100)) {}
 
  protected:
   void InitializeSurface() {
     static_cast<ui::PlatformWindow*>(&window_)->Show();
 
-    surface_ =
-        new DirectCompositionSurfaceWin(delegate_.AsWeakPtr(), window_.hwnd());
+    surface_ = new DirectCompositionSurfaceWin(nullptr, delegate_.AsWeakPtr(),
+                                               window_.hwnd());
     EXPECT_TRUE(surface_->Initialize());
   }
 
   void PixelTestSwapChain(bool layers_enabled) {
     if (!CheckIfDCSupported())
       return;
 
     InitializeSurface();
 
     surface_->SetEnableDCLayers(layers_enabled);
@@ skipping 84 matching lines @@
   EXPECT_TRUE(AreColorsSimilar(expected_color, actual_color))
       << std::hex << "Expected " << expected_color << " Actual "
       << actual_color;
 
   context = nullptr;
   DestroySurface(std::move(surface_));
 }
 
 }  // namespace
 }  // namespace gpu