OLD | NEW |
---|---|
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 "base/logging.h" | 7 #include "base/logging.h" |
8 #include "content/common/gpu/gpu_surface_lookup.h" | 8 #include "content/common/gpu/gpu_surface_lookup.h" |
9 #include "content/common/gpu/texture_image_transport_surface.h" | 9 #include "content/common/gpu/texture_image_transport_surface.h" |
10 #include "ui/gl/gl_surface_egl.h" | 10 #include "ui/gl/gl_surface_egl.h" |
11 | 11 |
12 namespace content { | 12 namespace content { |
13 | 13 |
14 // static | 14 // static |
15 scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface( | 15 scoped_refptr<gfx::GLSurface> ImageTransportSurface::CreateSurface( |
16 GpuChannelManager* manager, | 16 GpuChannelManager* manager, |
17 GpuCommandBufferStub* stub, | 17 GpuCommandBufferStub* stub, |
18 const gfx::GLSurfaceHandle& handle) { | 18 const gfx::GLSurfaceHandle& handle) { |
19 scoped_refptr<gfx::GLSurface> surface; | 19 scoped_refptr<gfx::GLSurface> surface; |
20 if (!handle.handle && handle.transport) { | 20 if (!handle.handle && handle.transport) { |
21 surface = new TextureImageTransportSurface(manager, stub, handle); | 21 surface = new TextureImageTransportSurface(manager, stub, handle); |
22 } else if (handle.handle == gfx::kDummyPluginWindow && !handle.transport) { | 22 } else if (handle.handle == gfx::kDummyPluginWindow && !handle.transport) { |
23 DCHECK(GpuSurfaceLookup::GetInstance()); | 23 DCHECK(GpuSurfaceLookup::GetInstance()); |
24 ANativeWindow* window = GpuSurfaceLookup::GetInstance()->GetNativeWidget( | 24 ANativeWindow* window = GpuSurfaceLookup::GetInstance()->GetNativeWidget( |
25 stub->surface_id()); | 25 stub->surface_id()); |
26 DCHECK(window); | |
27 surface = new gfx::NativeViewGLSurfaceEGL(false, window); | 26 surface = new gfx::NativeViewGLSurfaceEGL(false, window); |
28 if (!surface.get() || !surface->Initialize()) | 27 if (!surface->Initialize()) |
boliu
2013/01/26 01:18:00
I moved the DCHECK into Initialize() to make it re
| |
29 return NULL; | 28 return NULL; |
30 | 29 |
31 surface = new PassThroughImageTransportSurface( | 30 surface = new PassThroughImageTransportSurface( |
32 manager, stub, surface.get(), handle.transport); | 31 manager, stub, surface.get(), handle.transport); |
33 } else { | 32 } else { |
34 NOTIMPLEMENTED(); | 33 NOTIMPLEMENTED(); |
35 return NULL; | 34 return NULL; |
36 } | 35 } |
37 | 36 |
38 if (surface->Initialize()) | 37 if (surface->Initialize()) { |
39 return surface; | 38 return surface; |
40 else { | 39 } else { |
41 LOG(ERROR) << "Failed to initialize ImageTransportSurface"; | 40 LOG(ERROR) << "Failed to initialize ImageTransportSurface"; |
42 return NULL; | 41 return NULL; |
43 } | 42 } |
44 } | 43 } |
45 | 44 |
46 } // namespace content | 45 } // namespace content |
OLD | NEW |