Changeset 141300 in webkit

Timestamp:

Jan 30, 2013 12:51:07 PM (11 years ago)

Author:

benjamin@webkit.org

Message:

Do not convert to String->AtomicString for NamedNodeMap
​https://bugs.webkit.org/show_bug.cgi?id=108289

Reviewed by Kentaro Hara.

NamedNodeMap's API was taking a WTF::String. Internally, attribute
names are AtomicString.

The conversions String->AtomicString was causing an additional ref-deref
for the JS/V8 bindings. And could cause an additional memory allocation for the Objective-C
bindings.

This patch changes the API to use AtomicString, and update the custom bindings accordingly.

• bindings/js/JSNamedNodeMapCustom.cpp:

(WebCore::JSNamedNodeMap::canGetItemsForName):
(WebCore::JSNamedNodeMap::nameGetter):

• bindings/v8/custom/V8NamedNodeMapCustom.cpp:

(WebCore::V8NamedNodeMap::namedPropertyGetter):

• dom/NamedNodeMap.cpp:

(WebCore::NamedNodeMap::getNamedItem):
(WebCore::NamedNodeMap::getNamedItemNS):
(WebCore::NamedNodeMap::removeNamedItem):
(WebCore::NamedNodeMap::removeNamedItemNS):

• dom/NamedNodeMap.h:

(NamedNodeMap):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSNamedNodeMapCustom.cpp (modified) (3 diffs)
• bindings/v8/custom/V8NamedNodeMapCustom.cpp (modified) (1 diff)
• dom/NamedNodeMap.cpp (modified) (3 diffs)
• dom/NamedNodeMap.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-30  Benjamin Poulain  <benjamin@webkit.org>
+
+        Do not convert to String->AtomicString for NamedNodeMap
+        https://bugs.webkit.org/show_bug.cgi?id=108289
+
+        Reviewed by Kentaro Hara.
+
+        NamedNodeMap's API was taking a WTF::String. Internally, attribute
+        names are AtomicString.
+
+        The conversions String->AtomicString was causing an additional ref-deref
+        for the JS/V8 bindings. And could cause an additional memory allocation for the Objective-C
+        bindings.
+
+        This patch changes the API to use AtomicString, and update the custom bindings accordingly.
+
+        * bindings/js/JSNamedNodeMapCustom.cpp:
+        (WebCore::JSNamedNodeMap::canGetItemsForName):
+        (WebCore::JSNamedNodeMap::nameGetter):
+        * bindings/v8/custom/V8NamedNodeMapCustom.cpp:
+        (WebCore::V8NamedNodeMap::namedPropertyGetter):
+        * dom/NamedNodeMap.cpp:
+        (WebCore::NamedNodeMap::getNamedItem):
+        (WebCore::NamedNodeMap::getNamedItemNS):
+        (WebCore::NamedNodeMap::removeNamedItem):
+        (WebCore::NamedNodeMap::removeNamedItemNS):
+        * dom/NamedNodeMap.h:
+        (NamedNodeMap):
+
 2013-01-30  Zan Dobersek  <zdobersek@igalia.com>
 

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -38 +38 @@
 bool JSNamedNodeMap::canGetItemsForName(ExecState*, NamedNodeMap* impl, PropertyName propertyName)
 {
-    return impl->getNamedItem(propertyNameToString(propertyName));
+    return impl->getNamedItem(propertyNameToAtomicString(propertyName));
 }
 
@@ -44 +44 @@
 {
     JSNamedNodeMap* thisObj = jsCast<JSNamedNodeMap*>(asObject(slotBase));
-    return toJS(exec, thisObj->globalObject(), thisObj->impl()->getNamedItem(propertyNameToString(propertyName)));
+    return toJS(exec, thisObj->globalObject(), thisObj->impl()->getNamedItem(propertyNameToAtomicString(propertyName)));
 }
 

trunk/Source/WebCore/bindings/v8/custom/V8NamedNodeMapCustom.cpp

@@ -61 +61 @@
 
     NamedNodeMap* imp = V8NamedNodeMap::toNative(info.Holder());
-    RefPtr<Node> result = imp->getNamedItem(toWebCoreString(name));
+    RefPtr<Node> result = imp->getNamedItem(toWebCoreAtomicString(name));
     if (!result)
         return v8Undefined();

trunk/Source/WebCore/dom/NamedNodeMap.cpp

@@ -4 +4 @@
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.
  *           (C) 2007 Eric Seidel (eric@webkit.org)
  *
@@ -51 +51 @@
 }
 
-PassRefPtr<Node> NamedNodeMap::getNamedItem(const String& name) const
+PassRefPtr<Node> NamedNodeMap::getNamedItem(const AtomicString& name) const
 {
     return m_element->getAttributeNode(name);
 }
 
-PassRefPtr<Node> NamedNodeMap::getNamedItemNS(const String& namespaceURI, const String& localName) const
+PassRefPtr<Node> NamedNodeMap::getNamedItemNS(const AtomicString& namespaceURI, const AtomicString& localName) const
 {
     return m_element->getAttributeNodeNS(namespaceURI, localName);
 }
 
-PassRefPtr<Node> NamedNodeMap::removeNamedItem(const String& name, ExceptionCode& ec)
+PassRefPtr<Node> NamedNodeMap::removeNamedItem(const AtomicString& name, ExceptionCode& ec)
 {
     size_t index = m_element->getAttributeItemIndex(name, shouldIgnoreAttributeCase(m_element));
@@ -71 +71 @@
 }
 
-PassRefPtr<Node> NamedNodeMap::removeNamedItemNS(const String& namespaceURI, const String& localName, ExceptionCode& ec)
+PassRefPtr<Node> NamedNodeMap::removeNamedItemNS(const AtomicString& namespaceURI, const AtomicString& localName, ExceptionCode& ec)
 {
     size_t index = m_element->getAttributeItemIndex(QualifiedName(nullAtom, localName, namespaceURI));

trunk/Source/WebCore/dom/NamedNodeMap.h

@@ -4 +4 @@
  *           (C) 2001 Peter Kelly (pmk@post.com)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
- * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2004, 2005, 2006, 2008, 2010, 2013 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -29 +29 @@
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
-#include <wtf/text/WTFString.h>
+#include <wtf/text/AtomicString.h>
 
 namespace WebCore {
@@ -52 +52 @@
     // Public DOM interface.
 
-    PassRefPtr<Node> getNamedItem(const String& name) const;
-    PassRefPtr<Node> removeNamedItem(const String& name, ExceptionCode&);
+    PassRefPtr<Node> getNamedItem(const AtomicString&) const;
+    PassRefPtr<Node> removeNamedItem(const AtomicString& name, ExceptionCode&);
 
-    PassRefPtr<Node> getNamedItemNS(const String& namespaceURI, const String& localName) const;
-    PassRefPtr<Node> removeNamedItemNS(const String& namespaceURI, const String& localName, ExceptionCode&);
+    PassRefPtr<Node> getNamedItemNS(const AtomicString& namespaceURI, const AtomicString& localName) const;
+    PassRefPtr<Node> removeNamedItemNS(const AtomicString& namespaceURI, const AtomicString& localName, ExceptionCode&);
 
     PassRefPtr<Node> setNamedItem(Node*, ExceptionCode&);