webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 14 insertions, 189 deletions

diff --git a/Source/JavaScriptCore/runtime/CommonIdentifiers.h b/Source/JavaScriptCore/runtime/CommonIdentifiers.h
index 2ca665fc3..e8f9ed82b 100644
--- a/Source/JavaScriptCore/runtime/CommonIdentifiers.h
+++ b/Source/JavaScriptCore/runtime/CommonIdentifiers.h
@@ -21,65 +21,51 @@
 #ifndef CommonIdentifiers_h
 #define CommonIdentifiers_h
 
-#include "BytecodeIntrinsicRegistry.h"
 #include "Identifier.h"
 #include <wtf/Noncopyable.h>
 
 // MarkedArgumentBuffer of property names, passed to a macro so we can do set them up various
 // ways without repeating the list.
 #define JSC_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(macro) \
+    macro(ArgumentsIterator) \
     macro(Array) \
     macro(ArrayBuffer) \
     macro(ArrayIterator) \
     macro(BYTES_PER_ELEMENT) \
     macro(Boolean) \
-    macro(Collator) \
     macro(Date) \
-    macro(DateTimeFormat) \
     macro(Error) \
     macro(EvalError) \
     macro(Function) \
-    macro(GeneratorFunction) \
     macro(Infinity) \
-    macro(Intl) \
     macro(JSON) \
-    macro(Loader) \
     macro(Map)\
     macro(MapIterator)\
     macro(Math) \
     macro(NaN) \
     macro(Number) \
-    macro(NumberFormat) \
     macro(Object) \
     macro(Promise) \
-    macro(Proxy) \
     macro(RangeError) \
     macro(ReferenceError) \
-    macro(Reflect) \
     macro(RegExp) \
     macro(Set)\
     macro(SetIterator)\
     macro(String) \
-    macro(Symbol) \
     macro(SyntaxError) \
     macro(TypeError) \
     macro(URIError) \
     macro(UTC) \
     macro(WeakMap)\
-    macro(WeakSet)\
     macro(__defineGetter__) \
     macro(__defineSetter__) \
     macro(__lookupGetter__) \
     macro(__lookupSetter__) \
     macro(add) \
-    macro(additionalJettisonReason) \
     macro(anonymous) \
+    macro(apply) \
     macro(arguments) \
-    macro(as) \
-    macro(assign) \
-    macro(back) \
     macro(bind) \
-    macro(blur) \
     macro(buffer) \
     macro(byteLength) \
     macro(byteOffset) \
@@ -87,15 +73,11 @@
     macro(bytecodeIndex) \
     macro(bytecodes) \
     macro(bytecodesID) \
-    macro(calendar) \
+    macro(call) \
     macro(callee) \
     macro(caller) \
-    macro(caseFirst) \
+    macro(cast) \
     macro(clear) \
-    macro(close) \
-    macro(closed) \
-    macro(collation) \
-    macro(column) \
     macro(compilationKind) \
     macro(compilations) \
     macro(compile) \
@@ -103,8 +85,6 @@
     macro(constructor) \
     macro(count) \
     macro(counters) \
-    macro(day) \
-    macro(defineProperty) \
     macro(description) \
     macro(descriptions) \
     macro(displayName) \
@@ -112,54 +92,33 @@
     macro(done) \
     macro(entries) \
     macro(enumerable) \
-    macro(era) \
     macro(eval) \
     macro(exec) \
     macro(executionCount) \
     macro(exitKind) \
-    macro(flags) \
-    macro(focus) \
     macro(forEach) \
-    macro(formatMatcher) \
-    macro(forward) \
-    macro(frames) \
-    macro(from) \
     macro(fromCharCode) \
     macro(get) \
     macro(global) \
-    macro(go) \
     macro(has) \
     macro(hasOwnProperty) \
     macro(hash) \
     macro(header) \
-    macro(hour) \
-    macro(hour12) \
-    macro(href) \
     macro(id) \
     macro(ignoreCase) \
-    macro(ignorePunctuation) \
     macro(index) \
-    macro(indexedDB) \
     macro(inferredName) \
     macro(input) \
     macro(instructionCount) \
     macro(isArray) \
-    macro(isEnabled) \
     macro(isPrototypeOf) \
     macro(isView) \
     macro(isWatchpoint) \
