X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2FWebKit%2FSource%2Fbindings%2Fcore%2Fv8%2FV8NPObject.cpp;h=25173cd8a33c66c26e04d5e025fcca7f08cdf7ca;hb=3545e9f2671f595d2a2f3ee75ca0393b01e35ef6;hp=eb298aa566d7f63fd03b82b2c17721239f559dd8;hpb=7d210d4c7e9ba36e635eabc5b5780495f8a63292;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/third_party/WebKit/Source/bindings/core/v8/V8NPObject.cpp b/src/third_party/WebKit/Source/bindings/core/v8/V8NPObject.cpp
index eb298aa..25173cd 100644
--- a/src/third_party/WebKit/Source/bindings/core/v8/V8NPObject.cpp
+++ b/src/third_party/WebKit/Source/bindings/core/v8/V8NPObject.cpp
@@ -73,11 +73,11 @@ static void npObjectInvokeImpl(const v8::FunctionCallbackInfo<v8::Value>& info,
     v8::Isolate* isolate = info.GetIsolate();
 
     // These three types are subtypes of HTMLPlugInElement.
-    HTMLPlugInElement* element = V8HTMLAppletElement::toNativeWithTypeCheck(isolate, info.Holder());
+    HTMLPlugInElement* element = V8HTMLAppletElement::toImplWithTypeCheck(isolate, info.Holder());
     if (!element) {
-        element = V8HTMLEmbedElement::toNativeWithTypeCheck(isolate, info.Holder());
+        element = V8HTMLEmbedElement::toImplWithTypeCheck(isolate, info.Holder());
         if (!element) {
-            element = V8HTMLObjectElement::toNativeWithTypeCheck(isolate, info.Holder());
+            element = V8HTMLObjectElement::toImplWithTypeCheck(isolate, info.Holder());
         }
     }
     if (element) {
@@ -470,14 +470,13 @@ v8::Local<v8::Object> createV8ObjectForNPObject(NPObject* object, NPObject* root
     if (value.IsEmpty())
         return value;
 
-    V8DOMWrapper::setNativeInfo(value, npObjectTypeInfo(), npObjectToInternalPointer(object));
+    V8DOMWrapper::setNativeInfo(value, npObjectTypeInfo(), npObjectToScriptWrappableBase(object));
 
     // KJS retains the object as part of its wrapper (see Bindings::CInstance).
     _NPN_RetainObject(object);
     _NPN_RegisterObject(object, root);
 
-    WrapperConfiguration configuration = buildWrapperConfiguration(object, WrapperConfiguration::Dependent);
-    staticNPObjectMap().set(object, value, configuration);
+    staticNPObjectMap().set(object, value, npObjectTypeInfo());
     ASSERT(V8DOMWrapper::isDOMWrapper(value));
     return value;
 }