Remove runtime flags for symbols
https://bugs.webkit.org/show_bug.cgi?id=147246
Reviewed by Alex Christensen.
Source/JavaScriptCore:
* runtime/ArrayPrototype.cpp:
(JSC::ArrayPrototype::finishCreation):
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::init): Deleted.
* runtime/JSGlobalObject.h:
* runtime/ObjectConstructor.cpp:
(JSC::ObjectConstructor::finishCreation):
* runtime/RuntimeFlags.h:
Source/WebKit/mac:
* WebView/WebPreferencesPrivate.h:
Source/WebKit/win:
* Interfaces/IWebPreferencesPrivate.idl:
Source/WebKit2:
* UIProcess/API/C/WKPreferencesRefPrivate.h:
* UIProcess/API/Cocoa/WKPreferencesPrivate.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@187356 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/runtime/ArrayPrototype.cpp b/Source/JavaScriptCore/runtime/ArrayPrototype.cpp
index 87ceae1..3cc351b 100644
--- a/Source/JavaScriptCore/runtime/ArrayPrototype.cpp
+++ b/Source/JavaScriptCore/runtime/ArrayPrototype.cpp
@@ -119,21 +119,19 @@
JSC_BUILTIN_FUNCTION("includes", arrayPrototypeIncludesCodeGenerator, DontEnum);
JSC_BUILTIN_FUNCTION("copyWithin", arrayPrototypeCopyWithinCodeGenerator, DontEnum);
- if (!globalObject->runtimeFlags().isSymbolDisabled()) {
- JSObject* unscopables = constructEmptyObject(globalObject->globalExec(), globalObject->nullPrototypeObjectStructure());
- const char* unscopableNames[] = {
- "copyWithin",
- "entries",
- "fill",
- "find",
- "findIndex",
- "keys",
- "values"
- };
- for (const char* unscopableName : unscopableNames)
- unscopables->putDirect(vm, Identifier::fromString(&vm, unscopableName), jsBoolean(true));
- putDirectWithoutTransition(vm, vm.propertyNames->unscopablesSymbol, unscopables, DontEnum | ReadOnly);
- }
+ JSObject* unscopables = constructEmptyObject(globalObject->globalExec(), globalObject->nullPrototypeObjectStructure());
+ const char* unscopableNames[] = {
+ "copyWithin",
+ "entries",
+ "fill",
+ "find",
+ "findIndex",
+ "keys",
+ "values"
+ };
+ for (const char* unscopableName : unscopableNames)
+ unscopables->putDirect(vm, Identifier::fromString(&vm, unscopableName), jsBoolean(true));
+ putDirectWithoutTransition(vm, vm.propertyNames->unscopablesSymbol, unscopables, DontEnum | ReadOnly);
}
// ------------------------------ Array Functions ----------------------------
diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
index de72650..4104524 100644
--- a/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.cpp
@@ -418,9 +418,6 @@
FOR_EACH_SIMPLE_BUILTIN_TYPE_WITH_CONSTRUCTOR(PUT_CONSTRUCTOR_FOR_SIMPLE_TYPE)
- if (!m_runtimeFlags.isSymbolDisabled())
- putDirectWithoutTransition(vm, vm.propertyNames->Symbol, symbolConstructor, DontEnum);
-
#undef PUT_CONSTRUCTOR_FOR_SIMPLE_TYPE
PrototypeMap& prototypeMap = vm.prototypeMap;
Structure* iteratorResultStructure = prototypeMap.emptyObjectStructureForPrototype(m_objectPrototype.get(), JSFinalObject::defaultInlineCapacity());
diff --git a/Source/JavaScriptCore/runtime/JSGlobalObject.h b/Source/JavaScriptCore/runtime/JSGlobalObject.h
index eeb4d238..6e695d4 100644
--- a/Source/JavaScriptCore/runtime/JSGlobalObject.h
+++ b/Source/JavaScriptCore/runtime/JSGlobalObject.h
@@ -90,14 +90,12 @@
#define DEFINE_STANDARD_BUILTIN(macro, upperName, lowerName) macro(upperName, lowerName, lowerName, JS ## upperName, upperName)
-#define FOR_EACH_EXPERIMENTAL_BUILTIN_TYPE_WITH_CONSTRUCTOR(macro) \
- macro(Symbol, symbol, symbolObject, SymbolObject, Symbol) \
-
#define FOR_EACH_SIMPLE_BUILTIN_TYPE_WITH_CONSTRUCTOR(macro) \
macro(Set, set, set, JSSet, Set) \
macro(Map, map, map, JSMap, Map) \
macro(Date, date, date, DateInstance, Date) \
macro(String, string, stringObject, StringObject, String) \
+ macro(Symbol, symbol, symbolObject, SymbolObject, Symbol) \
macro(Boolean, boolean, booleanObject, BooleanObject, Boolean) \
macro(Number, number, numberObject, NumberObject, Number) \
macro(Error, error, error, ErrorInstance, Error) \
@@ -117,7 +115,6 @@
#define FOR_EACH_SIMPLE_BUILTIN_TYPE(macro) \
FOR_EACH_SIMPLE_BUILTIN_TYPE_WITH_CONSTRUCTOR(macro) \
- FOR_EACH_EXPERIMENTAL_BUILTIN_TYPE_WITH_CONSTRUCTOR(macro) \
#define DECLARE_SIMPLE_BUILTIN_TYPE(capitalName, lowerName, properName, instanceType, jsName) \
class JS ## capitalName; \
diff --git a/Source/JavaScriptCore/runtime/ObjectConstructor.cpp b/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
index f2e1e5a..240086f 100644
--- a/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
+++ b/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
@@ -97,9 +97,7 @@
// no. of arguments for constructor
putDirectWithoutTransition(vm, vm.propertyNames->length, jsNumber(1), ReadOnly | DontEnum | DontDelete);
- if (!globalObject->runtimeFlags().isSymbolDisabled())
- JSC_NATIVE_FUNCTION("getOwnPropertySymbols", objectConstructorGetOwnPropertySymbols, DontEnum, 1);
-
+ JSC_NATIVE_FUNCTION("getOwnPropertySymbols", objectConstructorGetOwnPropertySymbols, DontEnum, 1);
JSC_NATIVE_FUNCTION(vm.propertyNames->getPrototypeOfPrivateName, objectConstructorGetPrototypeOf, DontEnum, 1);
JSC_NATIVE_FUNCTION(vm.propertyNames->getOwnPropertyNamesPrivateName, objectConstructorGetOwnPropertyNames, DontEnum, 1);
}
diff --git a/Source/JavaScriptCore/runtime/RuntimeFlags.h b/Source/JavaScriptCore/runtime/RuntimeFlags.h
index 209d541..8cd30c6 100644
--- a/Source/JavaScriptCore/runtime/RuntimeFlags.h
+++ b/Source/JavaScriptCore/runtime/RuntimeFlags.h
@@ -31,8 +31,7 @@
namespace JSC {
// macro(name, isEnabledFlag)
-#define JSC_RUNTIME_FLAG(macro) \
- macro(SymbolDisabled, false)
+#define JSC_RUNTIME_FLAG(macro)
class RuntimeFlags {
private:
