bindings: Introduces on_{instance,prototype,interface} in the code generator.

Source/bindings/core/v8/V8DOMConfiguration.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 18 matching lines @@
 #include "config.h"
 #include "bindings/core/v8/V8DOMConfiguration.h"
 
 #include "bindings/core/v8/V8ObjectConstructor.h"
 #include "platform/TraceEvent.h"
 
 namespace blink {
 
 namespace {
 
-void setAccessor(v8::Isolate* isolate, v8::Local<v8::Object> target, v8::Local<v8::Name> name, v8::AccessorNameGetterCallback getter, v8::AccessorNameSetterCallback setter, v8::Local<v8::Value> data, v8::AccessControl settings, v8::PropertyAttribute attribute)
-{
-    v8::Maybe<bool> result = target->SetAccessor(isolate->GetCurrentContext(), name, getter, setter, v8::MaybeLocal<v8::Value>(data), settings, attribute);
-    ASSERT_UNUSED(result, result.FromJust());
-}
-
-void setAccessor(v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> target, v8::Local<v8::Name> name, v8::AccessorNameGetterCallback getter, v8::AccessorNameSetterCallback setter, v8::Local<v8::Value> data, v8::AccessControl settings, v8::PropertyAttribute attribute)
-{
-    target->SetAccessor(name, getter, setter, data, settings, attribute);
-}
-
-template<class ObjectOrTemplate>
-void installAttributeInternal(v8::Isolate* isolate, v8::Local<ObjectOrTemplate> instanceOrTemplate, v8::Local<ObjectOrTemplate> prototypeOrTemplate, const V8DOMConfiguration::AttributeConfiguration& attribute, const DOMWrapperWorld& world)
+void installAttributeInternal(v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> instanceTemplate, v8::Local<v8::ObjectTemplate> prototypeTemplate, const V8DOMConfiguration::AttributeConfiguration& attribute, const DOMWrapperWorld& world)
 {
     if (attribute.exposeConfiguration == V8DOMConfiguration::OnlyExposedToPrivateScript
         && !world.isPrivateScriptIsolatedWorld())
         return;
 
+    v8::Local<v8::Name> name = v8AtomicString(isolate, attribute.name);
     v8::AccessorNameGetterCallback getter = attribute.getter;
     v8::AccessorNameSetterCallback setter = attribute.setter;
     if (world.isMainWorld()) {
         if (attribute.getterForMainWorld)
             getter = attribute.getterForMainWorld;
         if (attribute.setterForMainWorld)
             setter = attribute.setterForMainWorld;
     }
-    v8::Local<ObjectOrTemplate> target =
-        attribute.instanceOrPrototypeConfiguration == V8DOMConfiguration::OnPrototype ?
-        prototypeOrTemplate :
-        instanceOrTemplate;
-    setAccessor(isolate, target, v8AtomicString(isolate, attribute.name), getter, setter, v8::External::New(isolate, const_cast<WrapperTypeInfo*>(attribute.data)), attribute.settings, attribute.attribute);
+    v8::Local<v8::Value> data = v8::External::New(isolate, const_cast<WrapperTypeInfo*>(attribute.data));
+
+    if (attribute.propertyLocationConfiguration & V8DOMConfiguration::OnInstance)
+        instanceTemplate->SetAccessor(name, getter, setter, data, attribute.settings, attribute.attribute);
+    if (attribute.propertyLocationConfiguration & V8DOMConfiguration::OnPrototype)

[haraken, 2015/06/17 16:31:21]

if => else if?

[Yuki, 2015/06/18 07:44:40]

No, I'd like to make attribute.propertyLocationConfiguration bitflags, so the
member can be located on instance, prototype AND/OR interface.

For example, constants must be placed on both of prototype object and interface
object.  It's not necessarily exclusive.

+        prototypeTemplate->SetAccessor(name, getter, setter, data, attribute.settings, attribute.attribute);
+    if (attribute.propertyLocationConfiguration & V8DOMConfiguration::OnInterface)

[haraken, 2015/06/17 16:31:21]

if => else if?

+        ASSERT_NOT_REACHED();
 }
 
-v8::Local<v8::FunctionTemplate> functionOrTemplate(v8::Isolate* isolate, v8::FunctionCallback callback, const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Signature> signature, int length, v8::Local<v8::ObjectTemplate> prototypeTemplateForOverloadResolution)
+v8::Local<v8::FunctionTemplate> createAccessorFunctionTemplate(v8::Isolate* isolate, v8::FunctionCallback callback, v8::Local<v8::Value> data, v8::Local<v8::Signature> signature, int length)
 {
     v8::Local<v8::FunctionTemplate> functionTemplate;
     if (callback) {
-        functionTemplate = v8::FunctionTemplate::New(isolate, callback, v8::External::New(isolate, const_cast<WrapperTypeInfo*>(wrapperTypeInfo)), signature, length);
+        functionTemplate = v8::FunctionTemplate::New(isolate, callback, data, signature, length);
         if (!functionTemplate.IsEmpty()) {
             functionTemplate->RemovePrototype();
             functionTemplate->SetAcceptAnyReceiver(false);
         }
     }
     return functionTemplate;
 }
 
-v8::Local<v8::Function> functionOrTemplate(v8::Isolate* isolate, v8::FunctionCallback callback, const WrapperTypeInfo*, v8::Local<v8::Signature>, int length, v8::Local<v8::Object> prototypeForOverloadResolution)
-{
-    return callback ? v8::Function::New(isolate, callback, v8::Local<v8::Value>(), length) : v8::Local<v8::Function>();
-}
-
-template<class ObjectOrTemplate>
-void installAccessorInternal(v8::Isolate* isolate, v8::Local<ObjectOrTemplate> prototypeOrTemplate, v8::Local<v8::Signature> signature, const V8DOMConfiguration::AccessorConfiguration& accessor, const DOMWrapperWorld& world)
+void installAccessorInternal(v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> instanceTemplate, v8::Local<v8::ObjectTemplate> prototypeTemplate, v8::Local<v8::FunctionTemplate> interfaceTemplate, v8::Local<v8::Signature> signature, const V8DOMConfiguration::AccessorConfiguration& accessor, const DOMWrapperWorld& world)
 {
     if (accessor.exposeConfiguration == V8DOMConfiguration::OnlyExposedToPrivateScript
         && !world.isPrivateScriptIsolatedWorld())
         return;
 
+    v8::Local<v8::Name> name = v8AtomicString(isolate, accessor.name);
     v8::FunctionCallback getterCallback = accessor.getter;
     v8::FunctionCallback setterCallback = accessor.setter;
     if (world.isMainWorld()) {
         if (accessor.getterForMainWorld)
             getterCallback = accessor.getterForMainWorld;
         if (accessor.setterForMainWorld)
             setterCallback = accessor.setterForMainWorld;
     }
     // Support [LenientThis] by not specifying the signature.  V8 does not do
     // the type checking against holder if no signature is specified.  Note that
     // info.Holder() passed to callbacks will be *unsafe*.
     if (accessor.holderCheckConfiguration == V8DOMConfiguration::DoNotCheckHolder)
         signature = v8::Local<v8::Signature>();
-    prototypeOrTemplate->SetAccessorProperty(
-        v8AtomicString(isolate, accessor.name),
-        functionOrTemplate(isolate, getterCallback, accessor.data, signature, 0, prototypeOrTemplate),
-        functionOrTemplate(isolate, setterCallback, accessor.data, signature, 1, prototypeOrTemplate),
-        accessor.attribute,
-        accessor.settings);
+    v8::Local<v8::Value> data = v8::External::New(isolate, const_cast<WrapperTypeInfo*>(accessor.data));
+    v8::Local<v8::FunctionTemplate> getter = createAccessorFunctionTemplate(isolate, getterCallback, data, signature, 0);
+    v8::Local<v8::FunctionTemplate> setter = createAccessorFunctionTemplate(isolate, setterCallback, data, signature, 1);
+
+    if (accessor.propertyLocationConfiguration & V8DOMConfiguration::OnInstance)
+        instanceTemplate->SetAccessorProperty(name, getter, setter, accessor.attribute, accessor.settings);
+    if (accessor.propertyLocationConfiguration & V8DOMConfiguration::OnPrototype)

[haraken, 2015/06/17 16:31:21]

Ditto.

+        prototypeTemplate->SetAccessorProperty(name, getter, setter, accessor.attribute, accessor.settings);
+    if (accessor.propertyLocationConfiguration & V8DOMConfiguration::OnInterface)

[haraken, 2015/06/17 16:31:21]

Ditto.

+        interfaceTemplate->SetAccessorProperty(name, getter, setter, accessor.attribute, accessor.settings);

[bashi, 2015/06/18 02:16:26]

Add ASSERT()?

[Yuki, 2015/06/18 07:44:40]

Added ASSERT(accessor.propertyLocationConfiguration); to check that it never be
zero.

 }
 
 void installConstantInternal(v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> functionDescriptor, v8::Local<v8::ObjectTemplate> prototypeTemplate, const V8DOMConfiguration::ConstantConfiguration& constant)
 {
     v8::Local<v8::String> constantName = v8AtomicString(isolate, constant.name);
     v8::PropertyAttribute attributes =
         static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontDelete);
     v8::Local<v8::Primitive> value;
     switch (constant.type) {
     case V8DOMConfiguration::ConstantTypeShort:
@@ skipping 48 matching lines @@
     for (size_t i = 0; i < attributeCount; ++i)
         installAttributeInternal(isolate, instanceTemplate, prototypeTemplate, attributes[i], world);
 }
 
 void V8DOMConfiguration::installAttribute(v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> instanceTemplate, v8::Local<v8::ObjectTemplate> prototypeTemplate, const AttributeConfiguration& attribute)
 {
     const DOMWrapperWorld& world = DOMWrapperWorld::current(isolate);
     installAttributeInternal(isolate, instanceTemplate, prototypeTemplate, attribute, world);
 }
 
-void V8DOMConfiguration::installAttribute(v8::Isolate* isolate, v8::Local<v8::Object> instance, v8::Local<v8::Object> prototype, const AttributeConfiguration& attribute)
-{
-    const DOMWrapperWorld& world = DOMWrapperWorld::current(isolate);
-    installAttributeInternal(isolate, instance, prototype, attribute, world);
-}
-
-void V8DOMConfiguration::installAccessors(v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> prototypeTemplate, v8::Local<v8::Signature> signature, const AccessorConfiguration* accessors, size_t accessorCount)
+void V8DOMConfiguration::installAccessors(v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> instanceTemplate, v8::Local<v8::ObjectTemplate> prototypeTemplate, v8::Local<v8::FunctionTemplate> interfaceTemplate, v8::Local<v8::Signature> signature, const AccessorConfiguration* accessors, size_t accessorCount)
 {
     const DOMWrapperWorld& world = DOMWrapperWorld::current(isolate);
     for (size_t i = 0; i < accessorCount; ++i)
-        installAccessorInternal(isolate, prototypeTemplate, signature, accessors[i], world);
+        installAccessorInternal(isolate, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, accessors[i], world);
 }
 
-void V8DOMConfiguration::installAccessor(v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> prototypeTemplate, v8::Local<v8::Signature> signature, const AccessorConfiguration& accessor)
+void V8DOMConfiguration::installAccessor(v8::Isolate* isolate, v8::Local<v8::ObjectTemplate> instanceTemplate, v8::Local<v8::ObjectTemplate> prototypeTemplate, v8::Local<v8::FunctionTemplate> interfaceTemplate, v8::Local<v8::Signature> signature, const AccessorConfiguration& accessor)
 {
     const DOMWrapperWorld& world = DOMWrapperWorld::current(isolate);
-    installAccessorInternal(isolate, prototypeTemplate, signature, accessor, world);
-}
-
-void V8DOMConfiguration::installAccessor(v8::Isolate* isolate, v8::Local<v8::Object> prototype, const AccessorConfiguration& accessor)
-{
-    const DOMWrapperWorld& world = DOMWrapperWorld::current(isolate);
-    installAccessorInternal(isolate, prototype, v8::Local<v8::Signature>(), accessor, world);
+    installAccessorInternal(isolate, instanceTemplate, prototypeTemplate, interfaceTemplate, signature, accessor, world);
 }
 
 void V8DOMConfiguration::installConstants(v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> functionDescriptor, v8::Local<v8::ObjectTemplate> prototypeTemplate, const ConstantConfiguration* constants, size_t constantCount)
 {
     for (size_t i = 0; i < constantCount; ++i)
         installConstantInternal(isolate, functionDescriptor, prototypeTemplate, constants[i]);
 }
 
 void V8DOMConfiguration::installConstant(v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> functionDescriptor, v8::Local<v8::ObjectTemplate> prototypeTemplate, const ConstantConfiguration& constant)
 {
@@ skipping 48 matching lines @@
         // Marks the prototype object as one of native-backed objects.
         // This is needed since bug 110436 asks WebKit to tell native-initiated prototypes from pure-JS ones.
         // This doesn't mark kinds "root" classes like Node, where setting this changes prototype chain structure.
         prototypeTemplate->SetInternalFieldCount(v8PrototypeInternalFieldcount);
     }
 
     v8::Local<v8::Signature> defaultSignature = v8::Signature::New(isolate, functionDescriptor);
     if (attributeCount)
         installAttributes(isolate, instanceTemplate, prototypeTemplate, attributes, attributeCount);
     if (accessorCount)
-        installAccessors(isolate, prototypeTemplate, defaultSignature, accessors, accessorCount);
+        installAccessors(isolate, instanceTemplate, prototypeTemplate, functionDescriptor, defaultSignature, accessors, accessorCount);
     if (callbackCount)
         installMethods(isolate, prototypeTemplate, defaultSignature, static_cast<v8::PropertyAttribute>(v8::None), callbacks, callbackCount);
     return defaultSignature;
 }
 
 v8::Local<v8::FunctionTemplate> V8DOMConfiguration::domClassTemplate(v8::Isolate* isolate, WrapperTypeInfo* wrapperTypeInfo, void (*configureDOMClassTemplate)(v8::Local<v8::FunctionTemplate>, v8::Isolate*))
 {
     V8PerIsolateData* data = V8PerIsolateData::from(isolate);
     v8::Local<v8::FunctionTemplate> result = data->existingDOMTemplate(wrapperTypeInfo);
     if (!result.IsEmpty())
         return result;
 
     TRACE_EVENT_SCOPED_SAMPLING_STATE("blink", "BuildDOMTemplate");
     result = v8::FunctionTemplate::New(isolate, V8ObjectConstructor::isValidConstructorMode);
     configureDOMClassTemplate(result, isolate);
     data->setDOMTemplate(wrapperTypeInfo, result);
     return result;
 }
 
 } // namespace blink