-    macro(jettisonReason) \
     macro(join) \
     macro(keys) \
     macro(lastIndex) \
     macro(length) \
-    macro(line) \
-    macro(locale) \
-    macro(localeMatcher) \
-    macro(location) \
     macro(message) \
-    macro(minute) \
-    macro(month) \
     macro(multiline) \
     macro(name) \
     macro(next) \
@@ -167,42 +126,24 @@
     macro(numInlinedCalls) \
     macro(numInlinedGetByIds) \
     macro(numInlinedPutByIds) \
-    macro(numberingSystem) \
-    macro(numeric) \
     macro(of) \
     macro(opcode) \
-    macro(opener) \
     macro(origin) \
     macro(osrExitSites) \
     macro(osrExits) \
-    macro(parent) \
     macro(parse) \
-    macro(parseInt) \
-    macro(postMessage) \
     macro(profiledBytecodes) \
     macro(propertyIsEnumerable) \
     macro(prototype) \
-    macro(raw) \
-    macro(reload) \
-    macro(replace) \
-    macro(resolve) \
-    macro(second) \
-    macro(self) \
-    macro(sensitivity) \
     macro(set) \
-    macro(showModalDialog) \
     macro(size) \
     macro(slice) \
     macro(source) \
     macro(sourceCode) \
-    macro(sourceURL) \
     macro(stack) \
     macro(subarray) \
-    macro(target) \
     macro(test) \
     macro(then) \
-    macro(timeZone) \
-    macro(timeZoneName) \
     macro(toExponential) \
     macro(toFixed) \
     macro(toISOString) \
@@ -210,17 +151,11 @@
     macro(toLocaleString) \
     macro(toPrecision) \
     macro(toString) \
-    macro(top) \
-    macro(usage) \
     macro(value) \
-    macro(valueOf) \
     macro(values) \
-    macro(webkit) \
-    macro(webkitIndexedDB) \
-    macro(weekday) \
+    macro(valueOf) \
     macro(window) \
-    macro(writable) \
-    macro(year)
+    macro(writable)
 
 #define JSC_COMMON_IDENTIFIERS_EACH_KEYWORD(macro) \
     macro(break) \
@@ -270,129 +205,34 @@
     macro(with) \
     macro(yield)
 
-#define JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_WELL_KNOWN_SYMBOL_NOT_IMPLEMENTED_YET(macro)\
-    macro(isConcatSpreadable) \
-    macro(match) \
-    macro(replace) \
-    macro(split) \
-    macro(toPrimitive)
-
-#define JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_WELL_KNOWN_SYMBOL(macro) \
-    macro(hasInstance) \
-    macro(iterator) \
-    macro(search) \
-    macro(species) \
-    macro(toStringTag) \
-    macro(unscopables)
-
 #define JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(macro) \
-    JSC_COMMON_BYTECODE_INTRINSIC_FUNCTIONS_EACH_NAME(macro) \
-    JSC_COMMON_BYTECODE_INTRINSIC_CONSTANTS_EACH_NAME(macro) \
-    macro(iteratedObject) \
-    macro(arrayIteratorNextIndex) \
-    macro(arrayIterationKind) \
-    macro(charCodeAt) \
-    macro(iteratedString) \
-    macro(stringIteratorNextIndex) \
+    macro(iterator) \
+    macro(iteratorNext) \
+    macro(resolve) \
+    macro(reject) \
     macro(promise) \
     macro(fulfillmentHandler) \
     macro(rejectionHandler) \
     macro(index) \
     macro(values) \
     macro(deferred) \
