Changeset 166520 in webkit

Timestamp:

Mar 31, 2014 1:23:21 PM (10 years ago)

Author:

akling@apple.com

Message:

Always inline toJS() for NodeList.
<​https://webkit.org/b/130974>

This is a pretty cheesy optimization, but it's a 3% progression on
Dromaeo/dom-query.html on my MBP.

Reviewed by Benjamin Poulain.

• WebCore.exp.in:
• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSNodeListCustom.h: Added.

(WebCore::toJS):

• dom/NodeList.idl:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.exp.in (modified) (2 diffs)
• WebCore.xcodeproj/project.pbxproj (modified) (4 diffs)
• bindings/js/JSNodeListCustom.cpp (modified) (1 diff)
• bindings/js/JSNodeListCustom.h (copied) (copied from trunk/Source/WebCore/bindings/js/JSNodeListCustom.cpp) (2 diffs)
• dom/NodeList.idl (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-31  Andreas Kling  <akling@apple.com>
+
+        Always inline toJS() for NodeList.
+        <https://webkit.org/b/130974>
+
+        This is a pretty cheesy optimization, but it's a 3% progression on
+        Dromaeo/dom-query.html on my MBP.
+
+        Reviewed by Benjamin Poulain.
+
+        * WebCore.exp.in:
+        * WebCore.xcodeproj/project.pbxproj:
+        * bindings/js/JSNodeListCustom.h: Added.
+        (WebCore::toJS):
+        * dom/NodeList.idl:
+
 2014-03-31  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -307 +307 @@
 __ZN7WebCore13cookiesForDOMERKNS_21NetworkStorageSessionERKNS_3URLES5_
 __ZN7WebCore13createWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_4NodeE
+__ZN7WebCore13createWrapperERNS_17JSDOMGlobalObjectERNS_8NodeListE
 __ZN7WebCore13directoryNameERKN3WTF6StringE
 __ZN7WebCore13listDirectoryERKN3WTF6StringES3_
@@ -1082 +1083 @@
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_19CSSStyleDeclarationE
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_5RangeE
-__ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_8NodeListE
 __ZN7WebCore50restrictScaleFactorToInitialScaleIfNotUserScalableERNS_18ViewportAttributesE
 __ZN7WebCore5Color11transparentE

trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -4225 +4225 @@
                 ABDDFE7A0A5C6E7000A3E11D /* RenderMenuList.h in Headers */ = {isa = PBXBuildFile; fileRef = ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */; };
                 AD03AAFA1468455300A39B5B /* CSSValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD03AAF81468453900A39B5B /* CSSValue.cpp */; };
+                AD20B18D18E9D237005A8083 /* JSNodeListCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = AD20B18C18E9D216005A8083 /* JSNodeListCustom.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 AD4495F3141FC08900541EDF /* EventListenerMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD4495F1141FC08900541EDF /* EventListenerMap.cpp */; };
                 AD4495F4141FC08900541EDF /* EventListenerMap.h in Headers */ = {isa = PBXBuildFile; fileRef = AD4495F2141FC08900541EDF /* EventListenerMap.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -11328 +11329 @@
                 ABDDFE740A5C6E7000A3E11D /* RenderMenuList.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = RenderMenuList.h; sourceTree = "<group>"; };
                 AD03AAF81468453900A39B5B /* CSSValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSValue.cpp; sourceTree = "<group>"; };
+                AD20B18C18E9D216005A8083 /* JSNodeListCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNodeListCustom.h; sourceTree = "<group>"; };
                 AD4495F1141FC08900541EDF /* EventListenerMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventListenerMap.cpp; sourceTree = "<group>"; };
                 AD4495F2141FC08900541EDF /* EventListenerMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EventListenerMap.h; sourceTree = "<group>"; };
@@ -20564 +20566 @@
                                 1A750DD30A90E729000FF215 /* JSNodeIteratorCustom.cpp */,
                                 BCD9C2610C17AA67005C90A2 /* JSNodeListCustom.cpp */,
+                                AD20B18C18E9D216005A8083 /* JSNodeListCustom.h */,
                                 FDBD1DFB167FE27D0051A11E /* JSOscillatorNodeCustom.cpp */,
                                 FD8AA63D169514A700D2EA68 /* JSPannerNodeCustom.cpp */,
@@ -24036 +24039 @@
                                 E44613A80CD6331000FADA75 /* HTMLSourceElement.h in Headers */,
                                 977E2DCE12F0E28300C13379 /* HTMLSourceTracker.h in Headers */,
+                                AD20B18D18E9D237005A8083 /* JSNodeListCustom.h in Headers */,
                                 978AD67514130A8D00C7CAE3 /* HTMLSpanElement.h in Headers */,
                                 A871DC230A15205700B12A68 /* HTMLStyleElement.h in Headers */,

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

@@ -61 +61 @@
 }
 
