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

Side by Side Diff: webkit/media/webmediaplayer_impl.cc

Issue 11887029: Update some #includes in webkit/media for headers in the new Platform directory (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: 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 | « webkit/media/webaudiosourceprovider_impl.h ('k') | webkit/media/webmediaplayer_ms.cc » ('j') | 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 "webkit/media/webmediaplayer_impl.h" 5 #include "webkit/media/webmediaplayer_impl.h"
6 6
7 #include <limits> 7 #include <limits>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/message_loop_proxy.h" 13 #include "base/message_loop_proxy.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/string_number_conversions.h" 15 #include "base/string_number_conversions.h"
16 #include "base/synchronization/waitable_event.h" 16 #include "base/synchronization/waitable_event.h"
17 #include "media/audio/null_audio_sink.h" 17 #include "media/audio/null_audio_sink.h"
18 #include "media/base/bind_to_loop.h" 18 #include "media/base/bind_to_loop.h"
19 #include "media/base/filter_collection.h" 19 #include "media/base/filter_collection.h"
20 #include "media/base/limits.h" 20 #include "media/base/limits.h"
21 #include "media/base/media_log.h" 21 #include "media/base/media_log.h"
22 #include "media/base/pipeline.h" 22 #include "media/base/pipeline.h"
23 #include "media/base/video_frame.h" 23 #include "media/base/video_frame.h"
24 #include "media/filters/audio_renderer_impl.h" 24 #include "media/filters/audio_renderer_impl.h"
25 #include "media/filters/chunk_demuxer.h" 25 #include "media/filters/chunk_demuxer.h"
26 #include "media/filters/video_renderer_base.h" 26 #include "media/filters/video_renderer_base.h"
27 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
28 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
29 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"
30 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h"
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" 32 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
29 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
30 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
31 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
32 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
33 #include "v8/include/v8.h" 33 #include "v8/include/v8.h"
34 #include "webkit/media/buffered_data_source.h" 34 #include "webkit/media/buffered_data_source.h"
35 #include "webkit/media/filter_helpers.h" 35 #include "webkit/media/filter_helpers.h"
36 #include "webkit/media/webaudiosourceprovider_impl.h" 36 #include "webkit/media/webaudiosourceprovider_impl.h"
37 #include "webkit/media/webmediaplayer_delegate.h" 37 #include "webkit/media/webmediaplayer_delegate.h"
38 #include "webkit/media/webmediaplayer_params.h" 38 #include "webkit/media/webmediaplayer_params.h"
39 #include "webkit/media/webmediaplayer_proxy.h" 39 #include "webkit/media/webmediaplayer_proxy.h"
40 #include "webkit/media/webmediaplayer_util.h" 40 #include "webkit/media/webmediaplayer_util.h"
41 #include "webkit/media/webvideoframe_impl.h" 41 #include "webkit/media/webvideoframe_impl.h"
42 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h" 42 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
(...skipping 1163 matching lines...) Expand 10 before | Expand all | Expand 10 after
1206 return audio_source_provider_; 1206 return audio_source_provider_;
1207 } 1207 }
1208 1208
1209 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() { 1209 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {
1210 DCHECK_EQ(main_loop_, MessageLoop::current()); 1210 DCHECK_EQ(main_loop_, MessageLoop::current());
1211 incremented_externally_allocated_memory_ = true; 1211 incremented_externally_allocated_memory_ = true;
1212 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory); 1212 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);
1213 } 1213 }
1214 1214
1215 } // namespace webkit_media 1215 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/webaudiosourceprovider_impl.h ('k') | webkit/media/webmediaplayer_ms.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698