Changeset 117859 in webkit

Timestamp:

May 21, 2012 5:37:09 PM (12 years ago)

Author:

barraclough@apple.com

Message:

Add support for private names
​https://bugs.webkit.org/show_bug.cgi?id=86509

Reviewed by Oliver Hunt.

The spec isn't final, but we can start adding support to allow property maps
to contain keys that aren't identifiers.

Source/JavaScriptCore:

• API/JSCallbackObjectFunctions.h:

(JSC::::getOwnPropertySlot):
(JSC::::put):
(JSC::::deleteProperty):
(JSC::::getStaticValue):
(JSC::::staticFunctionGetter):
(JSC::::callbackGetter):

• Only expose public named properties over the JSC API.

• CMakeLists.txt:
• DerivedSources.make:
• DerivedSources.pri:
• GNUmakefile.list.am:
• JavaScriptCore.gypi:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• Target.pri:
  • Added new files to build system.
• dfg/DFGOperations.cpp:

(JSC::DFG::operationPutByValInternal):

• Added support for property access with name objects.

• interpreter/CallFrame.h:

(JSC::ExecState::privateNamePrototypeTable):

• Added hash table for NamePrototype

• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• Added support for property access with name objects.

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• Added support for property access with name objects.

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::getByVal):
(JSC::LLInt::LLINT_SLOW_PATH_DECL):

• runtime/CommonSlowPaths.h:

(JSC::CommonSlowPaths::opIn):

• runtime/JSActivation.cpp:

(JSC::JSActivation::symbolTableGet):
(JSC::JSActivation::symbolTablePut):
(JSC::JSActivation::symbolTablePutWithAttributes):

• Added support for property access with name objects.

• runtime/JSGlobalData.cpp:

(JSC):
(JSC::JSGlobalData::JSGlobalData):
(JSC::JSGlobalData::~JSGlobalData):

• runtime/JSGlobalData.h:

(JSGlobalData):

• Added hash table for NamePrototype

• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::reset):

• runtime/JSGlobalObject.h:

(JSGlobalObject):
(JSC::JSGlobalObject::privateNameStructure):
(JSC::JSGlobalObject::symbolTableHasProperty):

• Added new global properties.

• runtime/JSType.h:
• runtime/JSTypeInfo.h:

(JSC::TypeInfo::isName):

• Added type for NameInstances, for fast isName check.

• runtime/JSVariableObject.cpp:

(JSC::JSVariableObject::deleteProperty):
(JSC::JSVariableObject::symbolTableGet):

• runtime/JSVariableObject.h:

(JSC::JSVariableObject::symbolTableGet):
(JSC::JSVariableObject::symbolTablePut):
(JSC::JSVariableObject::symbolTablePutWithAttributes):

• symbol table lookup should take a PropertyName.

• runtime/Lookup.cpp:

(JSC::setUpStaticFunctionSlot):

• runtime/Lookup.h:

(JSC::HashTable::entry):

• entry lookup should take a PropertyName.

• runtime/NameConstructor.cpp: Added.

(JSC):
(JSC::NameConstructor::NameConstructor):
(JSC::NameConstructor::finishCreation):
(JSC::constructPrivateName):
(JSC::NameConstructor::getConstructData):
(JSC::NameConstructor::getCallData):

• runtime/NameConstructor.h: Added.

(JSC):
(NameConstructor):
(JSC::NameConstructor::create):
(JSC::NameConstructor::createStructure):

• Added constructor.

• runtime/NameInstance.cpp: Added.

(JSC):
(JSC::NameInstance::NameInstance):
(JSC::NameInstance::destroy):

• runtime/NameInstance.h: Added.

(JSC):
(NameInstance):
(JSC::NameInstance::createStructure):
(JSC::NameInstance::create):
(JSC::NameInstance::privateName):
(JSC::NameInstance::nameString):
(JSC::NameInstance::finishCreation):
(JSC::isName):

• Added instance.

• runtime/NamePrototype.cpp: Added.

(JSC):
(JSC::NamePrototype::NamePrototype):
(JSC::NamePrototype::finishCreation):
(JSC::NamePrototype::getOwnPropertySlot):
(JSC::NamePrototype::getOwnPropertyDescriptor):
(JSC::privateNameProtoFuncToString):

• runtime/NamePrototype.h: Added.

(JSC):
(NamePrototype):
(JSC::NamePrototype::create):
(JSC::NamePrototype::createStructure):

• Added prototype.

• runtime/PrivateName.h: Added.

(JSC):
(PrivateName):
(JSC::PrivateName::PrivateName):
(JSC::PrivateName::uid):

• A private name object holds a StringImpl that can be used as a unique key in a property map.

• runtime/PropertyMapHashTable.h:

(JSC::PropertyTable::find):
(JSC::PropertyTable::findWithString):

• Strings should only match keys in the table that are identifiers.

• runtime/PropertyName.h:

(JSC::PropertyName::PropertyName):
(PropertyName):
(JSC::PropertyName::uid):
(JSC::PropertyName::publicName):
(JSC::PropertyName::asIndex):
(JSC::operator==):
(JSC::operator!=):

• replaced impl() & ustring() with uid() [to get the raw impl] and publicName() [impl or null, if not an identifier].

• runtime/Structure.cpp:

(JSC::Structure::despecifyDictionaryFunction):
(JSC::Structure::addPropertyTransitionToExistingStructure):
(JSC::Structure::addPropertyTransition):
(JSC::Structure::attributeChangeTransition):
(JSC::Structure::get):
(JSC::Structure::despecifyFunction):
(JSC::Structure::putSpecificValue):
(JSC::Structure::remove):
(JSC::Structure::getPropertyNamesFromStructure):

• runtime/Structure.h:

(JSC::Structure::get):

• call uid() to get a PropertyName raw impl, for use as a key.

Source/WebCore:

Test: fast/js/names.html

• bindings/js/JSCSSStyleDeclarationCustom.cpp:

(WebCore::cssPropertyIDForJSCSSPropertyName):

• bindings/js/JSDOMBinding.cpp:

(WebCore::findAtomicString):
(WebCore::objectToStringFunctionGetter):

• bindings/js/JSDOMBinding.h:

(WebCore::propertyNameToString):
(WebCore::propertyNameToAtomicString):

• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::nonCachingStaticFunctionGetter):

• bindings/js/JSHistoryCustom.cpp:

(WebCore::nonCachingStaticBackFunctionGetter):
(WebCore::nonCachingStaticForwardFunctionGetter):
(WebCore::nonCachingStaticGoFunctionGetter):

• bindings/js/JSLocationCustom.cpp:

(WebCore::nonCachingStaticReplaceFunctionGetter):
(WebCore::nonCachingStaticReloadFunctionGetter):
(WebCore::nonCachingStaticAssignFunctionGetter):

• bridge/c/c_class.cpp:

(JSC::Bindings::CClass::methodsNamed):
(JSC::Bindings::CClass::fieldNamed):

• bridge/c/c_instance.cpp:

(JSC::Bindings::CInstance::getMethod):

• bridge/jni/jsc/JavaClassJSC.cpp:

(JavaClass::methodsNamed):
(JavaClass::fieldNamed):

• bridge/jni/jsc/JavaInstanceJSC.cpp:
• bridge/objc/objc_class.mm:

(JSC::Bindings::ObjcClass::methodsNamed):
(JSC::Bindings::ObjcClass::fieldNamed):
(JSC::Bindings::ObjcClass::fallbackObject):

• bridge/objc/objc_instance.mm:

(ObjcInstance::setValueOfUndefinedField):
(ObjcInstance::getValueOfUndefinedField):

• Removed PropertyName::impl(), call publicName() to get the string associated with a name.

Source/WebKit/mac:

• Plugins/Hosted/ProxyInstance.mm:

(WebKit::ProxyClass::methodsNamed):
(WebKit::ProxyClass::fieldNamed):
(WebKit::ProxyInstance::getMethod):
(WebKit::ProxyInstance::methodsNamed):
(WebKit::ProxyInstance::fieldNamed):

• Removed PropertyName::impl(), call publicName() to get the string associated with a name.

Source/WebKit2:

• WebProcess/Plugins/Netscape/JSNPObject.cpp:

(WebKit::npIdentifierFromIdentifier):
(WebKit::JSNPObject::methodGetter):

• Removed PropertyName::impl(), call publicName() to get the string associated with a name.

Source/WTF:

• wtf/text/StringImpl.h:

(WTF::StringImpl::StringImpl):
(StringImpl):
(WTF::StringImpl::createEmptyUnique):
(WTF::StringImpl::isEmptyUnique):

• Allow empty string impls to be allocated, which can be used as unique keys.

LayoutTests:

• fast/js/names-expected.txt: Added.
• fast/js/names.html: Added.
• fast/js/script-tests/names.js: Added.
  • Added test cases.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/names-expected.txt (added)
