Commit 56cff35b authored by Jun Cai's avatar Jun Cai Committed by Commit Bot

Convert base::Bind and base::Callback in //ppapi/tests to Once or Repeating

This CL converts base::Bind and base::Callback in //ppapi/tests to Once
or Repeating

Bug: 1007818
Change-Id: I0613c200a4e5a7fe397bdf9d49193c7d2ea45066
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2083382Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: Jun Cai <juncai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747523}
parent 8cef4d5f
...@@ -129,12 +129,11 @@ class ScriptableBase : public pp::deprecated::ScriptableObject { ...@@ -129,12 +129,11 @@ class ScriptableBase : public pp::deprecated::ScriptableObject {
} }
protected: protected:
using MethodMap = using MethodMap = std::map<
std::map<std::string, std::string,
base::Callback<pp::Var(const std::vector<pp::Var>&, pp::Var*)>>; base::RepeatingCallback<pp::Var(const std::vector<pp::Var>&, pp::Var*)>>;
using PropertyMap = using PropertyMap =
std::map<std::string, base::Callback<void(bool, pp::Var*)>>; std::map<std::string, base::RepeatingCallback<void(bool, pp::Var*)>>;
MethodMap::iterator FindMethod(const pp::Var& name) { MethodMap::iterator FindMethod(const pp::Var& name) {
if (!name.is_string()) if (!name.is_string())
...@@ -159,8 +158,8 @@ class TestObjectSO : public ScriptableBase { ...@@ -159,8 +158,8 @@ class TestObjectSO : public ScriptableBase {
: ScriptableBase(instance) { : ScriptableBase(instance) {
++count_; ++count_;
properties_.insert(std::make_pair( properties_.insert(std::make_pair(
"testObject", "testObject", base::BindRepeating(&TestObjectSO::TestObjectAccessor,
base::Bind(&TestObjectSO::TestObjectAccessor, base::Unretained(this)))); base::Unretained(this))));
} }
~TestObjectSO() override { ~TestObjectSO() override {
--count_; --count_;
...@@ -190,43 +189,47 @@ class InstanceSO : public ScriptableBase { ...@@ -190,43 +189,47 @@ class InstanceSO : public ScriptableBase {
: ScriptableBase(instance) { : ScriptableBase(instance) {
methods_.insert(std::make_pair( methods_.insert(std::make_pair(
"normalize", "normalize",
base::Bind(&InstanceSO::Normalize, base::Unretained(this)))); base::BindRepeating(&InstanceSO::Normalize, base::Unretained(this))));
methods_.insert(std::make_pair( methods_.insert(std::make_pair(
"remember", "remember",
base::Bind(&InstanceSO::Remember, base::Unretained(this)))); base::BindRepeating(&InstanceSO::Remember, base::Unretained(this))));
methods_.insert(std::make_pair(
"testCloneObject",
base::Bind(&InstanceSO::TestCloneObject, base::Unretained(this))));
methods_.insert(std::make_pair(
"testCreateTestObject",
base::Bind(&InstanceSO::TestCreateTestObject, base::Unretained(this))));
methods_.insert(std::make_pair( methods_.insert(std::make_pair(
"testExecuteScript", "testCloneObject", base::BindRepeating(&InstanceSO::TestCloneObject,
base::Bind(&InstanceSO::TestExecuteScript, base::Unretained(this)))); base::Unretained(this))));
methods_.insert(
std::make_pair("testCreateTestObject",
base::BindRepeating(&InstanceSO::TestCreateTestObject,
base::Unretained(this))));
methods_.insert(std::make_pair( methods_.insert(std::make_pair(
"testGetProperty", "testExecuteScript", base::BindRepeating(&InstanceSO::TestExecuteScript,
base::Bind(&InstanceSO::TestGetProperty, base::Unretained(this)))); base::Unretained(this))));
methods_.insert(std::make_pair( methods_.insert(std::make_pair(
"testPassTestObject", "testGetProperty", base::BindRepeating(&InstanceSO::TestGetProperty,
base::Bind(&InstanceSO::TestPassTestObject, base::Unretained(this)))); base::Unretained(this))));
methods_.insert(
std::make_pair("testPassTestObject",
base::BindRepeating(&InstanceSO::TestPassTestObject,
base::Unretained(this))));
// Note: the semantics of testScriptObjectInvoke are identical to the // Note: the semantics of testScriptObjectInvoke are identical to the
// semantics of testPassTestObject: call args[0] with args[1] as a // semantics of testPassTestObject: call args[0] with args[1] as a
// parameter. // parameter.
methods_.insert( methods_.insert(
std::make_pair("testScriptObjectInvoke", std::make_pair("testScriptObjectInvoke",
base::Bind(&InstanceSO::TestPassTestObject, base::BindRepeating(&InstanceSO::TestPassTestObject,
base::Unretained(this)))); base::Unretained(this))));
properties_.insert(std::make_pair(
"testObject", base::Bind(&InstanceSO::TestObjectAccessor,
base::Unretained(this))));
properties_.insert(std::make_pair( properties_.insert(std::make_pair(
"testObjectCount", base::Bind(&InstanceSO::TestObjectCountAccessor, "testObject", base::BindRepeating(&InstanceSO::TestObjectAccessor,
base::Unretained(this)))); base::Unretained(this))));
properties_.insert(
std::make_pair("testObjectCount",
base::BindRepeating(&InstanceSO::TestObjectCountAccessor,
base::Unretained(this))));
properties_.insert(std::make_pair( properties_.insert(std::make_pair(
"testGetUndefined", base::Bind(&InstanceSO::TestGetUndefinedAccessor, "testGetUndefined",
base::Unretained(this)))); base::BindRepeating(&InstanceSO::TestGetUndefinedAccessor,
base::Unretained(this))));
} }
~InstanceSO() override {} ~InstanceSO() override = default;
private: private:
// Requires no argument. // Requires no argument.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment