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

Side by Side Diff: content/renderer/media/android/webmediaplayer_android.h

Issue 496103002: Fix the ownership of media_log_ in WebMediaPlayerAndroid (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits Created 6 years, 4 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 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 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 MediaPlayerHostMsg_Initialize_Type player_type_; 444 MediaPlayerHostMsg_Initialize_Type player_type_;
445 445
446 // The current playing time. Because the media player is in the browser 446 // The current playing time. Because the media player is in the browser
447 // process, it will regularly update the |current_time_| by calling 447 // process, it will regularly update the |current_time_| by calling
448 // OnTimeUpdate(). 448 // OnTimeUpdate().
449 double current_time_; 449 double current_time_;
450 450
451 // Whether the browser is currently connected to a remote media player. 451 // Whether the browser is currently connected to a remote media player.
452 bool is_remote_; 452 bool is_remote_;
453 453
454 media::MediaLog* media_log_; 454 scoped_refptr<media::MediaLog> media_log_;
455 455
456 scoped_ptr<MediaInfoLoader> info_loader_; 456 scoped_ptr<MediaInfoLoader> info_loader_;
457 457
458 // The currently selected key system. Empty string means that no key system 458 // The currently selected key system. Empty string means that no key system
459 // has been selected. 459 // has been selected.
460 std::string current_key_system_; 460 std::string current_key_system_;
461 461
462 // Temporary for EME v0.1. In the future the init data type should be passed 462 // Temporary for EME v0.1. In the future the init data type should be passed
463 // through GenerateKeyRequest() directly from WebKit. 463 // through GenerateKeyRequest() directly from WebKit.
464 std::string init_data_type_; 464 std::string init_data_type_;
(...skipping 18 matching lines...) Expand all
483 483
484 // NOTE: Weak pointers must be invalidated before all other member variables. 484 // NOTE: Weak pointers must be invalidated before all other member variables.
485 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 485 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
486 486
487 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 487 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
488 }; 488 };
489 489
490 } // namespace content 490 } // namespace content
491 491
492 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 492 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « content/renderer/media/android/media_source_delegate.cc ('k') | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698