WebKit
diff --git a/‎Source/JavaScriptCore/API/JSRetainPtr.h‎
Lines changed: 12 additions & 3 deletions b/‎Source/JavaScriptCore/API/JSRetainPtr.h‎
Lines changed: 12 additions & 3 deletions
diff --git a/‎Source/JavaScriptCore/ChangeLog‎
Lines changed: 9 additions & 0 deletions b/‎Source/JavaScriptCore/ChangeLog‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎Tools/ChangeLog‎
Lines changed: 757 additions & 0 deletions b/‎Tools/ChangeLog‎
Lines changed: 757 additions & 0 deletions
diff --git a/‎Tools/DumpRenderTree/AccessibilityController.cpp‎
Lines changed: 10 additions & 18 deletions b/‎Tools/DumpRenderTree/AccessibilityController.cpp‎
Lines changed: 10 additions & 18 deletions
diff --git a/‎Tools/DumpRenderTree/AccessibilityController.h‎
Lines changed: 3 additions & 3 deletions b/‎Tools/DumpRenderTree/AccessibilityController.h‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎Tools/DumpRenderTree/AccessibilityUIElement.cpp‎
Lines changed: 1 addition & 1 deletion b/‎Tools/DumpRenderTree/AccessibilityUIElement.cpp‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Tools/DumpRenderTree/Bindings/CodeGeneratorDumpRenderTree.pm‎
Lines changed: 5 additions & 5 deletions b/‎Tools/DumpRenderTree/Bindings/CodeGeneratorDumpRenderTree.pm‎
Lines changed: 5 additions & 5 deletions
diff --git a/‎Tools/DumpRenderTree/GCController.cpp‎
Lines changed: 16 additions & 39 deletions b/‎Tools/DumpRenderTree/GCController.cpp‎
Lines changed: 16 additions & 39 deletions
diff --git a/‎Tools/DumpRenderTree/GCController.h‎
Lines changed: 4 additions & 10 deletions b/‎Tools/DumpRenderTree/GCController.h‎
Lines changed: 4 additions & 10 deletions
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2005-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,13 +29,16 @@
 #pragma once
 
 #include <JavaScriptCore/JSContextRef.h>
+#include <JavaScriptCore/JSObjectRef.h>
 #include <JavaScriptCore/JSStringRef.h>
 #include <algorithm>
 
-inline void JSRetain(JSStringRef string) { JSStringRetain(string); }
-inline void JSRelease(JSStringRef string) { JSStringRelease(string); }
+inline void JSRetain(JSClassRef context) { JSClassRetain(context); }
+inline void JSRelease(JSClassRef context) { JSClassRelease(context); }
 inline void JSRetain(JSGlobalContextRef context) { JSGlobalContextRetain(context); }
 inline void JSRelease(JSGlobalContextRef context) { JSGlobalContextRelease(context); }
+inline void JSRetain(JSStringRef string) { JSStringRetain(string); }
+inline void JSRelease(JSStringRef string) { JSStringRelease(string); }
 
 enum AdoptTag { Adopt };
 
@@ -74,6 +77,7 @@ template<typename T> class JSRetainPtr {
     T m_ptr { nullptr };
 };
 
+JSRetainPtr<JSClassRef> adopt(JSClassRef);
 JSRetainPtr<JSStringRef> adopt(JSStringRef);
 JSRetainPtr<JSGlobalContextRef> adopt(JSGlobalContextRef);
 
@@ -82,6 +86,11 @@ template<typename T> inline JSRetainPtr<T>::JSRetainPtr(AdoptTag, T ptr)
 {
 }
 
