OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/webmediaplayer_ms.h" | 5 #include "content/renderer/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/message_loop.h" | 11 #include "base/message_loop/message_loop.h" |
12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
13 #include "cc/layers/video_layer.h" | 13 #include "cc/layers/video_layer.h" |
14 #include "content/renderer/media/media_stream_audio_renderer.h" | 14 #include "content/renderer/media/media_stream_audio_renderer.h" |
15 #include "content/renderer/media/media_stream_client.h" | 15 #include "content/renderer/media/media_stream_client.h" |
16 #include "content/renderer/media/video_frame_provider.h" | 16 #include "content/renderer/media/video_frame_provider.h" |
17 #include "content/renderer/media/webmediaplayer_delegate.h" | 17 #include "content/renderer/media/webmediaplayer_delegate.h" |
18 #include "content/renderer/media/webmediaplayer_util.h" | 18 #include "content/renderer/media/webmediaplayer_util.h" |
19 #include "media/base/media_log.h" | 19 #include "media/base/media_log.h" |
20 #include "media/base/video_frame.h" | 20 #include "media/base/video_frame.h" |
| 21 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" |
21 #include "third_party/WebKit/public/platform/WebRect.h" | 22 #include "third_party/WebKit/public/platform/WebRect.h" |
22 #include "third_party/WebKit/public/platform/WebSize.h" | 23 #include "third_party/WebKit/public/platform/WebSize.h" |
23 #include "third_party/WebKit/public/platform/WebURL.h" | 24 #include "third_party/WebKit/public/platform/WebURL.h" |
24 #include "third_party/WebKit/public/web/WebFrame.h" | 25 #include "third_party/WebKit/public/web/WebFrame.h" |
25 #include "third_party/WebKit/public/web/WebMediaPlayerClient.h" | |
26 #include "third_party/WebKit/public/web/WebView.h" | 26 #include "third_party/WebKit/public/web/WebView.h" |
27 #include "webkit/renderer/compositor_bindings/web_layer_impl.h" | 27 #include "webkit/renderer/compositor_bindings/web_layer_impl.h" |
28 | 28 |
29 using blink::WebCanvas; | 29 using blink::WebCanvas; |
30 using blink::WebMediaPlayer; | 30 using blink::WebMediaPlayer; |
31 using blink::WebRect; | 31 using blink::WebRect; |
32 using blink::WebSize; | 32 using blink::WebSize; |
33 | 33 |
34 namespace content { | 34 namespace content { |
35 | 35 |
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
423 GetClient()->readyStateChanged(); | 423 GetClient()->readyStateChanged(); |
424 } | 424 } |
425 | 425 |
426 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { | 426 blink::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() { |
427 DCHECK(thread_checker_.CalledOnValidThread()); | 427 DCHECK(thread_checker_.CalledOnValidThread()); |
428 DCHECK(client_); | 428 DCHECK(client_); |
429 return client_; | 429 return client_; |
430 } | 430 } |
431 | 431 |
432 } // namespace content | 432 } // namespace content |
OLD | NEW |