[CachedAccessor] for window.document.

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

Index: third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.cpp
diff --git a/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.cpp b/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.cpp
index 1f7d79ad77138ed6a703d0afcebaaea6af7ebb0f..d47a5d7419c975cc444cd424df086d3a96d5bf38 100644
--- a/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.cpp
+++ b/third_party/WebKit/Source/bindings/core/v8/V8DOMConfiguration.cpp
@@ -123,6 +123,7 @@ template <class FunctionOrTemplate>
 v8::Local<FunctionOrTemplate> createAccessorFunctionOrTemplate(
     v8::Isolate*,
     v8::FunctionCallback,
+    V8DOMConfiguration::CachedAccessorCallback,
     v8::Local<v8::Value> data,
     v8::Local<v8::Signature>,
     int length);
@@ -132,13 +133,21 @@ v8::Local<v8::FunctionTemplate>
 createAccessorFunctionOrTemplate<v8::FunctionTemplate>(
     v8::Isolate* isolate,
     v8::FunctionCallback callback,
+    V8DOMConfiguration::CachedAccessorCallback cachedAccessorCallback,
     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, data, signature, length);
+    if (cachedAccessorCallback) {
+      functionTemplate = v8::FunctionTemplate::NewWithCache(
+          isolate, callback, cachedAccessorCallback(isolate), data, signature,
+          length);
+    } else {
+      functionTemplate =
+          v8::FunctionTemplate::New(isolate, callback, data, signature, length);
+    }
+
     if (!functionTemplate.IsEmpty()) {
       functionTemplate->RemovePrototype();
       functionTemplate->SetAcceptAnyReceiver(false);
@@ -151,6 +160,7 @@ template <>
 v8::Local<v8::Function> createAccessorFunctionOrTemplate<v8::Function>(
     v8::Isolate* isolate,
     v8::FunctionCallback callback,
+    V8DOMConfiguration::CachedAccessorCallback,
     v8::Local<v8::Value> data,
     v8::Local<v8::Signature> signature,
     int length) {
@@ -159,7 +169,7 @@ v8::Local<v8::Function> createAccessorFunctionOrTemplate<v8::Function>(
 
   v8::Local<v8::FunctionTemplate> functionTemplate =
       createAccessorFunctionOrTemplate<v8::FunctionTemplate>(
-          isolate, callback, data, signature, length);
+          isolate, callback, nullptr, data, signature, length);
   if (functionTemplate.IsEmpty())
     return v8::Local<v8::Function>();
 
@@ -187,12 +197,15 @@ void installAccessorInternal(
   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*.
@@ -206,10 +219,11 @@ void installAccessorInternal(
       (V8DOMConfiguration::OnInstance | V8DOMConfiguration::OnPrototype)) {
     v8::Local<FunctionOrTemplate> getter =
         createAccessorFunctionOrTemplate<FunctionOrTemplate>(
-            isolate, getterCallback, data, signature, 0);
+            isolate, getterCallback, cachedAccessorCallback, data, signature,
+            0);
     v8::Local<FunctionOrTemplate> setter =
         createAccessorFunctionOrTemplate<FunctionOrTemplate>(
-            isolate, setterCallback, data, signature, 1);
+            isolate, setterCallback, nullptr, data, signature, 1);
     if (accessor.propertyLocationConfiguration & V8DOMConfiguration::OnInstance)
       instanceOrTemplate->SetAccessorProperty(
           name, getter, setter,
@@ -229,10 +243,12 @@ void installAccessorInternal(
     // type check against a holder.
     v8::Local<FunctionOrTemplate> getter =
         createAccessorFunctionOrTemplate<FunctionOrTemplate>(
-            isolate, getterCallback, data, v8::Local<v8::Signature>(), 0);
+            isolate, getterCallback, nullptr, data, v8::Local<v8::Signature>(),

[haraken, 2016/10/20 08:22:23]

nullptr => cachedAccessorCallback?

[vogelheim, 2016/10/20 13:27:59]

Well... not sure. :-/

Since this is case is presently not used (and thus also untested), I'd prefer to
not add the 'cache' here until we actually have a use for. There's no 'hard'
reason, I'm just trying to be careful since there've been several somewhat
subtle bugs with this functionality so far.

Does this make sense?

[haraken, 2016/10/20 13:40:33]

OK, let's keep nullptr here.

+            0);
     v8::Local<FunctionOrTemplate> setter =
         createAccessorFunctionOrTemplate<FunctionOrTemplate>(
-            isolate, setterCallback, data, v8::Local<v8::Signature>(), 1);
+            isolate, setterCallback, nullptr, data, v8::Local<v8::Signature>(),
+            1);
     interfaceOrTemplate->SetAccessorProperty(
         name, getter, setter,
         static_cast<v8::PropertyAttribute>(accessor.attribute),