| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "media/blink/webmediaplayer_cast_android.h" | 5 #include "media/blink/webmediaplayer_cast_android.h" |
| 6 | 6 |
| 7 #include "gpu/GLES2/gl2extchromium.h" | 7 #include "gpu/GLES2/gl2extchromium.h" |
| 8 #include "gpu/command_buffer/client/gles2_interface.h" | 8 #include "gpu/command_buffer/client/gles2_interface.h" |
| 9 #include "gpu/command_buffer/common/sync_token.h" | 9 #include "gpu/command_buffer/common/sync_token.h" |
| 10 #include "media/base/android/media_common_android.h" | 10 #include "media/base/android/media_common_android.h" |
| 11 #include "media/base/bind_to_current_loop.h" | 11 #include "media/base/bind_to_current_loop.h" |
| 12 #include "media/blink/webmediaplayer_impl.h" | 12 #include "media/blink/webmediaplayer_impl.h" |
| 13 #include "media/blink/webmediaplayer_params.h" | 13 #include "media/blink/webmediaplayer_params.h" |
| 14 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" | 14 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" |
| 15 #include "third_party/WebKit/public/platform/modules/mediasession/WebMediaSessio
n.h" | |
| 16 #include "third_party/WebKit/public/web/WebDocument.h" | 15 #include "third_party/WebKit/public/web/WebDocument.h" |
| 17 #include "third_party/WebKit/public/web/WebLocalFrame.h" | 16 #include "third_party/WebKit/public/web/WebLocalFrame.h" |
| 18 #include "third_party/skia/include/core/SkCanvas.h" | 17 #include "third_party/skia/include/core/SkCanvas.h" |
| 19 #include "third_party/skia/include/core/SkPaint.h" | 18 #include "third_party/skia/include/core/SkPaint.h" |
| 20 #include "third_party/skia/include/core/SkTypeface.h" | 19 #include "third_party/skia/include/core/SkTypeface.h" |
| 21 | 20 |
| 22 using gpu::gles2::GLES2Interface; | 21 using gpu::gles2::GLES2Interface; |
| 23 | 22 |
| 24 namespace media { | 23 namespace media { |
| 25 | 24 |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 | 166 |
| 168 player_manager_->UnregisterMediaPlayer(player_id_); | 167 player_manager_->UnregisterMediaPlayer(player_id_); |
| 169 } | 168 } |
| 170 } | 169 } |
| 171 | 170 |
| 172 void WebMediaPlayerCast::Initialize(const GURL& url, | 171 void WebMediaPlayerCast::Initialize(const GURL& url, |
| 173 blink::WebLocalFrame* frame, | 172 blink::WebLocalFrame* frame, |
| 174 int delegate_id) { | 173 int delegate_id) { |
| 175 player_manager_->Initialize(MEDIA_PLAYER_TYPE_REMOTE_ONLY, player_id_, url, | 174 player_manager_->Initialize(MEDIA_PLAYER_TYPE_REMOTE_ONLY, player_id_, url, |
| 176 frame->document().firstPartyForCookies(), 0, | 175 frame->document().firstPartyForCookies(), 0, |
| 177 frame->document().url(), true, delegate_id, | 176 frame->document().url(), true, delegate_id); |
| 178 blink::WebMediaSession::DefaultID); | |
| 179 is_player_initialized_ = true; | 177 is_player_initialized_ = true; |
| 180 } | 178 } |
| 181 | 179 |
| 182 void WebMediaPlayerCast::SetMediaPlayerManager( | 180 void WebMediaPlayerCast::SetMediaPlayerManager( |
| 183 RendererMediaPlayerManagerInterface* media_player_manager) { | 181 RendererMediaPlayerManagerInterface* media_player_manager) { |
| 184 player_manager_ = media_player_manager; | 182 player_manager_ = media_player_manager; |
| 185 player_id_ = player_manager_->RegisterMediaPlayer(this); | 183 player_id_ = player_manager_->RegisterMediaPlayer(this); |
| 186 } | 184 } |
| 187 | 185 |
| 188 void WebMediaPlayerCast::requestRemotePlayback() { | 186 void WebMediaPlayerCast::requestRemotePlayback() { |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 return MakeTextFrameForCast(remote_playback_message_, canvas_size, | 366 return MakeTextFrameForCast(remote_playback_message_, canvas_size, |
| 369 webmediaplayer_->naturalSize(), | 367 webmediaplayer_->naturalSize(), |
| 370 base::Bind(&GLCBShim, context_3d_cb_)); | 368 base::Bind(&GLCBShim, context_3d_cb_)); |
| 371 } | 369 } |
| 372 | 370 |
| 373 void WebMediaPlayerCast::setPoster(const blink::WebURL& poster) { | 371 void WebMediaPlayerCast::setPoster(const blink::WebURL& poster) { |
| 374 player_manager_->SetPoster(player_id_, poster); | 372 player_manager_->SetPoster(player_id_, poster); |
| 375 } | 373 } |
| 376 | 374 |
| 377 } // namespace media | 375 } // namespace media |
| OLD | NEW |