| Index: gpu/ipc/service/direct_composition_surface_win.cc
|
| diff --git a/gpu/ipc/service/direct_composition_surface_win.cc b/gpu/ipc/service/direct_composition_surface_win.cc
|
| index b794e77143cd68a378bed6a5c515aa1c25e39437..154405590ad03e2952585b7c8c3cb8500c5c2642 100644
|
| --- a/gpu/ipc/service/direct_composition_surface_win.cc
|
| +++ b/gpu/ipc/service/direct_composition_surface_win.cc
|
| @@ -644,9 +644,12 @@ bool DCLayerTree::ScheduleDCLayer(const ui::DCRendererLayerParams& params) {
|
| }
|
|
|
| DirectCompositionSurfaceWin::DirectCompositionSurfaceWin(
|
| + std::unique_ptr<gfx::VSyncProvider> vsync_provider,
|
| base::WeakPtr<ImageTransportSurfaceDelegate> delegate,
|
| HWND parent_window)
|
| - : gl::GLSurfaceEGL(), child_window_(delegate, parent_window) {}
|
| + : gl::GLSurfaceEGL(),
|
| + child_window_(delegate, parent_window),
|
| + vsync_provider_(std::move(vsync_provider)) {}
|
|
|
| DirectCompositionSurfaceWin::~DirectCompositionSurfaceWin() {
|
| Destroy();
|
| @@ -704,12 +707,6 @@ bool DirectCompositionSurfaceWin::InitializeNativeWindow() {
|
| return result;
|
| }
|
|
|
| -bool DirectCompositionSurfaceWin::Initialize(
|
| - std::unique_ptr<gfx::VSyncProvider> vsync_provider) {
|
| - vsync_provider_ = std::move(vsync_provider);
|
| - return Initialize(gl::GLSurfaceFormat());
|
| -}
|
| -
|
| bool DirectCompositionSurfaceWin::Initialize(gl::GLSurfaceFormat format) {
|
| d3d11_device_ = gl::QueryD3D11DeviceObjectFromANGLE();
|
| dcomp_device_ = gl::QueryDirectCompositionDevice(d3d11_device_);
|
|
|