• LayoutTests/fast/js/names.html (added)
• LayoutTests/fast/js/script-tests/names.js (added)
• LayoutTests/platform/chromium/test_expectations.txt (modified) (1 diff)
• Source/JavaScriptCore/API/JSCallbackObjectFunctions.h (modified) (6 diffs)
• Source/JavaScriptCore/CMakeLists.txt (modified) (2 diffs)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/DerivedSources.make (modified) (1 diff)
• Source/JavaScriptCore/DerivedSources.pri (modified) (1 diff)
• Source/JavaScriptCore/GNUmakefile.list.am (modified) (2 diffs)
• Source/JavaScriptCore/JavaScriptCore.gypi (modified) (3 diffs)
• Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj (modified) (2 diffs)
• Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (modified) (11 diffs)
• Source/JavaScriptCore/Target.pri (modified) (1 diff)
• Source/JavaScriptCore/dfg/DFGOperations.cpp (modified) (4 diffs)
• Source/JavaScriptCore/interpreter/CallFrame.h (modified) (1 diff)
• Source/JavaScriptCore/interpreter/Interpreter.cpp (modified) (5 diffs)
• Source/JavaScriptCore/jit/JITStubs.cpp (modified) (6 diffs)
• Source/JavaScriptCore/llint/LLIntSlowPaths.cpp (modified) (3 diffs)
• Source/JavaScriptCore/runtime/CommonSlowPaths.h (modified) (2 diffs)
• Source/JavaScriptCore/runtime/JSActivation.cpp (modified) (3 diffs)
• Source/JavaScriptCore/runtime/JSGlobalData.cpp (modified) (4 diffs)
• Source/JavaScriptCore/runtime/JSGlobalData.h (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSGlobalObject.cpp (modified) (5 diffs)
• Source/JavaScriptCore/runtime/JSGlobalObject.h (modified) (3 diffs)
• Source/JavaScriptCore/runtime/JSType.h (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSTypeInfo.h (modified) (1 diff)
• Source/JavaScriptCore/runtime/JSVariableObject.cpp (modified) (2 diffs)
• Source/JavaScriptCore/runtime/JSVariableObject.h (modified) (4 diffs)
• Source/JavaScriptCore/runtime/Lookup.cpp (modified) (1 diff)
• Source/JavaScriptCore/runtime/Lookup.h (modified) (2 diffs)
• Source/JavaScriptCore/runtime/NameConstructor.cpp (added)
• Source/JavaScriptCore/runtime/NameConstructor.h (added)
• Source/JavaScriptCore/runtime/NameInstance.cpp (added)
• Source/JavaScriptCore/runtime/NameInstance.h (added)
• Source/JavaScriptCore/runtime/NamePrototype.cpp (added)
• Source/JavaScriptCore/runtime/NamePrototype.h (added)
• Source/JavaScriptCore/runtime/PrivateName.h (added)
• Source/JavaScriptCore/runtime/PropertyMapHashTable.h (modified) (2 diffs)
• Source/JavaScriptCore/runtime/PropertyName.h (modified) (3 diffs)
• Source/JavaScriptCore/runtime/Structure.cpp (modified) (10 diffs)
• Source/JavaScriptCore/runtime/Structure.h (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/text/StringImpl.h (modified) (4 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp (modified) (1 diff)
• Source/WebCore/bindings/js/JSDOMBinding.cpp (modified) (2 diffs)
• Source/WebCore/bindings/js/JSDOMBinding.h (modified) (2 diffs)
• Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (modified) (1 diff)
• Source/WebCore/bindings/js/JSHistoryCustom.cpp (modified) (1 diff)
• Source/WebCore/bindings/js/JSLocationCustom.cpp (modified) (1 diff)
• Source/WebCore/bridge/c/c_class.cpp (modified) (2 diffs)
• Source/WebCore/bridge/c/c_instance.cpp (modified) (1 diff)
• Source/WebCore/bridge/jni/jsc/JavaClassJSC.cpp (modified) (2 diffs)
• Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp (modified) (1 diff)
• Source/WebCore/bridge/objc/objc_class.mm (modified) (7 diffs)
• Source/WebCore/bridge/objc/objc_instance.mm (modified) (5 diffs)
• Source/WebCore/bridge/qt/qt_class.cpp (modified) (2 diffs)
• Source/WebCore/bridge/qt/qt_instance.cpp (modified) (1 diff)
• Source/WebCore/bridge/qt/qt_pixmapruntime.cpp (modified) (3 diffs)
• Source/WebCore/bridge/qt/qt_runtime.cpp (modified) (2 diffs)
• Source/WebCore/bridge/qt/qt_runtime_qt4.cpp (modified) (2 diffs)
• Source/WebKit/mac/ChangeLog (modified) (1 diff)
• Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm (modified) (7 diffs)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-05-15  Gavin Barraclough  <barraclough@apple.com>
+
+        Add support for private names
+        https://bugs.webkit.org/show_bug.cgi?id=86509
+
+        Reviewed by Oliver Hunt.
+
+        The spec isn't final, but we can start adding support to allow property maps
+        to contain keys that aren't identifiers.
+
+        * fast/js/names-expected.txt: Added.
+        * fast/js/names.html: Added.
+        * fast/js/script-tests/names.js: Added.
+            - Added test cases.
+
 2012-05-21  Emil A Eklund  <eae@chromium.org>
 

trunk/LayoutTests/platform/chromium/test_expectations.txt

@@ -1437 +1437 @@
 BUGWK78657 : fast/js/constructor-length.html = FAIL
 
+// This is JSC-only, preliminary implementation of a ES6 feature - doesn't exist in V8 (yet)
+BUGWK86509 SKIP WONTFIX : fast/js/names.html = FAIL
+
 // Linux pixeltest failure: The text suggests that the radios should not
 // overlap, but it's very close and quite different from the Windows version

trunk/Source/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -130 +130 @@
     RefPtr<OpaqueJSString> propertyNameRef;
     
-    for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
-        // optional optimization to bypass getProperty in cases when we only need to know if the property exists
-        if (JSObjectHasPropertyCallback hasProperty = jsClass->hasProperty) {
-            if (!propertyNameRef)
-                propertyNameRef = OpaqueJSString::create(propertyName.ustring());
-            APICallbackShim callbackShim(exec);
-            if (hasProperty(ctx, thisRef, propertyNameRef.get())) {
-                slot.setCustom(thisObject, callbackGetter);
-                return true;
-            }
-        } else if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
-            if (!propertyNameRef)
-                propertyNameRef = OpaqueJSString::create(propertyName.ustring());
-            JSValueRef exception = 0;
-            JSValueRef value;
-            {
+    if (StringImpl* name = propertyName.publicName()) {
+        for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
+            // optional optimization to bypass getProperty in cases when we only need to know if the property exists
+            if (JSObjectHasPropertyCallback hasProperty = jsClass->hasProperty) {
+                if (!propertyNameRef)
+                    propertyNameRef = OpaqueJSString::create(name);
                 APICallbackShim callbackShim(exec);
-                value = getProperty(ctx, thisRef, propertyNameRef.get(), &exception);
-            }
-            if (exception) {
-                throwError(exec, toJS(exec, exception));
-                slot.setValue(jsUndefined());
-                return true;
-            }
-            if (value) {
-                slot.setValue(toJS(exec, value));
-                return true;
-            }
-        }
-        
-        if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
-            if (staticValues->contains(propertyName.impl())) {
-                JSValue value = thisObject->getStaticValue(exec, propertyName);
+                if (hasProperty(ctx, thisRef, propertyNameRef.get())) {
+                    slot.setCustom(thisObject, callbackGetter);
+                    return true;
+                }
+            } else if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
+                if (!propertyNameRef)
+                    propertyNameRef = OpaqueJSString::create(name);
+                JSValueRef exception = 0;
+                JSValueRef value;
+                {
+                    APICallbackShim callbackShim(exec);
+                    value = getProperty(ctx, thisRef, propertyNameRef.get(), &exception);
+                }
+                if (exception) {
+                    throwError(exec, toJS(exec, exception));
+                    slot.setValue(jsUndefined());
+                    return true;
+                }
                 if (value) {
-                    slot.setValue(value);
+                    slot.setValue(toJS(exec, value));
                     return true;
                 }
             }
-        }
-        
-        if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
-            if (staticFunctions->contains(propertyName.impl())) {
-                slot.setCustom(thisObject, staticFunctionGetter);
-                return true;
-            }
-        }
-    }
-    
+            
+            if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
+                if (staticValues->contains(name)) {
+                    JSValue value = thisObject->getStaticValue(exec, propertyName);
+                    if (value) {
+                        slot.setValue(value);
+                        return true;
+                    }
+                }
+            }
+            
+            if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
+                if (staticFunctions->contains(name)) {
+                    slot.setCustom(thisObject, staticFunctionGetter);
+                    return true;
+                }
+            }
+        }
+    }
+
     return Parent::getOwnPropertySlot(thisObject, exec, propertyName, slot);
 }
@@ -234 +236 @@
     JSValueRef valueRef = toRef(exec, value);
     
-    for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
-        if (JSObjectSetPropertyCallback setProperty = jsClass->setProperty) {
-            if (!propertyNameRef)
-                propertyNameRef = OpaqueJSString::create(propertyName.ustring());
-            JSValueRef exception = 0;
-            bool result;
-            {
-                APICallbackShim callbackShim(exec);
-                result = setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, &exception);
-            }
-            if (exception)
-                throwError(exec, toJS(exec, exception));
-            if (result || exception)
-                return;
-        }
-        
-        if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
-            if (StaticValueEntry* entry = staticValues->get(propertyName.impl())) {
-                if (entry->attributes & kJSPropertyAttributeReadOnly)
+    if (StringImpl* name = propertyName.publicName()) {
+        for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
+            if (JSObjectSetPropertyCallback setProperty = jsClass->setProperty) {
+                if (!propertyNameRef)
+                    propertyNameRef = OpaqueJSString::create(name);
+                JSValueRef exception = 0;
+                bool result;
+                {
+                    APICallbackShim callbackShim(exec);
+                    result = setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, &exception);
+                }
+                if (exception)
+                    throwError(exec, toJS(exec, exception));
+                if (result || exception)
                     return;
-                if (JSObjectSetPropertyCallback setProperty = entry->setProperty) {
-                    if (!propertyNameRef)
-                        propertyNameRef = OpaqueJSString::create(propertyName.ustring());
-                    JSValueRef exception = 0;
-                    bool result;
-                    {
-                        APICallbackShim callbackShim(exec);
-                        result = setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, &exception);
+            }
+            
+            if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
+                if (StaticValueEntry* entry = staticValues->get(name)) {
+                    if (entry->attributes & kJSPropertyAttributeReadOnly)
+                        return;
+                    if (JSObjectSetPropertyCallback setProperty = entry->setProperty) {
+                        if (!propertyNameRef)
+                            propertyNameRef = OpaqueJSString::create(name);
+                        JSValueRef exception = 0;
+                        bool result;
+                        {
+                            APICallbackShim callbackShim(exec);
+                            result = setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, &exception);
+                        }
+                        if (exception)
+                            throwError(exec, toJS(exec, exception));
+                        if (result || exception)
+                            return;
                     }
-                    if (exception)
-                        throwError(exec, toJS(exec, exception));
-                    if (result || exception)
+                }
+            }
+            
+            if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
+                if (StaticFunctionEntry* entry = staticFunctions->get(name)) {
+                    if (entry->attributes & kJSPropertyAttributeReadOnly)
                         return;
-                }
-            }
-        }
-        
-        if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
-            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.impl())) {
-                if (entry->attributes & kJSPropertyAttributeReadOnly)
+                    thisObject->JSCallbackObject<Parent>::putDirect(exec->globalData(), propertyName, value); // put as override property
                     return;
-                thisObject->JSCallbackObject<Parent>::putDirect(exec->globalData(), propertyName, value); // put as override property
-                return;
-            }
-        }
-    }
-    
+                }
+            }
+        }
+    }
+
     return Parent::put(thisObject, exec, propertyName, value, slot);
 }
@@ -292 +296 @@
     RefPtr<OpaqueJSString> propertyNameRef;
     
-    for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
-        if (JSObjectDeletePropertyCallback deleteProperty = jsClass->deleteProperty) {
-            if (!propertyNameRef)
-                propertyNameRef = OpaqueJSString::create(propertyName.ustring());
-            JSValueRef exception = 0;
-            bool result;
-            {
-                APICallbackShim callbackShim(exec);
-                result = deleteProperty(ctx, thisRef, propertyNameRef.get(), &exception);
-            }
-            if (exception)
-                throwError(exec, toJS(exec, exception));
-            if (result || exception)
-                return true;
-        }
-        
-        if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
-            if (StaticValueEntry* entry = staticValues->get(propertyName.impl())) {
-                if (entry->attributes & kJSPropertyAttributeDontDelete)
-                    return false;
-                return true;
-            }
-        }
-        
-        if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
-            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.impl())) {
-                if (entry->attributes & kJSPropertyAttributeDontDelete)
-                    return false;
-                return true;
-            }
-        }
-    }
-    
+    if (StringImpl* name = propertyName.publicName()) {
+        for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
+            if (JSObjectDeletePropertyCallback deleteProperty = jsClass->deleteProperty) {
+                if (!propertyNameRef)
+                    propertyNameRef = OpaqueJSString::create(name);
+                JSValueRef exception = 0;
+                bool result;
+                {
+                    APICallbackShim callbackShim(exec);
+                    result = deleteProperty(ctx, thisRef, propertyNameRef.get(), &exception);
+                }
+                if (exception)
+                    throwError(exec, toJS(exec, exception));
+                if (result || exception)
+                    return true;
+            }
+            
+            if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
+                if (StaticValueEntry* entry = staticValues->get(name)) {
+                    if (entry->attributes & kJSPropertyAttributeDontDelete)
+                        return false;
+                    return true;
+                }
+            }
+            
+            if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
+                if (StaticFunctionEntry* entry = staticFunctions->get(name)) {
+                    if (entry->attributes & kJSPropertyAttributeDontDelete)
+                        return false;
+                    return true;
+                }
+            }
+        }
+    }
+
     return Parent::deleteProperty(thisObject, exec, propertyName);
 }
@@ -510 +516 @@
     RefPtr<OpaqueJSString> propertyNameRef;
     
-    for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass)
-        if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec))
-            if (StaticValueEntry* entry = staticValues->get(propertyName.impl()))
-                if (JSObjectGetPropertyCallback getProperty = entry->getProperty) {
-                    if (!propertyNameRef)
-                        propertyNameRef = OpaqueJSString::create(propertyName.ustring());
-                    JSValueRef exception = 0;
-                    JSValueRef value;
-                    {
-                        APICallbackShim callbackShim(exec);
-                        value = getProperty(toRef(exec), thisRef, propertyNameRef.get(), &exception);
+    if (StringImpl* name = propertyName.publicName()) {
+        for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
+            if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
+                if (StaticValueEntry* entry = staticValues->get(name)) {
+                    if (JSObjectGetPropertyCallback getProperty = entry->getProperty) {
+                        if (!propertyNameRef)
+                            propertyNameRef = OpaqueJSString::create(name);
+                        JSValueRef exception = 0;
+                        JSValueRef value;
+                        {
+                            APICallbackShim callbackShim(exec);
+                            value = getProperty(toRef(exec), thisRef, propertyNameRef.get(), &exception);
+                        }
+                        if (exception) {
+                            throwError(exec, toJS(exec, exception));
+                            return jsUndefined();
+                        }
+                        if (value)
+                            return toJS(exec, value);
                     }
-                    if (exception) {
-                        throwError(exec, toJS(exec, exception));
-                        return jsUndefined();
-                    }
-                    if (value)
-                        return toJS(exec, value);
-                }
+                }
+            }
+        }
+    }
 
     return JSValue();
@@ -543 +554 @@
         return slot2.getValue(exec, propertyName);
     
-    for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass) {
-        if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
-            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.impl())) {
-                if (JSObjectCallAsFunctionCallback callAsFunction = entry->callAsFunction) {
-                    
-                    JSObject* o = JSCallbackFunction::create(exec, thisObj->globalObject(), callAsFunction, propertyName.ustring());
-                    thisObj->putDirect(exec->globalData(), propertyName, o, entry->attributes);
-                    return o;
-                }
-            }
-        }
-    }
-    
+    if (StringImpl* name = propertyName.publicName()) {
+        for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass) {
+            if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
+                if (StaticFunctionEntry* entry = staticFunctions->get(name)) {
+                    if (JSObjectCallAsFunctionCallback callAsFunction = entry->callAsFunction) {
+                        
+                        JSObject* o = JSCallbackFunction::create(exec, thisObj->globalObject(), callAsFunction, name);
+                        thisObj->putDirect(exec->globalData(), propertyName, o, entry->attributes);
+                        return o;
+                    }
+                }
+            }
+        }
+    }
+
     return throwError(exec, createReferenceError(exec, "Static function property defined with NULL callAsFunction callback."));
 }