+inline JSRetainPtr<JSClassRef> adopt(JSClassRef o)
+{
+    return JSRetainPtr<JSClassRef>(Adopt, o);
+}
+
 inline JSRetainPtr<JSStringRef> adopt(JSStringRef o)
 {
     return JSRetainPtr<JSStringRef>(Adopt, o);
 
@@ -1,3 +1,12 @@
+2020-09-26  Darin Adler  <darin@apple.com>
+
+        Refactor test runner code to cut down on copy/paste code and long-winded repetitive idioms
+        https://bugs.webkit.org/show_bug.cgi?id=217028
+
+        Reviewed by Sam Weinig.
+
+        * API/JSRetainPtr.h: Added support for JSClassRef.
+
 2020-09-29  Yusuke Suzuki  <ysuzuki@apple.com>
 
         [JSC] Annotate JIT operation functions called from B3 etc.
 
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009, 2010 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,6 +30,7 @@
 #include "AccessibilityController.h"
 
 #include "AccessibilityUIElement.h"
+#include "JSBasics.h"
 
 // Static Value Getters
 
@@ -47,15 +48,9 @@ static JSValueRef getRootElementCallback(JSContextRef context, JSObjectRef thisO
 
 // Object Creation
 
-void AccessibilityController::makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception)
+void AccessibilityController::makeWindowObject(JSContextRef context)
 {
-    auto accessibilityControllerStr = adopt(JSStringCreateWithUTF8CString("accessibilityController"));
-    
-    JSClassRef classRef = getJSClass();
-    JSValueRef accessibilityControllerObject = JSObjectMake(context, classRef, this);
-    JSClassRelease(classRef);
-
-    JSObjectSetProperty(context, windowObject, accessibilityControllerStr.get(), accessibilityControllerObject, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, exception);
+    WTR::setGlobalObjectProperty(context, "accessibilityController", JSObjectMake(context, createJSClass().get(), this));
 }
 
 static JSValueRef logFocusEventsCallback(JSContextRef ctx, JSObjectRef, JSObjectRef thisObject, size_t, const JSValueRef[], JSValueRef*)
@@ -152,9 +147,9 @@ static JSValueRef getPlatformNameCallback(JSContextRef context, JSObjectRef this
     return JSValueMakeString(context, platformName.get());
 }
 
-JSClassRef AccessibilityController::getJSClass()
+JSRetainPtr<JSClassRef> AccessibilityController::createJSClass()
 {
-    static JSStaticFunction staticFunctions[] = {
+    static constexpr JSStaticFunction functions[] = {
         { "logFocusEvents", logFocusEventsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "logValueChangeEvents", logValueChangeEventsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "logScrollingStartEvents", logScrollingStartEventsCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
@@ -166,21 +161,18 @@ JSClassRef AccessibilityController::getJSClass()
         { "enableEnhancedAccessibility", enableEnhancedAccessibilityCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { 0, 0, 0 }
     };
-
-    static JSStaticValue staticValues[] = {
+    static constexpr JSStaticValue values[] = {
         { "focusedElement", getFocusedElementCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "rootElement", getRootElementCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "enhancedAccessibilityEnabled", getEnhancedAccessibilityEnabledCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "platformName", getPlatformNameCallback, 0, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { 0, 0, 0, 0 }
     };
-
-    static JSClassDefinition classDefinition = {
-        0, kJSClassAttributeNone, "AccessibilityController", 0, staticValues, staticFunctions,
+    static const JSClassDefinition definition = {
+        0, kJSClassAttributeNone, "AccessibilityController", 0, values, functions,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     };
-
-    return JSClassCreate(&classDefinition);
+    return adopt(JSClassCreate(&definition));
 }
 
 void AccessibilityController::resetToConsistentState()
 
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2008, 2009, 2010 Apple Inc. All Rights Reserved.
+ * Copyright (C) 2008-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -47,7 +47,7 @@ class AccessibilityController {
     AccessibilityController();
     ~AccessibilityController();
 
-    void makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception);
+    void makeWindowObject(JSContextRef);
 
     // Controller Methods - platform-independent implementations
     AccessibilityUIElement rootElement();
@@ -83,7 +83,7 @@ class AccessibilityController {
 #endif
 
 private:
-    static JSClassRef getJSClass();
+    static JSRetainPtr<JSClassRef> createJSClass();
 
 #if PLATFORM(WIN)
     HWINEVENTHOOK m_focusEventHook { nullptr };
 
@@ -206,7 +206,7 @@ static JSValueRef uiElementCountForSearchPredicateCallback(JSContextRef context,
     AccessibilityUIElement* startElement = nullptr;
     bool isDirectionNext = true;
     JSValueRef searchKey = nullptr;
-    JSRetainPtr<JSStringRef> searchText = nullptr;
+    JSRetainPtr<JSStringRef> searchText;
     bool visibleOnly = false;
     bool immediateDescendantsOnly = false;
     if (argumentCount >= 5 && argumentCount <= 6) {
 
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 Apple Inc. All rights reserved.
+# Copyright (C) 2016-2020 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -431,10 +431,10 @@ sub _platformTypeConstructor
 {
     my ($self, $type, $argumentName) = @_;
 
-    return "JSValueToNullableBoolean(context, $argumentName)" if $type->name eq "boolean" && $type->isNullable;
+    return "toOptionalBool(context, $argumentName)" if $type->name eq "boolean" && $type->isNullable;
     return "JSValueToBoolean(context, $argumentName)" if $type->name eq "boolean";
     return "$argumentName" if $type->name eq "object";
-    return "adopt(JSValueToStringCopy(context, $argumentName, nullptr))" if $$self{codeGenerator}->IsStringType($type);
+    return "createJSString(context, $argumentName)" if $$self{codeGenerator}->IsStringType($type);
     return "JSValueToNumber(context, $argumentName, nullptr)" if $$self{codeGenerator}->IsPrimitiveType($type);
     return "to" . _implementationClassName($type) . "(context, $argumentName)";
 }
@@ -472,11 +472,11 @@ sub _returnExpression
     my ($self, $returnType, $expression) = @_;
 
     return "JSValueMakeUndefined(context)" if $returnType->name eq "undefined";
-    return "JSValueMakeBooleanOrNull(context, ${expression})" if $returnType->name eq "boolean" && $returnType->isNullable;
+    return "makeValue(context, ${expression})" if $returnType->name eq "boolean" && $returnType->isNullable;
     return "JSValueMakeBoolean(context, ${expression})" if $returnType->name eq "boolean";
     return "${expression}" if $returnType->name eq "object";
     return "JSValueMakeNumber(context, ${expression})" if $$self{codeGenerator}->IsPrimitiveType($returnType);
-    return "JSValueMakeStringOrNull(context, ${expression}.get())" if $$self{codeGenerator}->IsStringType($returnType);
+    return "makeValue(context, ${expression}.get())" if $$self{codeGenerator}->IsStringType($returnType);
     return "toJS(context, WTF::getPtr(${expression}))";
 }
 
 
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007 Apple Inc. All rights reserved.
+ * Copyright (C) 2007-2020 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -29,72 +29,49 @@
 #include "config.h"
 #include "GCController.h"
 
-#include <JavaScriptCore/JSObjectRef.h>
-#include <JavaScriptCore/JSRetainPtr.h>
-
-GCController::GCController()
-{
-}
-
-GCController::~GCController()
-{
-}
+#include "JSBasics.h"
 
 // Static Functions
 
 static JSValueRef collectCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
-    GCController* controller = static_cast<GCController*>(JSObjectGetPrivate(thisObject));
-    controller->collect();
+    auto& controller = *static_cast<GCController*>(JSObjectGetPrivate(thisObject));
+    controller.collect();
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef collectOnAlternateThreadCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
-    bool waitUntilDone = false;
-    if (argumentCount > 0)
-        waitUntilDone = JSValueToBoolean(context, arguments[0]);
-
-    GCController* controller = static_cast<GCController*>(JSObjectGetPrivate(thisObject));
-    controller->collectOnAlternateThread(waitUntilDone);
-
+    auto& controller = *static_cast<GCController*>(JSObjectGetPrivate(thisObject));
+    bool waitUntilDone = argumentCount > 0 && JSValueToBoolean(context, arguments[0]);
+    controller.collectOnAlternateThread(waitUntilDone);
     return JSValueMakeUndefined(context);
 }
 
 static JSValueRef getJSObjectCountCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
 {
-    GCController* controller = static_cast<GCController*>(JSObjectGetPrivate(thisObject));
-    size_t jsObjectCount = controller->getJSObjectCount();
-
-    return JSValueMakeNumber(context, jsObjectCount);
+    auto& controller = *static_cast<GCController*>(JSObjectGetPrivate(thisObject));
+    return JSValueMakeNumber(context, controller.getJSObjectCount());
 }
 
 // Object Creation
 
-void GCController::makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception)
+void GCController::makeWindowObject(JSContextRef context)
 {
-    auto gcControllerStr = adopt(JSStringCreateWithUTF8CString("GCController"));
-
-    JSClassRef classRef = getJSClass();
-    JSValueRef gcControllerObject = JSObjectMake(context, classRef, this);
-    JSClassRelease(classRef);
-
-    JSObjectSetProperty(context, windowObject, gcControllerStr.get(), gcControllerObject, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete, exception);
+    WTR::setGlobalObjectProperty(context, "GCController", JSObjectMake(context, createJSClass().get(), this));
 }
 
-JSClassRef GCController::getJSClass()
+JSRetainPtr<JSClassRef> GCController::createJSClass()
 {
-    static JSStaticFunction staticFunctions[] = {
+    static constexpr JSStaticFunction functions[] = {
         { "collect", collectCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "collectOnAlternateThread", collectOnAlternateThreadCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "getJSObjectCount", getJSObjectCountCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { 0, 0, 0 }
     };
-
-    static JSClassDefinition classDefinition = {
-        0, kJSClassAttributeNone, "GCController", 0, 0, staticFunctions,
+    static const JSClassDefinition definition = {
+        0, kJSClassAttributeNone, "GCController", 0, 0, functions,
         0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
     };
-
-    return JSClassCreate(&classDefinition);
+    return adopt(JSClassCreate(&definition));
 }
@@ -26,27 +26,21 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef GCController_h
-#define GCController_h
+#pragma once
 
-#include <JavaScriptCore/JSObjectRef.h>
+#include <JavaScriptCore/JSRetainPtr.h>
 #include <wtf/FastMalloc.h>
 
 class GCController {
     WTF_MAKE_FAST_ALLOCATED;
 public:
-    GCController();
-    ~GCController();
-
-    void makeWindowObject(JSContextRef context, JSObjectRef windowObject, JSValueRef* exception);
+    void makeWindowObject(JSContextRef);
 
     // Controller Methods - platfrom independant implementations
     void collect() const;
     void collectOnAlternateThread(bool waitUntilDone) const;
     size_t getJSObjectCount() const;
 
 private:
-    static JSClassRef getJSClass();
+    static JSRetainPtr<JSClassRef> createJSClass();
 };
-
-#endif // GCController_h