webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 7 insertions, 47 deletions

diff --git a/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp b/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp
index 475df2586..3f5c645c0 100644
--- a/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp
+++ b/Source/JavaScriptCore/runtime/CommonIdentifiers.cpp
@@ -21,65 +21,25 @@
 #include "config.h"
 #include "CommonIdentifiers.h"
 
-#include "BuiltinNames.h"
-#include "IdentifierInlines.h"
-#include "JSCBuiltins.h"
 #include "PrivateName.h"
 
 namespace JSC {
 
-#define INITIALIZE_PROPERTY_NAME(name) , name(Identifier::fromString(vm, #name))
-#define INITIALIZE_KEYWORD(name) , name##Keyword(Identifier::fromString(vm, #name))
-#define INITIALIZE_PRIVATE_NAME(name) , name##PrivateName(m_builtinNames->name##PrivateName())
-#define INITIALIZE_SYMBOL(name) , name##Symbol(m_builtinNames->name##Symbol())
+#define INITIALIZE_PROPERTY_NAME(name) , name(vm, #name)
+#define INITIALIZE_KEYWORD(name) , name##Keyword(vm, #name)
+#define INITIALIZE_PRIVATE_NAME(name) , name##PrivateName(Identifier::from(PrivateName()))
 
 CommonIdentifiers::CommonIdentifiers(VM* vm)
     : nullIdentifier()
     , emptyIdentifier(Identifier::EmptyIdentifier)
-    , underscoreProto(Identifier::fromString(vm, "__proto__"))
-    , thisIdentifier(Identifier::fromString(vm, "this"))
-    , useStrictIdentifier(Identifier::fromString(vm, "use strict"))
-    , timesIdentifier(Identifier::fromString(vm, "*"))
-    , m_builtinNames(new BuiltinNames(vm, this))
+    , underscoreProto(vm, "__proto__")
+    , thisIdentifier(vm, "this")
+    , useStrictIdentifier(vm, "use strict")
+    , hasNextIdentifier(vm, "hasNext")
     JSC_COMMON_IDENTIFIERS_EACH_KEYWORD(INITIALIZE_KEYWORD)
     JSC_COMMON_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_PROPERTY_NAME)
     JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(INITIALIZE_PRIVATE_NAME)
-    JSC_COMMON_PRIVATE_IDENTIFIERS_EACH_WELL_KNOWN_SYMBOL(INITIALIZE_SYMBOL)
 {
 }
 
-CommonIdentifiers::~CommonIdentifiers()
-{
-}
-
-bool CommonIdentifiers::isPrivateName(SymbolImpl& uid) const
-{
-    return m_builtinNames->isPrivateName(uid);
-}
-
-bool CommonIdentifiers::isPrivateName(UniquedStringImpl& uid) const
-{
-    return m_builtinNames->isPrivateName(uid);
-}
-
-bool CommonIdentifiers::isPrivateName(const Identifier& ident) const
-{
-    return m_builtinNames->isPrivateName(ident);
-}
-
-const Identifier* CommonIdentifiers::lookUpPrivateName(const Identifier& ident) const
-{
-    return m_builtinNames->lookUpPrivateName(ident);
-}
-    
-Identifier CommonIdentifiers::lookUpPublicName(const Identifier& ident) const
-{
-    return m_builtinNames->lookUpPublicName(ident);
-}
-
-void CommonIdentifiers::appendExternalName(const Identifier& publicName, const Identifier& privateName)
-{
-    m_builtinNames->appendExternalName(publicName, privateName);
-}
-
 } // namespace JSC