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/blink/webgraphicscontext3d_impl.h" | 8 #include "gpu/blink/webgraphicscontext3d_impl.h" |
9 #include "gpu/command_buffer/client/gles2_interface.h" | 9 #include "gpu/command_buffer/client/gles2_interface.h" |
10 #include "gpu/command_buffer/common/sync_token.h" | 10 #include "gpu/command_buffer/common/sync_token.h" |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
167 | 167 |
168 player_manager_->UnregisterMediaPlayer(player_id_); | 168 player_manager_->UnregisterMediaPlayer(player_id_); |
169 } | 169 } |
170 } | 170 } |
171 | 171 |
172 void WebMediaPlayerCast::Initialize(const GURL& url, | 172 void WebMediaPlayerCast::Initialize(const GURL& url, |
173 blink::WebLocalFrame* frame, | 173 blink::WebLocalFrame* frame, |
174 int delegate_id) { | 174 int delegate_id) { |
175 player_manager_->Initialize(MEDIA_PLAYER_TYPE_REMOTE_ONLY, player_id_, url, | 175 player_manager_->Initialize(MEDIA_PLAYER_TYPE_REMOTE_ONLY, player_id_, url, |
176 frame->document().firstPartyForCookies(), 0, | 176 frame->document().firstPartyForCookies(), 0, |
177 frame->document().url(), true, delegate_id); | 177 frame->document().url(), true, delegate_id, 0); |
mlamouri (slow - plz ping)
2016/02/22 16:58:20
const?
philipj_slow
2016/02/23 07:06:56
What should be const here?
| |
178 is_player_initialized_ = true; | 178 is_player_initialized_ = true; |
179 } | 179 } |
180 | 180 |
181 void WebMediaPlayerCast::SetMediaPlayerManager( | 181 void WebMediaPlayerCast::SetMediaPlayerManager( |
182 RendererMediaPlayerManagerInterface* media_player_manager) { | 182 RendererMediaPlayerManagerInterface* media_player_manager) { |
183 player_manager_ = media_player_manager; | 183 player_manager_ = media_player_manager; |
184 player_id_ = player_manager_->RegisterMediaPlayer(this); | 184 player_id_ = player_manager_->RegisterMediaPlayer(this); |
185 } | 185 } |
186 | 186 |
187 void WebMediaPlayerCast::requestRemotePlayback() { | 187 void WebMediaPlayerCast::requestRemotePlayback() { |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
368 | 368 |
369 if (!canvas_size.width()) | 369 if (!canvas_size.width()) |
370 return nullptr; | 370 return nullptr; |
371 | 371 |
372 return MakeTextFrameForCast(remote_playback_message_, canvas_size, | 372 return MakeTextFrameForCast(remote_playback_message_, canvas_size, |
373 webmediaplayer_->naturalSize(), | 373 webmediaplayer_->naturalSize(), |
374 base::Bind(&GLCBShim, context_3d_cb_)); | 374 base::Bind(&GLCBShim, context_3d_cb_)); |
375 } | 375 } |
376 | 376 |
377 } // namespace media | 377 } // namespace media |
OLD | NEW |