Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(137)

Side by Side Diff: webkit/media/android/webmediaplayer_android.cc

Issue 10979047: Upstream fullscreen video implementation for android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merging latest changes Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/android/webmediaplayer_android.h" 5 #include "webkit/media/android/webmediaplayer_android.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "media/base/android/media_player_bridge.h" 9 #include "media/base/android/media_player_bridge.h"
10 #include "net/base/mime_util.h" 10 #include "net/base/mime_util.h"
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 if (stream_texture_proxy_.get()) 403 if (stream_texture_proxy_.get())
404 stream_texture_proxy_->SetClient(client); 404 stream_texture_proxy_->SetClient(client);
405 } 405 }
406 406
407 void WebMediaPlayerAndroid::EstablishSurfaceTexturePeer() { 407 void WebMediaPlayerAndroid::EstablishSurfaceTexturePeer() {
408 if (stream_texture_factory_.get() && stream_id_) 408 if (stream_texture_factory_.get() && stream_id_)
409 stream_texture_factory_->EstablishPeer(stream_id_, player_id_); 409 stream_texture_factory_->EstablishPeer(stream_id_, player_id_);
410 needs_establish_peer_ = false; 410 needs_establish_peer_ = false;
411 } 411 }
412 412
413 void WebMediaPlayerAndroid::SetNeedsEstablishPeer(bool needs_establish_peer) {
414 needs_establish_peer_ = needs_establish_peer;
415 }
416
413 void WebMediaPlayerAndroid::UpdatePlayingState(bool is_playing) { 417 void WebMediaPlayerAndroid::UpdatePlayingState(bool is_playing) {
414 is_playing_ = is_playing; 418 is_playing_ = is_playing;
415 } 419 }
416 420
417 } // namespace webkit_media 421 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/media/android/webmediaplayer_android.h ('k') | webkit/media/android/webmediaplayer_impl_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698