OLD | NEW |
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_ms.h" | 5 #include "webkit/media/webmediaplayer_ms.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/message_loop.h" | 11 #include "base/message_loop.h" |
12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
13 #include "media/base/media_log.h" | 13 #include "media/base/media_log.h" |
14 #include "media/base/video_frame.h" | 14 #include "media/base/video_frame.h" |
| 15 #include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h" |
| 16 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h" |
| 17 #include "third_party/WebKit/Source/Platform/chromium/public/WebURL.h" |
15 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" | 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" |
16 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.
h" | 19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.
h" |
17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" | 20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h" |
18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 21 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
19 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h" | |
20 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h" | |
21 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" | |
22 #include "webkit/media/media_stream_audio_renderer.h" | 22 #include "webkit/media/media_stream_audio_renderer.h" |
23 #include "webkit/media/media_stream_client.h" | 23 #include "webkit/media/media_stream_client.h" |
24 #include "webkit/media/video_frame_provider.h" | 24 #include "webkit/media/video_frame_provider.h" |
25 #include "webkit/media/webmediaplayer_delegate.h" | 25 #include "webkit/media/webmediaplayer_delegate.h" |
26 #include "webkit/media/webmediaplayer_util.h" | 26 #include "webkit/media/webmediaplayer_util.h" |
27 #include "webkit/media/webvideoframe_impl.h" | 27 #include "webkit/media/webvideoframe_impl.h" |
28 | 28 |
29 using WebKit::WebCanvas; | 29 using WebKit::WebCanvas; |
30 using WebKit::WebMediaPlayer; | 30 using WebKit::WebMediaPlayer; |
31 using WebKit::WebRect; | 31 using WebKit::WebRect; |
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
450 GetClient()->readyStateChanged(); | 450 GetClient()->readyStateChanged(); |
451 } | 451 } |
452 | 452 |
453 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { | 453 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { |
454 DCHECK(thread_checker_.CalledOnValidThread()); | 454 DCHECK(thread_checker_.CalledOnValidThread()); |
455 DCHECK(client_); | 455 DCHECK(client_); |
456 return client_; | 456 return client_; |
457 } | 457 } |
458 | 458 |
459 } // namespace webkit_media | 459 } // namespace webkit_media |
OLD | NEW |