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

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

Issue 204463008: Remove all calls to WebMediaPlayerClient::needsWebLayerForVideo() as compositing is always enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 // media player. 245 // media player.
246 void EstablishSurfaceTexturePeer(); 246 void EstablishSurfaceTexturePeer();
247 247
248 // Requesting whether the surface texture peer needs to be reestablished. 248 // Requesting whether the surface texture peer needs to be reestablished.
249 void SetNeedsEstablishPeer(bool needs_establish_peer); 249 void SetNeedsEstablishPeer(bool needs_establish_peer);
250 250
251 private: 251 private:
252 void Pause(bool is_media_related_action); 252 void Pause(bool is_media_related_action);
253 void DrawRemotePlaybackIcon(); 253 void DrawRemotePlaybackIcon();
254 void ReallocateVideoFrame(); 254 void ReallocateVideoFrame();
255 void CreateWebLayerIfNeeded();
256 void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame); 255 void SetCurrentFrameInternal(scoped_refptr<media::VideoFrame>& frame);
257 void DidLoadMediaInfo(MediaInfoLoader::Status status); 256 void DidLoadMediaInfo(MediaInfoLoader::Status status);
258 void DoReleaseRemotePlaybackTexture( 257 void DoReleaseRemotePlaybackTexture(
259 scoped_ptr<gpu::MailboxHolder> mailbox_holder); 258 scoped_ptr<gpu::MailboxHolder> mailbox_holder);
260 259
261 bool IsKeySystemSupported(const std::string& key_system); 260 bool IsKeySystemSupported(const std::string& key_system);
262 261
263 // Actually do the work for generateKeyRequest/addKey so they can easily 262 // Actually do the work for generateKeyRequest/addKey so they can easily
264 // report results to UMA. 263 // report results to UMA.
265 MediaKeyException GenerateKeyRequestInternal(const std::string& key_system, 264 MediaKeyException GenerateKeyRequestInternal(const std::string& key_system,
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
435 434
436 // NOTE: Weak pointers must be invalidated before all other member variables. 435 // NOTE: Weak pointers must be invalidated before all other member variables.
437 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_; 436 base::WeakPtrFactory<WebMediaPlayerAndroid> weak_factory_;
438 437
439 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid); 438 DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerAndroid);
440 }; 439 };
441 440
442 } // namespace content 441 } // namespace content
443 442
444 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_ 443 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698