Changeset 171838 in webkit for trunk/Source/JavaScriptCore/runtime/PropertyName.h

Timestamp:

Jul 30, 2014, 10:38:30 PM (11 years ago)

Author:

[email protected]

Message:

PropertyName's internal string is always atomic.
<​https://webkit.org/b/135451>

Source/JavaScriptCore:
Now that we've merged the JSC::Identifier and WTF::AtomicString tables,
we know that any string that's an Identifier is guaranteed to be atomic.

A PropertyName can be either an Identifier or a PrivateName, and the
private names are also guaranteed to be atomic internally.

Make PropertyName vend AtomicStringImpl* instead of StringImpl*.

Reviewed by Benjamin Poulain.

• runtime/PropertyName.h:

(JSC::PropertyName::PropertyName):
(JSC::PropertyName::uid):
(JSC::PropertyName::publicName):

Source/WebCore:
Use PropertyName::publicName() directly instead of taking the slow route
through AtomicString::findStringWithHash().

These strings are always atomic, and findStringWithHash() would trudge
through a full hash lookup just to discover that indeed, they are!

Reviewed by Benjamin Poulain.

• bindings/js/JSDOMBinding.cpp:

(WebCore::findAtomicString): Deleted.

• bindings/js/JSDOMBinding.h:
• bindings/js/JSDOMWindowCustom.cpp:

(WebCore::namedItemGetter):
(WebCore::JSDOMWindow::getOwnPropertySlot):
(WebCore::JSDOMWindow::getOwnPropertySlotByIndex):

• bindings/js/JSHTMLDocumentCustom.cpp:

(WebCore::JSHTMLDocument::canGetItemsForName):
(WebCore::JSHTMLDocument::nameGetter):

Source/WTF:
Remove AtomicString::findStringWithHash() since nobody uses it anymore.

Reviewed by Benjamin Poulain.

• wtf/text/AtomicString.cpp:

(WTF::findString): Deleted.
(WTF::AtomicString::findStringWithHash): Deleted.

• wtf/text/AtomicString.h:

File:

• trunk/Source/JavaScriptCore/runtime/PropertyName.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/PropertyName.h

@@ -80 +80 @@
 public:
     PropertyName(const Identifier& propertyName)
-        : m_impl(propertyName.impl())
+        : m_impl(static_cast<AtomicStringImpl*>(propertyName.impl()))
     {
         ASSERT(!m_impl || m_impl->isAtomic());
@@ -86 +86 @@
 
     PropertyName(const PrivateName& propertyName)
-        : m_impl(propertyName.uid())
+        : m_impl(static_cast<AtomicStringImpl*>(propertyName.uid()))
     {
-        ASSERT(m_impl && m_impl->isEmptyUnique());
+        ASSERT(m_impl);
+        ASSERT(m_impl->isEmptyUnique());
+        ASSERT(m_impl->isAtomic());
     }
 
-    StringImpl* uid() const
+    AtomicStringImpl* uid() const
     {
         return m_impl;
     }
 
-    StringImpl* publicName() const
+    AtomicStringImpl* publicName() const
     {
-        return m_impl->isEmptyUnique() ? 0 : m_impl;
+        return m_impl->isEmptyUnique() ? nullptr : m_impl;
     }
 
@@ -109 +111 @@
 
 private:
-    StringImpl* m_impl;
+    AtomicStringImpl* m_impl;
 };