<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166823] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166823">166823</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-04-04 20:17:09 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Streamline cached wrapper lookup for Nodes in the normal world.
<https://webkit.org/b/131249>
Inline the hot path for toJS(..., Node*) for cached wrapper lookups
in the normal world. (Or really, out-of-line the cold path, since
that was preventing the compiler from inlining this function.)
Also have JSDOMGlobalObject cache the "is normal world" flag from
the DOMWrapperWorld so we can avoid the extra load.
Reviewed by Benjamin Poulain.
* WebCore.exp.in:
* bindings/js/JSDOMGlobalObject.cpp:
(WebCore::JSDOMGlobalObject::JSDOMGlobalObject):
* bindings/js/JSDOMGlobalObject.h:
(WebCore::JSDOMGlobalObject::worldIsNormal):
* bindings/js/JSNodeCustom.cpp:
(WebCore::getOutOfLineCachedWrapper):
* bindings/js/JSNodeCustom.h:
(WebCore::toJS):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMGlobalObjectcpp">trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMGlobalObjecth">trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNodeCustomcpp">trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNodeCustomh">trunk/Source/WebCore/bindings/js/JSNodeCustom.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166822 => 166823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-05 03:15:24 UTC (rev 166822)
+++ trunk/Source/WebCore/ChangeLog 2014-04-05 03:17:09 UTC (rev 166823)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-04-04 Andreas Kling <akling@apple.com>
+
+ Streamline cached wrapper lookup for Nodes in the normal world.
+ <https://webkit.org/b/131249>
+
+ Inline the hot path for toJS(..., Node*) for cached wrapper lookups
+ in the normal world. (Or really, out-of-line the cold path, since
+ that was preventing the compiler from inlining this function.)
+
+ Also have JSDOMGlobalObject cache the "is normal world" flag from
+ the DOMWrapperWorld so we can avoid the extra load.
+
+ Reviewed by Benjamin Poulain.
+
+ * WebCore.exp.in:
+ * bindings/js/JSDOMGlobalObject.cpp:
+ (WebCore::JSDOMGlobalObject::JSDOMGlobalObject):
+ * bindings/js/JSDOMGlobalObject.h:
+ (WebCore::JSDOMGlobalObject::worldIsNormal):
+ * bindings/js/JSNodeCustom.cpp:
+ (WebCore::getOutOfLineCachedWrapper):
+ * bindings/js/JSNodeCustom.h:
+ (WebCore::toJS):
+
</ins><span class="cx"> 2014-04-04 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Show DataDetector UI on scanned phone numbers.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (166822 => 166823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-04-05 03:15:24 UTC (rev 166822)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-04-05 03:17:09 UTC (rev 166823)
</span><span class="lines">@@ -963,6 +963,7 @@
</span><span class="cx"> __ZN7WebCore25addLanguageChangeObserverEPvPFvS0_E
</span><span class="cx"> __ZN7WebCore25computeViewportAttributesENS_17ViewportArgumentsEiiifNS_7IntSizeE
</span><span class="cx"> __ZN7WebCore25createCanonicalUUIDStringEv
</span><ins>+__ZN7WebCore25getOutOfLineCachedWrapperEPNS_17JSDOMGlobalObjectEPNS_4NodeE
</ins><span class="cx"> __ZN7WebCore26ContextDestructionObserver16contextDestroyedEv
</span><span class="cx"> __ZN7WebCore26ContextDestructionObserverC2EPNS_22ScriptExecutionContextE
</span><span class="cx"> __ZN7WebCore26ContextDestructionObserverD2Ev
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp (166822 => 166823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2014-04-05 03:15:24 UTC (rev 166822)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2014-04-05 03:17:09 UTC (rev 166823)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> : JSGlobalObject(vm, structure, globalObjectMethodTable)
</span><span class="cx"> , m_currentEvent(0)
</span><span class="cx"> , m_world(world)
</span><ins>+ , m_worldIsNormal(m_world->isNormal())
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_world);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h (166822 => 166823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h 2014-04-05 03:15:24 UTC (rev 166822)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.h 2014-04-05 03:17:09 UTC (rev 166823)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> static void visitChildren(JSC::JSCell*, JSC::SlotVisitor&);
</span><span class="cx">
</span><span class="cx"> DOMWrapperWorld& world() { return *m_world; }
</span><ins>+ bool worldIsNormal() const { return m_worldIsNormal; }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> static WEBKIT_EXPORTDATA const JSC::ClassInfo s_info;
</span><span class="lines">@@ -82,7 +83,8 @@
</span><span class="cx"> JSDOMConstructorMap m_constructors;
</span><span class="cx">
</span><span class="cx"> Event* m_currentEvent;
</span><del>- RefPtr<DOMWrapperWorld> m_world;
</del><ins>+ const RefPtr<DOMWrapperWorld> m_world;
+ bool m_worldIsNormal;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<class ConstructorClass>
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNodeCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp (166822 => 166823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp 2014-04-05 03:15:24 UTC (rev 166822)
+++ trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp 2014-04-05 03:17:09 UTC (rev 166823)
</span><span class="lines">@@ -261,6 +261,12 @@
</span><span class="cx"> return createWrapperInline(exec, globalObject, node);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+JSC::JSObject* getOutOfLineCachedWrapper(JSDOMGlobalObject* globalObject, Node* node)
+{
+ ASSERT(!globalObject->world().isNormal());
+ return globalObject->world().m_wrappers.get(node);
+}
+
</ins><span class="cx"> void willCreatePossiblyOrphanedTreeByRemovalSlowCase(Node* root)
</span><span class="cx"> {
</span><span class="cx"> JSC::ExecState* scriptState = mainWorldExecState(root->document().frame());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNodeCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSNodeCustom.h (166822 => 166823)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNodeCustom.h 2014-04-05 03:15:24 UTC (rev 166822)
+++ trunk/Source/WebCore/bindings/js/JSNodeCustom.h 2014-04-05 03:17:09 UTC (rev 166823)
</span><span class="lines">@@ -34,15 +34,20 @@
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> JSC::JSValue createWrapper(JSC::ExecState*, JSDOMGlobalObject*, Node*);
</span><ins>+JSC::JSObject* getOutOfLineCachedWrapper(JSDOMGlobalObject*, Node*);
</ins><span class="cx">
</span><span class="cx"> inline JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Node* node)
</span><span class="cx"> {
</span><span class="cx"> if (!node)
</span><span class="cx"> return JSC::jsNull();
</span><span class="cx">
</span><del>- JSNode* wrapper = JSC::jsCast<JSNode*>(getCachedWrapper(globalObject->world(), node));
- if (wrapper)
- return wrapper;
</del><ins>+ if (LIKELY(globalObject->worldIsNormal())) {
+ if (auto* wrapper = node->wrapper())
+ return wrapper;
+ } else {
+ if (auto* wrapper = getOutOfLineCachedWrapper(globalObject, node))
+ return wrapper;
+ }
</ins><span class="cx">
</span><span class="cx"> return createWrapper(exec, globalObject, node);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>