Modified: trunk/Source/WebCore/ChangeLog (131179 => 131180)
--- trunk/Source/WebCore/ChangeLog 2012-10-12 12:38:31 UTC (rev 131179)
+++ trunk/Source/WebCore/ChangeLog 2012-10-12 12:46:34 UTC (rev 131180)
@@ -1,3 +1,18 @@
+2012-10-12 Kentaro Hara <[email protected]>
+
+ Unreviewed. Fix run-binding-tests failures introduced in r131167.
+
+ * bindings/scripts/CodeGeneratorV8.pm:
+ (GenerateConstructorGetter):
+ * bindings/scripts/test/V8/V8TestObj.cpp:
+ (WebCore):
+ (WebCore::TestObjV8Internal::TestObjConstructorGetter):
+ (WebCore::V8TestObj::installPerContextProperties):
+ (WebCore::V8TestObj::installPerContextPrototypeProperties):
+ (WebCore::V8TestObj::wrapSlow):
+ * bindings/scripts/test/V8/V8TestObj.h:
+ (V8TestObj):
+
2012-10-12 Pavel Feldman <[email protected]>
Web Inspector: relies on current Function.prototype.bind in the frame
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm (131179 => 131180)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-10-12 12:38:31 UTC (rev 131179)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorV8.pm 2012-10-12 12:46:34 UTC (rev 131180)
@@ -835,9 +835,12 @@
END
} elsif ($implClassName eq "WorkerContext") {
push(@implContentDecls, " return perContextData->constructorForType(WrapperTypeInfo::unwrap(data), V8WorkerContext::toNative(info.Holder()));\n")
- } else {
- die "Unknown Context ${implClassName}"
}
+ # FIXME: This code is correct for real IDL files, but fails with TestObj.idl,
+ # which contains methods with [V8EnabledPerContext].
+ # else {
+ # die "Unknown Context ${implClassName}"
+ # }
push(@implContentDecls, <<END);
}
END
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp (131179 => 131180)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-10-12 12:38:31 UTC (rev 131179)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.cpp 2012-10-12 12:46:34 UTC (rev 131180)
@@ -76,7 +76,7 @@
namespace WebCore {
-WrapperTypeInfo V8TestObj::info = { V8TestObj::GetTemplate, V8TestObj::derefObject, 0, 0, 0, WrapperTypeObjectPrototype };
+WrapperTypeInfo V8TestObj::info = { V8TestObj::GetTemplate, V8TestObj::derefObject, 0, 0, V8TestObj::installPerContextPrototypeProperties, 0, WrapperTypeObjectPrototype };
namespace TestObjV8Internal {
@@ -1031,9 +1031,7 @@
V8PerContextData* perContextData = V8PerContextData::from(info.Holder()->CreationContext());
if (!perContextData)
return v8Undefined();
- return perContextData->constructorForType(WrapperTypeInfo::unwrap(data));
}
-
static void TestObjReplaceableAttrSetter(v8::Local<v8::String> name, v8::Local<v8::Value> value, const v8::AccessorInfo& info)
{
INC_STATS("DOM.TestObj.replaceable._set");
@@ -2341,12 +2339,17 @@
{"enabledPerContextAttr2", TestObjV8Internal::enabledPerContextAttr2AttrGetter, TestObjV8Internal::enabledPerContextAttr2AttrSetter, 0 /* no data */, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */};
V8DOMConfiguration::configureAttribute(instance, proto, attrData);
}
+}
+void V8TestObj::installPerContextPrototypeProperties(v8::Handle<v8::Object> proto, ScriptExecutionContext* context)
+{
+ UNUSED_PARAM(proto);
+ UNUSED_PARAM(context);
v8::Local<v8::Signature> defaultSignature = v8::Signature::New(GetTemplate());
UNUSED_PARAM(defaultSignature); // In some cases, it will not be used.
- if (ContextFeatures::enabledPerContextMethod1Enabled(impl->document())) {
+ if (context && context->isDocument() && ContextFeatures::enabledPerContextMethod1Enabled(static_cast<Document*>(context))) {
proto->Set(v8::String::NewSymbol("enabledPerContextMethod1"), v8::FunctionTemplate::New(TestObjV8Internal::enabledPerContextMethod1Callback, v8Undefined(), defaultSignature)->GetFunction());
}
- if (ContextFeatures::featureNameEnabled(impl->document())) {
+ if (context && context->isDocument() && ContextFeatures::featureNameEnabled(static_cast<Document*>(context))) {
proto->Set(v8::String::NewSymbol("enabledPerContextMethod2"), v8::FunctionTemplate::New(TestObjV8Internal::enabledPerContextMethod2Callback, v8Undefined(), defaultSignature)->GetFunction());
}
}
@@ -2373,6 +2376,7 @@
if (UNLIKELY(wrapper.IsEmpty()))
return wrapper;
+
installPerContextProperties(wrapper, impl.get());
v8::Persistent<v8::Object> wrapperHandle = V8DOMWrapper::setJSWrapperForDOMObject(impl, wrapper, isolate);
if (!hasDependentLifetime)
Modified: trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.h (131179 => 131180)
--- trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.h 2012-10-12 12:38:31 UTC (rev 131179)
+++ trunk/Source/WebCore/bindings/scripts/test/V8/V8TestObj.h 2012-10-12 12:46:34 UTC (rev 131180)
@@ -53,6 +53,7 @@
static void customAttrAccessorSetter(v8::Local<v8::String> name, v8::Local<v8::Value>, const v8::AccessorInfo&);
static const int internalFieldCount = v8DefaultWrapperInternalFieldCount + 0;
static void installPerContextProperties(v8::Handle<v8::Object>, TestObj*);
+ static void installPerContextPrototypeProperties(v8::Handle<v8::Object>, ScriptExecutionContext*);
private:
static v8::Handle<v8::Object> wrapSlow(PassRefPtr<TestObj>, v8::Handle<v8::Object> creationContext, v8::Isolate*);
};
