summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/webmediaplayer_delegate_impl.cc
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-17 20:16:56 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-17 20:16:56 +0000
commit8b2cec537f3678716180467ddffaf3caa4594777 (patch)
tree92262e0c53924d5f96d08cfae918730a16e024da /chrome/renderer/webmediaplayer_delegate_impl.cc
parentce34fe575bdff24570c078184e81373bd240069b (diff)
downloadchromium_src-8b2cec537f3678716180467ddffaf3caa4594777.zip
chromium_src-8b2cec537f3678716180467ddffaf3caa4594777.tar.gz
chromium_src-8b2cec537f3678716180467ddffaf3caa4594777.tar.bz2
Revert tree bustage cause by r11904.
TBR=agl git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/webmediaplayer_delegate_impl.cc')
-rw-r--r--chrome/renderer/webmediaplayer_delegate_impl.cc15
1 files changed, 8 insertions, 7 deletions
diff --git a/chrome/renderer/webmediaplayer_delegate_impl.cc b/chrome/renderer/webmediaplayer_delegate_impl.cc
index b9e70b4..78dcd4c 100644
--- a/chrome/renderer/webmediaplayer_delegate_impl.cc
+++ b/chrome/renderer/webmediaplayer_delegate_impl.cc
@@ -14,23 +14,23 @@
class NotifyWebMediaPlayerTask : public CancelableTask {
public:
- NotifyWebMediaPlayerTask(WebMediaPlayerDelegateImpl* delegate,
+ NotifyWebMediaPlayerTask(webkit_glue::WebMediaPlayer* web_media_player,
WebMediaPlayerMethod method)
- : delegate_(delegate_),
+ : web_media_player_(web_media_player),
method_(method) {}
virtual void Run() {
- if (delegate_) {
- (delegate_->web_media_player()->*(method_))();
+ if (web_media_player_) {
+ (web_media_player_->*(method_))();
}
}
virtual void Cancel() {
- delegate_ = NULL;
+ web_media_player_ = NULL;
}
private:
- WebMediaPlayerDelegateImpl* delegate_;
+ webkit_glue::WebMediaPlayer* web_media_player_;
WebMediaPlayerMethod method_;
DISALLOW_COPY_AND_ASSIGN(NotifyWebMediaPlayerTask);
@@ -356,7 +356,8 @@ void WebMediaPlayerDelegateImpl::PostTask(int index,
AutoLock auto_lock(task_lock_);
if(!tasks_[index]) {
- CancelableTask* task = new NotifyWebMediaPlayerTask(this, method);
+ CancelableTask* task = new NotifyWebMediaPlayerTask(web_media_player_,
+ method);
tasks_[index] = task;
main_loop_->PostTask(FROM_HERE, task);
}