webkit/media/webmediaplayer_impl.cc - Issue 8787003: Update these includes to use the new header locations

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

Issue 8787003: Update these includes to use the new header locations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years 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/test_response_generator.cc ('k') | webkit/mocks/mock_weburlloader.cc » ('j') | no next file with comments »

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 "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	9

10 #include "base/bind.h"	10 #include "base/bind.h"

11 #include "base/callback.h"	11 #include "base/callback.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/metrics/histogram.h"	13 #include "base/metrics/histogram.h"

14 #include "media/base/composite_data_source_factory.h"	14 #include "media/base/composite_data_source_factory.h"

15 #include "media/base/filter_collection.h"	15 #include "media/base/filter_collection.h"

16 #include "media/base/limits.h"	16 #include "media/base/limits.h"

17 #include "media/base/media_log.h"	17 #include "media/base/media_log.h"

18 #include "media/base/media_switches.h"	18 #include "media/base/media_switches.h"

19 #include "media/base/pipeline_impl.h"	19 #include "media/base/pipeline_impl.h"

20 #include "media/base/video_frame.h"	20 #include "media/base/video_frame.h"

21 #include "media/filters/chunk_demuxer_factory.h"	21 #include "media/filters/chunk_demuxer_factory.h"

22 #include "media/filters/dummy_demuxer_factory.h"	22 #include "media/filters/dummy_demuxer_factory.h"

23 #include "media/filters/ffmpeg_audio_decoder.h"	23 #include "media/filters/ffmpeg_audio_decoder.h"

24 #include "media/filters/ffmpeg_demuxer_factory.h"	24 #include "media/filters/ffmpeg_demuxer_factory.h"

25 #include "media/filters/ffmpeg_video_decoder.h"	25 #include "media/filters/ffmpeg_video_decoder.h"

26 #include "media/filters/null_audio_renderer.h"	26 #include "media/filters/null_audio_renderer.h"

27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h"

28 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"

29 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"

30 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"	27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"

31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"	28 #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/WebURL.h"

32 #include "v8/include/v8.h"	32 #include "v8/include/v8.h"

33 #include "webkit/media/buffered_data_source.h"	33 #include "webkit/media/buffered_data_source.h"

34 #include "webkit/media/media_stream_client.h"	34 #include "webkit/media/media_stream_client.h"

35 #include "webkit/media/simple_data_source.h"	35 #include "webkit/media/simple_data_source.h"

36 #include "webkit/media/video_renderer_impl.h"	36 #include "webkit/media/video_renderer_impl.h"

37 #include "webkit/media/webmediaplayer_delegate.h"	37 #include "webkit/media/webmediaplayer_delegate.h"

38 #include "webkit/media/webmediaplayer_proxy.h"	38 #include "webkit/media/webmediaplayer_proxy.h"

39 #include "webkit/media/webvideoframe_impl.h"	39 #include "webkit/media/webvideoframe_impl.h"

40	40

41 using WebKit::WebCanvas;	41 using WebKit::WebCanvas;

(...skipping 871 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
913 return client_;	913 return client_;

914 }	914 }

915	915

916 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {	916 void WebMediaPlayerImpl::IncrementExternallyAllocatedMemory() {

917 DCHECK_EQ(main_loop_, MessageLoop::current());	917 DCHECK_EQ(main_loop_, MessageLoop::current());

918 incremented_externally_allocated_memory_ = true;	918 incremented_externally_allocated_memory_ = true;

919 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);	919 v8::V8::AdjustAmountOfExternalAllocatedMemory(kPlayerExtraMemory);

920 }	920 }

921	921

922 } // namespace webkit_media	922 } // namespace webkit_media

OLD	NEW