Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / bindings / core / v8 / ScriptPromiseResolverTest.cpp

diff --git a/src/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolverTest.cpp b/src/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolverTest.cpp
index 73e1709..436b694 100644 (file)
--- a/src/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolverTest.cpp
+++ b/src/third_party/WebKit/Source/bindings/core/v8/ScriptPromiseResolverTest.cpp
@@ -9,6 +9,7 @@
 #include "bindings/core/v8/ScriptValue.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "core/dom/DOMException.h"
+#include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/testing/DummyPageHolder.h"
 
@@ -23,9 +24,17 @@ void callback(const v8::FunctionCallbackInfo<v8::Value>& info) { }
 
 class Function : public ScriptFunction {
 public:
-    static PassOwnPtr<Function> create(v8::Isolate* isolate, String* value)
+    static v8::Handle<v8::Function> createFunction(ScriptState* scriptState, String* value)
+    {
+        Function* self = new Function(scriptState, value);
+        return self->bindToV8Function();
+    }
+
+private:
+    Function(ScriptState* scriptState, String* value)
+        : ScriptFunction(scriptState)
+        , m_value(value)
     {
-        return adoptPtr(new Function(isolate, value));
     }
 
     virtual ScriptValue call(ScriptValue value) OVERRIDE
@@ -35,9 +44,6 @@ public:
         return value;
     }
 
-private:
-    Function(v8::Isolate* isolate, String* value) : ScriptFunction(isolate), m_value(value) { }
-
     String* m_value;
 };
 
@@ -86,7 +92,7 @@ TEST_F(ScriptPromiseResolverTest, resolve)
     ASSERT_FALSE(promise.isEmpty());
     {
         ScriptState::Scope scope(scriptState());
-        promise.then(Function::create(isolate(), &onFulfilled), Function::create(isolate(), &onRejected));
+        promise.then(Function::createFunction(scriptState(), &onFulfilled), Function::createFunction(scriptState(), &onRejected));
     }
 
     EXPECT_EQ(String(), onFulfilled);
@@ -134,7 +140,7 @@ TEST_F(ScriptPromiseResolverTest, reject)
     ASSERT_FALSE(promise.isEmpty());
     {
         ScriptState::Scope scope(scriptState());
-        promise.then(Function::create(isolate(), &onFulfilled), Function::create(isolate(), &onRejected));
+        promise.then(Function::createFunction(scriptState(), &onFulfilled), Function::createFunction(scriptState(), &onRejected));
     }
 
     EXPECT_EQ(String(), onFulfilled);
@@ -182,7 +188,7 @@ TEST_F(ScriptPromiseResolverTest, stop)
     ASSERT_FALSE(promise.isEmpty());
     {
         ScriptState::Scope scope(scriptState());
-        promise.then(Function::create(isolate(), &onFulfilled), Function::create(isolate(), &onRejected));
+        promise.then(Function::createFunction(scriptState(), &onFulfilled), Function::createFunction(scriptState(), &onRejected));
     }
 
     executionContext()->stopActiveDOMObjects();
@@ -275,7 +281,7 @@ TEST_F(ScriptPromiseResolverTest, resolveVoid)
     ASSERT_FALSE(promise.isEmpty());
     {
         ScriptState::Scope scope(scriptState());
-        promise.then(Function::create(isolate(), &onFulfilled), Function::create(isolate(), &onRejected));
+        promise.then(Function::createFunction(scriptState(), &onFulfilled), Function::createFunction(scriptState(), &onRejected));
     }
 
     resolver->resolve();
@@ -299,7 +305,7 @@ TEST_F(ScriptPromiseResolverTest, rejectVoid)
     ASSERT_FALSE(promise.isEmpty());
     {
         ScriptState::Scope scope(scriptState());
-        promise.then(Function::create(isolate(), &onFulfilled), Function::create(isolate(), &onRejected));
+        promise.then(Function::createFunction(scriptState(), &onFulfilled), Function::createFunction(scriptState(), &onRejected));
     }
 
     resolver->reject();