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

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

Issue 1998723002: Move code in ui/gl/* from gfx:: to gl:: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 7 months 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<gfx::GLSurface> ImageTransportSurface::CreateNativeSurface( 21 scoped_refptr<gl::GLSurface> ImageTransportSurface::CreateNativeSurface(
22 GpuChannelManager* manager, 22 GpuChannelManager* manager,
23 GpuCommandBufferStub* stub, 23 GpuCommandBufferStub* stub,
24 SurfaceHandle surface_handle, 24 SurfaceHandle surface_handle,
25 gfx::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<gfx::GLSurface> surface; 28 scoped_refptr<gl::GLSurface> surface;
29 if (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2 && 29 if (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2 &&
30 gfx::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(jbauman): Get frame statistics from DirectComposition 35 // TODO(jbauman): Get frame statistics from DirectComposition
36 std::unique_ptr<gfx::VSyncProvider> vsync_provider( 36 std::unique_ptr<gfx::VSyncProvider> vsync_provider(
37 new gfx::VSyncProviderWin(surface_handle)); 37 new gl::VSyncProviderWin(surface_handle));
38 if (!egl_surface->Initialize(std::move(vsync_provider))) 38 if (!egl_surface->Initialize(std::move(vsync_provider)))
39 return nullptr; 39 return nullptr;
40 } else { 40 } else {
41 surface = gl::init::CreateViewGLSurface(surface_handle); 41 surface = gl::init::CreateViewGLSurface(surface_handle);
42 if (!surface) 42 if (!surface)
43 return nullptr; 43 return nullptr;
44 } 44 }
45 45
46 return scoped_refptr<gfx::GLSurface>(new PassThroughImageTransportSurface( 46 return scoped_refptr<gl::GLSurface>(
47 manager, stub, surface.get())); 47 new PassThroughImageTransportSurface(manager, stub, surface.get()));
48 } 48 }
49 49
50 } // namespace gpu 50 } // 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