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

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

Issue 1212823003: Recover from timing problem at exit of video-fullscreen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased and removed trailing blank line Created 5 years, 5 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
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 286
287 private: 287 private:
288 void InitializePlayer(const GURL& url, 288 void InitializePlayer(const GURL& url,
289 const GURL& first_party_for_cookies, 289 const GURL& first_party_for_cookies,
290 bool allowed_stored_credentials, 290 bool allowed_stored_credentials,
291 int demuxer_client_id); 291 int demuxer_client_id);
292 void Pause(bool is_media_related_action); 292 void Pause(bool is_media_related_action);
293 void DrawRemotePlaybackText(const std::string& remote_playback_message); 293 void DrawRemotePlaybackText(const std::string& remote_playback_message);
294 void ReallocateVideoFrame(); 294 void ReallocateVideoFrame();
295 void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame); 295 void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame);
296 void RemoveSurfaceTextureAndProxy();
296 void DidLoadMediaInfo(MediaInfoLoader::Status status, 297 void DidLoadMediaInfo(MediaInfoLoader::Status status,
297 const GURL& redirected_url, 298 const GURL& redirected_url,
298 const GURL& first_party_for_cookies, 299 const GURL& first_party_for_cookies,
299 bool allow_stored_credentials); 300 bool allow_stored_credentials);
300 bool IsKeySystemSupported(const std::string& key_system); 301 bool IsKeySystemSupported(const std::string& key_system);
301 bool IsLocalResource(); 302 bool IsLocalResource();
302 303
303 // Actually do the work for generateKeyRequest/addKey so they can easily 304 // Actually do the work for generateKeyRequest/addKey so they can easily
304 // report results to UMA. 305 // report results to UMA.
305 MediaKeyException GenerateKeyRequestInternal(const std::string& key_system, 306 MediaKeyException GenerateKeyRequestInternal(const std::string& key_system,
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 517
517 // NOTE: Weak pointers must be invalidated before all other member variables. 518 // NOTE: Weak pointers must be invalidated before all other member variables.
518 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 519 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
519 520
520 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 521 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
521 }; 522 };
522 523
523 } // namespace content 524 } // namespace content
524 525
525 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 526 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/android/webmediaplayer_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698