Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(301)

Unified Diff: third_party/WebKit/Source/modules/permissions/Permissions.cpp

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/permissions/Permissions.cpp
diff --git a/third_party/WebKit/Source/modules/permissions/Permissions.cpp b/third_party/WebKit/Source/modules/permissions/Permissions.cpp
index fd395173727def4b414ec276c8186b2d5fa99230..59360846bf9f0357ee3625191734d7d8626b8a99 100644
--- a/third_party/WebKit/Source/modules/permissions/Permissions.cpp
+++ b/third_party/WebKit/Source/modules/permissions/Permissions.cpp
@@ -126,7 +126,7 @@ ScriptPromise Permissions::query(ScriptState* scriptState,
scriptState->getExecutionContext()->getSecurityOrigin(),
convertToBaseCallback(WTF::bind(
&Permissions::taskComplete, wrapPersistent(this),
- wrapPersistent(resolver), passed(std::move(descriptorCopy)))));
+ wrapPersistent(resolver), WTF::passed(std::move(descriptorCopy)))));
return promise;
}
@@ -159,7 +159,7 @@ ScriptPromise Permissions::request(ScriptState* scriptState,
UserGestureIndicator::processingUserGesture(),
convertToBaseCallback(WTF::bind(
&Permissions::taskComplete, wrapPersistent(this),
- wrapPersistent(resolver), passed(std::move(descriptorCopy)))));
+ wrapPersistent(resolver), WTF::passed(std::move(descriptorCopy)))));
return promise;
}
@@ -191,7 +191,7 @@ ScriptPromise Permissions::revoke(ScriptState* scriptState,
scriptState->getExecutionContext()->getSecurityOrigin(),
convertToBaseCallback(WTF::bind(
&Permissions::taskComplete, wrapPersistent(this),
- wrapPersistent(resolver), passed(std::move(descriptorCopy)))));
+ wrapPersistent(resolver), WTF::passed(std::move(descriptorCopy)))));
return promise;
}
@@ -248,10 +248,11 @@ ScriptPromise Permissions::requestAll(
std::move(internalPermissions),
scriptState->getExecutionContext()->getSecurityOrigin(),
UserGestureIndicator::processingUserGesture(),
- convertToBaseCallback(WTF::bind(
- &Permissions::batchTaskComplete, wrapPersistent(this),
- wrapPersistent(resolver), passed(std::move(internalPermissionsCopy)),
- passed(std::move(callerIndexToInternalIndex)))));
+ convertToBaseCallback(
+ WTF::bind(&Permissions::batchTaskComplete, wrapPersistent(this),
+ wrapPersistent(resolver),
+ WTF::passed(std::move(internalPermissionsCopy)),
+ WTF::passed(std::move(callerIndexToInternalIndex)))));
return promise;
}

Powered by Google App Engine
This is Rietveld 408576698