Slim V8DOMConfiguration structs for attributes and accessors.

third_party/WebKit/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 "bindings/core/v8/V8DOMConfiguration.h"
 
 #include "bindings/core/v8/V8ObjectConstructor.h"
 #include "bindings/core/v8/V8PerContextData.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 
 namespace blink {
 
 namespace {
 
+template <class Configuration>
+bool worldConfigurationApplies(const Configuration& config,
+                               const DOMWrapperWorld& world) {
+  const auto currentWorldConfig = world.isMainWorld()
+                                      ? V8DOMConfiguration::MainWorld
+                                      : V8DOMConfiguration::NonMainWorlds;
+  return config.worldConfiguration & currentWorldConfig;
+}
+
+template <>
+bool worldConfigurationApplies(
+    const V8DOMConfiguration::SymbolKeyedMethodConfiguration&,
+    const DOMWrapperWorld&) {
+  return true;
+}
+
 void installAttributeInternal(
     v8::Isolate* isolate,
     v8::Local<v8::ObjectTemplate> instanceTemplate,
     v8::Local<v8::ObjectTemplate> prototypeTemplate,
     const V8DOMConfiguration::AttributeConfiguration& attribute,
     const DOMWrapperWorld& world) {
+  if (!worldConfigurationApplies(attribute, world))
+    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<v8::Value> data =
       v8::External::New(isolate, const_cast<WrapperTypeInfo*>(attribute.data));
 
   DCHECK(attribute.propertyLocationConfiguration);
   if (attribute.propertyLocationConfiguration &
       V8DOMConfiguration::OnInstance) {
     instanceTemplate->SetNativeDataProperty(
         name, getter, setter, data,
         static_cast<v8::PropertyAttribute>(attribute.attribute),
         v8::Local<v8::AccessorSignature>(), v8::DEFAULT);
   }
   if (attribute.propertyLocationConfiguration &
       V8DOMConfiguration::OnPrototype) {
     prototypeTemplate->SetNativeDataProperty(
         name, getter, setter, data,
         static_cast<v8::PropertyAttribute>(attribute.attribute),
         v8::Local<v8::AccessorSignature>(), v8::DEFAULT);
   }
   if (attribute.propertyLocationConfiguration & V8DOMConfiguration::OnInterface)
     NOTREACHED();
 }
 
 void installAttributeInternal(
     v8::Isolate* isolate,
     v8::Local<v8::Object> instance,
     v8::Local<v8::Object> prototype,
     const V8DOMConfiguration::AttributeConfiguration& attribute,
     const DOMWrapperWorld& world) {
+  if (!worldConfigurationApplies(attribute, world))
+    return;
   v8::Local<v8::Name> name = v8AtomicString(isolate, attribute.name);
 
   // This method is only being used for installing interfaces which are
   // enabled through origin trials. Assert here that it is being called with
   // an attribute configuration for a constructor.
   // TODO(iclelland): Relax this constraint and allow arbitrary data-type
   // properties to be added here.
   DCHECK_EQ(&v8ConstructorAttributeGetter, attribute.getter);
 
   V8PerContextData* perContextData =
@@ skipping 20 matching lines @@
 
 void installLazyDataAttributeInternal(
     v8::Isolate* isolate,
     v8::Local<v8::ObjectTemplate> instanceTemplate,
     v8::Local<v8::ObjectTemplate> prototypeTemplate,
     const V8DOMConfiguration::AttributeConfiguration& attribute,
     const DOMWrapperWorld& world) {
   v8::Local<v8::Name> name = v8AtomicString(isolate, attribute.name);
   v8::AccessorNameGetterCallback getter = attribute.getter;
   DCHECK(!attribute.setter);
-  DCHECK(!attribute.getterForMainWorld);
-  DCHECK(!attribute.setterForMainWorld);
+  DCHECK_EQ(attribute.worldConfiguration, V8DOMConfiguration::AllWorlds);
   v8::Local<v8::Value> data =
       v8::External::New(isolate, const_cast<WrapperTypeInfo*>(attribute.data));
 
   DCHECK(attribute.propertyLocationConfiguration);
   if (attribute.propertyLocationConfiguration &
       V8DOMConfiguration::OnInstance) {
     instanceTemplate->SetLazyDataProperty(
         name, getter, data,
         static_cast<v8::PropertyAttribute>(attribute.attribute));
   }
@@ skipping 70 matching lines @@
 
 template <class ObjectOrTemplate, class FunctionOrTemplate>
 void installAccessorInternal(
     v8::Isolate* isolate,
     v8::Local<ObjectOrTemplate> instanceOrTemplate,
     v8::Local<ObjectOrTemplate> prototypeOrTemplate,
     v8::Local<FunctionOrTemplate> interfaceOrTemplate,
     v8::Local<v8::Signature> signature,
     const V8DOMConfiguration::AccessorConfiguration& accessor,
     const DOMWrapperWorld& world) {
+  if (!worldConfigurationApplies(accessor, world))
+    return;
   v8::Local<v8::Name> name = v8AtomicString(isolate, accessor.name);
   v8::FunctionCallback getterCallback = accessor.getter;
   v8::FunctionCallback setterCallback = accessor.setter;
   V8DOMConfiguration::CachedAccessorCallback cachedAccessorCallback = nullptr;
   if (world.isMainWorld()) {
-    if (accessor.getterForMainWorld)
-      getterCallback = accessor.getterForMainWorld;
-    if (accessor.setterForMainWorld)
-      setterCallback = accessor.setterForMainWorld;
     cachedAccessorCallback = accessor.cachedAccessorCallback;
   }
 
   // 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>();
   v8::Local<v8::Value> data =
       v8::External::New(isolate, const_cast<WrapperTypeInfo*>(accessor.data));
@@ skipping 84 matching lines @@
   v8::Local<v8::Context> context = isolate->GetCurrentContext();
   v8::Local<v8::Name> name = v8AtomicString(isolate, constant.name);
   v8::PropertyAttribute attributes =
       static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontDelete);
   v8::Local<v8::Primitive> value = valueForConstant(isolate, constant);
   interface->DefineOwnProperty(context, name, value, attributes).ToChecked();
   prototype->DefineOwnProperty(context, name, value, attributes).ToChecked();
 }
 
 template <class Configuration>
-bool worldConfigurationApplies(const Configuration& config,
-                               const DOMWrapperWorld& world) {
-  const auto currentWorldConfig = world.isMainWorld()
-                                      ? V8DOMConfiguration::MainWorld
-                                      : V8DOMConfiguration::NonMainWorlds;
-  return config.worldConfiguration & currentWorldConfig;
-}
-
-template <>
-bool worldConfigurationApplies(
-    const V8DOMConfiguration::SymbolKeyedMethodConfiguration&,
-    const DOMWrapperWorld&) {
-  return true;
-}
-
-template <class Configuration>
 void installMethodInternal(v8::Isolate* isolate,
                            v8::Local<v8::ObjectTemplate> instanceTemplate,
                            v8::Local<v8::ObjectTemplate> prototypeTemplate,
                            v8::Local<v8::FunctionTemplate> interfaceTemplate,
                            v8::Local<v8::Signature> signature,
                            const Configuration& method,
                            const DOMWrapperWorld& world) {
   if (!worldConfigurationApplies(method, world))
     return;
 
@@ skipping 339 matching lines @@
 void V8DOMConfiguration::setClassString(
     v8::Isolate* isolate,
     v8::Local<v8::ObjectTemplate> objectTemplate,
     const char* classString) {
   objectTemplate->Set(
       v8::Symbol::GetToStringTag(isolate), v8AtomicString(isolate, classString),
       static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum));
 }
 
 }  // namespace blink