Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / WebBindings.cpp

diff --git a/src/third_party/WebKit/Source/web/WebBindings.cpp b/src/third_party/WebKit/Source/web/WebBindings.cpp
index d9da0ca..75b047f 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebBindings.cpp
+++ b/src/third_party/WebKit/Source/web/WebBindings.cpp
@@ -31,18 +31,19 @@
 #include "config.h"
 #include "public/web/WebBindings.h"
 
-#include "V8Element.h"
-#include "V8Range.h"
-#include "bindings/v8/NPV8Object.h"  // for PrivateIdentifier
-#include "bindings/v8/ScriptController.h"
-#include "bindings/v8/V8DOMWrapper.h"
-#include "bindings/v8/V8NPUtils.h"
-#include "bindings/v8/custom/V8ArrayBufferCustom.h"
-#include "bindings/v8/custom/V8ArrayBufferViewCustom.h"
-#include "bindings/v8/npruntime_impl.h"
-#include "bindings/v8/npruntime_priv.h"
+#include "bindings/core/v8/NPV8Object.h"
+#include "bindings/core/v8/ScriptController.h"
+#include "bindings/core/v8/V8DOMWrapper.h"
+#include "bindings/core/v8/V8Element.h"
+#include "bindings/core/v8/V8NPObject.h"
+#include "bindings/core/v8/V8NPUtils.h"
+#include "bindings/core/v8/V8Range.h"
+#include "bindings/core/v8/custom/V8ArrayBufferCustom.h"
+#include "bindings/core/v8/custom/V8ArrayBufferViewCustom.h"
+#include "bindings/core/v8/npruntime_impl.h"
+#include "bindings/core/v8/npruntime_priv.h"
 #include "core/dom/Range.h"
-#include "core/frame/DOMWindow.h"
+#include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "public/platform/WebArrayBuffer.h"
 #include "public/web/WebArrayBufferView.h"
@@ -50,7 +51,7 @@
 #include "public/web/WebRange.h"
 #include "wtf/ArrayBufferView.h"
 
-using namespace WebCore;
+using namespace blink;
 
 namespace blink {
 
@@ -182,6 +183,11 @@ void WebBindings::unregisterObject(NPObject* object)
     _NPN_UnregisterObject(object);
 }
 
+void WebBindings::dropV8WrapperForObject(NPObject* object)
+{
+    blink::forgetV8ObjectForNPObject(object);
+}
+
 NPUTF8* WebBindings::utf8FromIdentifier(NPIdentifier identifier)
 {
     return _NPN_UTF8FromIdentifier(identifier);
@@ -318,7 +324,7 @@ static NPObject* makeIntArrayImpl(const WebVector<int>& data, v8::Isolate* isola
     for (size_t i = 0; i < data.size(); ++i)
         result->Set(i, v8::Number::New(isolate, data[i]));
 
-    DOMWindow* window = currentDOMWindow(isolate);
+    LocalDOMWindow* window = currentDOMWindow(isolate);
     return npCreateV8ScriptObject(0, result, window, isolate);
 }
 
@@ -329,7 +335,7 @@ static NPObject* makeStringArrayImpl(const WebVector<WebString>& data, v8::Isola
     for (size_t i = 0; i < data.size(); ++i)
         result->Set(i, v8String(isolate, data[i]));
 
-    DOMWindow* window = currentDOMWindow(isolate);
+    LocalDOMWindow* window = currentDOMWindow(isolate);
     return npCreateV8ScriptObject(0, result, window, isolate);
 }
 
@@ -370,17 +376,17 @@ NPObject* WebBindings::makeStringArray(const WebVector<WebString>& data)
 
 void WebBindings::pushExceptionHandler(ExceptionHandler handler, void* data)
 {
-    WebCore::pushExceptionHandler(handler, data);
+    blink::pushExceptionHandler(handler, data);
 }
 
 void WebBindings::popExceptionHandler()
 {
-    WebCore::popExceptionHandler();
+    blink::popExceptionHandler();
 }
 
 void WebBindings::toNPVariant(v8::Local<v8::Value> object, NPObject* root, NPVariant* result)
 {
-    WebCore::convertV8ObjectToNPVariant(object, root, result, v8::Isolate::GetCurrent());
+    blink::convertV8ObjectToNPVariant(object, root, result, v8::Isolate::GetCurrent());
 }
 
 v8::Handle<v8::Value> WebBindings::toV8Value(const NPVariant* variant)