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

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: Rebase 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 aca88ec76e2940ba20213170b496a95c55fcf745..9696b4ee202631ff499331fd02229e8f3cd2741e 100644
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestObject.cpp
@@ -11735,13 +11735,11 @@ static void installV8TestObjectTemplate(v8::Isolate* isolate, const DOMWrapperWo
void V8TestObject::installFeatureName(ScriptState* scriptState, v8::Local<v8::Object> instance)
{
- 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::Object> prototype = perContextData->prototypeForType(&V8TestObject::wrapperTypeInfo);
v8::Local<v8::Function> interface = perContextData->constructorForType(&V8TestObject::wrapperTypeInfo);
ALLOW_UNUSED_LOCAL(interface);
const V8DOMConfiguration::AccessorConfiguration accessororiginTrialEnabledLongAttributeConfiguration = \
@@ -11756,11 +11754,15 @@ 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::installFeatureName(ScriptState* scriptState)
{
- v8::Local<v8::Object> prototype = instance->GetPrototype()->ToObject(scriptState->isolate());
+ installFeatureName(scriptState, v8::Local<v8::Object>());
+}
+void V8TestObject::installFeatureName1(ScriptState* scriptState, v8::Local<v8::Object> instance)
+{
V8PerContextData* perContextData = V8PerContextData::from(scriptState->context());
+ v8::Local<v8::Object> prototype = perContextData->prototypeForType(&V8TestObject::wrapperTypeInfo);
v8::Local<v8::Function> interface = perContextData->constructorForType(&V8TestObject::wrapperTypeInfo);
ALLOW_UNUSED_LOCAL(interface);
const V8DOMConfiguration::ConstantConfiguration constantFeature1OriginTrialEnabledConst1Configuration = {"FEATURE1_ORIGIN_TRIAL_ENABLED_CONST1", 1, 0, V8DOMConfiguration::ConstantTypeShort};
@@ -11769,11 +11771,15 @@ void V8TestObject::installFeatureName1(ScriptState* scriptState, v8::Local<v8::O
V8DOMConfiguration::installConstant(scriptState->isolate(), interface, prototype, constantFeature1OriginTrialEnabledConst2Configuration);
}
-void V8TestObject::installFeatureName2(ScriptState* scriptState, v8::Local<v8::Object> instance)
+void V8TestObject::installFeatureName1(ScriptState* scriptState)
{
- v8::Local<v8::Object> prototype = instance->GetPrototype()->ToObject(scriptState->isolate());
+ installFeatureName1(scriptState, v8::Local<v8::Object>());
+}
+void V8TestObject::installFeatureName2(ScriptState* scriptState, v8::Local<v8::Object> instance)
+{
V8PerContextData* perContextData = V8PerContextData::from(scriptState->context());
+ v8::Local<v8::Object> prototype = perContextData->prototypeForType(&V8TestObject::wrapperTypeInfo);
v8::Local<v8::Function> interface = perContextData->constructorForType(&V8TestObject::wrapperTypeInfo);
ALLOW_UNUSED_LOCAL(interface);
const V8DOMConfiguration::ConstantConfiguration constantFeature2OriginTrialEnabledConst1Configuration = {"FEATURE2_ORIGIN_TRIAL_ENABLED_CONST1", 3, 0, V8DOMConfiguration::ConstantTypeShort};
@@ -11782,16 +11788,25 @@ void V8TestObject::installFeatureName2(ScriptState* scriptState, v8::Local<v8::O
V8DOMConfiguration::installConstant(scriptState->isolate(), interface, prototype, constantFeature2OriginTrialEnabledConst2Configuration);
}
-void V8TestObject::installFeatureName3(ScriptState* scriptState, v8::Local<v8::Object> instance)
+void V8TestObject::installFeatureName2(ScriptState* scriptState)
{
- v8::Local<v8::Object> prototype = instance->GetPrototype()->ToObject(scriptState->isolate());
+ installFeatureName2(scriptState, v8::Local<v8::Object>());
+}
+void V8TestObject::installFeatureName3(ScriptState* scriptState, v8::Local<v8::Object> instance)
+{
V8PerContextData* perContextData = V8PerContextData::from(scriptState->context());
+ v8::Local<v8::Object> prototype = perContextData->prototypeForType(&V8TestObject::wrapperTypeInfo);
v8::Local<v8::Function> interface = perContextData->constructorForType(&V8TestObject::wrapperTypeInfo);
ALLOW_UNUSED_LOCAL(interface);
const V8DOMConfiguration::ConstantConfiguration constantFeature3OriginTrialEnabledConst1Configuration = {"FEATURE3_ORIGIN_TRIAL_ENABLED_CONST1", 5, 0, V8DOMConfiguration::ConstantTypeShort};
V8DOMConfiguration::installConstant(scriptState->isolate(), interface, prototype, constantFeature3OriginTrialEnabledConst1Configuration);
}
+
+void V8TestObject::installFeatureName3(ScriptState* scriptState)
+{
+ installFeatureName3(scriptState, v8::Local<v8::Object>());
+}
v8::Local<v8::FunctionTemplate> V8TestObject::domTemplate(v8::Isolate* isolate, const DOMWrapperWorld& world)
{
return V8DOMConfiguration::domClassTemplate(isolate, world, const_cast<WrapperTypeInfo*>(&wrapperTypeInfo), installV8TestObjectTemplate);

Powered by Google App Engine
This is Rietveld 408576698