diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/net/disk_cache/blockfile/in_flight_io.cc | |
parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/net/disk_cache/blockfile/in_flight_io.cc')
-rw-r--r-- | chromium/net/disk_cache/blockfile/in_flight_io.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/net/disk_cache/blockfile/in_flight_io.cc b/chromium/net/disk_cache/blockfile/in_flight_io.cc index cbfcd1729fc..d5f172b6edd 100644 --- a/chromium/net/disk_cache/blockfile/in_flight_io.cc +++ b/chromium/net/disk_cache/blockfile/in_flight_io.cc @@ -21,6 +21,9 @@ BackgroundIO::BackgroundIO(InFlightIO* controller) // Runs on the primary thread. void BackgroundIO::OnIOSignalled() { + // TODO(pkasting): Remove ScopedTracker below once crbug.com/477117 is fixed. + tracked_objects::ScopedTracker tracking_profile( + FROM_HERE_WITH_EXPLICIT_FUNCTION("477117 BackgroundIO::OnIOSignalled")); if (controller_) controller_->InvokeCallback(this, false); } @@ -88,10 +91,6 @@ void InFlightIO::OnIOComplete(BackgroundIO* operation) { // Runs on the primary thread. void InFlightIO::InvokeCallback(BackgroundIO* operation, bool cancel_task) { { - // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed. - tracked_objects::ScopedTracker tracking_profile( - FROM_HERE_WITH_EXPLICIT_FUNCTION("422516 InFlightIO::InvokeCallback")); - // http://crbug.com/74623 base::ThreadRestrictions::ScopedAllowWait allow_wait; operation->io_completed()->Wait(); |