| Index: third_party/WebKit/Source/core/testing/CallbackFunctionTest.cpp
|
| diff --git a/third_party/WebKit/Source/core/testing/CallbackFunctionTest.cpp b/third_party/WebKit/Source/core/testing/CallbackFunctionTest.cpp
|
| index 17e3770861d90ca4c1b3629ada5789083b8f4a24..ac5e2815802d91f95610b9c558075a2f25ef8696 100644
|
| --- a/third_party/WebKit/Source/core/testing/CallbackFunctionTest.cpp
|
| +++ b/third_party/WebKit/Source/core/testing/CallbackFunctionTest.cpp
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "core/testing/CallbackFunctionTest.h"
|
|
|
| -#include "bindings/core/v8/ScriptState.h"
|
| #include "bindings/core/v8/TestCallback.h"
|
| #include "bindings/core/v8/TestInterfaceCallback.h"
|
| #include "bindings/core/v8/TestReceiverObjectCallback.h"
|
| @@ -16,15 +15,14 @@ namespace blink {
|
|
|
| DEFINE_TRACE(CallbackFunctionTest) {}
|
|
|
| -String CallbackFunctionTest::testCallback(ScriptState* scriptState,
|
| - TestCallback* callback,
|
| +String CallbackFunctionTest::testCallback(TestCallback* callback,
|
| const String& message1,
|
| const String& message2,
|
| ExceptionState& exceptionState) {
|
| ScriptWrappable* scriptWrappable;
|
| String returnValue;
|
|
|
| - if (callback->call(scriptState, scriptWrappable = nullptr, message1, message2,
|
| + if (callback->call(scriptWrappable = nullptr, message1, message2,
|
| returnValue)) {
|
| return String("SUCCESS: ") + returnValue;
|
| }
|
| @@ -32,31 +30,28 @@ String CallbackFunctionTest::testCallback(ScriptState* scriptState,
|
| }
|
|
|
| void CallbackFunctionTest::testInterfaceCallback(
|
| - ScriptState* scriptState,
|
| TestInterfaceCallback* callback,
|
| HTMLDivElement* divElement,
|
| ExceptionState& exceptionState) {
|
| ScriptWrappable* scriptWrappable;
|
|
|
| - callback->call(scriptState, scriptWrappable = nullptr, divElement);
|
| + callback->call(scriptWrappable = nullptr, divElement);
|
| return;
|
| }
|
|
|
| void CallbackFunctionTest::testReceiverObjectCallback(
|
| - ScriptState* scriptState,
|
| TestReceiverObjectCallback* callback,
|
| ExceptionState& exceptionState) {
|
| - callback->call(scriptState, this);
|
| + callback->call(this);
|
| return;
|
| }
|
|
|
| Vector<String> CallbackFunctionTest::testSequenceCallback(
|
| - ScriptState* scriptState,
|
| TestSequenceCallback* callback,
|
| const Vector<int>& numbers,
|
| ExceptionState& exceptionState) {
|
| Vector<String> returnValue;
|
| - if (callback->call(scriptState, nullptr, numbers, returnValue)) {
|
| + if (callback->call(nullptr, numbers, returnValue)) {
|
| return returnValue;
|
| }
|
| return Vector<String>();
|
|
|