@@ -567 +580 @@
     RefPtr<OpaqueJSString> propertyNameRef;
     
-    for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass)
-        if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
-            if (!propertyNameRef)
-                propertyNameRef = OpaqueJSString::create(propertyName.ustring());
-            JSValueRef exception = 0;
-            JSValueRef value;
-            {
-                APICallbackShim callbackShim(exec);
-                value = getProperty(toRef(exec), thisRef, propertyNameRef.get(), &exception);
-            }
-            if (exception) {
-                throwError(exec, toJS(exec, exception));
-                return jsUndefined();
-            }
-            if (value)
-                return toJS(exec, value);
-        }
-            
+    if (StringImpl* name = propertyName.publicName()) {
+        for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass) {
+            if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
+                if (!propertyNameRef)
+                    propertyNameRef = OpaqueJSString::create(name);
+                JSValueRef exception = 0;
+                JSValueRef value;
+                {
+                    APICallbackShim callbackShim(exec);
+                    value = getProperty(toRef(exec), thisRef, propertyNameRef.get(), &exception);
+                }
+                if (exception) {
+                    throwError(exec, toJS(exec, exception));
+                    return jsUndefined();
+                }
+                if (value)
+                    return toJS(exec, value);
+            }
+        }
+    }
+
     return throwError(exec, createReferenceError(exec, "hasProperty callback returned true for a property that doesn't exist."));
 }

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -193 +193 @@
     runtime/Lookup.cpp
     runtime/MathObject.cpp
+    runtime/NameConstructor.cpp
+    runtime/NameConstructor.h
+    runtime/NameInstance.cpp
+    runtime/NameInstance.h
+    runtime/NamePrototype.cpp
+    runtime/NamePrototype.h
     runtime/NativeErrorConstructor.cpp
     runtime/NativeErrorPrototype.cpp
@@ -244 +250 @@
     runtime/JSONObject.cpp
     runtime/MathObject.cpp
+    runtime/NamePrototype.cpp
     runtime/NumberConstructor.cpp
     runtime/NumberPrototype.cpp

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-05-15  Gavin Barraclough  <barraclough@apple.com>
+
+        Add support for private names
+        https://bugs.webkit.org/show_bug.cgi?id=86509
+
+        Reviewed by Oliver Hunt.
+
+        The spec isn't final, but we can start adding support to allow property maps
+        to contain keys that aren't identifiers.
+
+        * API/JSCallbackObjectFunctions.h:
+        (JSC::::getOwnPropertySlot):
+        (JSC::::put):
+        (JSC::::deleteProperty):
+        (JSC::::getStaticValue):
+        (JSC::::staticFunctionGetter):
+        (JSC::::callbackGetter):
+            - Only expose public named properties over the JSC API.
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * DerivedSources.pri:
+        * GNUmakefile.list.am:
+        * JavaScriptCore.gypi:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        * Target.pri:
+            - Added new files to build system.
+        * dfg/DFGOperations.cpp:
+        (JSC::DFG::operationPutByValInternal):
+            - Added support for property access with name objects.
+        * interpreter/CallFrame.h:
+        (JSC::ExecState::privateNamePrototypeTable):
+            - Added hash table for NamePrototype
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::privateExecute):
+            - Added support for property access with name objects.
+        * jit/JITStubs.cpp:
+        (JSC::DEFINE_STUB_FUNCTION):
+            - Added support for property access with name objects.
+        * llint/LLIntSlowPaths.cpp:
+        (JSC::LLInt::getByVal):
+        (JSC::LLInt::LLINT_SLOW_PATH_DECL):
+        * runtime/CommonSlowPaths.h:
+        (JSC::CommonSlowPaths::opIn):
+        * runtime/JSActivation.cpp:
+        (JSC::JSActivation::symbolTableGet):
+        (JSC::JSActivation::symbolTablePut):
+        (JSC::JSActivation::symbolTablePutWithAttributes):
+            - Added support for property access with name objects.
+        * runtime/JSGlobalData.cpp:
+        (JSC):
+        (JSC::JSGlobalData::JSGlobalData):
+        (JSC::JSGlobalData::~JSGlobalData):
+        * runtime/JSGlobalData.h:
+        (JSGlobalData):
+            - Added hash table for NamePrototype
+        * runtime/JSGlobalObject.cpp:
+        (JSC::JSGlobalObject::reset):
+        * runtime/JSGlobalObject.h:
+        (JSGlobalObject):
+        (JSC::JSGlobalObject::privateNameStructure):
+        (JSC::JSGlobalObject::symbolTableHasProperty):
+            - Added new global properties.
+        * runtime/JSType.h:
+        * runtime/JSTypeInfo.h:
+        (JSC::TypeInfo::isName):
+            - Added type for NameInstances, for fast isName check.
+        * runtime/JSVariableObject.cpp:
+        (JSC::JSVariableObject::deleteProperty):
+        (JSC::JSVariableObject::symbolTableGet):
+        * runtime/JSVariableObject.h:
+        (JSC::JSVariableObject::symbolTableGet):
+        (JSC::JSVariableObject::symbolTablePut):
+        (JSC::JSVariableObject::symbolTablePutWithAttributes):
+            - symbol table lookup should take a PropertyName.
+        * runtime/Lookup.cpp:
+        (JSC::setUpStaticFunctionSlot):
+        * runtime/Lookup.h:
+        (JSC::HashTable::entry):
+            - entry lookup should take a PropertyName.
+        * runtime/NameConstructor.cpp: Added.
+        (JSC):
+        (JSC::NameConstructor::NameConstructor):
+        (JSC::NameConstructor::finishCreation):
+        (JSC::constructPrivateName):
+        (JSC::NameConstructor::getConstructData):
+        (JSC::NameConstructor::getCallData):
+        * runtime/NameConstructor.h: Added.
+        (JSC):
+        (NameConstructor):
+        (JSC::NameConstructor::create):
+        (JSC::NameConstructor::createStructure):
+            - Added constructor.
+        * runtime/NameInstance.cpp: Added.
+        (JSC):
+        (JSC::NameInstance::NameInstance):
+        (JSC::NameInstance::destroy):
+        * runtime/NameInstance.h: Added.
+        (JSC):
+        (NameInstance):
+        (JSC::NameInstance::createStructure):
+        (JSC::NameInstance::create):
+        (JSC::NameInstance::privateName):
+        (JSC::NameInstance::nameString):
+        (JSC::NameInstance::finishCreation):
+        (JSC::isName):
+            - Added instance.
+        * runtime/NamePrototype.cpp: Added.
+        (JSC):
+        (JSC::NamePrototype::NamePrototype):
+        (JSC::NamePrototype::finishCreation):
+        (JSC::NamePrototype::getOwnPropertySlot):
+        (JSC::NamePrototype::getOwnPropertyDescriptor):
+        (JSC::privateNameProtoFuncToString):
+        * runtime/NamePrototype.h: Added.
+        (JSC):
+        (NamePrototype):
+        (JSC::NamePrototype::create):
+        (JSC::NamePrototype::createStructure):
+            - Added prototype.
+        * runtime/PrivateName.h: Added.
+        (JSC):
+        (PrivateName):
+        (JSC::PrivateName::PrivateName):
+        (JSC::PrivateName::uid):
+            - A private name object holds a StringImpl that can be used as a unique key in a property map.
+        * runtime/PropertyMapHashTable.h:
+        (JSC::PropertyTable::find):
+        (JSC::PropertyTable::findWithString):
+            - Strings should only match keys in the table that are identifiers.
+        * runtime/PropertyName.h:
+        (JSC::PropertyName::PropertyName):
+        (PropertyName):
+        (JSC::PropertyName::uid):
+        (JSC::PropertyName::publicName):
+        (JSC::PropertyName::asIndex):
+        (JSC::operator==):
+        (JSC::operator!=):
+            - replaced impl() & ustring() with uid() [to get the raw impl] and publicName() [impl or null, if not an identifier].
+        * runtime/Structure.cpp:
+        (JSC::Structure::despecifyDictionaryFunction):
+        (JSC::Structure::addPropertyTransitionToExistingStructure):
+        (JSC::Structure::addPropertyTransition):
+        (JSC::Structure::attributeChangeTransition):
+        (JSC::Structure::get):
+        (JSC::Structure::despecifyFunction):
+        (JSC::Structure::putSpecificValue):
+        (JSC::Structure::remove):
+        (JSC::Structure::getPropertyNamesFromStructure):
+        * runtime/Structure.h:
+        (JSC::Structure::get):
+            - call uid() to get a PropertyName raw impl, for use as a key.
+
 2012-04-30  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/DerivedSources.make

@@ -48 +48 @@
     Lexer.lut.h \
     MathObject.lut.h \
+    NamePrototype.lut.h \
     NumberConstructor.lut.h \
     NumberPrototype.lut.h \

trunk/Source/JavaScriptCore/DerivedSources.pri

@@ -17 +17 @@
     runtime/JSONObject.cpp \
     runtime/MathObject.cpp \
+    runtime/NamePrototype.cpp \
     runtime/NumberConstructor.cpp \
     runtime/NumberPrototype.cpp \

trunk/Source/JavaScriptCore/GNUmakefile.list.am

@@ -21 +21 @@
         DerivedSources/JavaScriptCore/JSONObject.lut.h \
         DerivedSources/JavaScriptCore/MathObject.lut.h \
+    DerivedSources/JavaScriptCore/NamePrototype.lut.h \
         DerivedSources/JavaScriptCore/NumberConstructor.lut.h \
         DerivedSources/JavaScriptCore/NumberPrototype.lut.h \
@@ -508 +509 @@
         Source/JavaScriptCore/runtime/MathObject.h \
         Source/JavaScriptCore/runtime/MemoryStatistics.h \
+        Source/JavaScriptCore/runtime/NameConstructor.cpp \
+        Source/JavaScriptCore/runtime/NameConstructor.h \
+        Source/JavaScriptCore/runtime/NameInstance.cpp \
+        Source/JavaScriptCore/runtime/NameInstance.h \
+        Source/JavaScriptCore/runtime/NamePrototype.cpp \
+        Source/JavaScriptCore/runtime/NamePrototype.h \
         Source/JavaScriptCore/runtime/NativeErrorConstructor.cpp \
         Source/JavaScriptCore/runtime/NativeErrorConstructor.h \

trunk/Source/JavaScriptCore/JavaScriptCore.gypi

@@ -273 +273 @@
             'runtime/MathObject.h',
             'runtime/MemoryStatistics.h',
+            'runtime/NameConstructor.h',
+            'runtime/NameInstance.h',
+            'runtime/NamePrototype.h',
             'runtime/NativeErrorConstructor.h',
             'runtime/NativeErrorPrototype.h',
@@ -498 +501 @@
             'runtime/MathObject.cpp',
             'runtime/MemoryStatistics.cpp',
+            'runtime/NameConstructor.cpp',
+            'runtime/NameInstance.cpp',
+            'runtime/NamePrototype.cpp',
             'runtime/NativeErrorConstructor.cpp',
             'runtime/NativeErrorPrototype.cpp',
@@ -550 +556 @@
             '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/JSONObject.lut.h',
             '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/MathObject.lut.h',
+            '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/NamePrototype.lut.h',
             '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/NumberConstructor.lut.h',
             '<(PRODUCT_DIR)/DerivedSources/JavaScriptCore/NumberPrototype.lut.h',

trunk/Source/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj

@@ -959 +959 @@
                         </File>
                         <File
+                                RelativePath="..\..\runtime\NameConstructor.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\runtime\NameConstructor.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\runtime\NameInstance.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\runtime\NameInstance.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\runtime\NamePrototype.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\runtime\NamePrototype.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\runtime\NativeErrorConstructor.cpp"
                                 >
@@ -2056 +2080 @@
                         <File
                                 RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\MathObject.lut.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="$(ConfigurationBuildDir)\obj\$(ProjectName)\DerivedSources\NamePrototype.lut.h"
                                 >
                         </File>

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -390 +390 @@
                 86880F1F14328BB900B08D42 /* DFGSpeculativeJIT32_64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86880F1B14328BB900B08D42 /* DFGSpeculativeJIT32_64.cpp */; };
                 86880F4D14353B2100B08D42 /* DFGSpeculativeJIT64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86880F4C14353B2100B08D42 /* DFGSpeculativeJIT64.cpp */; };
