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

Side by Side Diff: content/common/gpu/image_transport_surface_linux.cc

Issue 11475017: Revert 171569 as it broke some browser_tests on win_aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years 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 | Annotate | Revision Log
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 "content/common/gpu/image_transport_surface.h" 5 #include "content/common/gpu/image_transport_surface.h"
6 6
7 #include "content/common/gpu/texture_image_transport_surface.h" 7 #include "content/common/gpu/texture_image_transport_surface.h"
8 8
9 namespace content { 9 namespace content {
10 10
11 // static 11 // static
12 scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface( 12 scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface(
13 GpuChannelManager* manager, 13 GpuChannelManager* manager,
14 GpuCommandBufferStub* stub, 14 GpuCommandBufferStub* stub,
15 const gfx::GLSurfaceHandle& handle) { 15 const gfx::GLSurfaceHandle& handle) {
16 scoped_refptr<gfx::GLSurface> surface; 16 scoped_refptr<gfx::GLSurface> surface;
17 if (!handle.handle) { 17 if (!handle.handle) {
18 DCHECK(handle.transport); 18 DCHECK(handle.transport);
19 DCHECK(handle.parent_client_id);
19 surface = new TextureImageTransportSurface(manager, stub, handle); 20 surface = new TextureImageTransportSurface(manager, stub, handle);
20 } else { 21 } else {
21 surface = gfx::GLSurface::CreateViewGLSurface(false, handle.handle); 22 surface = gfx::GLSurface::CreateViewGLSurface(false, handle.handle);
22 if (!surface.get()) 23 if (!surface.get())
23 return NULL; 24 return NULL;
24 surface = new PassThroughImageTransportSurface(manager, 25 surface = new PassThroughImageTransportSurface(manager,
25 stub, 26 stub,
26 surface.get(), 27 surface.get(),
27 handle.transport); 28 handle.transport);
28 } 29 }
29 30
30 if (surface->Initialize()) 31 if (surface->Initialize())
31 return surface; 32 return surface;
32 else 33 else
33 return NULL; 34 return NULL;
34 } 35 }
35 36
36 } // namespace content 37 } // namespace content
OLDNEW
« no previous file with comments | « content/common/gpu/image_transport_surface_android.cc ('k') | content/common/gpu/image_transport_surface_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698