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/android/webmediaplayer_android.h" | 5 #include "content/renderer/media/android/webmediaplayer_android.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/android/build_info.h" | 9 #include "base/android/build_info.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 #include "content/renderer/media/webmediaplayer_util.h" | 30 #include "content/renderer/media/webmediaplayer_util.h" |
31 #include "content/renderer/render_frame_impl.h" | 31 #include "content/renderer/render_frame_impl.h" |
32 #include "content/renderer/render_thread_impl.h" | 32 #include "content/renderer/render_thread_impl.h" |
33 #include "gpu/GLES2/gl2extchromium.h" | 33 #include "gpu/GLES2/gl2extchromium.h" |
34 #include "gpu/command_buffer/client/gles2_interface.h" | 34 #include "gpu/command_buffer/client/gles2_interface.h" |
35 #include "gpu/command_buffer/common/mailbox_holder.h" | 35 #include "gpu/command_buffer/common/mailbox_holder.h" |
36 #include "media/base/android/media_player_android.h" | 36 #include "media/base/android/media_player_android.h" |
37 #include "media/base/bind_to_current_loop.h" | 37 #include "media/base/bind_to_current_loop.h" |
38 // TODO(xhwang): Remove when we remove prefixed EME implementation. | 38 // TODO(xhwang): Remove when we remove prefixed EME implementation. |
39 #include "media/base/media_keys.h" | 39 #include "media/base/media_keys.h" |
| 40 #include "media/base/media_log.h" |
40 #include "media/base/media_switches.h" | 41 #include "media/base/media_switches.h" |
41 #include "media/base/video_frame.h" | 42 #include "media/base/video_frame.h" |
42 #include "net/base/mime_util.h" | 43 #include "net/base/mime_util.h" |
43 #include "third_party/WebKit/public/platform/Platform.h" | 44 #include "third_party/WebKit/public/platform/Platform.h" |
44 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h" | 45 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h" |
45 #include "third_party/WebKit/public/platform/WebGraphicsContext3DProvider.h" | 46 #include "third_party/WebKit/public/platform/WebGraphicsContext3DProvider.h" |
46 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" | 47 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" |
47 #include "third_party/WebKit/public/platform/WebString.h" | 48 #include "third_party/WebKit/public/platform/WebString.h" |
48 #include "third_party/WebKit/public/platform/WebURL.h" | 49 #include "third_party/WebKit/public/platform/WebURL.h" |
49 #include "third_party/WebKit/public/web/WebDocument.h" | 50 #include "third_party/WebKit/public/web/WebDocument.h" |
(...skipping 1679 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1729 player_manager_->EnterFullscreen(player_id_, frame_); | 1730 player_manager_->EnterFullscreen(player_id_, frame_); |
1730 SetNeedsEstablishPeer(false); | 1731 SetNeedsEstablishPeer(false); |
1731 } | 1732 } |
1732 } | 1733 } |
1733 | 1734 |
1734 bool WebMediaPlayerAndroid::canEnterFullscreen() const { | 1735 bool WebMediaPlayerAndroid::canEnterFullscreen() const { |
1735 return player_manager_->CanEnterFullscreen(frame_); | 1736 return player_manager_->CanEnterFullscreen(frame_); |
1736 } | 1737 } |
1737 | 1738 |
1738 } // namespace content | 1739 } // namespace content |
OLD | NEW |