| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "gpu/ipc/service/image_transport_surface.h" | 5 #include "gpu/ipc/service/image_transport_surface.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "gpu/ipc/service/child_window_surface_win.h" | 9 #include "gpu/ipc/service/child_window_surface_win.h" |
| 10 #include "gpu/ipc/service/pass_through_image_transport_surface.h" | 10 #include "gpu/ipc/service/pass_through_image_transport_surface.h" |
| 11 #include "ui/gfx/native_widget_types.h" | 11 #include "ui/gfx/native_widget_types.h" |
| 12 #include "ui/gl/gl_bindings.h" | 12 #include "ui/gl/gl_bindings.h" |
| 13 #include "ui/gl/gl_implementation.h" | 13 #include "ui/gl/gl_implementation.h" |
| 14 #include "ui/gl/gl_surface_egl.h" | 14 #include "ui/gl/gl_surface_egl.h" |
| 15 #include "ui/gl/init/gl_factory.h" | 15 #include "ui/gl/init/gl_factory.h" |
| 16 #include "ui/gl/vsync_provider_win.h" | 16 #include "ui/gl/vsync_provider_win.h" |
| 17 | 17 |
| 18 namespace gpu { | 18 namespace gpu { |
| 19 | 19 |
| 20 // static | 20 // static |
| 21 scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface( | 21 scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface( |
| 22 GpuChannelManager* manager, | |
| 23 base::WeakPtr<ImageTransportSurfaceDelegate> delegate, | 22 base::WeakPtr<ImageTransportSurfaceDelegate> delegate, |
| 24 SurfaceHandle surface_handle, | 23 SurfaceHandle surface_handle, |
| 25 gl::GLSurface::Format format) { | 24 gl::GLSurface::Format format) { |
| 26 DCHECK_NE(surface_handle, kNullSurfaceHandle); | 25 DCHECK_NE(surface_handle, kNullSurfaceHandle); |
| 27 | 26 |
| 28 scoped_refptr<gl::GLSurface> surface; | 27 scoped_refptr<gl::GLSurface> surface; |
| 29 if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2 && | 28 if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2 && |
| 30 gl::GLSurfaceEGL::IsDirectCompositionSupported()) { | 29 gl::GLSurfaceEGL::IsDirectCompositionSupported()) { |
| 31 scoped_refptr<ChildWindowSurfaceWin> egl_surface( | 30 scoped_refptr<ChildWindowSurfaceWin> egl_surface( |
| 32 new ChildWindowSurfaceWin(manager, surface_handle)); | 31 new ChildWindowSurfaceWin(delegate, surface_handle)); |
| 33 surface = egl_surface; | 32 surface = egl_surface; |
| 34 | 33 |
| 35 // TODO(stanisc): http://crbug.com/659844: | 34 // TODO(stanisc): http://crbug.com/659844: |
| 36 // Force DWM based gl::VSyncProviderWin provider to avoid video playback | 35 // Force DWM based gl::VSyncProviderWin provider to avoid video playback |
| 37 // smoothness issues. Once that issue is fixed, passing a nullptr | 36 // smoothness issues. Once that issue is fixed, passing a nullptr |
| 38 // vsync_provider would result in assigning a default VSyncProvider inside | 37 // vsync_provider would result in assigning a default VSyncProvider inside |
| 39 // the Initialize call. | 38 // the Initialize call. |
| 40 std::unique_ptr<gfx::VSyncProvider> vsync_provider( | 39 std::unique_ptr<gfx::VSyncProvider> vsync_provider( |
| 41 new gl::VSyncProviderWin(surface_handle)); | 40 new gl::VSyncProviderWin(surface_handle)); |
| 42 | 41 |
| 43 if (!egl_surface->Initialize(std::move(vsync_provider))) | 42 if (!egl_surface->Initialize(std::move(vsync_provider))) |
| 44 return nullptr; | 43 return nullptr; |
| 45 } else { | 44 } else { |
| 46 surface = gl::init::CreateViewGLSurface(surface_handle); | 45 surface = gl::init::CreateViewGLSurface(surface_handle); |
| 47 if (!surface) | 46 if (!surface) |
| 48 return nullptr; | 47 return nullptr; |
| 49 } | 48 } |
| 50 | 49 |
| 51 return scoped_refptr<gl::GLSurface>( | 50 return scoped_refptr<gl::GLSurface>( |
| 52 new PassThroughImageTransportSurface(delegate, surface.get())); | 51 new PassThroughImageTransportSurface(delegate, surface.get())); |
| 53 } | 52 } |
| 54 | 53 |
| 55 } // namespace gpu | 54 } // namespace gpu |
| OLD | NEW |