diff options
author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-16 02:38:51 +0000 |
---|---|---|
committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-16 02:38:51 +0000 |
commit | 4f67d17c879cc6fac85f5baeb82115e5a5ca169f (patch) | |
tree | 3205b017b12f171eeb6563cdec4539d7570b8bbf /content/renderer/load_progress_tracker.cc | |
parent | 14b95f1e35ee10b56b0ec6b88d2f563d5c14e99b (diff) | |
download | chromium_src-4f67d17c879cc6fac85f5baeb82115e5a5ca169f.zip chromium_src-4f67d17c879cc6fac85f5baeb82115e5a5ca169f.tar.gz chromium_src-4f67d17c879cc6fac85f5baeb82115e5a5ca169f.tar.bz2 |
Revert 117824 - Convert use of int ms to TimeDelta in files owned by brettw.
This change broke Linux and Mac bots. I would recommend to ask committers to run your next change on trybots.
(*1) http://chromegw.corp.google.com/i/chromium/builders/Mac/builds/10788/steps/compile/logs/stdio
(*2) http://chromegw.corp.google.com/i/chromium/builders/Linux/builds/19313/steps/compile/logs/stdio
(*3) http://chromegw.corp.google.com/i/chromium/builders/Linux%20x64/builds/21385/steps/compile/logs/stdio
R=brettw@chromium.org
BUG=108171
TEST=
Review URL: http://codereview.chromium.org/9185026
TBR=tedvessenes@gmail.com
Review URL: http://codereview.chromium.org/9215005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/load_progress_tracker.cc')
-rw-r--r-- | content/renderer/load_progress_tracker.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/content/renderer/load_progress_tracker.cc b/content/renderer/load_progress_tracker.cc index b7a14ba..cc153f6 100644 --- a/content/renderer/load_progress_tracker.cc +++ b/content/renderer/load_progress_tracker.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. @@ -51,11 +51,9 @@ void LoadProgressTracker::DidChangeLoadProgress(WebKit::WebFrame* frame, // last updates. Also, since the message loop may be pretty busy when a page // is loaded, it might not execute a posted task in a timely manner so we make // sure to immediately send progress report if enough time has passed. - base::TimeDelta min_delay = - base::TimeDelta::FromMilliseconds(kMinimumDelayBetweenUpdatesMS); if (progress == 1.0 || last_time_progress_sent_.is_null() || - base::TimeTicks::Now() - last_time_progress_sent_ > - min_delay) { + (base::TimeTicks::Now() - last_time_progress_sent_).InMilliseconds() > + kMinimumDelayBetweenUpdatesMS) { // If there is a pending task to send progress, it is now obsolete. weak_factory_.InvalidateWeakPtrs(); SendChangeLoadProgress(); @@ -71,7 +69,7 @@ void LoadProgressTracker::DidChangeLoadProgress(WebKit::WebFrame* frame, FROM_HERE, base::Bind(&LoadProgressTracker::SendChangeLoadProgress, weak_factory_.GetWeakPtr()), - min_delay); + kMinimumDelayBetweenUpdatesMS); } void LoadProgressTracker::SendChangeLoadProgress() { |