Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Side by Side Diff: gpu/ipc/service/image_transport_surface_win.cc

Issue 2492583002: Decouple PassThroughImageTransportSurface from GpuCommandBufferStub (Closed)
Patch Set: Addressed Antoine's comments Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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, 22 GpuChannelManager* manager,
23 GpuCommandBufferStub* stub, 23 base::WeakPtr<ImageTransportSurfaceDelegate> delegate,
24 SurfaceHandle surface_handle, 24 SurfaceHandle surface_handle,
25 gl::GLSurface::Format format) { 25 gl::GLSurface::Format format) {
26 DCHECK_NE(surface_handle, kNullSurfaceHandle); 26 DCHECK_NE(surface_handle, kNullSurfaceHandle);
27 27
28 scoped_refptr<gl::GLSurface> surface; 28 scoped_refptr<gl::GLSurface> surface;
29 if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2 && 29 if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2 &&
30 gl::GLSurfaceEGL::IsDirectCompositionSupported()) { 30 gl::GLSurfaceEGL::IsDirectCompositionSupported()) {
31 scoped_refptr<ChildWindowSurfaceWin> egl_surface( 31 scoped_refptr<ChildWindowSurfaceWin> egl_surface(
32 new ChildWindowSurfaceWin(manager, surface_handle)); 32 new ChildWindowSurfaceWin(manager, surface_handle));
33 surface = egl_surface; 33 surface = egl_surface;
34 34
35 // TODO(stanisc): http://crbug.com/659844: 35 // TODO(stanisc): http://crbug.com/659844:
36 // Force DWM based gl::VSyncProviderWin provider to avoid video playback 36 // Force DWM based gl::VSyncProviderWin provider to avoid video playback
37 // smoothness issues. Once that issue is fixed, passing a nullptr 37 // smoothness issues. Once that issue is fixed, passing a nullptr
38 // vsync_provider would result in assigning a default VSyncProvider inside 38 // vsync_provider would result in assigning a default VSyncProvider inside
39 // the Initialize call. 39 // the Initialize call.
40 std::unique_ptr<gfx::VSyncProvider> vsync_provider( 40 std::unique_ptr<gfx::VSyncProvider> vsync_provider(
41 new gl::VSyncProviderWin(surface_handle)); 41 new gl::VSyncProviderWin(surface_handle));
42 42
43 if (!egl_surface->Initialize(std::move(vsync_provider))) 43 if (!egl_surface->Initialize(std::move(vsync_provider)))
44 return nullptr; 44 return nullptr;
45 } else { 45 } else {
46 surface = gl::init::CreateViewGLSurface(surface_handle); 46 surface = gl::init::CreateViewGLSurface(surface_handle);
47 if (!surface) 47 if (!surface)
48 return nullptr; 48 return nullptr;
49 } 49 }
50 50
51 return scoped_refptr<gl::GLSurface>( 51 return scoped_refptr<gl::GLSurface>(
52 new PassThroughImageTransportSurface(stub, surface.get())); 52 new PassThroughImageTransportSurface(delegate, surface.get()));
53 } 53 }
54 54
55 } // namespace gpu 55 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/ipc/service/image_transport_surface_overlay_mac.mm ('k') | gpu/ipc/service/pass_through_image_transport_surface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698