Update To 11.40.268.0

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

diff --git a/src/third_party/WebKit/Source/bindings/core/v8/V8DOMWrapper.cpp b/src/third_party/WebKit/Source/bindings/core/v8/V8DOMWrapper.cpp
index 8c81962..09ae542 100644 (file)
--- a/src/third_party/WebKit/Source/bindings/core/v8/V8DOMWrapper.cpp
+++ b/src/third_party/WebKit/Source/bindings/core/v8/V8DOMWrapper.cpp
@@ -41,7 +41,7 @@
 
 namespace blink {
 
-static v8::Local<v8::Object> wrapInShadowTemplate(v8::Local<v8::Object> wrapper, ScriptWrappableBase* internalPointer, v8::Isolate* isolate)
+static v8::Local<v8::Object> wrapInShadowTemplate(v8::Local<v8::Object> wrapper, ScriptWrappableBase* scriptWrappableBase, v8::Isolate* isolate)
 {
     static int shadowTemplateKey; // This address is used for a key to look up the dom template.
     V8PerIsolateData* data = V8PerIsolateData::from(isolate);
@@ -64,11 +64,11 @@ static v8::Local<v8::Object> wrapInShadowTemplate(v8::Local<v8::Object> wrapper,
     if (shadow.IsEmpty())
         return v8::Local<v8::Object>();
     shadow->SetPrototype(wrapper);
-    V8DOMWrapper::setNativeInfoForHiddenWrapper(wrapper, &V8HTMLDocument::wrapperTypeInfo, internalPointer);
+    V8DOMWrapper::setNativeInfo(wrapper, &V8HTMLDocument::wrapperTypeInfo, scriptWrappableBase);
     return shadow;
 }
 
-v8::Local<v8::Object> V8DOMWrapper::createWrapper(v8::Handle<v8::Object> creationContext, const WrapperTypeInfo* type, ScriptWrappableBase* internalPointer, v8::Isolate* isolate)
+v8::Local<v8::Object> V8DOMWrapper::createWrapper(v8::Handle<v8::Object> creationContext, const WrapperTypeInfo* type, ScriptWrappableBase* scriptWrappableBase, v8::Isolate* isolate)
 {
     V8WrapperInstantiationScope scope(creationContext, isolate);
 
@@ -76,7 +76,7 @@ v8::Local<v8::Object> V8DOMWrapper::createWrapper(v8::Handle<v8::Object> creatio
     v8::Local<v8::Object> wrapper = perContextData ? perContextData->createWrapperFromCache(type) : V8ObjectConstructor::newInstance(isolate, type->domTemplate(isolate)->GetFunction());
 
     if (type == &V8HTMLDocument::wrapperTypeInfo && !wrapper.IsEmpty())
-        wrapper = wrapInShadowTemplate(wrapper, internalPointer, isolate);
+        wrapper = wrapInShadowTemplate(wrapper, scriptWrappableBase, isolate);
 
     return wrapper;
 }