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

Side by Side Diff: gpu/ipc/service/image_transport_surface_mac.mm

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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/macros.h" 7 #include "base/macros.h"
8 #include "gpu/ipc/service/image_transport_surface_overlay_mac.h" 8 #include "gpu/ipc/service/image_transport_surface_overlay_mac.h"
9 #include "gpu/ipc/service/pass_through_image_transport_surface.h" 9 #include "gpu/ipc/service/pass_through_image_transport_surface.h"
10 #include "ui/gfx/native_widget_types.h" 10 #include "ui/gfx/native_widget_types.h"
(...skipping 24 matching lines...) Expand all
35 return gfx::SwapResult::SWAP_ACK; 35 return gfx::SwapResult::SWAP_ACK;
36 } 36 }
37 37
38 bool g_allow_os_mesa = false; 38 bool g_allow_os_mesa = false;
39 39
40 } // namespace 40 } // namespace
41 41
42 // static 42 // static
43 scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface( 43 scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface(
44 GpuChannelManager* manager, 44 GpuChannelManager* manager,
45 GpuCommandBufferStub* stub, 45 base::WeakPtr<ImageTransportSurfaceDelegate> delegate,
46 SurfaceHandle surface_handle, 46 SurfaceHandle surface_handle,
47 gl::GLSurface::Format format) { 47 gl::GLSurface::Format format) {
48 DCHECK_NE(surface_handle, kNullSurfaceHandle); 48 DCHECK_NE(surface_handle, kNullSurfaceHandle);
49 49
50 switch (gl::GetGLImplementation()) { 50 switch (gl::GetGLImplementation()) {
51 case gl::kGLImplementationDesktopGL: 51 case gl::kGLImplementationDesktopGL:
52 case gl::kGLImplementationDesktopGLCoreProfile: 52 case gl::kGLImplementationDesktopGLCoreProfile:
53 case gl::kGLImplementationAppleGL: 53 case gl::kGLImplementationAppleGL:
54 return make_scoped_refptr<gl::GLSurface>( 54 return make_scoped_refptr<gl::GLSurface>(
55 new ImageTransportSurfaceOverlayMac(stub)); 55 new ImageTransportSurfaceOverlayMac(delegate));
56 case gl::kGLImplementationMockGL: 56 case gl::kGLImplementationMockGL:
57 return make_scoped_refptr<gl::GLSurface>(new gl::GLSurfaceStub); 57 return make_scoped_refptr<gl::GLSurface>(new gl::GLSurfaceStub);
58 default: 58 default:
59 // Content shell in DRT mode spins up a gpu process which needs an 59 // Content shell in DRT mode spins up a gpu process which needs an
60 // image transport surface, but that surface isn't used to read pixel 60 // image transport surface, but that surface isn't used to read pixel
61 // baselines. So this is mostly a dummy surface. 61 // baselines. So this is mostly a dummy surface.
62 if (!g_allow_os_mesa) { 62 if (!g_allow_os_mesa) {
63 NOTREACHED(); 63 NOTREACHED();
64 return nullptr; 64 return nullptr;
65 } 65 }
66 scoped_refptr<gl::GLSurface> surface(new DRTSurfaceOSMesa()); 66 scoped_refptr<gl::GLSurface> surface(new DRTSurfaceOSMesa());
67 if (!surface.get() || !surface->Initialize(format)) 67 if (!surface.get() || !surface->Initialize(format))
68 return surface; 68 return surface;
69 return make_scoped_refptr<gl::GLSurface>( 69 return make_scoped_refptr<gl::GLSurface>(
70 new PassThroughImageTransportSurface(stub, surface.get())); 70 new PassThroughImageTransportSurface(delegate, surface.get()));
71 } 71 }
72 } 72 }
73 73
74 // static 74 // static
75 void ImageTransportSurface::SetAllowOSMesaForTesting(bool allow) { 75 void ImageTransportSurface::SetAllowOSMesaForTesting(bool allow) {
76 g_allow_os_mesa = allow; 76 g_allow_os_mesa = allow;
77 } 77 }
78 78
79 } // namespace gpu 79 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/ipc/service/image_transport_surface_linux.cc ('k') | gpu/ipc/service/image_transport_surface_overlay_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698