OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <GLES2/gl2.h> | 5 #include <GLES2/gl2.h> |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "content/renderer/transport_texture_host.h" | 9 #include "content/renderer/gpu/transport_texture_host.h" |
10 | 10 |
11 // On Mac gl2.h clashes with gpu_messages.h and this problem hasn't been | 11 // On Mac gl2.h clashes with gpu_messages.h and this problem hasn't been |
12 // solved yet so exclude building on Mac. | 12 // solved yet so exclude building on Mac. |
13 #if !defined(OS_MACOSX) | 13 #if !defined(OS_MACOSX) |
14 | 14 |
15 #include "base/message_loop.h" | 15 #include "base/message_loop.h" |
16 #include "content/common/gpu/gpu_messages.h" | 16 #include "content/common/gpu/gpu_messages.h" |
17 #include "content/renderer/renderer_gl_context.h" | 17 #include "content/renderer/gpu/renderer_gl_context.h" |
18 #include "content/renderer/transport_texture_service.h" | 18 #include "content/renderer/gpu/transport_texture_service.h" |
19 | 19 |
20 TransportTextureHost::TransportTextureHost(MessageLoop* io_message_loop, | 20 TransportTextureHost::TransportTextureHost(MessageLoop* io_message_loop, |
21 MessageLoop* render_message_loop, | 21 MessageLoop* render_message_loop, |
22 TransportTextureService* service, | 22 TransportTextureService* service, |
23 IPC::Message::Sender* sender, | 23 IPC::Message::Sender* sender, |
24 RendererGLContext* context, | 24 RendererGLContext* context, |
25 int32 context_route_id, | 25 int32 context_route_id, |
26 int32 host_id) | 26 int32 host_id) |
27 : io_message_loop_(io_message_loop), | 27 : io_message_loop_(io_message_loop), |
28 render_message_loop_(render_message_loop), | 28 render_message_loop_(render_message_loop), |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
184 // This method will switch thread properly so just call it directly. | 184 // This method will switch thread properly so just call it directly. |
185 ReleaseTexturesInternal(); | 185 ReleaseTexturesInternal(); |
186 } | 186 } |
187 | 187 |
188 void TransportTextureHost::OnTextureUpdated(int texture_id) { | 188 void TransportTextureHost::OnTextureUpdated(int texture_id) { |
189 if (update_callback_.get()) | 189 if (update_callback_.get()) |
190 update_callback_->Run(texture_id); | 190 update_callback_->Run(texture_id); |
191 } | 191 } |
192 | 192 |
193 #endif | 193 #endif |
OLD | NEW |