Downgrade to 538.11.1 due to stability issues

Author: phoboslab

JavaScriptCore/API/JSBase.h

@@ -144,7 +144,7 @@ JS_EXPORT void JSGarbageCollect(JSContextRef ctx);
 #ifndef JSC_OBJC_API_AVAILABLE_MAC_OS_X_1080
 #define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
 #else
-#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !defined(__i386__)) || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE)))
+#define JSC_OBJC_API_ENABLED (defined(__clang__) && defined(__APPLE__) && defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 && !defined(__i386__))
 #endif
 #endif
 

JavaScriptCore/API/JSStringRef.cpp

@@ -83,7 +83,7 @@ size_t JSStringGetLength(JSStringRef string)
 
 const JSChar* JSStringGetCharactersPtr(JSStringRef string)
 {
-    return string->deprecatedCharacters();
+    return string->characters();
 }
 
 size_t JSStringGetMaximumUTF8CStringSize(JSStringRef string)
@@ -98,7 +98,7 @@ size_t JSStringGetUTF8CString(JSStringRef string, char* buffer, size_t bufferSiz
         return 0;
 
     char* p = buffer;
-    const UChar* d = string->deprecatedCharacters();
+    const UChar* d = string->characters();
     ConversionResult result = convertUTF16ToUTF8(&d, d + string->length(), &p, p + bufferSize - 1, true);
     *p++ = '\0';
     if (result != conversionOK && result != targetExhausted)
@@ -110,7 +110,7 @@ size_t JSStringGetUTF8CString(JSStringRef string, char* buffer, size_t bufferSiz
 bool JSStringIsEqual(JSStringRef a, JSStringRef b)
 {
     unsigned len = a->length();
-    return len == b->length() && 0 == memcmp(a->deprecatedCharacters(), b->deprecatedCharacters(), len * sizeof(UChar));
+    return len == b->length() && 0 == memcmp(a->characters(), b->characters(), len * sizeof(UChar));
 }
 
 bool JSStringIsEqualToUTF8CString(JSStringRef a, const char* b)

JavaScriptCore/API/JSStringRefCF.cpp

@@ -61,5 +61,5 @@ CFStringRef JSStringCopyCFString(CFAllocatorRef alloc, JSStringRef string)
     if (!string->length())
         return CFSTR("");
 
-    return CFStringCreateWithCharacters(alloc, reinterpret_cast<const UniChar*>(string->deprecatedCharacters()), string->length());
+    return CFStringCreateWithCharacters(alloc, reinterpret_cast<const UniChar*>(string->characters()), string->length());
 }

JavaScriptCore/API/JSWrapperMap.mm

@@ -98,16 +98,6 @@ - (JSObjCClassInfo*)classInfoForClass:(Class)cls;
     return result;
 }
 
-static bool constructorHasInstance(JSContextRef ctx, JSObjectRef constructorRef, JSValueRef possibleInstance, JSValueRef*)
-{
-    JSC::ExecState* exec = toJS(ctx);
-    JSC::APIEntryShim entryShim(exec);
-
-    JSC::JSObject* constructor = toJS(constructorRef);
-    JSC::JSValue instance = toJS(exec, possibleInstance);
-    return JSC::JSObject::defaultHasInstance(exec, instance, constructor->get(exec, exec->propertyNames().prototype));
-}
-
 static JSObjectRef makeWrapper(JSContextRef ctx, JSClassRef jsClass, id wrappedObject)
 {
     JSC::ExecState* exec = toJS(ctx);
@@ -136,18 +126,6 @@ static JSObjectRef makeWrapper(JSContextRef ctx, JSClassRef jsClass, id wrappedO
     return [JSValue valueWithJSValueRef:result inContext:context];
 }
 
-static JSValue *constructorWithCustomBrand(JSContext *context, NSString *brand, Class cls)
-{
-    JSClassDefinition definition;
-    definition = kJSClassDefinitionEmpty;
-    definition.className = [brand UTF8String];
-    definition.hasInstance = constructorHasInstance;
-    JSClassRef classRef = JSClassCreate(&definition);
-    JSObjectRef result = makeWrapper([context JSGlobalContextRef], classRef, cls);
-    JSClassRelease(classRef);
-    return [JSValue valueWithJSValueRef:result inContext:context];
-}
-
 // Look for @optional properties in the prototype containing a selector to property
 // name mapping, separated by a __JS_EXPORT_AS__ delimiter.
 static NSMutableDictionary *createRenameMap(Protocol *protocol, BOOL isInstanceMethod)
@@ -401,7 +379,7 @@ - (void)dealloc
 static JSValue *allocateConstructorForCustomClass(JSContext *context, const char* className, Class cls)
 {
     if (!supportsInitMethodConstructors())
-        return constructorWithCustomBrand(context, [NSString stringWithFormat:@"%sConstructor", className], cls);
+        return objectWithCustomBrand(context, [NSString stringWithFormat:@"%sConstructor", className], cls);
 
     // For each protocol that the class implements, gather all of the init family methods into a hash table.
     __block HashMap<String, Protocol *> initTable;
@@ -447,7 +425,7 @@ - (void)dealloc
         JSObjectRef method = objCCallbackFunctionForInit(context, cls, initProtocol, initMethod, types);
         return [JSValue valueWithJSValueRef:method inContext:context];
     }
-    return constructorWithCustomBrand(context, [NSString stringWithFormat:@"%sConstructor", className], cls);
+    return objectWithCustomBrand(context, [NSString stringWithFormat:@"%sConstructor", className], cls);
 }
 
 - (void)allocateConstructorAndPrototypeWithSuperClassInfo:(JSObjCClassInfo*)superClassInfo

JavaScriptCore/API/OpaqueJSString.h

@@ -53,9 +53,8 @@ struct OpaqueJSString : public ThreadSafeRefCounted<OpaqueJSString> {
 
     JS_EXPORT_PRIVATE static PassRefPtr<OpaqueJSString> create(const String&);
 
-    const UChar* characters() { return deprecatedCharacters(); } // FIXME: Delete this.
-    const UChar* deprecatedCharacters() { return this ? m_string.deprecatedCharacters() : nullptr; }
-    unsigned length() { return this ? m_string.length() : 0; }
+    const UChar* characters() { return !!this ? m_string.characters() : 0; }
+    unsigned length() { return !!this ? m_string.length() : 0; }
 
     JS_EXPORT_PRIVATE String string() const;
     JSC::Identifier identifier(JSC::VM*) const;
@@ -73,13 +72,13 @@ struct OpaqueJSString : public ThreadSafeRefCounted<OpaqueJSString> {
     }
 
     OpaqueJSString(const LChar* characters, unsigned length)
-        : m_string(characters, length)
     {
+        m_string = String(characters, length);
     }
 
     OpaqueJSString(const UChar* characters, unsigned length)
-        : m_string(characters, length)
     {
+        m_string = String(characters, length);
     }
 
     String m_string;