summaryrefslogtreecommitdiffstats
path: root/content/common
diff options
context:
space:
mode:
authorlambroslambrou@google.com <lambroslambrou@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 00:24:23 +0000
committerlambroslambrou@google.com <lambroslambrou@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-12 00:24:23 +0000
commitd8bfff7569546aab660e15218667609c34a94c59 (patch)
tree0fa427b916da4ed0970f3e2724117a5e6478e335 /content/common
parent898d39f8c9d4cd165493a5fcaecde558a6abdb8c (diff)
downloadchromium_src-d8bfff7569546aab660e15218667609c34a94c59.zip
chromium_src-d8bfff7569546aab660e15218667609c34a94c59.tar.gz
chromium_src-d8bfff7569546aab660e15218667609c34a94c59.tar.bz2
Revert 117324 - Convert use of int ms to TimeDelta in files owned by apatrick.
R=apatrick@chromium.org BUG=108171 TEST= Review URL: http://codereview.chromium.org/9188017 TBR=tedvessenes@gmail.com Review URL: http://codereview.chromium.org/9188020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
-rw-r--r--content/common/gpu/gpu_channel.cc3
-rw-r--r--content/common/gpu/media/omx_video_decode_accelerator.cc4
2 files changed, 3 insertions, 4 deletions
diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc
index fcaf7c3..a53ed72 100644
--- a/content/common/gpu/gpu_channel.cc
+++ b/content/common/gpu/gpu_channel.cc
@@ -26,8 +26,7 @@
#endif
namespace {
-const base::TimeDelta kHandleMoreWorkPeriod =
- base::TimeDelta::FromMilliseconds(1);
+const int64 kHandleMoreWorkPeriod = 1;
}
GpuChannel::GpuChannel(GpuChannelManager* gpu_channel_manager,
diff --git a/content/common/gpu/media/omx_video_decode_accelerator.cc b/content/common/gpu/media/omx_video_decode_accelerator.cc
index 1172845..0c96b9c 100644
--- a/content/common/gpu/media/omx_video_decode_accelerator.cc
+++ b/content/common/gpu/media/omx_video_decode_accelerator.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 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.
@@ -565,7 +565,7 @@ void OmxVideoDecodeAccelerator::BusyLoopInDestroying() {
if (!component_handle_) return;
// Can't use PostDelayedTask here because MessageLoop doesn't drain delayed
// tasks. Instead we sleep for 5ms. Really.
- base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(5));
+ base::PlatformThread::Sleep(5);
message_loop_->PostTask(
FROM_HERE, base::Bind(
&OmxVideoDecodeAccelerator::BusyLoopInDestroying, this));