From 100b268a6f77cfa2d321ba025d30a61420683065 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 15 Feb 2016 02:58:02 +0200 Subject: [PATCH] JavaScriptCore cleanups Signed-off-by: Ivailo Monev --- .../javascriptcore/JavaScriptCore/API/APICast.h | 4 +- .../JavaScriptCore/API/JSBasePrivate.h | 3 +- .../JavaScriptCore/API/JSContextRef.h | 13 +- .../JavaScriptCore/API/JSContextRefPrivate.h | 1 - .../JavaScriptCore/API/JSObjectRef.h | 9 +- .../JavaScriptCore/API/WebKitAvailability.h | 764 --------------------- .../JavaScriptCore/WebKitAvailability.h | 1 - .../JavaScriptCore/JavaScriptCorePrefix.h | 35 - .../bytecompiler/BytecodeGenerator.cpp | 4 +- .../javascriptcore/JavaScriptCore/config.h | 3 - .../JavaScriptCore/interpreter/Interpreter.cpp | 16 +- .../JavaScriptCore/jit/JITPropertyAccess.cpp | 6 +- .../javascriptcore/JavaScriptCore/jit/JITStubs.cpp | 32 +- .../JavaScriptCore/runtime/GetterSetter.h | 4 +- .../JavaScriptCore/runtime/JSByteArray.h | 2 +- .../JavaScriptCore/runtime/JSString.h | 8 +- .../JavaScriptCore/runtime/JSValue.h | 8 - .../JavaScriptCore/runtime/Operations.cpp | 2 +- .../JavaScriptCore/runtime/Operations.h | 6 +- .../JavaScriptCore/runtime/Protect.h | 4 +- .../JavaScriptCore/wtf/MainThread.cpp | 1 - .../javascriptcore/JavaScriptCore/wtf/MainThread.h | 1 - .../JavaScriptCore/wtf/qt/MainThreadQt.cpp | 4 - 23 files changed, 55 insertions(+), 876 deletions(-) delete mode 100644 src/3rdparty/javascriptcore/JavaScriptCore/API/WebKitAvailability.h delete mode 100644 src/3rdparty/javascriptcore/JavaScriptCore/ForwardingHeaders/JavaScriptCore/WebKitAvailability.h delete mode 100644 src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCorePrefix.h diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/API/APICast.h b/src/3rdparty/javascriptcore/JavaScriptCore/API/APICast.h index 4284c448a..eff7db334 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/API/APICast.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/API/APICast.h @@ -112,8 +112,8 @@ inline JSValueRef toRef(JSC::ExecState* exec, JSC::JSValue v) if (!v) return 0; if (!v.isCell()) - return reinterpret_cast(asCell(JSC::jsAPIValueWrapper(exec, v))); - return reinterpret_cast(asCell(v)); + return reinterpret_cast(JSC::jsAPIValueWrapper(exec, v).asCell()); + return reinterpret_cast(v.asCell()); #else UNUSED_PARAM(exec); return reinterpret_cast(JSC::JSValue::encode(v)); diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/API/JSBasePrivate.h b/src/3rdparty/javascriptcore/JavaScriptCore/API/JSBasePrivate.h index befa31643..3c9a8d603 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/API/JSBasePrivate.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/API/JSBasePrivate.h @@ -27,7 +27,6 @@ #define JSBasePrivate_h #include -#include #ifdef __cplusplus extern "C" { @@ -43,7 +42,7 @@ owns a large non-GC memory region. Calling this function will encourage the garbage collector to collect soon, hoping to reclaim that large non-GC memory region. */ -JS_EXPORT void JSReportExtraMemoryCost(JSContextRef ctx, size_t size) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT void JSReportExtraMemoryCost(JSContextRef ctx, size_t size); #ifdef __cplusplus } diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/API/JSContextRef.h b/src/3rdparty/javascriptcore/JavaScriptCore/API/JSContextRef.h index c5c8a71e6..4bd6f31b4 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/API/JSContextRef.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/API/JSContextRef.h @@ -28,7 +28,6 @@ #include #include -#include #ifndef __cplusplus #include @@ -48,7 +47,7 @@ extern "C" { synchronization is required. @result The created JSContextGroup. */ -JS_EXPORT JSContextGroupRef JSContextGroupCreate() AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT JSContextGroupRef JSContextGroupCreate(); /*! @function @@ -56,14 +55,14 @@ JS_EXPORT JSContextGroupRef JSContextGroupCreate() AVAILABLE_IN_WEBKIT_VERSION_4 @param group The JSContextGroup to retain. @result A JSContextGroup that is the same as group. */ -JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT JSContextGroupRef JSContextGroupRetain(JSContextGroupRef group); /*! @function @abstract Releases a JavaScript context group. @param group The JSContextGroup to release. */ -JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group); /*! @function @@ -78,7 +77,7 @@ JS_EXPORT void JSContextGroupRelease(JSContextGroupRef group) AVAILABLE_IN_WEBKI NULL to use the default object class. @result A JSGlobalContext with a global object of class globalObjectClass. */ -JS_EXPORT JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass) AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER; +JS_EXPORT JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass); /*! @function @@ -92,7 +91,7 @@ JS_EXPORT JSGlobalContextRef JSGlobalContextCreate(JSClassRef globalObjectClass) @result A JSGlobalContext with a global object of class globalObjectClass and a context group equal to group. */ -JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT JSGlobalContextRef JSGlobalContextCreateInGroup(JSContextGroupRef group, JSClassRef globalObjectClass); /*! @function @@ -123,7 +122,7 @@ JS_EXPORT JSObjectRef JSContextGetGlobalObject(JSContextRef ctx); @param ctx The JSContext whose group you want to get. @result ctx's group. */ -JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT JSContextGroupRef JSContextGetGroup(JSContextRef ctx); #ifdef __cplusplus } diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/API/JSContextRefPrivate.h b/src/3rdparty/javascriptcore/JavaScriptCore/API/JSContextRefPrivate.h index ff014ec64..641b8d587 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/API/JSContextRefPrivate.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/API/JSContextRefPrivate.h @@ -28,7 +28,6 @@ #include #include -#include #ifndef __cplusplus #include diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/API/JSObjectRef.h b/src/3rdparty/javascriptcore/JavaScriptCore/API/JSObjectRef.h index 3e8b0eb62..7ff8d7843 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/API/JSObjectRef.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/API/JSObjectRef.h @@ -29,7 +29,6 @@ #include #include -#include #ifndef __cplusplus #include @@ -441,7 +440,7 @@ JS_EXPORT JSObjectRef JSObjectMakeConstructor(JSContextRef ctx, JSClassRef jsCla @discussion The behavior of this function does not exactly match the behavior of the built-in Array constructor. Specifically, if one argument is supplied, this function returns an array with one element. */ -JS_EXPORT JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception); /*! @function @@ -452,7 +451,7 @@ JS_EXPORT JSObjectRef JSObjectMakeArray(JSContextRef ctx, size_t argumentCount, @param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception. @result A JSObject that is a Date. */ -JS_EXPORT JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception); /*! @function @@ -463,7 +462,7 @@ JS_EXPORT JSObjectRef JSObjectMakeDate(JSContextRef ctx, size_t argumentCount, c @param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception. @result A JSObject that is a Error. */ -JS_EXPORT JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception); /*! @function @@ -474,7 +473,7 @@ JS_EXPORT JSObjectRef JSObjectMakeError(JSContextRef ctx, size_t argumentCount, @param exception A pointer to a JSValueRef in which to store an exception, if any. Pass NULL if you do not care to store an exception. @result A JSObject that is a RegExp. */ -JS_EXPORT JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) AVAILABLE_IN_WEBKIT_VERSION_4_0; +JS_EXPORT JSObjectRef JSObjectMakeRegExp(JSContextRef ctx, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception); /*! @function diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/API/WebKitAvailability.h b/src/3rdparty/javascriptcore/JavaScriptCore/API/WebKitAvailability.h deleted file mode 100644 index 840252831..000000000 --- a/src/3rdparty/javascriptcore/JavaScriptCore/API/WebKitAvailability.h +++ /dev/null @@ -1,764 +0,0 @@ -/* - * Copyright (C) 2008 Apple Inc. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef __WebKitAvailability__ -#define __WebKitAvailability__ - -/* The structure of this header is based on AvailabilityMacros.h. The major difference is that the availability - macros are defined in terms of WebKit version numbers rather than Mac OS X system version numbers, as WebKit - releases span multiple versions of Mac OS X. -*/ - -#define WEBKIT_VERSION_1_0 0x0100 -#define WEBKIT_VERSION_1_1 0x0110 -#define WEBKIT_VERSION_1_2 0x0120 -#define WEBKIT_VERSION_1_3 0x0130 -#define WEBKIT_VERSION_2_0 0x0200 -#define WEBKIT_VERSION_3_0 0x0300 -#define WEBKIT_VERSION_3_1 0x0310 -#define WEBKIT_VERSION_4_0 0x0400 -#define WEBKIT_VERSION_LATEST 0x9999 - -#ifdef __APPLE__ -#import -#else -/* - * For non-Mac platforms, require the newest version. - */ -#define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_LATEST -/* - * only certain compilers support __attribute__((deprecated)) - */ -#if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) - #define DEPRECATED_ATTRIBUTE __attribute__((deprecated)) -#else - #define DEPRECATED_ATTRIBUTE -#endif -#endif - -/* The versions of GCC that shipped with Xcode prior to 3.0 (GCC build number < 5400) did not support attributes on methods. - If we are building with one of these versions, we need to omit the attribute. We achieve this by wrapping the annotation - in WEBKIT_OBJC_METHOD_ANNOTATION, which will remove the annotation when an old version of GCC is in use and will otherwise - expand to the annotation. The same is needed for protocol methods. -*/ -#if defined(__APPLE_CC__) && __APPLE_CC__ < 5400 - #define WEBKIT_OBJC_METHOD_ANNOTATION(ANNOTATION) -#else - #define WEBKIT_OBJC_METHOD_ANNOTATION(ANNOTATION) ANNOTATION -#endif - - -/* If minimum WebKit version is not specified, assume the version that shipped with the target Mac OS X version */ -#ifndef WEBKIT_VERSION_MIN_REQUIRED - #if !defined(MAC_OS_X_VERSION_10_2) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_2 - #error WebKit was not available prior to Mac OS X 10.2 - #elif !defined(MAC_OS_X_VERSION_10_3) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_3 - /* WebKit 1.0 is the only version available on Mac OS X 10.2. */ - #define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_1_0 - #elif !defined(MAC_OS_X_VERSION_10_4) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4 - /* WebKit 1.1 is the version that shipped on Mac OS X 10.3. */ - #define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_1_1 - #elif !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5 - /* WebKit 2.0 is the version that shipped on Mac OS X 10.4. */ - #define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_2_0 - #elif !defined(MAC_OS_X_VERSION_10_6) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6 - /* WebKit 3.0 is the version that shipped on Mac OS X 10.5. */ - #define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_3_0 - #else - #define WEBKIT_VERSION_MIN_REQUIRED WEBKIT_VERSION_LATEST - #endif -#endif - - -/* If maximum WebKit version is not specified, assume largerof(latest, minimum) */ -#ifndef WEBKIT_VERSION_MAX_ALLOWED - #if WEBKIT_VERSION_MIN_REQUIRED > WEBKIT_VERSION_LATEST - #define WEBKIT_VERSION_MAX_ALLOWED WEBKIT_VERSION_MIN_REQUIRED - #else - #define WEBKIT_VERSION_MAX_ALLOWED WEBKIT_VERSION_LATEST - #endif -#endif - - -/* Sanity check the configured values */ -#if WEBKIT_VERSION_MAX_ALLOWED < WEBKIT_VERSION_MIN_REQUIRED - #error WEBKIT_VERSION_MAX_ALLOWED must be >= WEBKIT_VERSION_MIN_REQUIRED -#endif -#if WEBKIT_VERSION_MIN_REQUIRED < WEBKIT_VERSION_1_0 - #error WEBKIT_VERSION_MIN_REQUIRED must be >= WEBKIT_VERSION_1_0 -#endif - - - - - - -/* - * AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER - * - * Used on functions introduced in WebKit 1.0 - */ -#define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER - -/* - * AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED - * - * Used on functions introduced in WebKit 1.0, - * and deprecated in WebKit 1.0 - */ -#define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE - -/* - * DEPRECATED_IN_WEBKIT_VERSION_1_0_AND_LATER - * - * Used on types deprecated in WebKit 1.0 - */ -#define DEPRECATED_IN_WEBKIT_VERSION_1_0_AND_LATER DEPRECATED_ATTRIBUTE - - - - - - -/* - * AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER - * - * Used on declarations introduced in WebKit 1.1 - */ -#if WEBKIT_VERSION_MAX_ALLOWED < WEBKIT_VERSION_1_1 - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER UNAVAILABLE_ATTRIBUTE -#elif WEBKIT_VERSION_MIN_REQUIRED < WEBKIT_VERSION_1_1 - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER WEAK_IMPORT_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED - * - * Used on declarations introduced in WebKit 1.1, - * and deprecated in WebKit 1.1 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_1_1 - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_1 - * - * Used on declarations introduced in WebKit 1.0, - * but later deprecated in WebKit 1.1 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_1_1 - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_1 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_1 AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER -#endif - -/* - * DEPRECATED_IN_WEBKIT_VERSION_1_1_AND_LATER - * - * Used on types deprecated in WebKit 1.1 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_1_1 - #define DEPRECATED_IN_WEBKIT_VERSION_1_1_AND_LATER DEPRECATED_ATTRIBUTE -#else - #define DEPRECATED_IN_WEBKIT_VERSION_1_1_AND_LATER -#endif - - - - - - -/* - * AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER - * - * Used on declarations introduced in WebKit 1.2 - */ -#if WEBKIT_VERSION_MAX_ALLOWED < WEBKIT_VERSION_1_2 - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER UNAVAILABLE_ATTRIBUTE -#elif WEBKIT_VERSION_MIN_REQUIRED < WEBKIT_VERSION_1_2 - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER WEAK_IMPORT_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED - * - * Used on declarations introduced in WebKit 1.2, - * and deprecated in WebKit 1.2 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_1_2 - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_2 - * - * Used on declarations introduced in WebKit 1.0, - * but later deprecated in WebKit 1.2 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_1_2 - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_2 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_2 AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_2 - * - * Used on declarations introduced in WebKit 1.1, - * but later deprecated in WebKit 1.2 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_1_2 - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_2 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_2 AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER -#endif - -/* - * DEPRECATED_IN_WEBKIT_VERSION_1_2_AND_LATER - * - * Used on types deprecated in WebKit 1.2 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_1_2 - #define DEPRECATED_IN_WEBKIT_VERSION_1_2_AND_LATER DEPRECATED_ATTRIBUTE -#else - #define DEPRECATED_IN_WEBKIT_VERSION_1_2_AND_LATER -#endif - - - - - - -/* - * AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER - * - * Used on declarations introduced in WebKit 1.3 - */ -#if WEBKIT_VERSION_MAX_ALLOWED < WEBKIT_VERSION_1_3 - #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER UNAVAILABLE_ATTRIBUTE -#elif WEBKIT_VERSION_MIN_REQUIRED < WEBKIT_VERSION_1_3 - #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER WEAK_IMPORT_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED - * - * Used on declarations introduced in WebKit 1.3, - * and deprecated in WebKit 1.3 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_1_3 - #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_3 - * - * Used on declarations introduced in WebKit 1.0, - * but later deprecated in WebKit 1.3 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_1_3 - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_3 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_3 AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_3 - * - * Used on declarations introduced in WebKit 1.1, - * but later deprecated in WebKit 1.3 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_1_3 - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_3 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_3 AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_3 - * - * Used on declarations introduced in WebKit 1.2, - * but later deprecated in WebKit 1.3 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_1_3 - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_3 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_1_3 AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER -#endif - -/* - * DEPRECATED_IN_WEBKIT_VERSION_1_3_AND_LATER - * - * Used on types deprecated in WebKit 1.3 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_1_3 - #define DEPRECATED_IN_WEBKIT_VERSION_1_3_AND_LATER DEPRECATED_ATTRIBUTE -#else - #define DEPRECATED_IN_WEBKIT_VERSION_1_3_AND_LATER -#endif - - - - - - -/* - * AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER - * - * Used on declarations introduced in WebKit 2.0 - */ -#if WEBKIT_VERSION_MAX_ALLOWED < WEBKIT_VERSION_2_0 - #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER UNAVAILABLE_ATTRIBUTE -#elif WEBKIT_VERSION_MIN_REQUIRED < WEBKIT_VERSION_2_0 - #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER WEAK_IMPORT_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED - * - * Used on declarations introduced in WebKit 2.0, - * and deprecated in WebKit 2.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_2_0 - #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_2_0 - * - * Used on declarations introduced in WebKit 1.0, - * but later deprecated in WebKit 2.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_2_0 - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_2_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_2_0 AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_2_0 - * - * Used on declarations introduced in WebKit 1.1, - * but later deprecated in WebKit 2.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_2_0 - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_2_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_2_0 AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_2_0 - * - * Used on declarations introduced in WebKit 1.2, - * but later deprecated in WebKit 2.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_2_0 - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_2_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_2_0 AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_2_0 - * - * Used on declarations introduced in WebKit 1.3, - * but later deprecated in WebKit 2.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_2_0 - #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_2_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_2_0 AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER -#endif - -/* - * DEPRECATED_IN_WEBKIT_VERSION_2_0_AND_LATER - * - * Used on types deprecated in WebKit 2.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_2_0 - #define DEPRECATED_IN_WEBKIT_VERSION_2_0_AND_LATER DEPRECATED_ATTRIBUTE -#else - #define DEPRECATED_IN_WEBKIT_VERSION_2_0_AND_LATER -#endif - - - - - - -/* - * AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER - * - * Used on declarations introduced in WebKit 3.0 - */ -#if WEBKIT_VERSION_MAX_ALLOWED < WEBKIT_VERSION_3_0 - #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER UNAVAILABLE_ATTRIBUTE -#elif WEBKIT_VERSION_MIN_REQUIRED < WEBKIT_VERSION_3_0 - #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER WEAK_IMPORT_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED - * - * Used on declarations introduced in WebKit 3.0, - * and deprecated in WebKit 3.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_0 - #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 - * - * Used on declarations introduced in WebKit 1.0, - * but later deprecated in WebKit 3.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_0 - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 - * - * Used on declarations introduced in WebKit 1.1, - * but later deprecated in WebKit 3.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_0 - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 - * - * Used on declarations introduced in WebKit 1.2, - * but later deprecated in WebKit 3.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_0 - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 - * - * Used on declarations introduced in WebKit 1.3, - * but later deprecated in WebKit 3.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_0 - #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 - * - * Used on declarations introduced in WebKit 2.0, - * but later deprecated in WebKit 3.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_0 - #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_0 AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER -#endif - -/* - * DEPRECATED_IN_WEBKIT_VERSION_3_0_AND_LATER - * - * Used on types deprecated in WebKit 3.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_0 - #define DEPRECATED_IN_WEBKIT_VERSION_3_0_AND_LATER DEPRECATED_ATTRIBUTE -#else - #define DEPRECATED_IN_WEBKIT_VERSION_3_0_AND_LATER -#endif - - - - - - -/* - * AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER - * - * Used on declarations introduced in WebKit 3.1 - */ -#if WEBKIT_VERSION_MAX_ALLOWED < WEBKIT_VERSION_3_1 - #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER UNAVAILABLE_ATTRIBUTE -#elif WEBKIT_VERSION_MIN_REQUIRED < WEBKIT_VERSION_3_1 - #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER WEAK_IMPORT_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED - * - * Used on declarations introduced in WebKit 3.1, - * and deprecated in WebKit 3.1 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_1 - #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 - * - * Used on declarations introduced in WebKit 1.0, - * but later deprecated in WebKit 3.1 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_1 - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 - * - * Used on declarations introduced in WebKit 1.1, - * but later deprecated in WebKit 3.1 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_1 - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 - * - * Used on declarations introduced in WebKit 1.2, - * but later deprecated in WebKit 3.1 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_1 - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 - * - * Used on declarations introduced in WebKit 1.3, - * but later deprecated in WebKit 3.1 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_1 - #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 - * - * Used on declarations introduced in WebKit 2.0, - * but later deprecated in WebKit 3.1 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_1 - #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 - * - * Used on declarations introduced in WebKit 3.0, - * but later deprecated in WebKit 3.1 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_1 - #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_3_1 AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER -#endif - -/* - * DEPRECATED_IN_WEBKIT_VERSION_3_1_AND_LATER - * - * Used on types deprecated in WebKit 3.1 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_3_1 - #define DEPRECATED_IN_WEBKIT_VERSION_3_1_AND_LATER DEPRECATED_ATTRIBUTE -#else - #define DEPRECATED_IN_WEBKIT_VERSION_3_1_AND_LATER -#endif - - - - - - -/* - * AVAILABLE_IN_WEBKIT_VERSION_4_0 - * - * Used on declarations introduced in WebKit 4.0 - */ -#if WEBKIT_VERSION_MAX_ALLOWED < WEBKIT_VERSION_LATEST - #define AVAILABLE_IN_WEBKIT_VERSION_4_0 UNAVAILABLE_ATTRIBUTE -#elif WEBKIT_VERSION_MIN_REQUIRED < WEBKIT_VERSION_LATEST - #define AVAILABLE_IN_WEBKIT_VERSION_4_0 WEAK_IMPORT_ATTRIBUTE -#else - #define AVAILABLE_IN_WEBKIT_VERSION_4_0 -#endif - -/* - * AVAILABLE_IN_WEBKIT_VERSION_4_0_BUT_DEPRECATED - * - * Used on declarations introduced in WebKit 4.0, - * and deprecated in WebKit 4.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST - #define AVAILABLE_IN_WEBKIT_VERSION_4_0_BUT_DEPRECATED DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_IN_WEBKIT_VERSION_4_0_BUT_DEPRECATED AVAILABLE_IN_WEBKIT_VERSION_4_0 -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 - * - * Used on declarations introduced in WebKit 1.0, - * but later deprecated in WebKit 4.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 AVAILABLE_WEBKIT_VERSION_1_0_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 - * - * Used on declarations introduced in WebKit 1.1, - * but later deprecated in WebKit 4.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 AVAILABLE_WEBKIT_VERSION_1_1_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 - * - * Used on declarations introduced in WebKit 1.2, - * but later deprecated in WebKit 4.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 AVAILABLE_WEBKIT_VERSION_1_2_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 - * - * Used on declarations introduced in WebKit 1.3, - * but later deprecated in WebKit 4.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST - #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 AVAILABLE_WEBKIT_VERSION_1_3_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 - * - * Used on declarations introduced in WebKit 2.0, - * but later deprecated in WebKit 4.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST - #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 AVAILABLE_WEBKIT_VERSION_2_0_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 - * - * Used on declarations introduced in WebKit 3.0, - * but later deprecated in WebKit 4.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST - #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 AVAILABLE_WEBKIT_VERSION_3_0_AND_LATER -#endif - -/* - * AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 - * - * Used on declarations introduced in WebKit 3.1, - * but later deprecated in WebKit 4.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST - #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 DEPRECATED_ATTRIBUTE -#else - #define AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER_BUT_DEPRECATED_IN_WEBKIT_VERSION_4_0 AVAILABLE_WEBKIT_VERSION_3_1_AND_LATER -#endif - -/* - * DEPRECATED_IN_WEBKIT_VERSION_4_0 - * - * Used on types deprecated in WebKit 4.0 - */ -#if WEBKIT_VERSION_MIN_REQUIRED >= WEBKIT_VERSION_LATEST - #define DEPRECATED_IN_WEBKIT_VERSION_4_0 DEPRECATED_ATTRIBUTE -#else - #define DEPRECATED_IN_WEBKIT_VERSION_4_0 -#endif - - -#endif /* __WebKitAvailability__ */ diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ForwardingHeaders/JavaScriptCore/WebKitAvailability.h b/src/3rdparty/javascriptcore/JavaScriptCore/ForwardingHeaders/JavaScriptCore/WebKitAvailability.h deleted file mode 100644 index 0c58890bd..000000000 --- a/src/3rdparty/javascriptcore/JavaScriptCore/ForwardingHeaders/JavaScriptCore/WebKitAvailability.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCorePrefix.h b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCorePrefix.h deleted file mode 100644 index 13b21bbbe..000000000 --- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCorePrefix.h +++ /dev/null @@ -1,35 +0,0 @@ -#ifdef __cplusplus -#define NULL __null -#else -#define NULL ((void *)0) -#endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifdef __cplusplus - -#include -#include - -#endif - -#ifdef __cplusplus -#define new ("if you use new/delete make sure to include config.h at the top of the file"()) -#define delete ("if you use new/delete make sure to include config.h at the top of the file"()) -#endif - -/* Work around bug with C++ library that screws up Objective-C++ when exception support is disabled. */ -#undef try -#undef catch diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp index 64c05c72a..87890ebee 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/bytecompiler/BytecodeGenerator.cpp @@ -1112,7 +1112,7 @@ RegisterID* BytecodeGenerator::emitGetScopedVar(RegisterID* dst, size_t depth, i if (globalObject) { emitOpcode(op_get_global_var); instructions().append(dst->index()); - instructions().append(asCell(globalObject)); + instructions().append(globalObject.asCell()); instructions().append(index); return dst; } @@ -1128,7 +1128,7 @@ RegisterID* BytecodeGenerator::emitPutScopedVar(size_t depth, int index, Registe { if (globalObject) { emitOpcode(op_put_global_var); - instructions().append(asCell(globalObject)); + instructions().append(globalObject.asCell()); instructions().append(index); instructions().append(value->index()); return value; diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/config.h b/src/3rdparty/javascriptcore/JavaScriptCore/config.h index 88a619faf..1d156de5d 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/config.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/config.h @@ -53,9 +53,6 @@ #define HAVE_PTHREAD_NP_H 1 #endif -/* FIXME: if all platforms have these, do they really need #defines? */ -#define HAVE_STDINT_H 1 - #ifdef __cplusplus #undef new #undef delete diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp index 9e7eb7fc8..59f85ce6d 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/interpreter/Interpreter.cpp @@ -891,7 +891,7 @@ NEVER_INLINE void Interpreter::tryCachePutByID(CallFrame* callFrame, CodeBlock* return; } - JSCell* baseCell = asCell(baseValue); + JSCell* baseCell = baseValue.asCell(); Structure* structure = baseCell->structure(); if (structure->isUncacheableDictionary()) { @@ -981,7 +981,7 @@ NEVER_INLINE void Interpreter::tryCacheGetByID(CallFrame* callFrame, CodeBlock* return; } - Structure* structure = asCell(baseValue)->structure(); + Structure* structure = baseValue.asCell()->structure(); if (structure->isUncacheableDictionary()) { vPC[0] = getOpcode(op_get_by_id_generic); @@ -1276,7 +1276,7 @@ JSValue Interpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFi NEXT_INSTRUCTION(); } - callFrame->r(dst) = jsBoolean(!src.isCell() || !asCell(src)->structure()->typeInfo().masqueradesAsUndefined()); + callFrame->r(dst) = jsBoolean(!src.isCell() || !src.asCell()->structure()->typeInfo().masqueradesAsUndefined()); vPC += OPCODE_LENGTH(op_neq_null); NEXT_INSTRUCTION(); } @@ -2085,7 +2085,7 @@ JSValue Interpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFi JSValue baseValue = callFrame->r(base).jsValue(); if (LIKELY(baseValue.isCell())) { - JSCell* baseCell = asCell(baseValue); + JSCell* baseCell = baseValue.asCell(); Structure* structure = vPC[4].u.structure; if (LIKELY(baseCell->structure() == structure)) { @@ -2116,7 +2116,7 @@ JSValue Interpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFi JSValue baseValue = callFrame->r(base).jsValue(); if (LIKELY(baseValue.isCell())) { - JSCell* baseCell = asCell(baseValue); + JSCell* baseCell = baseValue.asCell(); Structure* structure = vPC[4].u.structure; if (LIKELY(baseCell->structure() == structure)) { @@ -2166,7 +2166,7 @@ JSValue Interpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFi JSValue baseValue = callFrame->r(base).jsValue(); if (LIKELY(baseValue.isCell())) { - JSCell* baseCell = asCell(baseValue); + JSCell* baseCell = baseValue.asCell(); Structure* structure = vPC[4].u.structure; if (LIKELY(baseCell->structure() == structure)) { @@ -2302,7 +2302,7 @@ JSValue Interpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFi JSValue baseValue = callFrame->r(base).jsValue(); if (LIKELY(baseValue.isCell())) { - JSCell* baseCell = asCell(baseValue); + JSCell* baseCell = baseValue.asCell(); Structure* oldStructure = vPC[4].u.structure; Structure* newStructure = vPC[5].u.structure; @@ -2352,7 +2352,7 @@ JSValue Interpreter::privateExecute(ExecutionFlag flag, RegisterFile* registerFi JSValue baseValue = callFrame->r(base).jsValue(); if (LIKELY(baseValue.isCell())) { - JSCell* baseCell = asCell(baseValue); + JSCell* baseCell = baseValue.asCell(); Structure* structure = vPC[4].u.structure; if (LIKELY(baseCell->structure() == structure)) { diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITPropertyAccess.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITPropertyAccess.cpp index ef95f996a..701456c06 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITPropertyAccess.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITPropertyAccess.cpp @@ -547,7 +547,7 @@ void JIT::testPrototype(Structure* structure, JumpList& failureCases) if (structure->m_prototype.isNull()) return; - failureCases.append(branchPtr(NotEqual, AbsoluteAddress(&asCell(structure->m_prototype)->m_structure), ImmPtr(asCell(structure->m_prototype)->m_structure))); + failureCases.append(branchPtr(NotEqual, AbsoluteAddress(&structure->m_prototype.asCell()->m_structure), ImmPtr(structure->m_prototype.asCell()->m_structure))); } void JIT::privateCompilePutByIdTransition(StructureStubInfo* stubInfo, Structure* oldStructure, Structure* newStructure, size_t cachedOffset, StructureChain* chain, ReturnAddressPtr returnAddress) @@ -1496,8 +1496,8 @@ void JIT::testPrototype(Structure* structure, JumpList& failureCases) if (structure->m_prototype.isNull()) return; - move(ImmPtr(&asCell(structure->m_prototype)->m_structure), regT2); - move(ImmPtr(asCell(structure->m_prototype)->m_structure), regT3); + move(ImmPtr(&structure->m_prototype.asCell()->m_structure), regT2); + move(ImmPtr(structure->m_prototype.asCell()->m_structure), regT3); failureCases.append(branchPtr(NotEqual, Address(regT2), regT3)); } diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp index 9ad6150a5..81441ae00 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/JITStubs.cpp @@ -795,7 +795,7 @@ NEVER_INLINE void JITThunks::tryCachePutByID(CallFrame* callFrame, CodeBlock* co return; } - JSCell* baseCell = asCell(baseValue); + JSCell* baseCell = baseValue.asCell(); Structure* structure = baseCell->structure(); if (structure->isUncacheableDictionary()) { @@ -863,7 +863,7 @@ NEVER_INLINE void JITThunks::tryCacheGetByID(CallFrame* callFrame, CodeBlock* co return; } - JSCell* baseCell = asCell(baseValue); + JSCell* baseCell = baseValue.asCell(); Structure* structure = baseCell->structure(); if (structure->isUncacheableDictionary()) { @@ -1316,7 +1316,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_method_check) JSObject* slotBaseObject; if (baseValue.isCell() && slot.isCacheable() - && !(structure = asCell(baseValue)->structure())->isUncacheableDictionary() + && !(structure = baseValue.asCell()->structure())->isUncacheableDictionary() && (slotBaseObject = asObject(slot.slotBase()))->getPropertySpecificValue(callFrame, ident, specific) && specific ) { @@ -1390,7 +1390,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_self_fail) if (baseValue.isCell() && slot.isCacheable() - && !asCell(baseValue)->structure()->isUncacheableDictionary() + && !baseValue.asCell()->structure()->isUncacheableDictionary() && slot.slotBase() == baseValue) { CodeBlock* codeBlock = callFrame->codeBlock(); @@ -1411,7 +1411,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_self_fail) stubInfo->u.getByIdSelfList.listSize++; } - JIT::compileGetByIdSelfList(callFrame->scopeChain()->globalData, codeBlock, stubInfo, polymorphicStructureList, listIndex, asCell(baseValue)->structure(), slot.cachedOffset()); + JIT::compileGetByIdSelfList(callFrame->scopeChain()->globalData, codeBlock, stubInfo, polymorphicStructureList, listIndex, baseValue.asCell()->structure(), slot.cachedOffset()); if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1)) ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_generic)); @@ -1462,12 +1462,12 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_proto_list) CHECK_FOR_EXCEPTION(); - if (!baseValue.isCell() || !slot.isCacheable() || asCell(baseValue)->structure()->isDictionary()) { + if (!baseValue.isCell() || !slot.isCacheable() || baseValue.asCell()->structure()->isDictionary()) { ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_fail)); return JSValue::encode(result); } - Structure* structure = asCell(baseValue)->structure(); + Structure* structure = baseValue.asCell()->structure(); CodeBlock* codeBlock = callFrame->codeBlock(); StructureStubInfo* stubInfo = &codeBlock->getStubInfo(STUB_RETURN_ADDRESS); @@ -1478,8 +1478,8 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_proto_list) if (slot.slotBase() == baseValue) ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_fail)); - else if (slot.slotBase() == asCell(baseValue)->structure()->prototypeForLookup(callFrame)) { - ASSERT(!asCell(baseValue)->structure()->isDictionary()); + else if (slot.slotBase() == baseValue.asCell()->structure()->prototypeForLookup(callFrame)) { + ASSERT(!baseValue.asCell()->structure()->isDictionary()); // Since we're accessing a prototype in a loop, it's a good bet that it // should not be treated as a dictionary. if (slotBaseObject->structure()->isDictionary()) { @@ -1495,7 +1495,7 @@ DEFINE_STUB_FUNCTION(EncodedJSValue, op_get_by_id_proto_list) if (listIndex == (POLYMORPHIC_LIST_CACHE_SIZE - 1)) ctiPatchCallByReturnAddress(codeBlock, STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_id_proto_list_full)); } else if (size_t count = normalizePrototypeChain(callFrame, baseValue, slot.slotBase(), propertyName, offset)) { - ASSERT(!asCell(baseValue)->structure()->isDictionary()); + ASSERT(!baseValue.asCell()->structure()->isDictionary()); int listIndex; PolymorphicAccessStructureList* prototypeStructureList = getPolymorphicAccessStructureListSlot(stubInfo, listIndex); @@ -2429,13 +2429,13 @@ DEFINE_STUB_FUNCTION(int, op_eq) start: if (src2.isUndefined()) { return src1.isNull() || - (src1.isCell() && asCell(src1)->structure()->typeInfo().masqueradesAsUndefined()) || + (src1.isCell() && src1.asCell()->structure()->typeInfo().masqueradesAsUndefined()) || src1.isUndefined(); } if (src2.isNull()) { return src1.isUndefined() || - (src1.isCell() && asCell(src1)->structure()->typeInfo().masqueradesAsUndefined()) || + (src1.isCell() && src1.asCell()->structure()->typeInfo().masqueradesAsUndefined()) || src1.isNull(); } @@ -2472,12 +2472,12 @@ DEFINE_STUB_FUNCTION(int, op_eq) } if (src1.isUndefined()) - return src2.isCell() && asCell(src2)->structure()->typeInfo().masqueradesAsUndefined(); + return src2.isCell() && src2.asCell()->structure()->typeInfo().masqueradesAsUndefined(); if (src1.isNull()) - return src2.isCell() && asCell(src2)->structure()->typeInfo().masqueradesAsUndefined(); + return src2.isCell() && src2.asCell()->structure()->typeInfo().masqueradesAsUndefined(); - JSCell* cell1 = asCell(src1); + JSCell* cell1 = src1.asCell(); if (cell1->isString()) { if (src2.isInt32()) @@ -2492,7 +2492,7 @@ DEFINE_STUB_FUNCTION(int, op_eq) if (src2.isFalse()) return static_cast(cell1)->value(stackFrame.callFrame).toDouble() == 0.0; - JSCell* cell2 = asCell(src2); + JSCell* cell2 = src2.asCell(); if (cell2->isString()) return static_cast(cell1)->value(stackFrame.callFrame) == static_cast(cell2)->value(stackFrame.callFrame); diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/GetterSetter.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/GetterSetter.h index 68e9ea3cc..e1d27b3d9 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/GetterSetter.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/GetterSetter.h @@ -63,8 +63,8 @@ namespace JSC { inline GetterSetter* asGetterSetter(JSValue value) { - ASSERT(asCell(value)->isGetterSetter()); - return static_cast(asCell(value)); + ASSERT(value.asCell()->isGetterSetter()); + return static_cast(value.asCell()); } diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSByteArray.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSByteArray.h index 5b7adcf88..1ca065b2a 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSByteArray.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSByteArray.h @@ -113,7 +113,7 @@ namespace JSC { JSByteArray* asByteArray(JSValue value); inline JSByteArray* asByteArray(JSValue value) { - return static_cast(asCell(value)); + return static_cast(value.asCell()); } inline bool isJSByteArray(JSGlobalData* globalData, JSValue v) { return v.isCell() && v.asCell()->vptr() == globalData->jsByteArrayVPtr; } diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSString.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSString.h index e1c6abaf9..cc7ddadd3 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSString.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSString.h @@ -325,8 +325,8 @@ namespace JSC { void appendValueInConstructAndIncrementLength(ExecState* exec, unsigned& index, JSValue v) { if (v.isString()) { - ASSERT(asCell(v)->isString()); - JSString* s = static_cast(asCell(v)); + ASSERT(v.asCell()->isString()); + JSString* s = static_cast(v.asCell()); ASSERT(s->ropeLength() == 1); appendStringInConstruct(index, s); m_stringLength += s->length(); @@ -387,8 +387,8 @@ namespace JSC { inline JSString* asString(JSValue value) { - ASSERT(asCell(value)->isString()); - return static_cast(asCell(value)); + ASSERT(value.asCell()->isString()); + return static_cast(value.asCell()); } inline JSString* jsEmptyString(JSGlobalData* globalData) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h index 4da8315fd..3d150c927 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h @@ -385,14 +385,6 @@ namespace JSC { return static_cast(val); } - // FIXME: We should deprecate this and just use JSValue::asCell() instead. - JSCell* asCell(JSValue); - - inline JSCell* asCell(JSValue value) - { - return value.asCell(); - } - ALWAYS_INLINE int32_t JSValue::toInt32(ExecState* exec) const { if (isInt32()) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Operations.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Operations.cpp index 0e1887c0f..3c9f1a21d 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Operations.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Operations.cpp @@ -92,7 +92,7 @@ bool jsIsObjectType(JSValue v) if (!v.isCell()) return v.isNull(); - JSType type = asCell(v)->structure()->typeInfo().type(); + JSType type = v.asCell()->structure()->typeInfo().type(); if (type == NumberType || type == StringType) return false; if (type == ObjectType) { diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Operations.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Operations.h index 56725f414..7ce2f2b59 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Operations.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Operations.h @@ -341,7 +341,7 @@ namespace JSC { inline size_t normalizePrototypeChain(CallFrame* callFrame, JSValue base, JSValue slotBase, const Identifier& propertyName, size_t& slotOffset) { - JSCell* cell = asCell(base); + JSCell* cell = base.asCell(); size_t count = 0; while (slotBase != cell) { @@ -353,7 +353,7 @@ namespace JSC { if (v.isNull()) return 0; - cell = asCell(v); + cell = v.asCell(); // Since we're accessing a prototype in a loop, it's a good bet that it // should not be treated as a dictionary. @@ -378,7 +378,7 @@ namespace JSC { if (v.isNull()) return count; - base = asCell(v); + base = v.asCell(); // Since we're accessing a prototype in a loop, it's a good bet that it // should not be treated as a dictionary. diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Protect.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Protect.h index c2d7f0c1c..9b98883af 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Protect.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Protect.h @@ -52,13 +52,13 @@ namespace JSC { inline void gcProtect(JSValue value) { if (value && value.isCell()) - gcProtect(asCell(value)); + gcProtect(value.asCell()); } inline void gcUnprotect(JSValue value) { if (value && value.isCell()) - gcUnprotect(asCell(value)); + gcUnprotect(value.asCell()); } // FIXME: Share more code with RefPtr template? The only differences are the ref/deref operation diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MainThread.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MainThread.cpp index 40a4ae530..2e64b16ba 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MainThread.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MainThread.cpp @@ -68,7 +68,6 @@ static FunctionQueue& functionQueue() void initializeMainThread() { mainThreadFunctionQueueMutex(); - initializeMainThreadPlatform(); } // 0.1 sec delays in UI is approximate threshold when they become noticeable. Have a limit that's half of that. diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MainThread.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MainThread.h index 11a5eb137..d1a9e5dab 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MainThread.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/MainThread.h @@ -49,7 +49,6 @@ void setMainThreadCallbacksPaused(bool paused); void initializeMainThread(); // These functions are internal to the callOnMainThread implementation. -void initializeMainThreadPlatform(); void scheduleDispatchFunctionsOnMainThread(); Mutex& mainThreadFunctionQueueMutex(); void dispatchFunctionsFromMainThread(); diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp index c19beaa29..c2d9fce4f 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/qt/MainThreadQt.cpp @@ -60,10 +60,6 @@ void MainThreadInvoker::dispatch() Q_GLOBAL_STATIC(MainThreadInvoker, webkit_main_thread_invoker) -void initializeMainThreadPlatform() -{ -} - void scheduleDispatchFunctionsOnMainThread() { QMetaObject::invokeMethod(webkit_main_thread_invoker(), "dispatch", Qt::QueuedConnection); -- 2.11.0