PrivateScriptRunner should use GetOwnPropertyDescriptor in V8 APIs

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 "config.h"
 #include "bindings/core/v8/PrivateScriptRunner.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/V8Binding.h"
@@ skipping 60 matching lines @@
 
         compilePrivateScript(isolate, className);
         compiledClass = v8::Handle<v8::Object>::Cast(installedClasses)->Get(v8String(isolate, className));
         RELEASE_ASSERT(!compiledClass.IsEmpty());
         RELEASE_ASSERT(compiledClass->IsObject());
         scriptState->perContextData()->setCompiledPrivateScript(className, compiledClass);
     }
     return v8::Handle<v8::Object>::Cast(compiledClass);
 }
 
-// FIXME: Replace this method with a V8 API for getOwnPropertyDescriptor, once V8 is rolled.
-static v8::Handle<v8::Object> getOwnPropertyDescriptor(ScriptState* scriptState, v8::Handle<v8::Object> classObject, String name)
-{
-    ASSERT(!scriptState->contextIsEmpty());
-    v8::Handle<v8::Value> object = scriptState->context()->Global()->Get(v8String(scriptState->isolate(), "Object"));
-    RELEASE_ASSERT(!object.IsEmpty());
-    RELEASE_ASSERT(object->IsObject());
-    v8::Handle<v8::Value> getOwnPropertyDescriptorFunction = v8::Handle<v8::Object>::Cast(object)->Get(v8String(scriptState->isolate(), "getOwnPropertyDescriptor"));
-    RELEASE_ASSERT(!getOwnPropertyDescriptorFunction.IsEmpty());
-    RELEASE_ASSERT(getOwnPropertyDescriptorFunction->IsFunction());
-    v8::Handle<v8::Value> argv[] = { classObject, v8String(scriptState->isolate(), name) };
-    v8::Handle<v8::Value> descriptor = V8ScriptRunner::callInternalFunction(v8::Handle<v8::Function>::Cast(getOwnPropertyDescriptorFunction), object, WTF_ARRAY_LENGTH(argv), argv, scriptState->isolate());
-    RELEASE_ASSERT(!descriptor.IsEmpty());
-    RELEASE_ASSERT(descriptor->IsObject());
-    return v8::Handle<v8::Object>::Cast(descriptor);
-}
-
 static void initializeHolderIfNeeded(ScriptState* scriptState, v8::Handle<v8::Object> classObject, v8::Handle<v8::Value> holder)
 {
     RELEASE_ASSERT(!holder.IsEmpty());
     RELEASE_ASSERT(holder->IsObject());
     v8::Handle<v8::Object> holderObject = v8::Handle<v8::Object>::Cast(holder);
     v8::Isolate* isolate = scriptState->isolate();
     v8::Handle<v8::Value> isInitialized = V8HiddenValue::getHiddenValue(isolate, holderObject, V8HiddenValue::privateScriptObjectIsInitialized(isolate));
     if (isInitialized.IsEmpty()) {
         v8::TryCatch block;
         v8::Handle<v8::Value> initializeFunction = classObject->Get(v8String(isolate, "initialize"));
@@ skipping 23 matching lines @@
     if (!scriptState->executionContext())
         return v8::Handle<v8::Value>();
 
     ScriptState::Scope scope(scriptState);
     return classObjectOfPrivateScript(scriptState, className);
 }
 
 v8::Handle<v8::Value> PrivateScriptRunner::runDOMAttributeGetter(ScriptState* scriptState, String className, String attributeName, v8::Handle<v8::Value> holder)
 {
     v8::Handle<v8::Object> classObject = classObjectOfPrivateScript(scriptState, className);
-    v8::Handle<v8::Object> descriptor = getOwnPropertyDescriptor(scriptState, classObject, attributeName);
-    v8::Handle<v8::Value> getter = descriptor->Get(v8String(scriptState->isolate(), "get"));
+    v8::Handle<v8::Value> descriptor = classObject->GetOwnPropertyDescriptor(v8String(scriptState->isolate(), attributeName));
+    if (descriptor.IsEmpty() || !descriptor->IsObject()) {
+        FATAL("Private script error: Target DOM attribute getter was not found. (Class name = %s, Attribute name = %s)\n", className.utf8().data(), attributeName.utf8().data());
+        RELEASE_ASSERT_NOT_REACHED();
+    }
+    v8::Handle<v8::Value> getter = v8::Handle<v8::Object>::Cast(descriptor)->Get(v8String(scriptState->isolate(), "get"));
     if (getter.IsEmpty() || !getter->IsFunction()) {
         FATAL("Private script error: Target DOM attribute getter was not found. (Class name = %s, Attribute name = %s)\n", className.utf8().data(), attributeName.utf8().data());
         RELEASE_ASSERT_NOT_REACHED();
     }
     initializeHolderIfNeeded(scriptState, classObject, holder);
     return V8ScriptRunner::callFunction(v8::Handle<v8::Function>::Cast(getter), scriptState->executionContext(), holder, 0, 0, scriptState->isolate());
 }
 
 void PrivateScriptRunner::runDOMAttributeSetter(ScriptState* scriptState, String className, String attributeName, v8::Handle<v8::Value> holder, v8::Handle<v8::Value> v8Value)
 {
     v8::Handle<v8::Object> classObject = classObjectOfPrivateScript(scriptState, className);
-    v8::Handle<v8::Object> descriptor = getOwnPropertyDescriptor(scriptState, classObject, attributeName);
-    v8::Handle<v8::Value> setter = descriptor->Get(v8String(scriptState->isolate(), "set"));
+    v8::Handle<v8::Value> descriptor = classObject->GetOwnPropertyDescriptor(v8String(scriptState->isolate(), attributeName));
+    if (descriptor.IsEmpty() || !descriptor->IsObject()) {
+        FATAL("Private script error: Target DOM attribute setter was not found. (Class name = %s, Attribute name = %s)\n", className.utf8().data(), attributeName.utf8().data());
+        RELEASE_ASSERT_NOT_REACHED();
+    }
+    v8::Handle<v8::Value> setter = v8::Handle<v8::Object>::Cast(descriptor)->Get(v8String(scriptState->isolate(), "set"));
     if (setter.IsEmpty() || !setter->IsFunction()) {
         FATAL("Private script error: Target DOM attribute setter was not found. (Class name = %s, Attribute name = %s)\n", className.utf8().data(), attributeName.utf8().data());
         RELEASE_ASSERT_NOT_REACHED();
     }
     initializeHolderIfNeeded(scriptState, classObject, holder);
     v8::Handle<v8::Value> argv[] = { v8Value };
     V8ScriptRunner::callFunction(v8::Handle<v8::Function>::Cast(setter), scriptState->executionContext(), holder, WTF_ARRAY_LENGTH(argv), argv, scriptState->isolate());
 }
 
 v8::Handle<v8::Value> PrivateScriptRunner::runDOMMethod(ScriptState* scriptState, String className, String methodName, v8::Handle<v8::Value> holder, int argc, v8::Handle<v8::Value> argv[])
@@ skipping 24 matching lines @@
     RELEASE_ASSERT(!message.IsEmpty() && message->IsString());
     v8::Handle<v8::Value> code = exceptionObject->Get(v8String(isolate, "code"));
     RELEASE_ASSERT(!code.IsEmpty() && code->IsInt32());
     // FIXME: Support JavaScript errors such as TypeError, RangeError and SecurityError.
     exceptionState.throwDOMException(toInt32(code), toCoreString(v8::Handle<v8::String>::Cast(message)));
     exceptionState.throwIfNeeded();
     return true;
 }
 
 } // namespace WebCore