summaryrefslogtreecommitdiff
path: root/chromium/base/callback_helpers.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-01-04 14:17:57 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-01-05 10:05:06 +0000
commit39d357e3248f80abea0159765ff39554affb40db (patch)
treeaba0e6bfb76de0244bba0f5fdbd64b830dd6e621 /chromium/base/callback_helpers.h
parent87778abf5a1f89266f37d1321b92a21851d8244d (diff)
downloadqtwebengine-chromium-39d357e3248f80abea0159765ff39554affb40db.tar.gz
BASELINE: Update Chromium to 55.0.2883.105
And updates ninja to 1.7.2 Change-Id: I20d43c737f82764d857ada9a55586901b18b9243 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/base/callback_helpers.h')
-rw-r--r--chromium/base/callback_helpers.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/chromium/base/callback_helpers.h b/chromium/base/callback_helpers.h
index c4b0d867634..782371f6e71 100644
--- a/chromium/base/callback_helpers.h
+++ b/chromium/base/callback_helpers.h
@@ -37,15 +37,15 @@ class BASE_EXPORT ScopedClosureRunner {
ScopedClosureRunner(ScopedClosureRunner&& other);
- // Calls the current closure if it's set and replaces it with the closure from
- // |other|.
+ // Releases the current closure if it's set and replaces it with the closure
+ // from |other|.
ScopedClosureRunner& operator=(ScopedClosureRunner&& other);
// Calls the current closure and resets it, so it wont be called again.
- void Reset();
+ void RunAndReset();
- // Calls the current closure and replaces it with the new one.
- void Reset(const Closure& closure);
+ // Replaces closure with the new one releasing the old one without calling it.
+ void ReplaceClosure(const Closure& closure);
// Releases the Closure without calling.
Closure Release() WARN_UNUSED_RESULT;