-    macro(countdownHolder) \
-    macro(Object) \
-    macro(ownEnumerablePropertyKeys) \
-    macro(Number) \
-    macro(Array) \
-    macro(String) \
-    macro(RegExp) \
-    macro(Map) \
-    macro(Promise) \
-    macro(InternalPromise) \
-    macro(abs) \
-    macro(floor) \
-    macro(isFinite) \
-    macro(isNaN) \
-    macro(getPrototypeOf) \
-    macro(getOwnPropertyNames) \
-    macro(RangeError) \
-    macro(TypeError) \
-    macro(typedArrayLength) \
-    macro(typedArraySort) \
-    macro(BuiltinLog) \
-    macro(homeObject) \
-    macro(getTemplateObject) \
-    macro(enqueueJob) \
-    macro(handler) \
-    macro(promiseState) \
-    macro(promiseFulfillReactions) \
-    macro(promiseRejectReactions) \
-    macro(promiseResult) \
-    macro(push) \
-    macro(capabilities) \
-    macro(starDefault) \
-    macro(InspectorInstrumentation) \
-    macro(get) \
-    macro(set) \
-    macro(shift) \
-    macro(allocateTypedArray) \
-    macro(Int8Array) \
-    macro(Int16Array) \
-    macro(Int32Array) \
-    macro(Uint8Array) \
-    macro(Uint8ClampedArray) \
-    macro(Uint16Array) \
-    macro(Uint32Array) \
-    macro(Float32Array) \
-    macro(Float64Array) \
-    macro(generator) \
-    macro(generatorNext) \
-    macro(generatorState) \
-    macro(generatorFrame) \
-    macro(generatorValue) \
-    macro(generatorThis) \
-    macro(generatorResumeMode) \
-    macro(Collator) \
-    macro(DateTimeFormat) \
-    macro(NumberFormat) \
-    macro(thisTimeValue) \
-    macro(newTargetLocal) \
-    macro(derivedConstructor) \
-    macro(isBoundFunction) \
-    macro(hasInstanceBoundFunction) \
-    macro(instanceOf) \
-    macro(isSet) \
-    macro(isMap) \
-    macro(SetIterator) \
-    macro(setIteratorNext) \
-    macro(MapIterator) \
-    macro(mapIteratorNext) \
-
+    macro(countdownHolder)
 
 namespace JSC {
-    
-    class BuiltinNames;
-    
+
     class CommonIdentifiers {
         WTF_MAKE_NONCOPYABLE(CommonIdentifiers); WTF_MAKE_FAST_ALLOCATED;
     private:
         CommonIdentifiers(VM*);
-        ~CommonIdentifiers();
         friend class VM;
-        
+
     public:
-        const BuiltinNames& builtinNames() const { return *m_builtinNames; }
         const Identifier nullIdentifier;
         const Identifier emptyIdentifier;
         const Identifier underscoreProto;
         const Identifier thisIdentifier;
         const Identifier useStrictIdentifier;
-        const Identifier timesIdentifier;
-    private:
-        std::unique_ptr<BuiltinNames> m_builtinNames;
-
-    public:
+        const Identifier hasNextIdentifier;
         
 #define JSC_IDENTIFIER_DECLARE_KEYWORD_NAME_GLOBAL(name) const Identifier name##Keyword;
         JSC_COMMON_IDENTIFIERS_EACH_KEYWORD(JSC_IDENTIFIER_DECLARE_KEYWORD_NAME_GLOBAL)
@@ -405,21 +245,6 @@ namespace JSC {
 #define JSC_IDENTIFIER_DECLARE_PRIVATE_PROPERTY_NAME_GLOBAL(name) const Identifier name##PrivateName;
         JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(JSC_IDENTIFIER_DECLARE_PRIVATE_PROPERTY_NAME_GLOBAL)
 #undef JSC_IDENTIFIER_DECLARE_PRIVATE_PROPERTY_NAME_GLOBAL
-
-#define JSC_IDENTIFIER_DECLARE_PRIVATE_WELL_KNOWN_SYMBOL_GLOBAL(name) const Identifier name##Symbol;
-        JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_WELL_KNOWN_SYMBOL(JSC_IDENTIFIER_DECLARE_PRIVATE_WELL_KNOWN_SYMBOL_GLOBAL)
-#undef JSC_IDENTIFIER_DECLARE_PRIVATE_WELL_KNOWN_SYMBOL_GLOBAL
-
-        bool isPrivateName(SymbolImpl& uid) const;
-        bool isPrivateName(UniquedStringImpl& uid) const;
-        bool isPrivateName(const Identifier&) const;
-
-        const Identifier* lookUpPrivateName(const Identifier&) const;
-        Identifier lookUpPublicName(const Identifier&) const;
-
-        // Callers of this method should make sure that identifiers given to this method 
-        // survive the lifetime of CommonIdentifiers and related VM.
-        JS_EXPORT_PRIVATE void appendExternalName(const Identifier& publicName, const Identifier& privateName);
     };
 
 } // namespace JSC