+                868916B0155F286300CB2B9A /* PrivateName.h in Headers */ = {isa = PBXBuildFile; fileRef = 868916A9155F285400CB2B9A /* PrivateName.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 869D04AF1193B54D00803475 /* CachedTranscendentalFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 869D04AE1193B54D00803475 /* CachedTranscendentalFunction.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 869EBCB70E8C6D4A008722CC /* ResultType.h in Headers */ = {isa = PBXBuildFile; fileRef = 869EBCB60E8C6D4A008722CC /* ResultType.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -423 +424 @@
                 86E116B10FE75AC800B512BC /* CodeLocation.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E116B00FE75AC800B512BC /* CodeLocation.h */; };
                 86E85539111B9968001AF51E /* JSStringBuilder.h in Headers */ = {isa = PBXBuildFile; fileRef = 86E85538111B9968001AF51E /* JSStringBuilder.h */; };
+                86EBF2FF1560F06A008E9222 /* NameConstructor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86EBF2F91560F036008E9222 /* NameConstructor.cpp */; };
+                86EBF3001560F06A008E9222 /* NameConstructor.h in Headers */ = {isa = PBXBuildFile; fileRef = 86EBF2FA1560F036008E9222 /* NameConstructor.h */; };
+                86EBF3011560F06A008E9222 /* NameInstance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86EBF2FB1560F036008E9222 /* NameInstance.cpp */; };
+                86EBF3021560F06A008E9222 /* NameInstance.h in Headers */ = {isa = PBXBuildFile; fileRef = 86EBF2FC1560F036008E9222 /* NameInstance.h */; };
+                86EBF3031560F06A008E9222 /* NamePrototype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86EBF2FD1560F036008E9222 /* NamePrototype.cpp */; };
+                86EBF3041560F06A008E9222 /* NamePrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = 86EBF2FE1560F036008E9222 /* NamePrototype.h */; };
                 86EC9DC41328DF82002B2AD7 /* DFGByteCodeParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 86EC9DB41328DF82002B2AD7 /* DFGByteCodeParser.cpp */; };
                 86EC9DC51328DF82002B2AD7 /* DFGByteCodeParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 86EC9DB51328DF82002B2AD7 /* DFGByteCodeParser.h */; };
@@ -1057 +1064 @@
                 86880F1B14328BB900B08D42 /* DFGSpeculativeJIT32_64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGSpeculativeJIT32_64.cpp; path = dfg/DFGSpeculativeJIT32_64.cpp; sourceTree = "<group>"; };
                 86880F4C14353B2100B08D42 /* DFGSpeculativeJIT64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGSpeculativeJIT64.cpp; path = dfg/DFGSpeculativeJIT64.cpp; sourceTree = "<group>"; };
+                868916A9155F285400CB2B9A /* PrivateName.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrivateName.h; sourceTree = "<group>"; };
                 869D04AE1193B54D00803475 /* CachedTranscendentalFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedTranscendentalFunction.h; sourceTree = "<group>"; };
                 869EBCB60E8C6D4A008722CC /* ResultType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResultType.h; sourceTree = "<group>"; };
@@ -1096 +1104 @@
                 86E116B00FE75AC800B512BC /* CodeLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeLocation.h; sourceTree = "<group>"; };
                 86E85538111B9968001AF51E /* JSStringBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStringBuilder.h; sourceTree = "<group>"; };
+                86EBF2F91560F036008E9222 /* NameConstructor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NameConstructor.cpp; sourceTree = "<group>"; };
+                86EBF2FA1560F036008E9222 /* NameConstructor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NameConstructor.h; sourceTree = "<group>"; };
+                86EBF2FB1560F036008E9222 /* NameInstance.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NameInstance.cpp; sourceTree = "<group>"; };
+                86EBF2FC1560F036008E9222 /* NameInstance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NameInstance.h; sourceTree = "<group>"; };
+                86EBF2FD1560F036008E9222 /* NamePrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NamePrototype.cpp; sourceTree = "<group>"; };
+                86EBF2FE1560F036008E9222 /* NamePrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NamePrototype.h; sourceTree = "<group>"; };
                 86EC9DB41328DF82002B2AD7 /* DFGByteCodeParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGByteCodeParser.cpp; path = dfg/DFGByteCodeParser.cpp; sourceTree = "<group>"; };
                 86EC9DB51328DF82002B2AD7 /* DFGByteCodeParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGByteCodeParser.h; path = dfg/DFGByteCodeParser.h; sourceTree = "<group>"; };
@@ -1811 +1825 @@
                         isa = PBXGroup;
                         children = (
-                                0F21C27914BE727300ADC64B /* CodeSpecializationKind.h */,
-                                0F21C27A14BE727300ADC64B /* ExecutionHarness.h */,
-                                0F15F15D14B7A73A005DE37D /* CommonSlowPaths.h */,
                                 BCF605110E203EF800B9A64D /* ArgList.cpp */,
                                 BCF605120E203EF800B9A64D /* ArgList.h */,
@@ -1834 +1845 @@
                                 145C507F0D9DF63B0088F6B9 /* CallData.h */,
                                 BC6AAAE40E1F426500AD87D8 /* ClassInfo.h */,
+                                0F21C27914BE727300ADC64B /* CodeSpecializationKind.h */,
                                 65EA73620BAE35D1001BB560 /* CommonIdentifiers.cpp */,
                                 65EA73630BAE35D1001BB560 /* CommonIdentifiers.h */,
+                                0F15F15D14B7A73A005DE37D /* CommonSlowPaths.h */,
                                 969A09220ED1E09C00F1F681 /* Completion.cpp */,
                                 F5BB2BC5030F772101FCFE1D /* Completion.h */,
@@ -1861 +1874 @@
                                 86CA032D1038E8440028A609 /* Executable.cpp */,
                                 86CAFEE21035DDE60028A609 /* Executable.h */,
+                                0F21C27A14BE727300ADC64B /* ExecutionHarness.h */,
                                 BC2680C00E16D4E900A06E92 /* FunctionConstructor.cpp */,
                                 BC2680C10E16D4E900A06E92 /* FunctionConstructor.h */,
@@ -1932 +1946 @@
                                 90213E3B123A40C200D422F3 /* MemoryStatistics.cpp */,
                                 90213E3C123A40C200D422F3 /* MemoryStatistics.h */,
+                                86EBF2F91560F036008E9222 /* NameConstructor.cpp */,
+                                86EBF2FA1560F036008E9222 /* NameConstructor.h */,
+                                86EBF2FB1560F036008E9222 /* NameInstance.cpp */,
+                                86EBF2FC1560F036008E9222 /* NameInstance.h */,
+                                86EBF2FD1560F036008E9222 /* NamePrototype.cpp */,
+                                86EBF2FE1560F036008E9222 /* NamePrototype.h */,
                                 BC02E9080E1839DB000F9297 /* NativeErrorConstructor.cpp */,
                                 BC02E9090E1839DB000F9297 /* NativeErrorConstructor.h */,
@@ -1951 +1971 @@
                                 0FE228EA1436AB2300196C48 /* Options.cpp */,
                                 0FE228EB1436AB2300196C48 /* Options.h */,
+                                868916A9155F285400CB2B9A /* PrivateName.h */,
                                 A7FB60A3103F7DC20017A286 /* PropertyDescriptor.cpp */,
                                 A7FB604B103F5EAB0017A286 /* PropertyDescriptor.h */,
@@ -2609 +2630 @@
                                 14816E1C154CC56C00B8054C /* BlockAllocator.h in Headers */,
                                 86158AB3155C8B4000B45C9C /* PropertyName.h in Headers */,
+                                868916B0155F286300CB2B9A /* PrivateName.h in Headers */,
+                                86EBF3001560F06A008E9222 /* NameConstructor.h in Headers */,
+                                86EBF3021560F06A008E9222 /* NameInstance.h in Headers */,
+                                86EBF3041560F06A008E9222 /* NamePrototype.h in Headers */,
                                 0F1E3A67153A21E2000F9456 /* DFGSilentRegisterSavePlan.h in Headers */,
                                 0F3B3A281544C997003ED0FF /* DFGCFGSimplificationPhase.h in Headers */,
@@ -3175 +3200 @@
                                 863C6D9C1521111A00585E4E /* YarrCanonicalizeUCS2.cpp in Sources */,
                                 14816E1B154CC56C00B8054C /* BlockAllocator.cpp in Sources */,
+                                86EBF2FF1560F06A008E9222 /* NameConstructor.cpp in Sources */,
+                                86EBF3011560F06A008E9222 /* NameInstance.cpp in Sources */,
+                                86EBF3031560F06A008E9222 /* NamePrototype.cpp in Sources */,
                                 0F3B3A1A153E68F2003ED0FF /* DFGConstantFoldingPhase.cpp in Sources */,
                                 0F3B3A271544C995003ED0FF /* DFGCFGSimplificationPhase.cpp in Sources */,

trunk/Source/JavaScriptCore/Target.pri

@@ -201 +201 @@
     runtime/Lookup.cpp \
     runtime/MathObject.cpp \
+    runtime/NameConstructor.cpp \
+    runtime/NameInstance.cpp \
+    runtime/NamePrototype.cpp \
     runtime/NativeErrorConstructor.cpp \
     runtime/NativeErrorPrototype.cpp \

trunk/Source/JavaScriptCore/dfg/DFGOperations.cpp

@@ -37 +37 @@
 #include "JSGlobalData.h"
 #include "JSStaticScopeObject.h"
+#include "NameInstance.h"
 #include "Operations.h"
 
@@ -201 +202 @@
     }
 
+    if (isName(property)) {
+        PutPropertySlot slot(strict);
+        baseValue.put(exec, jsCast<NameInstance*>(property.asCell())->privateName(), value, slot);
+        return;
+    }
 
     // Don't put to an object if toString throws an exception.
@@ -308 +314 @@
     }
 
+    if (isName(property))
+        return JSValue::encode(baseValue.get(exec, jsCast<NameInstance*>(property.asCell())->privateName()));
+
     Identifier ident(exec, property.toString(exec)->value(exec));
     return JSValue::encode(baseValue.get(exec, ident));
@@ -330 +339 @@
             return JSValue::encode(result);
     }
+
+    if (isName(property))
+        return JSValue::encode(JSValue(base).get(exec, jsCast<NameInstance*>(property.asCell())->privateName()));
 
     Identifier ident(exec, property.toString(exec)->value(exec));

trunk/Source/JavaScriptCore/interpreter/CallFrame.h

@@ -91 +91 @@
         static const HashTable* objectConstructorTable(CallFrame* callFrame) { return callFrame->globalData().objectConstructorTable; }
         static const HashTable* objectPrototypeTable(CallFrame* callFrame) { return callFrame->globalData().objectPrototypeTable; }
+        static const HashTable* privateNamePrototypeTable(CallFrame* callFrame) { return callFrame->globalData().privateNamePrototypeTable; }
         static const HashTable* regExpTable(CallFrame* callFrame) { return callFrame->globalData().regExpTable; }
         static const HashTable* regExpConstructorTable(CallFrame* callFrame) { return callFrame->globalData().regExpConstructorTable; }

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -51 +51 @@
 #include "JSStaticScopeObject.h"
 #include "JSString.h"
+#include "NameInstance.h"
 #include "ObjectPrototype.h"
 #include "Operations.h"
@@ -2796 +2797 @@
         if (propName.getUInt32(i))
             callFrame->uncheckedR(dst) = jsBoolean(baseObj->hasProperty(callFrame, i));
+        else if (isName(propName))
+            callFrame->uncheckedR(dst) = jsBoolean(baseObj->hasProperty(callFrame, jsCast<NameInstance*>(propName.asCell())->privateName()));
         else {
             Identifier property(callFrame, propName.toString(callFrame)->value(callFrame));
@@ -3776 +3779 @@
             else
                 result = baseValue.get(callFrame, i);
-        } else {
+        } else if (isName(subscript))
+            result = baseValue.get(callFrame, jsCast<NameInstance*>(subscript.asCell())->privateName());
+        else {
             Identifier property(callFrame, subscript.toString(callFrame)->value(callFrame));
             result = baseValue.get(callFrame, property);
@@ -3814 +3819 @@
             } else
                 baseValue.putByIndex(callFrame, i, callFrame->r(value).jsValue(), codeBlock->isStrictMode());
+        } else if (isName(subscript)) {
+            PutPropertySlot slot(codeBlock->isStrictMode());
+            baseValue.put(callFrame, jsCast<NameInstance*>(subscript.asCell())->privateName(), callFrame->r(value).jsValue(), slot);
         } else {
             Identifier property(callFrame, subscript.toString(callFrame)->value(callFrame));
@@ -3845 +3853 @@
         if (subscript.getUInt32(i))
             result = baseObj->methodTable()->deletePropertyByIndex(baseObj, callFrame, i);
+        else if (isName(subscript))
+            result = baseObj->methodTable()->deleteProperty(baseObj, callFrame, jsCast<NameInstance*>(subscript.asCell())->privateName());
         else {
             CHECK_FOR_EXCEPTION();

trunk/Source/JavaScriptCore/jit/JITStubs.cpp

@@ -55 +55 @@
 #include "JSStaticScopeObject.h"
 #include "JSString.h"
+#include "NameInstance.h"
 #include "ObjectPrototype.h"
 #include "Operations.h"
@@ -2448 +2449 @@
         return JSValue::encode(result);
     }
-    
+
+    if (isName(subscript)) {
+        JSValue result = baseValue.get(callFrame, jsCast<NameInstance*>(subscript.asCell())->privateName());
+        CHECK_FOR_EXCEPTION();
+        return JSValue::encode(result);
+    }
+
     Identifier property(callFrame, subscript.toString(callFrame)->value(callFrame));
     JSValue result = baseValue.get(callFrame, property);
@@ -2475 +2482 @@
                 ctiPatchCallByReturnAddress(callFrame->codeBlock(), STUB_RETURN_ADDRESS, FunctionPtr(cti_op_get_by_val));
         }
