Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Unified Diff: third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp

Issue 2130883002: [OriginTrials] Allow origin trials to be installed without an instance object. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
index fdb37cb0948323c93787ddf01239a7afaf628b65..ffe94c59056e7951d60cd909f4f15fec2b87fca1 100644
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
@@ -11733,16 +11733,15 @@ static void installV8TestObjectTemplate(v8::Isolate* isolate, const DOMWrapperWo
}
-void V8TestObject::installFeatureName(ScriptState* scriptState, v8::Local<v8::Object> instance)
+void V8TestObject::installFeatureName(ScriptState* scriptState)
{
- v8::Local<v8::Object> prototype = instance->GetPrototype()->ToObject(scriptState->isolate());
-
- V8PerIsolateData* perIsolateData = V8PerIsolateData::from(scriptState->isolate());
- v8::Local<v8::FunctionTemplate> interfaceTemplate = perIsolateData->findInterfaceTemplate(scriptState->world(), &V8TestObject::wrapperTypeInfo);
+ v8::Local<v8::FunctionTemplate> interfaceTemplate = V8TestObject::wrapperTypeInfo.domTemplate(scriptState->isolate(), scriptState->world());
v8::Local<v8::Signature> signature = v8::Signature::New(scriptState->isolate(), interfaceTemplate);
ALLOW_UNUSED_LOCAL(signature);
V8PerContextData* perContextData = V8PerContextData::from(scriptState->context());
v8::Local<v8::Function> interface = perContextData->constructorForType(&V8TestObject::wrapperTypeInfo);
+ v8::Local<v8::Object> prototype = perContextData->prototypeForType(&V8TestObject::wrapperTypeInfo);
+ v8::Local<v8::Object> instance; // unused; all members are OnInterface or OnPrototype
const V8DOMConfiguration::AccessorConfiguration accessororiginTrialEnabledLongAttributeConfiguration = \
{"originTrialEnabledLongAttribute", TestObjectV8Internal::originTrialEnabledLongAttributeAttributeGetterCallback, TestObjectV8Internal::originTrialEnabledLongAttributeAttributeSetterCallback, 0, 0, 0, v8::DEFAULT, static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::ExposedToAllScripts, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder};
V8DOMConfiguration::installAccessor(scriptState->isolate(), scriptState->world(), instance, prototype, v8::Local<v8::Function>(), signature, accessororiginTrialEnabledLongAttributeConfiguration);
@@ -11755,36 +11754,36 @@ void V8TestObject::installFeatureName(ScriptState* scriptState, v8::Local<v8::Ob
V8DOMConfiguration::installMethod(scriptState->isolate(), scriptState->world(), instance, prototype, interface, signature, methodPerworldbindingsorigintrialenabledvoidmethodConfiguration);
}
-void V8TestObject::installFeatureName1(ScriptState* scriptState, v8::Local<v8::Object> instance)
+void V8TestObject::installFeatureName1(ScriptState* scriptState)
{
- v8::Local<v8::Object> prototype = instance->GetPrototype()->ToObject(scriptState->isolate());
-
V8PerContextData* perContextData = V8PerContextData::from(scriptState->context());
v8::Local<v8::Function> interface = perContextData->constructorForType(&V8TestObject::wrapperTypeInfo);
+ v8::Local<v8::Object> prototype = perContextData->prototypeForType(&V8TestObject::wrapperTypeInfo);
+ v8::Local<v8::Object> instance; // unused; all members are OnInterface or OnPrototype
const V8DOMConfiguration::ConstantConfiguration constantFeature1OriginTrialEnabledConst1Configuration = {"FEATURE1_ORIGIN_TRIAL_ENABLED_CONST1", 1, 0, V8DOMConfiguration::ConstantTypeShort};
V8DOMConfiguration::installConstant(scriptState->isolate(), interface, prototype, constantFeature1OriginTrialEnabledConst1Configuration);
const V8DOMConfiguration::ConstantConfiguration constantFeature1OriginTrialEnabledConst2Configuration = {"FEATURE1_ORIGIN_TRIAL_ENABLED_CONST2", 2, 0, V8DOMConfiguration::ConstantTypeShort};
V8DOMConfiguration::installConstant(scriptState->isolate(), interface, prototype, constantFeature1OriginTrialEnabledConst2Configuration);
}
-void V8TestObject::installFeatureName2(ScriptState* scriptState, v8::Local<v8::Object> instance)
+void V8TestObject::installFeatureName2(ScriptState* scriptState)
{
- v8::Local<v8::Object> prototype = instance->GetPrototype()->ToObject(scriptState->isolate());
-
V8PerContextData* perContextData = V8PerContextData::from(scriptState->context());
v8::Local<v8::Function> interface = perContextData->constructorForType(&V8TestObject::wrapperTypeInfo);
+ v8::Local<v8::Object> prototype = perContextData->prototypeForType(&V8TestObject::wrapperTypeInfo);
+ v8::Local<v8::Object> instance; // unused; all members are OnInterface or OnPrototype
const V8DOMConfiguration::ConstantConfiguration constantFeature2OriginTrialEnabledConst1Configuration = {"FEATURE2_ORIGIN_TRIAL_ENABLED_CONST1", 3, 0, V8DOMConfiguration::ConstantTypeShort};
V8DOMConfiguration::installConstant(scriptState->isolate(), interface, prototype, constantFeature2OriginTrialEnabledConst1Configuration);
const V8DOMConfiguration::ConstantConfiguration constantFeature2OriginTrialEnabledConst2Configuration = {"FEATURE2_ORIGIN_TRIAL_ENABLED_CONST2", 4, 0, V8DOMConfiguration::ConstantTypeShort};
V8DOMConfiguration::installConstant(scriptState->isolate(), interface, prototype, constantFeature2OriginTrialEnabledConst2Configuration);
}
-void V8TestObject::installFeatureName3(ScriptState* scriptState, v8::Local<v8::Object> instance)
+void V8TestObject::installFeatureName3(ScriptState* scriptState)
{
- v8::Local<v8::Object> prototype = instance->GetPrototype()->ToObject(scriptState->isolate());
-
V8PerContextData* perContextData = V8PerContextData::from(scriptState->context());
v8::Local<v8::Function> interface = perContextData->constructorForType(&V8TestObject::wrapperTypeInfo);
+ v8::Local<v8::Object> prototype = perContextData->prototypeForType(&V8TestObject::wrapperTypeInfo);
+ v8::Local<v8::Object> instance; // unused; all members are OnInterface or OnPrototype
const V8DOMConfiguration::ConstantConfiguration constantFeature3OriginTrialEnabledConst1Configuration = {"FEATURE3_ORIGIN_TRIAL_ENABLED_CONST1", 5, 0, V8DOMConfiguration::ConstantTypeShort};
V8DOMConfiguration::installConstant(scriptState->isolate(), interface, prototype, constantFeature3OriginTrialEnabledConst1Configuration);
}

Powered by Google App Engine
This is Rietveld 408576698