+JSC::JSValue createWrapper(JSDOMGlobalObject& globalObject, NodeList& nodeList)
+{
+    globalObject.vm().heap.reportExtraMemoryCost(nodeList.memoryCost());
+    return createNewWrapper<JSNodeList>(&globalObject, &nodeList);
+}
+
 } // namespace WebCore

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

@@ -1 +1 @@
 /*
- * Copyright (C) 2007, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -21 +21 @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "config.h"
+#ifndef JSNodeListCustom_h
+#define JSNodeListCustom_h
+
+#include "JSDOMBinding.h"
 #include "JSNodeList.h"
-
-#include "ChildNodeList.h"
-#include "JSNode.h"
-#include "LiveNodeList.h"
-#include "Node.h"
-#include "NodeList.h"
-#include <wtf/text/AtomicString.h>
-
-using namespace JSC;
 
 namespace WebCore {
 
-bool JSNodeListOwner::isReachableFromOpaqueRoots(JSC::Handle<JSC::Unknown> handle, void*, SlotVisitor& visitor)
+JSC::JSValue createWrapper(JSDOMGlobalObject&, NodeList&);
+
+ALWAYS_INLINE JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, NodeList* nodeList)
 {
-    JSNodeList* jsNodeList = jsCast<JSNodeList*>(handle.slot()->asCell());
-    if (!jsNodeList->hasCustomProperties())
-        return false;
-    if (jsNodeList->impl().isLiveNodeList())
-        return visitor.containsOpaqueRoot(root(static_cast<LiveNodeList&>(jsNodeList->impl()).ownerNode()));
-    if (jsNodeList->impl().isChildNodeList())
-        return visitor.containsOpaqueRoot(root(static_cast<ChildNodeList&>(jsNodeList->impl()).ownerNode()));
-    if (jsNodeList->impl().isEmptyNodeList())
-        return visitor.containsOpaqueRoot(root(static_cast<EmptyNodeList&>(jsNodeList->impl()).ownerNode()));
-    return false;
-}
-
-bool JSNodeList::getOwnPropertySlotDelegate(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
-{
-    if (Node* item = impl().namedItem(propertyNameToAtomicString(propertyName))) {
-        slot.setValue(this, ReadOnly | DontDelete | DontEnum, toJS(exec, globalObject(), item));
-        return true;
-    }
-    return false;
+    if (!nodeList)
+        return JSC::jsNull();
+    if (JSC::JSValue existingWrapper = getExistingWrapper<JSNodeList>(globalObject, nodeList))
+        return existingWrapper;
+    return createWrapper(*globalObject, *nodeList);
 }
 
 } // namespace WebCore
+
+#endif // JSNodeListCustom_h

trunk/Source/WebCore/dom/NodeList.idl

@@ -21 +21 @@
 [
     CustomIsReachable,
+    CustomToJSObject,
     JSCustomGetOwnPropertySlotAndDescriptor,
+    JSCustomHeader,
     SkipVTableValidation,
     ReportExtraMemoryCost,