summaryrefslogtreecommitdiffstats
path: root/remoting/client/rectangle_update_decoder.cc
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-27 04:17:22 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-27 04:17:22 +0000
commitc9c0d079c24a02f8f9b667f3cbf06d234a586625 (patch)
tree3190175cc6bd419a1f36d3a9265c1c61e1ba9884 /remoting/client/rectangle_update_decoder.cc
parent0c12ed8f62b3691f1fee9e5abd6b6bc2fa5af14a (diff)
downloadchromium_src-c9c0d079c24a02f8f9b667f3cbf06d234a586625.zip
chromium_src-c9c0d079c24a02f8f9b667f3cbf06d234a586625.tar.gz
chromium_src-c9c0d079c24a02f8f9b667f3cbf06d234a586625.tar.bz2
Move media library AutoTaskRunner to base and rename ScopedTaskRunner.
This is needed to avoid faux dependencies on media/ creeping in to remoting/ code, and creating linker issues. BUG= TEST=Everything works as before. Review URL: http://codereview.chromium.org/7062013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86971 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client/rectangle_update_decoder.cc')
-rw-r--r--remoting/client/rectangle_update_decoder.cc16
1 files changed, 7 insertions, 9 deletions
diff --git a/remoting/client/rectangle_update_decoder.cc b/remoting/client/rectangle_update_decoder.cc
index 5659fc5..ca7e24a 100644
--- a/remoting/client/rectangle_update_decoder.cc
+++ b/remoting/client/rectangle_update_decoder.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -6,7 +6,6 @@
#include "base/logging.h"
#include "base/message_loop.h"
-#include "media/base/callback.h"
#include "remoting/base/decoder.h"
#include "remoting/base/decoder_row_based.h"
#include "remoting/base/decoder_vp8.h"
@@ -15,7 +14,6 @@
#include "remoting/client/frame_consumer.h"
#include "remoting/protocol/session_config.h"
-using media::AutoTaskRunner;
using remoting::protocol::ChannelConfig;
using remoting::protocol::SessionConfig;
@@ -84,11 +82,11 @@ void RectangleUpdateDecoder::DecodePacket(const VideoPacket* packet,
done));
return;
}
- AutoTaskRunner done_runner(done);
+ base::ScopedTaskRunner done_runner(done);
TraceContext::tracer()->PrintString("Decode Packet called.");
- AllocateFrame(packet, done_runner.release());
+ AllocateFrame(packet, done_runner.Release());
}
void RectangleUpdateDecoder::AllocateFrame(const VideoPacket* packet,
@@ -100,7 +98,7 @@ void RectangleUpdateDecoder::AllocateFrame(const VideoPacket* packet,
&RectangleUpdateDecoder::AllocateFrame, packet, done));
return;
}
- AutoTaskRunner done_runner(done);
+ base::ScopedTaskRunner done_runner(done);
TraceContext::tracer()->PrintString("AllocateFrame called.");
@@ -133,11 +131,11 @@ void RectangleUpdateDecoder::AllocateFrame(const VideoPacket* packet,
&frame_,
NewRunnableMethod(this,
&RectangleUpdateDecoder::ProcessPacketData,
- packet, done_runner.release()));
+ packet, done_runner.Release()));
frame_is_new_ = true;
return;
}
- ProcessPacketData(packet, done_runner.release());
+ ProcessPacketData(packet, done_runner.Release());
}
void RectangleUpdateDecoder::ProcessPacketData(
@@ -150,7 +148,7 @@ void RectangleUpdateDecoder::ProcessPacketData(
done));
return;
}
- AutoTaskRunner done_runner(done);
+ base::ScopedTaskRunner done_runner(done);
if (frame_is_new_) {
decoder_->Reset();