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

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

Issue 17309003: Removed unused NeedKey callback from Decryptors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 7 years, 6 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 #include "webkit/renderer/media/android/webmediaplayer_android.h" 5 #include "webkit/renderer/media/android/webmediaplayer_android.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 107
108 #if defined(GOOGLE_TV) 108 #if defined(GOOGLE_TV)
109 if (WebKit::WebRuntimeFeatures::isLegacyEncryptedMediaEnabled()) { 109 if (WebKit::WebRuntimeFeatures::isLegacyEncryptedMediaEnabled()) {
110 // |decryptor_| is owned, so Unretained() is safe here. 110 // |decryptor_| is owned, so Unretained() is safe here.
111 decryptor_.reset(new ProxyDecryptor( 111 decryptor_.reset(new ProxyDecryptor(
112 client, 112 client,
113 frame, 113 frame,
114 base::Bind(&WebMediaPlayerAndroid::OnKeyAdded, base::Unretained(this)), 114 base::Bind(&WebMediaPlayerAndroid::OnKeyAdded, base::Unretained(this)),
115 base::Bind(&WebMediaPlayerAndroid::OnKeyError, base::Unretained(this)), 115 base::Bind(&WebMediaPlayerAndroid::OnKeyError, base::Unretained(this)),
116 base::Bind(&WebMediaPlayerAndroid::OnKeyMessage, 116 base::Bind(&WebMediaPlayerAndroid::OnKeyMessage,
117 base::Unretained(this)), 117 base::Unretained(this))));
118 base::Bind(&WebMediaPlayerAndroid::OnNeedKey, base::Unretained(this))));
119 } 118 }
120 119
121 demuxer_ = NULL; 120 demuxer_ = NULL;
122 #endif // defined(GOOGLE_TV) 121 #endif // defined(GOOGLE_TV)
123 } 122 }
124 123
125 WebMediaPlayerAndroid::~WebMediaPlayerAndroid() { 124 WebMediaPlayerAndroid::~WebMediaPlayerAndroid() {
126 SetVideoFrameProviderClient(NULL); 125 SetVideoFrameProviderClient(NULL);
127 client_->setWebLayer(NULL); 126 client_->setWebLayer(NULL);
128 127
(...skipping 990 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 1118
1120 void WebMediaPlayerAndroid::exitFullscreen() { 1119 void WebMediaPlayerAndroid::exitFullscreen() {
1121 proxy_->ExitFullscreen(player_id_); 1120 proxy_->ExitFullscreen(player_id_);
1122 } 1121 }
1123 1122
1124 bool WebMediaPlayerAndroid::canEnterFullscreen() const { 1123 bool WebMediaPlayerAndroid::canEnterFullscreen() const {
1125 return manager_->CanEnterFullscreen(frame_); 1124 return manager_->CanEnterFullscreen(frame_);
1126 } 1125 }
1127 1126
1128 } // namespace webkit_media 1127 } // namespace webkit_media
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/content_decryptor_delegate.cc ('k') | webkit/renderer/media/crypto/ppapi/clear_key_cdm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698