-    } else {
+    } else if (isName(subscript))
+        result = baseValue.get(callFrame, jsCast<NameInstance*>(subscript.asCell())->privateName());
+    else {
         Identifier property(callFrame, subscript.toString(callFrame)->value(callFrame));
         result = baseValue.get(callFrame, property);
@@ -2521 +2530 @@
         } else
             baseValue.putByIndex(callFrame, i, value, callFrame->codeBlock()->isStrictMode());
+    } else if (isName(subscript)) {
+        PutPropertySlot slot(callFrame->codeBlock()->isStrictMode());
+        baseValue.put(callFrame, jsCast<NameInstance*>(subscript.asCell())->privateName(), value, slot);
     } else {
         Identifier property(callFrame, subscript.toString(callFrame)->value(callFrame));
@@ -3242 +3254 @@
         return JSValue::encode(jsBoolean(baseObj->hasProperty(callFrame, i)));
 
+    if (isName(propName))
+        return JSValue::encode(jsBoolean(baseObj->hasProperty(callFrame, jsCast<NameInstance*>(propName.asCell())->privateName())));
+
     Identifier property(callFrame, propName.toString(callFrame)->value(callFrame));
     CHECK_FOR_EXCEPTION();
@@ -3354 +3369 @@
     if (subscript.getUInt32(i))
         result = baseObj->methodTable()->deletePropertyByIndex(baseObj, callFrame, i);
+    else if (isName(subscript))
+        result = baseObj->methodTable()->deleteProperty(baseObj, callFrame, jsCast<NameInstance*>(subscript.asCell())->privateName());
     else {
         CHECK_FOR_EXCEPTION();

trunk/Source/JavaScriptCore/llint/LLIntSlowPaths.cpp

@@ -953 +953 @@
         return baseValue.get(exec, i);
     }
+
+    if (isName(subscript))
+        return baseValue.get(exec, jsCast<NameInstance*>(subscript.asCell())->privateName());
     
     Identifier property(exec, subscript.toString(exec)->value(exec));
@@ -1005 +1008 @@
         LLINT_END();
     }
-    
+
+    if (isName(subscript)) {
+        PutPropertySlot slot(exec->codeBlock()->isStrictMode());
+        baseValue.put(exec, jsCast<NameInstance*>(subscript.asCell())->privateName(), value, slot);
+        LLINT_END();
+    }
+
     Identifier property(exec, subscript.toString(exec)->value(exec));
     LLINT_CHECK_EXCEPTION();
@@ -1026 +1035 @@
     if (subscript.getUInt32(i))
         couldDelete = baseObject->methodTable()->deletePropertyByIndex(baseObject, exec, i);
