Slim V8DOMConfiguration::MethodConfiguration by refactoring per-world bindings.

third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.h

 /*
  * 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 47 matching lines @@
   enum HolderCheckConfiguration : unsigned {
     CheckHolder,
     DoNotCheckHolder,
   };
 
   enum AccessCheckConfiguration : unsigned {
     CheckAccess,
     DoNotCheckAccess,
   };
 
+  // Bit field to select which worlds the member will be defined in.
+  enum WorldConfiguration : unsigned {
+    MainWorld = 1 << 0,
+    OtherWorlds = 1 << 1,

[haraken, 2017/03/17 18:16:14]

NonMainWorlds ?

[jbroman, 2017/03/17 18:32:43]

Done. I'd named it for the hypothetical possibility of us adding other kinds of
per-world bindings, but we can rename in the unlikely event that ever happens.

+    AllWorlds = MainWorld | OtherWorlds,
+  };
+
   typedef v8::Local<v8::Private> (*CachedAccessorCallback)(v8::Isolate*);
 
   // AttributeConfiguration translates into calls to SetNativeDataProperty() on
   // either the instance or the prototype ObjectTemplate, based on
   // |propertyLocationConfiguration|.
   struct AttributeConfiguration {
     AttributeConfiguration& operator=(const AttributeConfiguration&) = delete;
     DISALLOW_NEW();
     const char* const name;
     v8::AccessorNameGetterCallback getter;
@@ skipping 148 matching lines @@
 
   // MethodConfiguration translates into calls to Set() for setting up an
   // object's callbacks. It sets the method on both the FunctionTemplate or
   // the ObjectTemplate.
   struct MethodConfiguration {
     MethodConfiguration& operator=(const MethodConfiguration&) = delete;
     DISALLOW_NEW();
     v8::Local<v8::Name> methodName(v8::Isolate* isolate) const {
       return v8AtomicString(isolate, name);
     }
-    v8::FunctionCallback callbackForWorld(const DOMWrapperWorld& world) const {
-      return world.isMainWorld() && callbackForMainWorld ? callbackForMainWorld
-                                                         : callback;
-    }
 
     const char* const name;
     v8::FunctionCallback callback;
-    v8::FunctionCallback callbackForMainWorld;
     int length;
     // v8::PropertyAttribute
     unsigned attribute : 8;
     // PropertyLocationConfiguration
     unsigned propertyLocationConfiguration : 3;
     // HolderCheckConfiguration
     unsigned holderCheckConfiguration : 1;
     // AccessCheckConfiguration
     unsigned accessCheckConfiguration : 1;
+    // WorldConfiguration
+    unsigned worldConfiguration : 2;
   };
 
   struct SymbolKeyedMethodConfiguration {
     SymbolKeyedMethodConfiguration& operator=(
         const SymbolKeyedMethodConfiguration&) = delete;
     DISALLOW_NEW();
     v8::Local<v8::Name> methodName(v8::Isolate* isolate) const {
       return getSymbol(isolate);
     }
     v8::FunctionCallback callbackForWorld(const DOMWrapperWorld&) const {
@@ skipping 61 matching lines @@
   // Sets the class string of platform objects, interface prototype objects,
   // etc.  See also http://heycam.github.io/webidl/#dfn-class-string
   static void setClassString(v8::Isolate*,
                              v8::Local<v8::ObjectTemplate>,
                              const char* classString);
 };
 
 }  // namespace blink
 
 #endif  // V8DOMConfiguration_h