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

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

Issue 2801163002: Deletes NativeViewGLSurfaceEGL::Initialize(gfx::VSyncProvider). (Closed)
Patch Set: fixes DirectCompositionSurfaceTest Created 3 years, 8 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 "base/logging.h" 7 #include "base/logging.h"
8 #include "gpu/ipc/common/gpu_surface_lookup.h" 8 #include "gpu/ipc/common/gpu_surface_lookup.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/gl/gl_surface_egl.h" 10 #include "ui/gl/gl_surface_egl.h"
(...skipping 12 matching lines...) Expand all
23 DCHECK(GpuSurfaceLookup::GetInstance()); 23 DCHECK(GpuSurfaceLookup::GetInstance());
24 DCHECK_NE(surface_handle, kNullSurfaceHandle); 24 DCHECK_NE(surface_handle, kNullSurfaceHandle);
25 // On Android, the surface_handle is the id of the surface in the 25 // On Android, the surface_handle is the id of the surface in the
26 // GpuSurfaceTracker/GpuSurfaceLookup 26 // GpuSurfaceTracker/GpuSurfaceLookup
27 ANativeWindow* window = 27 ANativeWindow* window =
28 GpuSurfaceLookup::GetInstance()->AcquireNativeWidget(surface_handle); 28 GpuSurfaceLookup::GetInstance()->AcquireNativeWidget(surface_handle);
29 if (!window) { 29 if (!window) {
30 LOG(WARNING) << "Failed to acquire native widget."; 30 LOG(WARNING) << "Failed to acquire native widget.";
31 return nullptr; 31 return nullptr;
32 } 32 }
33 scoped_refptr<gl::GLSurface> surface = new gl::NativeViewGLSurfaceEGL(window); 33 scoped_refptr<gl::GLSurface> surface =
34 new gl::NativeViewGLSurfaceEGL(window, nullptr);
34 bool initialize_success = surface->Initialize(format); 35 bool initialize_success = surface->Initialize(format);
35 ANativeWindow_release(window); 36 ANativeWindow_release(window);
36 if (!initialize_success) 37 if (!initialize_success)
37 return scoped_refptr<gl::GLSurface>(); 38 return scoped_refptr<gl::GLSurface>();
38 39
39 return scoped_refptr<gl::GLSurface>( 40 return scoped_refptr<gl::GLSurface>(
40 new PassThroughImageTransportSurface(delegate, surface.get())); 41 new PassThroughImageTransportSurface(delegate, surface.get()));
41 } 42 }
42 43
43 } // namespace gpu 44 } // namespace gpu
OLDNEW
« no previous file with comments | « gpu/ipc/service/direct_composition_surface_win_unittest.cc ('k') | gpu/ipc/service/image_transport_surface_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698