<!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>[178758] 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/178758">178758</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-01-20 15:10:12 -0800 (Tue, 20 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fast path for casting JSValue to JSDocument*.
<https://webkit.org/b/134655>
Add a custom JSType bit for JSDocument so we can quickly cast to it
from JSValue in the DocumentPrototype functions. This removes a bunch
of grunt work and branches from common functions like getElementById.
Also removed GetCastingHelperForBaseObject and replace it with
simple jsCasts since we don't need dynamic type checks for the base.
Reviewed by Darin Adler.
* WebCore.xcodeproj/project.pbxproj:
* bindings/js/JSDOMWrapper.h:
* bindings/js/JSDocumentCustom.h:
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader):
(GetCastingHelperForThisObject):
(GenerateImplementation):
(GetCastingHelperForBaseObject): Deleted.
* dom/Document.idl:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWrapperh">trunk/Source/WebCore/bindings/js/JSDOMWrapper.h</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm">trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm</a></li>
<li><a href="#trunkSourceWebCoredomDocumentidl">trunk/Source/WebCore/dom/Document.idl</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorebindingsjsJSDocumentCustomh">trunk/Source/WebCore/bindings/js/JSDocumentCustom.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178757 => 178758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-20 22:43:36 UTC (rev 178757)
+++ trunk/Source/WebCore/ChangeLog 2015-01-20 23:10:12 UTC (rev 178758)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-01-20 Andreas Kling <akling@apple.com>
+
+ Fast path for casting JSValue to JSDocument*.
+ <https://webkit.org/b/134655>
+
+ Add a custom JSType bit for JSDocument so we can quickly cast to it
+ from JSValue in the DocumentPrototype functions. This removes a bunch
+ of grunt work and branches from common functions like getElementById.
+
+ Also removed GetCastingHelperForBaseObject and replace it with
+ simple jsCasts since we don't need dynamic type checks for the base.
+
+ Reviewed by Darin Adler.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSDOMWrapper.h:
+ * bindings/js/JSDocumentCustom.h:
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateHeader):
+ (GetCastingHelperForThisObject):
+ (GenerateImplementation):
+ (GetCastingHelperForBaseObject): Deleted.
+ * dom/Document.idl:
+
</ins><span class="cx"> 2015-01-20 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r178751.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (178757 => 178758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-20 22:43:36 UTC (rev 178757)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-20 23:10:12 UTC (rev 178758)
</span><span class="lines">@@ -4346,6 +4346,7 @@
</span><span class="cx"> AD726FEF16DA11F5003A4E6D /* JSCSSRuleCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = AD726FE916D9F40A003A4E6D /* JSCSSRuleCustom.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> AD9FF6E11908391D003B61E0 /* IOSurfacePoolCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = AD9FF6E01908391D003B61E0 /* IOSurfacePoolCocoa.mm */; };
</span><span class="cx"> ADB6B29818FB90240081963E /* MemoryPressureHandlerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = ADB6B29718FB90240081963E /* MemoryPressureHandlerCocoa.mm */; };
</span><ins>+ ADDA94C219687AA500453029 /* JSDocumentCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = ADDA94BF19686F8000453029 /* JSDocumentCustom.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> ADDF1AD71257CD9A0003A759 /* RenderSVGPath.h in Headers */ = {isa = PBXBuildFile; fileRef = ADDF1AD51257CD9A0003A759 /* RenderSVGPath.h */; };
</span><span class="cx"> ADEC78F818EE5308001315C2 /* JSElementCustom.h in Headers */ = {isa = PBXBuildFile; fileRef = ADEC78F718EE5308001315C2 /* JSElementCustom.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> B10B6980140C174000BC1C26 /* WebVTTToken.h in Headers */ = {isa = PBXBuildFile; fileRef = B10B697D140C174000BC1C26 /* WebVTTToken.h */; };
</span><span class="lines">@@ -11579,6 +11580,7 @@
</span><span class="cx"> AD726FEC16D9F4B9003A4E6D /* JSStyleSheetCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSStyleSheetCustom.h; sourceTree = "<group>"; };
</span><span class="cx"> AD9FF6E01908391D003B61E0 /* IOSurfacePoolCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = IOSurfacePoolCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx"> ADB6B29718FB90240081963E /* MemoryPressureHandlerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MemoryPressureHandlerCocoa.mm; sourceTree = "<group>"; };
</span><ins>+ ADDA94BF19686F8000453029 /* JSDocumentCustom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDocumentCustom.h; sourceTree = "<group>"; };
</ins><span class="cx"> ADDF1AD41257CD9A0003A759 /* RenderSVGPath.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RenderSVGPath.cpp; sourceTree = "<group>"; };
</span><span class="cx"> ADDF1AD51257CD9A0003A759 /* RenderSVGPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderSVGPath.h; sourceTree = "<group>"; };
</span><span class="cx"> ADE11F4A18D8311B0078983B /* ElementDescendantIterator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementDescendantIterator.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -20803,6 +20805,7 @@
</span><span class="cx"> E125F83C182411E700D84CD9 /* JSCryptoOperationData.h */,
</span><span class="cx"> BCE438A1140C0DBF005E437E /* JSDictionary.cpp */,
</span><span class="cx"> BCE4389B140B1BA7005E437E /* JSDictionary.h */,
</span><ins>+ ADDA94BF19686F8000453029 /* JSDocumentCustom.h */,
</ins><span class="cx"> 93B70D4709EB0C7C009D8468 /* JSDOMBinding.cpp */,
</span><span class="cx"> 93B70D4809EB0C7C009D8468 /* JSDOMBinding.h */,
</span><span class="cx"> E1C36CBC0EB08062007410BC /* JSDOMGlobalObject.cpp */,
</span><span class="lines">@@ -25462,6 +25465,7 @@
</span><span class="cx"> 93CCF0270AF6C52900018E89 /* NavigationAction.h in Headers */,
</span><span class="cx"> 979F43D41075E44A0000F83B /* NavigationScheduler.h in Headers */,
</span><span class="cx"> A9C6E5A60D746458006442E9 /* Navigator.h in Headers */,
</span><ins>+ ADDA94C219687AA500453029 /* JSDocumentCustom.h in Headers */,
</ins><span class="cx"> E12719C70EEEC16800F61213 /* NavigatorBase.h in Headers */,
</span><span class="cx"> 9711460414EF009A00674FD9 /* NavigatorGeolocation.h in Headers */,
</span><span class="cx"> 078E091A17D14D1C00420AA1 /* NavigatorUserMedia.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWrapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWrapper.h (178757 => 178758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWrapper.h 2015-01-20 22:43:36 UTC (rev 178757)
+++ trunk/Source/WebCore/bindings/js/JSDOMWrapper.h 2015-01-20 23:10:12 UTC (rev 178758)
</span><span class="lines">@@ -30,7 +30,8 @@
</span><span class="cx"> class ScriptExecutionContext;
</span><span class="cx">
</span><span class="cx"> static const uint8_t JSNodeType = JSC::LastJSCObjectType + 1;
</span><del>-static const uint8_t JSElementType = JSC::LastJSCObjectType + 2;
</del><ins>+static const uint8_t JSDocumentWrapperType = JSC::LastJSCObjectType + 2;
+static const uint8_t JSElementType = JSC::LastJSCObjectType + 3;
</ins><span class="cx">
</span><span class="cx"> class JSDOMWrapper : public JSC::JSDestructibleObject {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDocumentCustomh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/bindings/js/JSDocumentCustom.h (0 => 178758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDocumentCustom.h (rev 0)
+++ trunk/Source/WebCore/bindings/js/JSDocumentCustom.h 2015-01-20 23:10:12 UTC (rev 178758)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * 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.
+ */
+
+#ifndef JSDocumentCustom_h
+#define JSDocumentCustom_h
+
+#include "JSDOMBinding.h"
+#include "JSDocument.h"
+
+namespace WebCore {
+
+ALWAYS_INLINE JSDocument* jsDocumentCast(JSC::JSValue value)
+{
+ if (UNLIKELY(!value.isCell()))
+ return nullptr;
+ return value.asCell()->type() == JSDocumentWrapperType ? JSC::jsCast<JSDocument*>(value) : nullptr;
+}
+
+} // namespace WebCore
+
+#endif // JSDocumentCustom_h
</ins></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (178757 => 178758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-01-20 22:43:36 UTC (rev 178757)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2015-01-20 23:10:12 UTC (rev 178758)
</span><span class="lines">@@ -929,6 +929,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, "Document")) {
+ push(@headerContent, " return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::JSType(JSDocumentWrapperType), StructureFlags), info());\n");
</ins><span class="cx"> } elsif ($codeGenerator->InheritsInterface($interface, "Element")) {
</span><span class="cx"> push(@headerContent, " return JSC::Structure::create(vm, globalObject, prototype, JSC::TypeInfo(JSC::JSType(JSElementType), StructureFlags), info());\n");
</span><span class="cx"> } elsif ($codeGenerator->InheritsInterface($interface, "Node")) {
</span><span class="lines">@@ -1609,22 +1611,12 @@
</span><span class="cx"> if ($interface->name eq "Element") {
</span><span class="cx"> return "jsElementCast";
</span><span class="cx"> }
</span><ins>+ if ($interface->name eq "Document") {
+ return "jsDocumentCast";
+ }
</ins><span class="cx"> return "jsDynamicCast<JS" . $interface->name . "*>";
</span><span class="cx"> }
</span><span class="cx">
</span><del>-sub GetCastingHelperForBaseObject
-{
- my $interface = shift;
-
- if ($interface->name eq "Node") {
- return "jsNodeCast";
- }
- if ($interface->name eq "Element") {
- return "jsElementCast";
- }
- return "jsCast<JS" . $interface->name . "*>";
-}
-
</del><span class="cx"> sub GetIndexedGetterExpression
</span><span class="cx"> {
</span><span class="cx"> my $indexedGetterFunction = shift;
</span><span class="lines">@@ -2173,7 +2165,7 @@
</span><span class="cx"> if ($interface->extendedAttributes->{"CustomProxyToJSObject"}) {
</span><span class="cx"> push(@implContent, " ${className}* castedThis = to${className}(JSValue::decode(thisValue));\n");
</span><span class="cx"> } elsif (AttributeShouldBeOnInstance($interface, $attribute)) {
</span><del>- push(@implContent, " ${className}* castedThis = " . GetCastingHelperForBaseObject($interface) . "(slotBase);\n");
</del><ins>+ push(@implContent, " ${className}* castedThis = jsCast<JS${interfaceName}*>(slotBase);\n");
</ins><span class="cx"> if (InterfaceRequiresAttributesOnInstanceForCompatibility($interface)) {
</span><span class="cx"> push(@implContent, " ${className}* castedThisObject = " . GetCastingHelperForThisObject($interface) . "(JSValue::decode(thisValue));\n");
</span><span class="cx"> push(@implContent, " if (UNLIKELY(!castedThisObject))\n");
</span><span class="lines">@@ -2529,7 +2521,7 @@
</span><span class="cx"> push(@implContent, " ${className}* castedThis = to${className}(JSValue::decode(thisValue));\n");
</span><span class="cx"> } elsif (AttributeShouldBeOnInstance($interface, $attribute)) {
</span><span class="cx"> push(@implContent, " UNUSED_PARAM(thisValue);\n");
</span><del>- push(@implContent, " ${className}* castedThis = " . GetCastingHelperForBaseObject($interface) . "(baseObject);\n");
</del><ins>+ push(@implContent, " ${className}* castedThis = jsCast<JS${interfaceName}*>(baseObject);\n");
</ins><span class="cx"> if (InterfaceRequiresAttributesOnInstanceForCompatibility($interface)) {
</span><span class="cx"> push(@implContent, " ${className}* castedThisObject = " . GetCastingHelperForThisObject($interface) . "(JSValue::decode(thisValue));\n");
</span><span class="cx"> push(@implContent, " if (UNLIKELY(!castedThisObject))\n");
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.idl (178757 => 178758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.idl 2015-01-20 22:43:36 UTC (rev 178757)
+++ trunk/Source/WebCore/dom/Document.idl 2015-01-20 23:10:12 UTC (rev 178758)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> Constructor,
</span><span class="cx"> ConstructorCallWith=ScriptExecutionContext,
</span><span class="cx"> CustomToJSObject,
</span><ins>+ JSCustomHeader,
</ins><span class="cx"> JSGenerateToNativeObject,
</span><span class="cx"> ] interface Document : Node {
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>