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

Side by Side Diff: content/renderer/media/stream_texture_factory_impl_android.cc

Issue 11783073: Update some #includes in content/renderer/media for headers in the new Platform directory (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Update some #includes in content/renderer/media for headers in the new Platform directory Created 7 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/media/renderer_webaudiodevice_impl.h ('k') | 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) 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/renderer/media/stream_texture_factory_impl_android.h" 5 #include "content/renderer/media/stream_texture_factory_impl_android.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/message_loop_proxy.h" 9 #include "base/message_loop_proxy.h"
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
11 #include "content/common/android/surface_texture_peer.h" 11 #include "content/common/android/surface_texture_peer.h"
12 #include "content/common/gpu/client/gpu_channel_host.h" 12 #include "content/common/gpu/client/gpu_channel_host.h"
13 #include "content/common/gpu/gpu_messages.h" 13 #include "content/common/gpu/gpu_messages.h"
14 #include "content/renderer/render_thread_impl.h" 14 #include "content/renderer/render_thread_impl.h"
15 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h"
15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStreamTextureClien t.h" 16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStreamTextureClien t.h"
16 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsC ontext3D.h"
17 #include "ui/gfx/size.h" 17 #include "ui/gfx/size.h"
18 18
19 namespace { 19 namespace {
20 20
21 static void DeleteStreamTextureHost(content::StreamTextureHost* host) { 21 static void DeleteStreamTextureHost(content::StreamTextureHost* host) {
22 delete host; 22 delete host;
23 } 23 }
24 24
25 // Implementation of the StreamTextureProxy class. This class listens to all 25 // Implementation of the StreamTextureProxy class. This class listens to all
26 // the stream texture updates and forward them to the WebStreamTextureClient. 26 // the stream texture updates and forward them to the WebStreamTextureClient.
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 135
136 void StreamTextureFactoryImpl::DestroyStreamTexture(unsigned texture_id) { 136 void StreamTextureFactoryImpl::DestroyStreamTexture(unsigned texture_id) {
137 if (context_->makeContextCurrent()) { 137 if (context_->makeContextCurrent()) {
138 context_->destroyStreamTextureCHROMIUM(texture_id); 138 context_->destroyStreamTextureCHROMIUM(texture_id);
139 context_->deleteTexture(texture_id); 139 context_->deleteTexture(texture_id);
140 context_->flush(); 140 context_->flush();
141 } 141 }
142 } 142 }
143 143
144 } // namespace content 144 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/renderer_webaudiodevice_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698