+    else if (isName(subscript))
+        couldDelete = baseObject->methodTable()->deleteProperty(baseObject, exec, jsCast<NameInstance*>(subscript.asCell())->privateName());
     else {
         LLINT_CHECK_EXCEPTION();

trunk/Source/JavaScriptCore/runtime/CommonSlowPaths.h

@@ -31 +31 @@
 #include "ExceptionHelpers.h"
 #include "JSArray.h"
+#include "NameInstance.h"
 
 namespace JSC {
@@ -109 +110 @@
     if (propName.getUInt32(i))
         return baseObj->hasProperty(exec, i);
+
+    if (isName(propName))
+        return baseObj->hasProperty(exec, jsCast<NameInstance*>(propName.asCell())->privateName());
 
     Identifier property(exec, propName.toString(exec)->value(exec));

trunk/Source/JavaScriptCore/runtime/JSActivation.cpp

@@ -93 +93 @@
 inline bool JSActivation::symbolTableGet(PropertyName propertyName, PropertySlot& slot)
 {
-    SymbolTableEntry entry = symbolTable().inlineGet(propertyName.impl());
+    SymbolTableEntry entry = symbolTable().inlineGet(propertyName.publicName());
     if (entry.isNull())
         return false;
@@ -108 +108 @@
     ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
     
-    SymbolTableEntry entry = symbolTable().inlineGet(propertyName.impl());
+    SymbolTableEntry entry = symbolTable().inlineGet(propertyName.publicName());
     if (entry.isNull())
         return false;
@@ -142 +142 @@
     ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
     
-    SymbolTable::iterator iter = symbolTable().find(propertyName.impl());
+    SymbolTable::iterator iter = symbolTable().find(propertyName.publicName());
     if (iter == symbolTable().end())
         return false;

trunk/Source/JavaScriptCore/runtime/JSGlobalData.cpp

@@ -87 +87 @@
 JS_EXPORTDATA extern const HashTable objectConstructorTable;
 extern const HashTable objectPrototypeTable;
+extern const HashTable privateNamePrototypeTable;
 extern const HashTable regExpTable;
 extern const HashTable regExpConstructorTable;
@@ -136 +137 @@
     , objectConstructorTable(fastNew<HashTable>(JSC::objectConstructorTable))
     , objectPrototypeTable(fastNew<HashTable>(JSC::objectPrototypeTable))
+    , privateNamePrototypeTable(fastNew<HashTable>(JSC::privateNamePrototypeTable))
     , regExpTable(fastNew<HashTable>(JSC::regExpTable))
     , regExpConstructorTable(fastNew<HashTable>(JSC::regExpConstructorTable))
@@ -242 +244 @@
     objectConstructorTable->deleteTable();
     objectPrototypeTable->deleteTable();
+    privateNamePrototypeTable->deleteTable();
     regExpTable->deleteTable();
     regExpConstructorTable->deleteTable();
@@ -261 +264 @@
     fastDelete(const_cast<HashTable*>(objectConstructorTable));
     fastDelete(const_cast<HashTable*>(objectPrototypeTable));
+    fastDelete(const_cast<HashTable*>(privateNamePrototypeTable));
     fastDelete(const_cast<HashTable*>(regExpTable));
     fastDelete(const_cast<HashTable*>(regExpConstructorTable));

trunk/Source/JavaScriptCore/runtime/JSGlobalData.h

@@ -193 +193 @@
         const HashTable* objectConstructorTable;
         const HashTable* objectPrototypeTable;
+        const HashTable* privateNamePrototypeTable;
         const HashTable* regExpTable;
         const HashTable* regExpConstructorTable;

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -57 +57 @@
 #include "Lookup.h"
 #include "MathObject.h"
+#include "NameConstructor.h"
+#include "NameInstance.h"
+#include "NamePrototype.h"
 #include "NativeErrorConstructor.h"
 #include "NativeErrorPrototype.h"
@@ -245 +248 @@
     m_errorStructure.set(exec->globalData(), this, ErrorInstance::createStructure(exec->globalData(), this, errorPrototype));
 
+    NamePrototype* privateNamePrototype = NamePrototype::create(exec, NamePrototype::createStructure(exec->globalData(), this, m_objectPrototype.get()));
+    m_privateNameStructure.set(exec->globalData(), this, NameInstance::createStructure(exec->globalData(), this, privateNamePrototype));
+
     // Constructors
 
@@ -258 +264 @@
 
     m_errorConstructor.set(exec->globalData(), this, ErrorConstructor::create(exec, this, ErrorConstructor::createStructure(exec->globalData(), this, m_functionPrototype.get()), errorPrototype));
+    JSCell* privateNameConstructor = NameConstructor::create(exec, this, NameConstructor::createStructure(exec->globalData(), this, m_functionPrototype.get()), privateNamePrototype);
 
     Structure* nativeErrorPrototypeStructure = NativeErrorPrototype::createStructure(exec->globalData(), this, errorPrototype);
@@ -277 +284 @@
     m_regExpPrototype->putDirectWithoutTransition(exec->globalData(), exec->propertyNames().constructor, m_regExpConstructor.get(), DontEnum);
     errorPrototype->putDirectWithoutTransition(exec->globalData(), exec->propertyNames().constructor, m_errorConstructor.get(), DontEnum);
+    privateNamePrototype->putDirectWithoutTransition(exec->globalData(), exec->propertyNames().constructor, privateNameConstructor, DontEnum);
 
     putDirectWithoutTransition(exec->globalData(), Identifier(exec, "Object"), objectConstructor, DontEnum);
@@ -293 +301 @@
     putDirectWithoutTransition(exec->globalData(), Identifier(exec, "TypeError"), m_typeErrorConstructor.get(), DontEnum);
     putDirectWithoutTransition(exec->globalData(), Identifier(exec, "URIError"), m_URIErrorConstructor.get(), DontEnum);
+    putDirectWithoutTransition(exec->globalData(), Identifier(exec, "Name"), privateNameConstructor, DontEnum);
 
     m_evalFunction.set(exec->globalData(), this, JSFunction::create(exec, this, 1, exec->propertyNames().eval.ustring(), globalFuncEval));

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

@@ -131 +131 @@
         size_t m_functionNameOffset;
         WriteBarrier<Structure> m_numberObjectStructure;
+        WriteBarrier<Structure> m_privateNameStructure;
         WriteBarrier<Structure> m_regExpMatchesArrayStructure;
         WriteBarrier<Structure> m_regExpStructure;
@@ -264 +265 @@
         size_t functionNameOffset() const { return m_functionNameOffset; }
         Structure* numberObjectStructure() const { return m_numberObjectStructure.get(); }
+        Structure* privateNameStructure() const { return m_privateNameStructure.get(); }
         Structure* internalFunctionStructure() const { return m_internalFunctionStructure.get(); }
         Structure* regExpMatchesArrayStructure() const { return m_regExpMatchesArrayStructure.get(); }
@@ -377 +379 @@
     inline bool JSGlobalObject::symbolTableHasProperty(PropertyName propertyName)
     {
-        SymbolTableEntry entry = symbolTable().inlineGet(propertyName.impl());
+        SymbolTableEntry entry = symbolTable().inlineGet(propertyName.publicName());
         return !entry.isNull();
     }

trunk/Source/JavaScriptCore/runtime/JSType.h

@@ -46 +46 @@
     FinalObjectType,
     JSFunctionType,
+    NameInstanceType,
     NumberObjectType,
     ErrorInstanceType,

trunk/Source/JavaScriptCore/runtime/JSTypeInfo.h

@@ -68 +68 @@
         bool isFinalObject() const { return type() == FinalObjectType; }
         bool isNumberObject() const { return type() == NumberObjectType; }
+        bool isName() const { return type() == NameInstanceType; }
 
         bool masqueradesAsUndefined() const { return isSetOnFlags1(MasqueradesAsUndefined); }

trunk/Source/JavaScriptCore/runtime/JSVariableObject.cpp

@@ -46 +46 @@
 {
     JSVariableObject* thisObject = jsCast<JSVariableObject*>(cell);
-    if (thisObject->symbolTable().contains(propertyName.impl()))
+    if (thisObject->symbolTable().contains(propertyName.publicName()))
         return false;
 
@@ -66 +66 @@
 bool JSVariableObject::symbolTableGet(PropertyName propertyName, PropertyDescriptor& descriptor)
 {
-    SymbolTableEntry entry = symbolTable().inlineGet(propertyName.impl());
+    SymbolTableEntry entry = symbolTable().inlineGet(propertyName.publicName());
     if (!entry.isNull()) {
         descriptor.setDescriptor(registerAt(entry.getIndex()).get(), entry.getAttributes() | DontDelete);

trunk/Source/JavaScriptCore/runtime/JSVariableObject.h

@@ -103 +103 @@
     inline bool JSVariableObject::symbolTableGet(PropertyName propertyName, PropertySlot& slot)
     {
-        SymbolTableEntry entry = symbolTable().inlineGet(propertyName.impl());
+        SymbolTableEntry entry = symbolTable().inlineGet(propertyName.publicName());
         if (!entry.isNull()) {
             slot.setValue(registerAt(entry.getIndex()).get());
@@ -113 +113 @@
     inline bool JSVariableObject::symbolTableGet(PropertyName propertyName, PropertySlot& slot, bool& slotIsWriteable)
     {
-        SymbolTableEntry entry = symbolTable().inlineGet(propertyName.impl());
+        SymbolTableEntry entry = symbolTable().inlineGet(propertyName.publicName());
         if (!entry.isNull()) {
             slot.setValue(registerAt(entry.getIndex()).get());
@@ -127 +127 @@
         ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
 
-        SymbolTableEntry entry = symbolTable().inlineGet(propertyName.impl());
+        SymbolTableEntry entry = symbolTable().inlineGet(propertyName.publicName());
         if (entry.isNull())
             return false;
@@ -143 +143 @@
         ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
 
-        SymbolTable::iterator iter = symbolTable().find(propertyName.impl());
+        SymbolTable::iterator iter = symbolTable().find(propertyName.publicName());
         if (iter == symbolTable().end())
             return false;

trunk/Source/JavaScriptCore/runtime/Lookup.cpp

@@ -77 +77 @@
             return false;
     
-        JSFunction* function = JSFunction::create(exec, thisObj->globalObject(), entry->functionLength(), propertyName.ustring(), entry->function(), entry->intrinsic());
+        StringImpl* name = propertyName.publicName();
+        ASSERT(name);
+        
+        JSFunction* function = JSFunction::create(exec, thisObj->globalObject(), entry->functionLength(), name, entry->function(), entry->intrinsic());
         thisObj->putDirect(exec->globalData(), propertyName, function, entry->attributes());
         location = thisObj->getDirectLocation(exec->globalData(), propertyName);

trunk/Source/JavaScriptCore/runtime/Lookup.h

@@ -200 +200 @@
 
     private:
-        ALWAYS_INLINE const HashEntry* entry(PropertyName identifier) const
-        {
+        ALWAYS_INLINE const HashEntry* entry(PropertyName propertyName) const
+        {
+            StringImpl* impl = propertyName.publicName();
+            if (!impl)
+                return 0;
+        
             ASSERT(table);
 
-            const HashEntry* entry = &table[identifier.impl()->existingHash() & compactHashSizeMask];
+            const HashEntry* entry = &table[impl->existingHash() & compactHashSizeMask];
 
             if (!entry->key())
@@ -210 +214 @@
 
             do {
-                if (entry->key() == identifier.impl())
+                if (entry->key() == impl)
                     return entry;
                 entry = entry->next();

trunk/Source/JavaScriptCore/runtime/PropertyMapHashTable.h

@@ -326 +326 @@
 {
     ASSERT(key);
-    ASSERT(key->isIdentifier());
+    ASSERT(key->isIdentifier() || key->isEmptyUnique());
     unsigned hash = key->existingHash();
     unsigned step = 0;
@@ -370 +370 @@
         if (entryIndex == EmptyEntryIndex)
             return std::make_pair((ValueType*)0, hash & m_indexMask);
-        if (equal(key, table()[entryIndex - 1].key))
+        const KeyType& keyInMap = table()[entryIndex - 1].key;
+        if (equal(key, keyInMap) && keyInMap->isIdentifier())
             return std::make_pair(&table()[entryIndex - 1], hash & m_indexMask);
 

trunk/Source/JavaScriptCore/runtime/PropertyName.h

@@ -28 +28 @@
 
 #include "Identifier.h"
+#include "PrivateName.h"
 
 namespace JSC {
@@ -81 +82 @@
         : m_impl(propertyName.impl())
     {
+        ASSERT(!m_impl || m_impl->isIdentifier());
     }
 
-    StringImpl* impl() const { return m_impl; }
-    UString ustring() const { return m_impl; }
+    PropertyName(const PrivateName& propertyName)
+        : m_impl(propertyName.uid())
+    {
+        ASSERT(m_impl && m_impl->isEmptyUnique());
+    }
+
+    StringImpl* uid() const
+    {
+        ASSERT(!m_impl || (m_impl->isIdentifier() == !m_impl->isEmptyUnique()));
+        return m_impl;
+    }
+
+    StringImpl* publicName() const
+    {
+        ASSERT(!m_impl || (m_impl->isIdentifier() == !m_impl->isEmptyUnique()));
+        return m_impl->isIdentifier() ? m_impl : 0;
+    }
 
     static const uint32_t NotAnIndex = UINT_MAX;
+
     uint32_t asIndex()
     {
-        return toUInt32FromStringImpl(m_impl);
+        ASSERT(!m_impl || (m_impl->isIdentifier() == !m_impl->isEmptyUnique()));
+        return m_impl ? toUInt32FromStringImpl(m_impl) : NotAnIndex;
     }
 
@@ -98 +117 @@
 inline bool operator==(PropertyName a, const Identifier& b)
 {
-    return a.impl() == b.impl();
+    return a.uid() == b.impl();
 }
 
 inline bool operator==(const Identifier& a, PropertyName b)
 {
-    return a.impl() == b.impl();
+    return a.impl() == b.uid();
 }
 
 inline bool operator==(PropertyName a, PropertyName b)
 {
-    return a.impl() == b.impl();
+    return a.uid() == b.uid();
 }
 
 inline bool operator!=(PropertyName a, const Identifier& b)
 {
-    return a.impl() != b.impl();
+    return a.uid() != b.impl();
 }
 
 inline bool operator!=(const Identifier& a, PropertyName b)
 {
-    return a.impl() != b.impl();
+    return a.impl() != b.uid();
 }
 
 inline bool operator!=(PropertyName a, PropertyName b)
 {
-    return a.impl() != b.impl();
+    return a.uid() != b.uid();
 }
 

trunk/Source/JavaScriptCore/runtime/Structure.cpp

@@ -276 +276 @@
 void Structure::despecifyDictionaryFunction(JSGlobalData& globalData, PropertyName propertyName)
 {
-    StringImpl* rep = propertyName.impl();
+    StringImpl* rep = propertyName.uid();
 
     materializePropertyMapIfNecessary(globalData);
@@ -293 +293 @@
     ASSERT(structure->isObject());
 
-    if (Structure* existingTransition = structure->m_transitionTable.get(propertyName.impl(), attributes)) {
+    if (Structure* existingTransition = structure->m_transitionTable.get(propertyName.uid(), attributes)) {
         JSCell* specificValueInPrevious = existingTransition->m_specificValueInPrevious.get();
         if (specificValueInPrevious && specificValueInPrevious != specificValue)
@@ -314 +314 @@
     // in us adding a non-specific transition, and any subsequent lookup in
     // Structure::addPropertyTransitionToExistingStructure will just use that.
-    if (specificValue && structure->m_transitionTable.contains(propertyName.impl(), attributes))
+    if (specificValue && structure->m_transitionTable.contains(propertyName.uid(), attributes))
         specificValue = 0;
 
@@ -337 +337 @@
     transition->m_cachedPrototypeChain.setMayBeNull(globalData, transition, structure->m_cachedPrototypeChain.get());
     transition->m_previous.set(globalData, transition, structure);
-    transition->m_nameInPrevious = propertyName.impl();
+    transition->m_nameInPrevious = propertyName.uid();
     transition->m_attributesInPrevious = attributes;
     transition->m_specificValueInPrevious.setMayBeNull(globalData, transition, specificValue);
@@ -426 +426 @@
 
     ASSERT(structure->m_propertyTable);
-    PropertyMapEntry* entry = structure->m_propertyTable->find(propertyName.impl()).first;
+    PropertyMapEntry* entry = structure->m_propertyTable->find(propertyName.uid()).first;
     ASSERT(entry);
     entry->attributes = attributes;
@@ -651 +651 @@
         return WTF::notFound;
 
-    PropertyMapEntry* entry = m_propertyTable->find(propertyName.impl()).first;
+    PropertyMapEntry* entry = m_propertyTable->find(propertyName.uid()).first;
     if (!entry)
         return WTF::notFound;
@@ -666 +666 @@
         return false;
 
-    PropertyMapEntry* entry = m_propertyTable->find(propertyName.impl()).first;
+    PropertyMapEntry* entry = m_propertyTable->find(propertyName.uid()).first;
     if (!entry)
         return false;
@@ -694 +694 @@
         m_hasNonEnumerableProperties = true;
 
-    StringImpl* rep = propertyName.impl();
+    StringImpl* rep = propertyName.uid();
 
     if (!m_propertyTable)
@@ -716 +716 @@
     checkConsistency();
 
-    StringImpl* rep = propertyName.impl();
+    StringImpl* rep = propertyName.uid();
 
     if (!m_propertyTable)
@@ -754 +754 @@
     for (PropertyTable::iterator iter = m_propertyTable->begin(); iter != end; ++iter) {
         ASSERT(m_hasNonEnumerableProperties || !(iter->attributes & DontEnum));
-        if (!(iter->attributes & DontEnum) || (mode == IncludeDontEnumProperties)) {
+        if (iter->key->isIdentifier() && (!(iter->attributes & DontEnum) || mode == IncludeDontEnumProperties)) {
             if (knownUnique)
                 propertyNames.addKnownUnique(iter->key);

trunk/Source/JavaScriptCore/runtime/Structure.h

@@ -318 +318 @@
             return notFound;
 
-        PropertyMapEntry* entry = m_propertyTable->find(propertyName.impl()).first;
+        PropertyMapEntry* entry = m_propertyTable->find(propertyName.uid()).first;
         return entry ? entry->offset : notFound;
     }

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2012-05-15  Gavin Barraclough  <barraclough@apple.com>
+
+        Add support for private names
+        https://bugs.webkit.org/show_bug.cgi?id=86509
+
+        Reviewed by Oliver Hunt.
+
+        The spec isn't final, but we can start adding support to allow property maps
+        to contain keys that aren't identifiers.
+
+        * wtf/text/StringImpl.h:
+        (WTF::StringImpl::StringImpl):
+        (StringImpl):
+        (WTF::StringImpl::createEmptyUnique):
+        (WTF::StringImpl::isEmptyUnique):
+            - Allow empty string impls to be allocated, which can be used as unique keys.
+
 2012-05-21  Emil A Eklund <eae@chromium.org> and Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WTF/wtf/text/StringImpl.h

@@ -158 +158 @@
     // Create a StringImpl adopting ownership of the provided buffer (BufferOwned)
     StringImpl(const UChar* characters, unsigned length)
-    : m_refCount(s_refCountIncrement)
-    , m_length(length)
-    , m_data16(characters)
-    , m_buffer(0)
-    , m_hashAndFlags(BufferOwned)
+        : m_refCount(s_refCountIncrement)
+        , m_length(length)
+        , m_data16(characters)
+        , m_buffer(0)
+        , m_hashAndFlags(BufferOwned)
     {
         ASSERT(m_data16);
@@ -194 +194 @@
         ASSERT(m_length);
         ASSERT(m_substringBuffer->bufferOwnership() != BufferSubstring);
+    }
+
+    enum CreateEmptyUnique_T { CreateEmptyUnique };
+    StringImpl(CreateEmptyUnique_T)
+        : m_refCount(s_refCountIncrement)
+        , m_length(0)
+        , m_data16(reinterpret_cast<const UChar*>(1))
+        , m_buffer(0)
+    {
+        ASSERT(m_data16);
+        // Set the hash early, so that all empty unique StringImpls have a hash,
+        // and don't use the normal hashing algorithm - the unique nature of these
+        // keys means that we don't need them to match any other string (in fact,
+        // that's exactly the oposite of what we want!), and teh normal hash would
+        // lead to lots of conflicts.
+        unsigned hash = reinterpret_cast<uintptr_t>(this);
+        hash <<= s_flagCount;
+        if (!hash)
+            hash = 1 << s_flagCount;
+        m_hashAndFlags = hash | BufferInternal;
     }
 
@@ -258 +278 @@
     }
 
+    static PassRefPtr<StringImpl> createEmptyUnique()
+    {
+        return adoptRef(new StringImpl(CreateEmptyUnique));
+    }
+
     // Reallocate the StringImpl. The originalString must be only owned by the PassRefPtr,
     // and the buffer ownership must be BufferInternal. Just like the input pointer of realloc(),
@@ -324 +349 @@
         else
             m_hashAndFlags &= ~s_hashFlagIsIdentifier;
+    }
+
+    bool isEmptyUnique() const
+    {
+        return !length() && !isStatic();
     }
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-15  Gavin Barraclough  <barraclough@apple.com>
+
+        Add support for private names
+        https://bugs.webkit.org/show_bug.cgi?id=86509
+
+        Reviewed by Oliver Hunt.
+
+        The spec isn't final, but we can start adding support to allow property maps
+        to contain keys that aren't identifiers.
+
+        Test: fast/js/names.html
+
+        * bindings/js/JSCSSStyleDeclarationCustom.cpp:
+        (WebCore::cssPropertyIDForJSCSSPropertyName):
+        * bindings/js/JSDOMBinding.cpp:
+        (WebCore::findAtomicString):
+        (WebCore::objectToStringFunctionGetter):
+        * bindings/js/JSDOMBinding.h:
+        (WebCore::propertyNameToString):
+        (WebCore::propertyNameToAtomicString):
+        * bindings/js/JSDOMWindowCustom.cpp:
+        (WebCore::nonCachingStaticFunctionGetter):
+        * bindings/js/JSHistoryCustom.cpp:
+        (WebCore::nonCachingStaticBackFunctionGetter):
+        (WebCore::nonCachingStaticForwardFunctionGetter):
+        (WebCore::nonCachingStaticGoFunctionGetter):
+        * bindings/js/JSLocationCustom.cpp:
+        (WebCore::nonCachingStaticReplaceFunctionGetter):
+        (WebCore::nonCachingStaticReloadFunctionGetter):
+        (WebCore::nonCachingStaticAssignFunctionGetter):
+        * bridge/c/c_class.cpp:
+        (JSC::Bindings::CClass::methodsNamed):
+        (JSC::Bindings::CClass::fieldNamed):
+        * bridge/c/c_instance.cpp:
+        (JSC::Bindings::CInstance::getMethod):
+        * bridge/jni/jsc/JavaClassJSC.cpp:
+        (JavaClass::methodsNamed):
+        (JavaClass::fieldNamed):
+        * bridge/jni/jsc/JavaInstanceJSC.cpp:
+        * bridge/objc/objc_class.mm:
+        (JSC::Bindings::ObjcClass::methodsNamed):
+        (JSC::Bindings::ObjcClass::fieldNamed):
+        (JSC::Bindings::ObjcClass::fallbackObject):
+        * bridge/objc/objc_instance.mm:
+        (ObjcInstance::setValueOfUndefinedField):
+        (ObjcInstance::getValueOfUndefinedField):
+            - Removed PropertyName::impl(), call publicName() to get the string associated with a name.
+
 2012-05-21  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp

@@ -182 +182 @@
     bool hadPixelOrPosPrefix = false;
 
-    StringImpl* propertyNameString = propertyName.impl();
+    StringImpl* propertyNameString = propertyName.publicName();
+    if (!propertyNameString)
+        return propertyInfo;
     unsigned length = propertyNameString->length();
     if (!length)

trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp

@@ -110 +110 @@
 AtomicStringImpl* findAtomicString(PropertyName propertyName)
 {
-    StringImpl* impl = propertyName.impl();
+    StringImpl* impl = propertyName.publicName();
     if (!impl)
         return 0;
@@ -246 +246 @@
 JSValue objectToStringFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
 {
-    return JSFunction::create(exec, exec->lexicalGlobalObject(), 0, propertyName.impl(), objectProtoFuncToString);
+    return JSFunction::create(exec, exec->lexicalGlobalObject(), 0, propertyName.publicName(), objectProtoFuncToString);
 }
 

trunk/Source/WebCore/bindings/js/JSDOMBinding.h

@@ -374 +374 @@
     inline String propertyNameToString(JSC::PropertyName propertyName)
     {
-        return propertyName.impl();
+        return propertyName.publicName();
     }
 
@@ -384 +384 @@
     inline AtomicString propertyNameToAtomicString(JSC::PropertyName propertyName)
     {
-        return AtomicString(propertyName.impl());
+        return AtomicString(propertyName.publicName());
     }
 

trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp

@@ -95 +95 @@
 JSValue nonCachingStaticFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
 {
-    return JSFunction::create(exec, exec->lexicalGlobalObject(), length, propertyName.impl(), nativeFunction);
+    return JSFunction::create(exec, exec->lexicalGlobalObject(), length, propertyName.publicName(), nativeFunction);
 }
 

trunk/Source/WebCore/bindings/js/JSHistoryCustom.cpp

@@ -41 +41 @@
 static JSValue nonCachingStaticBackFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
 {
-    return JSFunction::create(exec, exec->lexicalGlobalObject(), 0, propertyName.impl(), jsHistoryPrototypeFunctionBack);
+    return JSFunction::create(exec, exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsHistoryPrototypeFunctionBack);
 }
 
 static JSValue nonCachingStaticForwardFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
 {
-    return JSFunction::create(exec, exec->lexicalGlobalObject(), 0, propertyName.impl(), jsHistoryPrototypeFunctionForward);
+    return JSFunction::create(exec, exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsHistoryPrototypeFunctionForward);
 }
 
 static JSValue nonCachingStaticGoFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
 {
-    return JSFunction::create(exec, exec->lexicalGlobalObject(), 1, propertyName.impl(), jsHistoryPrototypeFunctionGo);
+    return JSFunction::create(exec, exec->lexicalGlobalObject(), 1, propertyName.publicName(), jsHistoryPrototypeFunctionGo);
 }
 

trunk/Source/WebCore/bindings/js/JSLocationCustom.cpp

@@ -33 +33 @@
 static JSValue nonCachingStaticReplaceFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
 {
-    return JSFunction::create(exec, exec->lexicalGlobalObject(), 1, propertyName.impl(), jsLocationPrototypeFunctionReplace);
+    return JSFunction::create(exec, exec->lexicalGlobalObject(), 1, propertyName.publicName(), jsLocationPrototypeFunctionReplace);
 }
 
 static JSValue nonCachingStaticReloadFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
 {
-    return JSFunction::create(exec, exec->lexicalGlobalObject(), 0, propertyName.impl(), jsLocationPrototypeFunctionReload);
+    return JSFunction::create(exec, exec->lexicalGlobalObject(), 0, propertyName.publicName(), jsLocationPrototypeFunctionReload);
 }
 
 static JSValue nonCachingStaticAssignFunctionGetter(ExecState* exec, JSValue, PropertyName propertyName)
 {
-    return JSFunction::create(exec, exec->lexicalGlobalObject(), 1, propertyName.impl(), jsLocationPrototypeFunctionAssign);
+    return JSFunction::create(exec, exec->lexicalGlobalObject(), 1, propertyName.publicName(), jsLocationPrototypeFunctionAssign);
 }
 

trunk/Source/WebCore/bridge/c/c_class.cpp

@@ -74 +74 @@
 }
 
-MethodList CClass::methodsNamed(PropertyName identifier, Instance* instance) const
+MethodList CClass::methodsNamed(PropertyName propertyName, Instance* instance) const
 {
-    UString name(identifier.impl());
+    UString name(propertyName.publicName());
     
     MethodList methodList;
@@ -101 +101 @@
 }
 
-Field* CClass::fieldNamed(PropertyName identifier, Instance* instance) const
+Field* CClass::fieldNamed(PropertyName propertyName, Instance* instance) const
 {
-    UString name(identifier.impl());
+    UString name(propertyName.publicName());
     
     Field* aField = _fields.get(name.impl());

trunk/Source/WebCore/bridge/c/c_instance.cpp

@@ -150 +150 @@
 {
     MethodList methodList = getClass()->methodsNamed(propertyName, this);
-    return CRuntimeMethod::create(exec, exec->lexicalGlobalObject(), propertyName.impl(), methodList);
+    return CRuntimeMethod::create(exec, exec->lexicalGlobalObject(), propertyName.publicName(), methodList);
 }
 

trunk/Source/WebCore/bridge/jni/jsc/JavaClassJSC.cpp

@@ -115 +115 @@
 }
 
-MethodList JavaClass::methodsNamed(PropertyName identifier, Instance*) const
+MethodList JavaClass::methodsNamed(PropertyName propertyName, Instance*) const
 {
-    MethodList* methodList = m_methods.get(identifier.ustring().impl());
+    MethodList* methodList = m_methods.get(propertyName.publicName());
 
     if (methodList)
@@ -124 +124 @@
 }
 
-Field* JavaClass::fieldNamed(PropertyName identifier, Instance*) const
+Field* JavaClass::fieldNamed(PropertyName propertyName, Instance*) const
 {
-    return m_fields.get(identifier.ustring().impl());
+    return m_fields.get(propertyName.publicName());
 }
 

trunk/Source/WebCore/bridge/jni/jsc/JavaInstanceJSC.cpp

@@ -154 +154 @@
 {
     MethodList methodList = getClass()->methodsNamed(propertyName, this);
-    return JavaRuntimeMethod::create(exec, exec->lexicalGlobalObject(), propertyName.ustring(), methodList);
+    return JavaRuntimeMethod::create(exec, exec->lexicalGlobalObject(), propertyName.publicName(), methodList);
 }
 

trunk/Source/WebCore/bridge/objc/objc_class.mm

@@ -96 +96 @@
 }
 
-MethodList ObjcClass::methodsNamed(PropertyName identifier, Instance*) const
-{
+MethodList ObjcClass::methodsNamed(PropertyName propertyName, Instance*) const
+{
+    UString name(propertyName.publicName());
+    if (name.isNull())
+        return MethodList();
+
     MethodList methodList;
-    if (Method* method = m_methodCache.get(identifier.impl())) {
+    if (Method* method = m_methodCache.get(name.impl())) {
         methodList.append(method);
         return methodList;
     }
 
-    CString jsName = identifier.ustring().ascii();
+    CString jsName = name.ascii();
     JSNameConversionBuffer buffer;
     convertJSMethodNameToObjc(jsName, buffer);
@@ -133 +137 @@
                 OwnPtr<Method> method = adoptPtr(new ObjcMethod(thisClass, objcMethodSelector));
                 methodList.append(method.get());
-                m_methodCache.add(identifier.impl(), method.release());
+                m_methodCache.add(name.impl(), method.release());
                 break;
             }
@@ -144 +148 @@
 }
 
-Field* ObjcClass::fieldNamed(PropertyName identifier, Instance* instance) const
-{
-    Field* field = m_fieldCache.get(identifier.impl());
+Field* ObjcClass::fieldNamed(PropertyName propertyName, Instance* instance) const
+{
+    UString name(propertyName.publicName());
+    if (name.isNull())
+        return 0;
+
+    Field* field = m_fieldCache.get(name.impl());
     if (field)
         return field;
@@ -152 +160 @@
     ClassStructPtr thisClass = _isa;
 
-    CString jsName = identifier.ustring().ascii();
+    CString jsName = name.ascii();
     RetainPtr<CFStringRef> fieldName(AdoptCF, CFStringCreateWithCString(NULL, jsName.data(), kCFStringEncodingASCII));
     id targetObject = (static_cast<ObjcInstance*>(instance))->getObject();
@@ -178 +186 @@
                 OwnPtr<Field> newField = adoptPtr(new ObjcField((CFStringRef)keyName));
                 field = newField.get();
-                m_fieldCache.add(identifier.impl(), newField.release());
+                m_fieldCache.add(name.impl(), newField.release());
                 break;
             }
@@ -209 +217 @@
                     OwnPtr<Field> newField = adoptPtr(new ObjcField(objcIVar));
                     field = newField.get();
-                    m_fieldCache.add(identifier.impl(), newField.release());
+                    m_fieldCache.add(name.impl(), newField.release());
                     break;
                 }
@@ -229 +237 @@
     if (![targetObject respondsToSelector:@selector(invokeUndefinedMethodFromWebScript:withArguments:)])
         return jsUndefined();
-    return ObjcFallbackObjectImp::create(exec, exec->lexicalGlobalObject(), objcInstance, propertyName.impl());
-}
-
-}
-}
+    return ObjcFallbackObjectImp::create(exec, exec->lexicalGlobalObject(), objcInstance, propertyName.publicName());
+}
+
+}
+}

trunk/Source/WebCore/bridge/objc/objc_instance.mm

@@ -219 +219 @@
 {
     MethodList methodList = getClass()->methodsNamed(propertyName, this);
-    return ObjCRuntimeMethod::create(exec, exec->lexicalGlobalObject(), propertyName.ustring(), methodList);
+    return ObjCRuntimeMethod::create(exec, exec->lexicalGlobalObject(), propertyName.publicName(), methodList);
 }
 
@@ -402 +402 @@
 }
 
-bool ObjcInstance::setValueOfUndefinedField(ExecState* exec, PropertyName property, JSValue aValue)
-{
+bool ObjcInstance::setValueOfUndefinedField(ExecState* exec, PropertyName propertyName, JSValue aValue)
+{
+    UString name(propertyName.publicName());
+    if (name.isNull())
+        return false;
+
     id targetObject = getObject();
     if (![targetObject respondsToSelector:@selector(setValue:forUndefinedKey:)])
@@ -419 +423 @@
 
         @try {
-            [targetObject setValue:objcValue.objectValue forUndefinedKey:[NSString stringWithCString:property.ustring().ascii().data() encoding:NSASCIIStringEncoding]];
+            [targetObject setValue:objcValue.objectValue forUndefinedKey:[NSString stringWithCString:name.ascii().data() encoding:NSASCIIStringEncoding]];
         } @catch(NSException* localException) {
             // Do nothing.  Class did not override valueForUndefinedKey:.
@@ -430 +434 @@
 }
 
-JSValue ObjcInstance::getValueOfUndefinedField(ExecState* exec, PropertyName property) const
-{
+JSValue ObjcInstance::getValueOfUndefinedField(ExecState* exec, PropertyName propertyName) const
+{
+    UString name(propertyName.publicName());
+    if (name.isNull())
+        return jsUndefined();
+
     JSValue result = jsUndefined();
     
@@ -445 +453 @@
     
         @try {
-            id objcValue = [targetObject valueForUndefinedKey:[NSString stringWithCString:property.ustring().ascii().data() encoding:NSASCIIStringEncoding]];
+            id objcValue = [targetObject valueForUndefinedKey:[NSString stringWithCString:name.ascii().data() encoding:NSASCIIStringEncoding]];
             result = convertObjcValueToValue(exec, &objcValue, ObjcObjectType, m_rootObject.get());
         } @catch(NSException* localException) {

trunk/Source/WebCore/bridge/qt/qt_class.cpp

@@ -71 +71 @@
     QtInstance* qtinst = static_cast<QtInstance*>(inst);
 
-    const UString& ustring = identifier.ustring();
+    UString ustring(identifier.publicName());
     const QByteArray name = QString(reinterpret_cast<const QChar*>(ustring.characters()), ustring.length()).toAscii();
 
@@ -134 +134 @@
 
     QObject* obj = qtinst->getObject();
-    const UString& ustring = identifier.ustring();
+    UString ustring(identifier.publicName());
     const QString name(reinterpret_cast<const QChar*>(ustring.characters()), ustring.length());
     const QByteArray ascii = name.toAscii();

trunk/Source/WebCore/bridge/qt/qt_instance.cpp

@@ -254 +254 @@
         return jsNull();
     MethodList methodList = m_class->methodsNamed(propertyName, this);
-    return RuntimeMethod::create(exec, exec->lexicalGlobalObject(), WebCore::deprecatedGetDOMStructure<RuntimeMethod>(exec), propertyName.ustring(), methodList);
+    return RuntimeMethod::create(exec, exec->lexicalGlobalObject(), WebCore::deprecatedGetDOMStructure<RuntimeMethod>(exec), propertyName.publicName(), methodList);
 }
 

trunk/Source/WebCore/bridge/qt/qt_pixmapruntime.cpp

@@ -243 +243 @@
 {
     MethodList methodList = getClass()->methodsNamed(propertyName, this);
-    return RuntimeMethod::create(exec, exec->lexicalGlobalObject(), WebCore::deprecatedGetDOMStructure<RuntimeMethod>(exec), propertyName.ustring(), methodList);
+    return RuntimeMethod::create(exec, exec->lexicalGlobalObject(), WebCore::deprecatedGetDOMStructure<RuntimeMethod>(exec), propertyName.publicName(), methodList);
 }
 
@@ -260 +260 @@
 {
     MethodList methods;
-    if (identifier.ustring() == QtPixmapToDataUrlMethod::name())
+    UString ustring(identifier.publicName());
+    if (ustring == QtPixmapToDataUrlMethod::name())
         methods.append(&qt_pixmap_metaData.toDataUrlMethod);
-    else if (identifier.ustring() == QtPixmapToImageDataMethod::name())
+    else if (ustring == QtPixmapToImageDataMethod::name())
         methods.append(&qt_pixmap_metaData.toImageDataMethod);
-    else if (identifier.ustring() == QtPixmapAssignToElementMethod::name())
+    else if (ustring == QtPixmapAssignToElementMethod::name())
         methods.append(&qt_pixmap_metaData.assignToElementMethod);
-    else if (identifier.ustring() == QtPixmapToStringMethod::name())
+    else if (ustring == QtPixmapToStringMethod::name())
         methods.append(&qt_pixmap_metaData.toStringMethod);
     return methods;
@@ -273 +274 @@
 Field* QtPixmapClass::fieldNamed(PropertyName identifier, Instance*) const
 {
-    if (identifier.ustring() == QtPixmapWidthField::name())
+    UString ustring(identifier.publicName());
+    if (ustring == QtPixmapWidthField::name())
         return &qt_pixmap_metaData.widthField;
-    if (identifier.ustring() == QtPixmapHeightField::name())
+    if (ustring == QtPixmapHeightField::name())
         return &qt_pixmap_metaData.heightField;
     return 0;

trunk/Source/WebCore/bridge/qt/qt_runtime.cpp

@@ -1522 +1522 @@
 
     if (!d->m_connect)
-        d->m_connect.set(exec->globalData(), thisObj, QtRuntimeConnectionMethod::create(exec, ident.impl(), true, d->m_instance, d->m_index, d->m_signature));
+        d->m_connect.set(exec->globalData(), thisObj, QtRuntimeConnectionMethod::create(exec, ident.publicName(), true, d->m_instance, d->m_index, d->m_signature));
     return d->m_connect.get();
 }
@@ -1532 +1532 @@
 
     if (!d->m_disconnect)
-        d->m_disconnect.set(exec->globalData(), thisObj, QtRuntimeConnectionMethod::create(exec, ident.impl(), false, d->m_instance, d->m_index, d->m_signature));
+        d->m_disconnect.set(exec->globalData(), thisObj, QtRuntimeConnectionMethod::create(exec, ident.publicName(), false, d->m_instance, d->m_index, d->m_signature));
     return d->m_disconnect.get();
 }

trunk/Source/WebCore/bridge/qt/qt_runtime_qt4.cpp

@@ -1531 +1531 @@
 
     if (!d->m_connect)
-        d->m_connect.set(exec->globalData(), thisObj, QtRuntimeConnectionMethod::create(exec, ident.ustring(), true, d->m_instance, d->m_index, d->m_signature));
+        d->m_connect.set(exec->globalData(), thisObj, QtRuntimeConnectionMethod::create(exec, ident.publicName(), true, d->m_instance, d->m_index, d->m_signature));
     return d->m_connect.get();
 }
@@ -1541 +1541 @@
 
     if (!d->m_disconnect)
-        d->m_disconnect.set(exec->globalData(), thisObj, QtRuntimeConnectionMethod::create(exec, ident.ustring(), false, d->m_instance, d->m_index, d->m_signature));
+        d->m_disconnect.set(exec->globalData(), thisObj, QtRuntimeConnectionMethod::create(exec, ident.publicName(), false, d->m_instance, d->m_index, d->m_signature));
     return d->m_disconnect.get();
 }

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2012-05-15  Gavin Barraclough  <barraclough@apple.com>
+
+        Add support for private names
+        https://bugs.webkit.org/show_bug.cgi?id=86509
+
+        Reviewed by Oliver Hunt.
+
+        The spec isn't final, but we can start adding support to allow property maps
+        to contain keys that aren't identifiers.
+
+        * Plugins/Hosted/ProxyInstance.mm:
+        (WebKit::ProxyClass::methodsNamed):
+        (WebKit::ProxyClass::fieldNamed):
+        (WebKit::ProxyInstance::getMethod):
+        (WebKit::ProxyInstance::methodsNamed):
+        (WebKit::ProxyInstance::fieldNamed):
+            - Removed PropertyName::impl(), call publicName() to get the string associated with a name.
+
 2012-05-21  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
 

trunk/Source/WebKit/mac/Plugins/Hosted/ProxyInstance.mm

@@ -55 +55 @@
 };
 
-MethodList ProxyClass::methodsNamed(PropertyName identifier, Instance* instance) const
-{
-    return static_cast<ProxyInstance*>(instance)->methodsNamed(identifier);
-}
-
-Field* ProxyClass::fieldNamed(PropertyName identifier, Instance* instance) const
-{
-    return static_cast<ProxyInstance*>(instance)->fieldNamed(identifier);
+MethodList ProxyClass::methodsNamed(PropertyName propertyName, Instance* instance) const
+{
+    return static_cast<ProxyInstance*>(instance)->methodsNamed(propertyName);
+}
+
+Field* ProxyClass::fieldNamed(PropertyName propertyName, Instance* instance) const
+{
+    return static_cast<ProxyInstance*>(instance)->fieldNamed(propertyName);
 }
 
@@ -217 +217 @@
 {
     MethodList methodList = getClass()->methodsNamed(propertyName, this);
-    return ProxyRuntimeMethod::create(exec, exec->lexicalGlobalObject(), propertyName.impl(), methodList);
+    return ProxyRuntimeMethod::create(exec, exec->lexicalGlobalObject(), propertyName.publicName(), methodList);
 }
 
@@ -347 +347 @@
 }
 
-MethodList ProxyInstance::methodsNamed(PropertyName identifier)
-{
-    if (!m_instanceProxy)
+MethodList ProxyInstance::methodsNamed(PropertyName propertyName)
+{
+    UString name(propertyName.publicName());
+    if (name.isNull())
         return MethodList();
+
+    if (!m_instanceProxy)
+        return MethodList();
     
     // If we already have an entry in the map, use it.
-    MethodMap::iterator existingMapEntry = m_methods.find(identifier.impl());
+    MethodMap::iterator existingMapEntry = m_methods.find(name.impl());
     if (existingMapEntry != m_methods.end()) {
         MethodList methodList;
@@ -361 +365 @@
     }
     
-    uint64_t methodName = reinterpret_cast<uint64_t>(_NPN_GetStringIdentifier(identifier.ustring().ascii().data()));
+    uint64_t methodName = reinterpret_cast<uint64_t>(_NPN_GetStringIdentifier(name.ascii().data()));
     uint32_t requestID = m_instanceProxy->nextRequestID();
     
@@ -377 +381 @@
 
     // Add a new entry to the map unless an entry was added while we were in waitForReply.
-    MethodMap::AddResult mapAddResult = m_methods.add(identifier.impl(), 0);
+    MethodMap::AddResult mapAddResult = m_methods.add(name.impl(), 0);
     if (mapAddResult.isNewEntry && reply->m_result)
         mapAddResult.iterator->second = new ProxyMethod(methodName);
@@ -387 +391 @@
 }
 
-Field* ProxyInstance::fieldNamed(PropertyName identifier)
-{
-    if (!m_instanceProxy)
+Field* ProxyInstance::fieldNamed(PropertyName propertyName)
+{
+    UString name(propertyName.publicName());
+    if (name.isNull())
         return 0;
+
+    if (!m_instanceProxy)
+        return 0;
     
     // If we already have an entry in the map, use it.
-    FieldMap::iterator existingMapEntry = m_fields.find(identifier.impl());
+    FieldMap::iterator existingMapEntry = m_fields.find(name.impl());
     if (existingMapEntry != m_fields.end())
         return existingMapEntry->second;
     
-    uint64_t propertyName = reinterpret_cast<uint64_t>(_NPN_GetStringIdentifier(identifier.ustring().ascii().data()));
+    uint64_t identifier = reinterpret_cast<uint64_t>(_NPN_GetStringIdentifier(name.ascii().data()));
     uint32_t requestID = m_instanceProxy->nextRequestID();
     
     if (_WKPHNPObjectHasProperty(m_instanceProxy->hostProxy()->port(),
                                  m_instanceProxy->pluginID(), requestID,
-                                 m_objectID, propertyName) != KERN_SUCCESS)
+                                 m_objectID, identifier) != KERN_SUCCESS)
         return 0;
     
@@ -413 +421 @@
     
     // Add a new entry to the map unless an entry was added while we were in waitForReply.
-    FieldMap::AddResult mapAddResult = m_fields.add(identifier.impl(), 0);
+    FieldMap::AddResult mapAddResult = m_fields.add(name.impl(), 0);
     if (mapAddResult.isNewEntry && reply->m_result)
-        mapAddResult.iterator->second = new ProxyField(propertyName);
+        mapAddResult.iterator->second = new ProxyField(identifier);
     return mapAddResult.iterator->second;
 }

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-05-15  Gavin Barraclough  <barraclough@apple.com>
+
+        Add support for private names
+        https://bugs.webkit.org/show_bug.cgi?id=86509
+
+        Reviewed by Oliver Hunt.
+
+        The spec isn't final, but we can start adding support to allow property maps
+        to contain keys that aren't identifiers.
+
+        * WebProcess/Plugins/Netscape/JSNPObject.cpp:
+        (WebKit::npIdentifierFromIdentifier):
+        (WebKit::JSNPObject::methodGetter):
+            - Removed PropertyName::impl(), call publicName() to get the string associated with a name.
+
 2012-05-21  Hugo Parente Lima  <hugo.lima@openbossa.org>
 

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp

@@ -46 +46 @@
 namespace WebKit {
 
-static NPIdentifier npIdentifierFromIdentifier(PropertyName identifier)
-{
-    return static_cast<NPIdentifier>(IdentifierRep::get(identifier.ustring().utf8().data()));
+static NPIdentifier npIdentifierFromIdentifier(PropertyName propertyName)
+{
+    UString name(propertyName.publicName());
+    if (name.isNull())
+        return 0;
+    return static_cast<NPIdentifier>(IdentifierRep::get(name.utf8().data()));
 }
 
@@ -475 +478 @@
 }
 
-JSValue JSNPObject::methodGetter(ExecState* exec, JSValue slotBase, PropertyName methodName)
+JSValue JSNPObject::methodGetter(ExecState* exec, JSValue slotBase, PropertyName propertyName)
 {
     JSNPObject* thisObj = static_cast<JSNPObject*>(asObject(slotBase));
@@ -483 +486 @@
         return throwInvalidAccessError(exec);
 
-    NPIdentifier npIdentifier = npIdentifierFromIdentifier(methodName);
-    return JSNPMethod::create(exec, thisObj->globalObject(), methodName.ustring(), npIdentifier);
+    NPIdentifier npIdentifier = npIdentifierFromIdentifier(propertyName);
+    return JSNPMethod::create(exec, thisObj->globalObject(), propertyName.publicName(), npIdentifier);
 }