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

Side by Side Diff: content/renderer/gpu/transport_texture_host.cc

Issue 8540032: fix gl include (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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>
6 5
7 #include <algorithm> 6 #include <algorithm>
8 7
9 #include "content/renderer/gpu/transport_texture_host.h" 8 #include "content/renderer/gpu/transport_texture_host.h"
10 9
11 // On Mac gl2.h clashes with gpu_messages.h and this problem hasn't been 10 // On Mac gl2.h clashes with gpu_messages.h and this problem hasn't been
12 // solved yet so exclude building on Mac. 11 // solved yet so exclude building on Mac.
13 #if !defined(OS_MACOSX) 12 #if !defined(OS_MACOSX)
14 13
15 #include "base/message_loop.h" 14 #include "base/message_loop.h"
16 #include "content/common/gpu/gpu_messages.h" 15 #include "content/common/gpu/gpu_messages.h"
17 #include "content/renderer/gpu/renderer_gl_context.h" 16 #include "content/renderer/gpu/renderer_gl_context.h"
18 #include "content/renderer/gpu/transport_texture_service.h" 17 #include "content/renderer/gpu/transport_texture_service.h"
18 #include "gpu/GLES2/gl2.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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 // This method will switch thread properly so just call it directly. 185 // This method will switch thread properly so just call it directly.
186 ReleaseTexturesInternal(); 186 ReleaseTexturesInternal();
187 } 187 }
188 188
189 void TransportTextureHost::OnTextureUpdated(int texture_id) { 189 void TransportTextureHost::OnTextureUpdated(int texture_id) {
190 if (update_callback_.get()) 190 if (update_callback_.get())
191 update_callback_->Run(texture_id); 191 update_callback_->Run(texture_id);
192 } 192 }
193 193
194 #endif 194 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698