binding: Makes PrivateScriptRunner use V8PrivateProperty instead of V8HiddenValue.

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "bindings/core/v8/PrivateScriptRunner.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8PerContextData.h"
+#include "bindings/core/v8/V8PrivateProperty.h"
 #include "bindings/core/v8/V8ScriptRunner.h"
 #include "core/PrivateScriptSources.h"
 #ifndef NDEBUG
 #include "core/PrivateScriptSourcesForTesting.h"
 #endif
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "platform/PlatformResourceLoader.h"
 
 namespace blink {
@@ skipping 161 matching lines @@
     return v8::Local<v8::Object>::Cast(compiledClass);
 }
 
 static void initializeHolderIfNeeded(ScriptState* scriptState, v8::Local<v8::Object> classObject, v8::Local<v8::Value> holder)
 {
     RELEASE_ASSERT(!holder.IsEmpty());
     RELEASE_ASSERT(holder->IsObject());
     v8::Local<v8::Object> holderObject = v8::Local<v8::Object>::Cast(holder);
     v8::Isolate* isolate = scriptState->isolate();
     v8::Local<v8::Context> context = scriptState->context();
-    v8::Local<v8::Value> isInitialized = V8HiddenValue::getHiddenValue(scriptState, holderObject, V8HiddenValue::privateScriptObjectIsInitialized(isolate));
-    if (isInitialized.IsEmpty()) {
+    auto privateIsInitialized = V8PrivateProperty::getPrivateScriptRunnerIsInitialized(isolate);
+    if (privateIsInitialized.hasValue(context, holderObject))
+        return; // Already initialized.
+
+    v8::TryCatch block(isolate);
+    v8::Local<v8::Value> initializeFunction;
+    if (classObject->Get(scriptState->context(), v8String(isolate, "initialize")).ToLocal(&initializeFunction) && initializeFunction->IsFunction()) {
         v8::TryCatch block(isolate);
-        v8::Local<v8::Value> initializeFunction;
-        if (classObject->Get(scriptState->context(), v8String(isolate, "initialize")).ToLocal(&initializeFunction) && initializeFunction->IsFunction()) {
-            v8::TryCatch block(isolate);
-            v8::Local<v8::Value> result;
-            if (!V8ScriptRunner::callFunction(v8::Local<v8::Function>::Cast(initializeFunction), scriptState->getExecutionContext(), holder, 0, 0, isolate).ToLocal(&result)) {
-                fprintf(stderr, "Private script error: Object constructor threw an exception.\n");
-                dumpV8Message(context, block.Message());
-                RELEASE_NOTREACHED();
-            }
+        v8::Local<v8::Value> result;
+        if (!V8ScriptRunner::callFunction(v8::Local<v8::Function>::Cast(initializeFunction), scriptState->getExecutionContext(), holder, 0, 0, isolate).ToLocal(&result)) {
+            fprintf(stderr, "Private script error: Object constructor threw an exception.\n");
+            dumpV8Message(context, block.Message());
+            RELEASE_NOTREACHED();
         }
+    }
 
-        // Inject the prototype object of the private script into the prototype chain of the holder object.
-        // This is necessary to let the holder object use properties defined on the prototype object
-        // of the private script. (e.g., if the prototype object has |foo|, the holder object should be able
-        // to use it with |this.foo|.)
-        if (classObject->GetPrototype() != holderObject->GetPrototype()) {
-            if (!v8CallBoolean(classObject->SetPrototype(context, holderObject->GetPrototype()))) {
-                fprintf(stderr, "Private script error: SetPrototype failed.\n");
-                dumpV8Message(context, block.Message());
-                RELEASE_NOTREACHED();
-            }
-        }
-        if (!v8CallBoolean(holderObject->SetPrototype(context, classObject))) {
+    // Inject the prototype object of the private script into the prototype chain of the holder object.
+    // This is necessary to let the holder object use properties defined on the prototype object
+    // of the private script. (e.g., if the prototype object has |foo|, the holder object should be able
+    // to use it with |this.foo|.)
+    if (classObject->GetPrototype() != holderObject->GetPrototype()) {
+        if (!v8CallBoolean(classObject->SetPrototype(context, holderObject->GetPrototype()))) {
             fprintf(stderr, "Private script error: SetPrototype failed.\n");
             dumpV8Message(context, block.Message());
             RELEASE_NOTREACHED();
         }
+    }
+    if (!v8CallBoolean(holderObject->SetPrototype(context, classObject))) {
+        fprintf(stderr, "Private script error: SetPrototype failed.\n");
+        dumpV8Message(context, block.Message());
+        RELEASE_NOTREACHED();
+    }
 
-        isInitialized = v8Boolean(true, isolate);
-        V8HiddenValue::setHiddenValue(scriptState, holderObject, V8HiddenValue::privateScriptObjectIsInitialized(isolate), isInitialized);
-    }
+    privateIsInitialized.set(context, holderObject, v8Boolean(true, isolate));
 }
 
 v8::Local<v8::Value> PrivateScriptRunner::installClassIfNeeded(Document* document, String className)
 {
     if (!document->contextDocument()->frame())
         return v8::Local<v8::Value>();
 
     v8::HandleScope handleScope(toIsolate(document));
     ScriptState* scriptState = ScriptState::forWorld(document->contextDocument()->frame(), DOMWrapperWorld::privateScriptIsolatedWorld());
     if (!scriptState)
@@ skipping 116 matching lines @@
     v8::Local<v8::Value> result;
     if (!V8ScriptRunner::callFunction(v8::Local<v8::Function>::Cast(method), scriptState->getExecutionContext(), holder, argc, argv, scriptState->isolate()).ToLocal(&result)) {
         rethrowExceptionInPrivateScript(scriptState->isolate(), block, scriptStateInUserScript, ExceptionState::ExecutionContext, methodName, className);
         block.ReThrow();
         return v8::Local<v8::Value>();
     }
     return result;
 }
 
 } // namespace blink