<!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>[166760] trunk/Source</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/166760">166760</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-04-03 19:29:15 -0700 (Thu, 03 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fast-path for casting JS wrappers to JSNode.
<https://webkit.org/b/131196>
Source/JavaScriptCore:
Allow code outside of JSC (well, WebCore) to extend the JSType spectrum
a little bit. We do this by exposing a LastJSCObjectType constant so
WebCore can encode its own wrapper types after that.
Reviewed by Mark Hahnenberg and Geoff Garen.
* runtime/JSType.h:
Added LastJSCObjectType for use by WebCore.
* runtime/JSObject.h:
(JSC::JSObject::isVariableObject):
Updated since this can no longer assume that types >= VariableObjectType
are all variable objects.
Source/WebCore:
Add a way to quickly determine that a given JSObject is a JSNode.
This lets us avoid walking the ClassInfo chain in the DOM bindings
for WebCore::Node.
Reviewed by Mark Hahnenberg and Geoff Garen.
* bindings/js/JSDOMWrapper.h:
Added a JSNodeType constant that extends beyond JSC::JSType.
* bindings/js/JSNodeCustom.h:
(WebCore::jsNodeCast):
Added. Fast cast from JSValue to JSNode.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader):
(GenerateImplementation):
Generate code that uses jsNodeCast in Node interfaces.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSObjecth">trunk/Source/JavaScriptCore/runtime/JSObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSTypeh">trunk/Source/JavaScriptCore/runtime/JSType.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWrapperh">trunk/Source/WebCore/bindings/js/JSDOMWrapper.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNodeCustomh">trunk/Source/WebCore/bindings/js/JSNodeCustom.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166759 => 166760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-04 02:24:28 UTC (rev 166759)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-04 02:29:15 UTC (rev 166760)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-04-03 Andreas Kling <akling@apple.com>
+
+ Fast-path for casting JS wrappers to JSNode.
+ <https://webkit.org/b/131196>
+
+ Allow code outside of JSC (well, WebCore) to extend the JSType spectrum
+ a little bit. We do this by exposing a LastJSCObjectType constant so
+ WebCore can encode its own wrapper types after that.
+
+ Reviewed by Mark Hahnenberg and Geoff Garen.
+
+ * runtime/JSType.h:
+
+ Added LastJSCObjectType for use by WebCore.
+
+ * runtime/JSObject.h:
+ (JSC::JSObject::isVariableObject):
+
+ Updated since this can no longer assume that types >= VariableObjectType
+ are all variable objects.
+
</ins><span class="cx"> 2014-04-03 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> All Heap::writeBarriers should be inline
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSObject.h (166759 => 166760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSObject.h 2014-04-04 02:24:28 UTC (rev 166759)
+++ trunk/Source/JavaScriptCore/runtime/JSObject.h 2014-04-04 02:29:15 UTC (rev 166760)
</span><span class="lines">@@ -1122,10 +1122,9 @@
</span><span class="cx">
</span><span class="cx"> inline bool JSObject::isVariableObject() const
</span><span class="cx"> {
</span><del>- return type() >= VariableObjectType;
</del><ins>+ return type() == GlobalObjectType || type() == ActivationObjectType;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> inline bool JSObject::isStaticScopeObject() const
</span><span class="cx"> {
</span><span class="cx"> JSType type = this->type();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSTypeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSType.h (166759 => 166760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSType.h 2014-04-04 02:24:28 UTC (rev 166759)
+++ trunk/Source/JavaScriptCore/runtime/JSType.h 2014-04-04 02:29:15 UTC (rev 166760)
</span><span class="lines">@@ -69,11 +69,11 @@
</span><span class="cx"> DataViewType,
</span><span class="cx">
</span><span class="cx"> NameScopeObjectType,
</span><del>- // VariableObjectType must be less than MOST of the types of its subclasses and only its subclasses.
- // We use >=VariableObjectType checks to test for Global & Activation objects, but exclude NameScopes.
- VariableObjectType,
</del><ins>+
</ins><span class="cx"> GlobalObjectType,
</span><span class="cx"> ActivationObjectType,
</span><ins>+
+ LastJSCObjectType = ActivationObjectType,
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> COMPILE_ASSERT(sizeof(JSType) == sizeof(uint8_t), sizeof_jstype_is_one_byte);
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166759 => 166760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-04 02:24:28 UTC (rev 166759)
+++ trunk/Source/WebCore/ChangeLog 2014-04-04 02:29:15 UTC (rev 166760)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-04-03 Andreas Kling <akling@apple.com>
+
+ Fast-path for casting JS wrappers to JSNode.
+ <https://webkit.org/b/131196>
+
+ Add a way to quickly determine that a given JSObject is a JSNode.
+ This lets us avoid walking the ClassInfo chain in the DOM bindings
+ for WebCore::Node.
+
+ Reviewed by Mark Hahnenberg and Geoff Garen.
+
+ * bindings/js/JSDOMWrapper.h:
+
+ Added a JSNodeType constant that extends beyond JSC::JSType.
+
+ * bindings/js/JSNodeCustom.h:
+ (WebCore::jsNodeCast):
+
+ Added. Fast cast from JSValue to JSNode.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateHeader):
+ (GenerateImplementation):
+
+ Generate code that uses jsNodeCast in Node interfaces.
+
</ins><span class="cx"> 2014-04-03 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><span class="cx"> Merge ShapeInfo & ShapeOutsideInfo now that ShapeInsideInfo is no more
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWrapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWrapper.h (166759 => 166760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWrapper.h 2014-04-04 02:24:28 UTC (rev 166759)
+++ trunk/Source/WebCore/bindings/js/JSDOMWrapper.h 2014-04-04 02:29:15 UTC (rev 166760)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx">
</span><span class="cx"> class ScriptExecutionContext;
</span><span class="cx">
</span><ins>+static const uint8_t JSNodeType = JSC::LastJSCObjectType + 1;
+
</ins><span class="cx"> class JSDOMWrapper : public JSC::JSDestructibleObject {
</span><span class="cx"> public:
</span><span class="cx"> typedef JSC::JSDestructibleObject Base;
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNodeCustomh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSNodeCustom.h (166759 => 166760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNodeCustom.h 2014-04-04 02:24:28 UTC (rev 166759)
+++ trunk/Source/WebCore/bindings/js/JSNodeCustom.h 2014-04-04 02:29:15 UTC (rev 166760)
</span><span class="lines">@@ -78,6 +78,13 @@
</span><span class="cx"> return root(&node);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ALWAYS_INLINE JSNode* jsNodeCast(JSC::JSValue value)
+{
+ if (UNLIKELY(!value.isCell()))
+ return nullptr;
+ return value.asCell()->type() == JSNodeType ? JSC::jsCast<JSNode*>(value) : nullptr;
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // JSDOMNodeCustom_h
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (166759 => 166760)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-04-04 02:24:28 UTC (rev 166759)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-04-04 02:29:15 UTC (rev 166760)
</span><span class="lines">@@ -959,6 +959,8 @@
</span><span class="cx"> push(@headerContent, " {\n");
</span><span class="cx"> if (IsDOMGlobalObject($interface)) {
</span><span class="cx"> push(@headerContent, " return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::GlobalObjectType, StructureFlags), info());\n");
</span><ins>+ } elsif ($codeGenerator->InheritsInterface($interface, "Node")) {
+ push(@headerContent, " return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::JSType(JSNodeType), StructureFlags), info());\n");
</ins><span class="cx"> } else {
</span><span class="cx"> push(@headerContent, " return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), info());\n");
</span><span class="cx"> }
</span><span class="lines">@@ -2130,7 +2132,11 @@
</span><span class="cx"> push(@implContent, " ${className}* castedThis = to${className}(JSValue::decode(thisValue));\n");
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(slotBase);\n");
</span><span class="cx"> } else {
</span><del>- push(@implContent, " ${className}* castedThis = jsDynamicCast<$className*>(JSValue::decode(thisValue));\n");
</del><ins>+ if ($interfaceName eq "Node") {
+ push(@implContent, " JSNode* castedThis = jsNodeCast(JSValue::decode(thisValue));\n");
+ } else {
+ push(@implContent, " ${className}* castedThis = jsDynamicCast<$className*>(JSValue::decode(thisValue));\n");
+ }
</ins><span class="cx"> push(@implContent, " UNUSED_PARAM(slotBase);\n");
</span><span class="cx"> }
</span><span class="cx"> $implIncludes{"ScriptExecutionContext.h"} = 1;
</span></span></pre>
</div>
</div>
</body>
</html>