Index: third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface.cpp |
diff --git a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface.cpp b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface.cpp |
index 3ef5e5e18744cf4435188792f48bf0c99f3a541d..389ede306826286cc67f63b643de63eaafcaeb97 100644 |
--- a/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface.cpp |
+++ b/third_party/WebKit/Source/bindings/tests/results/core/V8TestInterface.cpp |
@@ -885,6 +885,28 @@ static void partialPartialEnumTypeAttributeAttributeSetter(v8::Local<v8::Value> |
TestInterfacePartial::setPartialPartialEnumTypeAttribute(*impl, cppValue); |
} |
+static void partialSecureContextLongAttributeAttributeGetter(const v8::FunctionCallbackInfo<v8::Value>& info) { |
+ v8::Local<v8::Object> holder = info.Holder(); |
+ |
+ TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder); |
+ |
+ v8SetReturnValueInt(info, TestInterfacePartial::partialSecureContextLongAttribute(*impl)); |
+} |
+ |
+static void partialSecureContextLongAttributeAttributeSetter(v8::Local<v8::Value> v8Value, const v8::FunctionCallbackInfo<v8::Value>& info) { |
+ v8::Local<v8::Object> holder = info.Holder(); |
+ TestInterfaceImplementation* impl = V8TestInterface::toImpl(holder); |
+ |
+ ExceptionState exceptionState(info.GetIsolate(), ExceptionState::SetterContext, "TestInterface", "partialSecureContextLongAttribute"); |
+ |
+ // Prepare the value to be set. |
+ int cppValue = toInt32(info.GetIsolate(), v8Value, NormalConversion, exceptionState); |
+ if (exceptionState.hadException()) |
+ return; |
+ |
+ TestInterfacePartial::setPartialSecureContextLongAttribute(*impl, cppValue); |
+} |
+ |
static void partial2LongAttributeAttributeGetter(const v8::FunctionCallbackInfo<v8::Value>& info) { |
v8::Local<v8::Object> holder = info.Holder(); |
@@ -2221,6 +2243,16 @@ void V8TestInterface::partialPartialEnumTypeAttributeAttributeSetterCallback(con |
TestInterfaceImplementationV8Internal::partialPartialEnumTypeAttributeAttributeSetter(v8Value, info); |
} |
+void V8TestInterface::partialSecureContextLongAttributeAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) { |
+ TestInterfaceImplementationV8Internal::partialSecureContextLongAttributeAttributeGetter(info); |
+} |
+ |
+void V8TestInterface::partialSecureContextLongAttributeAttributeSetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) { |
+ v8::Local<v8::Value> v8Value = info[0]; |
+ |
+ TestInterfaceImplementationV8Internal::partialSecureContextLongAttributeAttributeSetter(v8Value, info); |
+} |
+ |
void V8TestInterface::partial2LongAttributeAttributeGetterCallback(const v8::FunctionCallbackInfo<v8::Value>& info) { |
TestInterfaceImplementationV8Internal::partial2LongAttributeAttributeGetter(info); |
} |
@@ -2755,9 +2787,10 @@ TestInterfaceImplementation* V8TestInterface::toImplWithTypeCheck(v8::Isolate* i |
void V8TestInterface::preparePrototypeAndInterfaceObject(v8::Local<v8::Context> context, const DOMWrapperWorld& world, v8::Local<v8::Object> prototypeObject, v8::Local<v8::Function> interfaceObject, v8::Local<v8::FunctionTemplate> interfaceTemplate) { |
v8::Isolate* isolate = context->GetIsolate(); |
- |
- ExecutionContext* executionContext = toExecutionContext(context); |
v8::Local<v8::Signature> signature = v8::Signature::New(isolate, interfaceTemplate); |
+ ExecutionContext* executionContext = toExecutionContext(context); |
+ DCHECK(executionContext); |
+ |
if (executionContext && (executionContext->isWorkerGlobalScope())) { |
const V8DOMConfiguration::AccessorConfiguration accessorConfiguration = {"workerExposedAttribute", V8TestInterface::workerExposedAttributeAttributeGetterCallback, V8TestInterface::workerExposedAttributeAttributeSetterCallback, nullptr, nullptr, nullptr, nullptr, static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder}; |
V8DOMConfiguration::installAccessor(isolate, world, v8::Local<v8::Object>(), prototypeObject, interfaceObject, signature, accessorConfiguration); |
@@ -2805,6 +2838,12 @@ void V8TestInterface::preparePrototypeAndInterfaceObject(v8::Local<v8::Context> |
} |
} |
if (executionContext && (executionContext->isSecureContext())) { |
+ if (RuntimeEnabledFeatures::partialFeatureNameEnabled()) { |
+ const V8DOMConfiguration::AccessorConfiguration accessorConfiguration = {"partialSecureContextLongAttribute", V8TestInterface::partialSecureContextLongAttributeAttributeGetterCallback, V8TestInterface::partialSecureContextLongAttributeAttributeSetterCallback, nullptr, nullptr, nullptr, nullptr, static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder}; |
+ V8DOMConfiguration::installAccessor(isolate, world, v8::Local<v8::Object>(), prototypeObject, interfaceObject, signature, accessorConfiguration); |
+ } |
+ } |
+ if (executionContext && (executionContext->isSecureContext())) { |
const V8DOMConfiguration::AccessorConfiguration accessorConfiguration = {"partial2SecureContextAttribute", V8TestInterface::partial2SecureContextAttributeAttributeGetterCallback, V8TestInterface::partial2SecureContextAttributeAttributeSetterCallback, nullptr, nullptr, nullptr, nullptr, static_cast<v8::PropertyAttribute>(v8::None), V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder}; |
V8DOMConfiguration::installAccessor(isolate, world, v8::Local<v8::Object>(), prototypeObject, interfaceObject, signature, accessorConfiguration); |
} |
@@ -2846,9 +2885,6 @@ void V8TestInterface::preparePrototypeAndInterfaceObject(v8::Local<v8::Context> |
} |
} |
} |
- v8::Local<v8::Signature> signature = v8::Signature::New(isolate, interfaceTemplate); |
- ExecutionContext* executionContext = toExecutionContext(prototypeObject->CreationContext()); |
- DCHECK(executionContext); |
if (executionContext && (executionContext->isWorkerGlobalScope())) { |
const V8DOMConfiguration::MethodConfiguration workerExposedMethodMethodConfiguration = {"workerExposedMethod", V8TestInterface::workerExposedMethodMethodCallback, nullptr, 0, v8::None, V8DOMConfiguration::OnPrototype, V8DOMConfiguration::CheckHolder}; |
V8DOMConfiguration::installMethod(isolate, world, v8::Local<v8::Object>(), prototypeObject, interfaceObject, signature, workerExposedMethodMethodConfiguration); |