<!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>[189949] 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/189949">189949</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-09-17 17:46:12 -0700 (Thu, 17 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Regression(<a href="http://trac.webkit.org/projects/webkit/changeset/189881">r189881</a>): release assertion hit in toJS(ExecState*, JSDOMGlobalObject*, DocumentFragment*)
https://bugs.webkit.org/show_bug.cgi?id=149281
Reviewed by Ryosuke Niwa.
After <a href="http://trac.webkit.org/projects/webkit/changeset/189881">r189881</a>, we started generating a toJS() function for DocumentFragment
as an optimization. DocumentFragment has a subclass (ShadowRoot) but the
default toJS() implementation should have still been acceptable given that
the subclass is not web-exposed and therefore does not have a JS wrapper.
However, the ShadowRoot interface was introduced shortly after in <a href="http://trac.webkit.org/projects/webkit/changeset/189841">r189841</a>
and to toJS() implementation for DocumentFragment is now invalid. This
patch introduces a ShadowRoot-aware custom implementation of toJS() for
DocumentFragment to address the problem.
No new tests, already covered by:
plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html
* bindings/js/JSDocumentFragmentCustom.cpp:
(WebCore::createNewDocumentFragmentWrapper):
(WebCore::toJSNewlyCreated):
(WebCore::toJS):
Provide a ShadowRoot-aware custom implementation of toJS() /
toJSNewlyCreated() for DocumentFragment.
* bindings/js/JSNodeCustom.cpp:
(WebCore::createWrapperInline):
Fix bug in toJS() implementation for Node as it was not handling
ShadowRoots properly either.
* dom/DocumentFragment.idl:
Use [CustomToJSObject] so we can provide our own custom implementation
of toJS().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDocumentFragmentCustomcpp">trunk/Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNodeCustomcpp">trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentFragmentidl">trunk/Source/WebCore/dom/DocumentFragment.idl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (189948 => 189949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-18 00:44:56 UTC (rev 189948)
+++ trunk/Source/WebCore/ChangeLog 2015-09-18 00:46:12 UTC (rev 189949)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2015-09-17 Chris Dumez <cdumez@apple.com>
+
+ Regression(r189881): release assertion hit in toJS(ExecState*, JSDOMGlobalObject*, DocumentFragment*)
+ https://bugs.webkit.org/show_bug.cgi?id=149281
+
+ Reviewed by Ryosuke Niwa.
+
+ After r189881, we started generating a toJS() function for DocumentFragment
+ as an optimization. DocumentFragment has a subclass (ShadowRoot) but the
+ default toJS() implementation should have still been acceptable given that
+ the subclass is not web-exposed and therefore does not have a JS wrapper.
+
+ However, the ShadowRoot interface was introduced shortly after in r189841
+ and to toJS() implementation for DocumentFragment is now invalid. This
+ patch introduces a ShadowRoot-aware custom implementation of toJS() for
+ DocumentFragment to address the problem.
+
+ No new tests, already covered by:
+ plugins/snapshotting/snapshot-plugin-not-quite-blocked-by-image.html
+
+ * bindings/js/JSDocumentFragmentCustom.cpp:
+ (WebCore::createNewDocumentFragmentWrapper):
+ (WebCore::toJSNewlyCreated):
+ (WebCore::toJS):
+ Provide a ShadowRoot-aware custom implementation of toJS() /
+ toJSNewlyCreated() for DocumentFragment.
+
+ * bindings/js/JSNodeCustom.cpp:
+ (WebCore::createWrapperInline):
+ Fix bug in toJS() implementation for Node as it was not handling
+ ShadowRoots properly either.
+
+ * dom/DocumentFragment.idl:
+ Use [CustomToJSObject] so we can provide our own custom implementation
+ of toJS().
+
</ins><span class="cx"> 2015-09-17 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> De-template ContainerNodeAlgorithms
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDocumentFragmentCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp (189948 => 189949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp 2015-09-18 00:44:56 UTC (rev 189948)
+++ trunk/Source/WebCore/bindings/js/JSDocumentFragmentCustom.cpp 2015-09-18 00:46:12 UTC (rev 189949)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "JSNodeOrString.h"
</span><ins>+#include "JSShadowRoot.h"
</ins><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="lines">@@ -51,4 +52,29 @@
</span><span class="cx"> return jsUndefined();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline JSValue createNewDocumentFragmentWrapper(JSDOMGlobalObject& globalObject, DocumentFragment& impl)
+{
+#if ENABLE(SHADOW_DOM)
+ if (impl.isShadowRoot())
+ return createNewWrapper<JSShadowRoot>(&globalObject, &static_cast<ShadowRoot&>(impl));
+#endif
+ return createNewWrapper<JSDocumentFragment>(&globalObject, &impl);
+}
+
+JSValue toJSNewlyCreated(ExecState*, JSDOMGlobalObject* globalObject, DocumentFragment* impl)
+{
+ return impl ? createNewDocumentFragmentWrapper(*globalObject, *impl) : jsNull();
+}
+
+JSValue toJS(ExecState*, JSDOMGlobalObject* globalObject, DocumentFragment* impl)
+{
+ if (!impl)
+ return jsNull();
+
+ if (JSValue result = getExistingWrapper<JSDocumentFragment>(globalObject, impl))
+ return result;
+
+ return createNewDocumentFragmentWrapper(*globalObject, *impl);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNodeCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp (189948 => 189949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp 2015-09-18 00:44:56 UTC (rev 189948)
+++ trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp 2015-09-18 00:46:12 UTC (rev 189949)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> #include "JSHTMLElementWrapperFactory.h"
</span><span class="cx"> #include "JSProcessingInstruction.h"
</span><span class="cx"> #include "JSSVGElementWrapperFactory.h"
</span><ins>+#include "JSShadowRoot.h"
</ins><span class="cx"> #include "JSText.h"
</span><span class="cx"> #include "Node.h"
</span><span class="cx"> #include "ProcessingInstruction.h"
</span><span class="lines">@@ -205,7 +206,12 @@
</span><span class="cx"> wrapper = CREATE_DOM_WRAPPER(globalObject, DocumentType, node);
</span><span class="cx"> break;
</span><span class="cx"> case Node::DOCUMENT_FRAGMENT_NODE:
</span><del>- wrapper = CREATE_DOM_WRAPPER(globalObject, DocumentFragment, node);
</del><ins>+#if ENABLE(SHADOW_DOM)
+ if (node->isShadowRoot())
+ wrapper = CREATE_DOM_WRAPPER(globalObject, ShadowRoot, node);
+ else
+#endif
+ wrapper = CREATE_DOM_WRAPPER(globalObject, DocumentFragment, node);
</ins><span class="cx"> break;
</span><span class="cx"> case Node::ENTITY_REFERENCE_NODE:
</span><span class="cx"> wrapper = CREATE_DOM_WRAPPER(globalObject, EntityReference, node);
</span><span class="lines">@@ -214,7 +220,7 @@
</span><span class="cx"> wrapper = CREATE_DOM_WRAPPER(globalObject, Node, node);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return wrapper;
</del><ins>+ return wrapper;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue createWrapper(ExecState* exec, JSDOMGlobalObject* globalObject, Node* node)
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentFragmentidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentFragment.idl (189948 => 189949)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentFragment.idl 2015-09-18 00:44:56 UTC (rev 189948)
+++ trunk/Source/WebCore/dom/DocumentFragment.idl 2015-09-18 00:46:12 UTC (rev 189949)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> [
</span><span class="cx"> Constructor,
</span><span class="cx"> ConstructorCallWith=Document,
</span><del>- JSGenerateToJSObject
</del><ins>+ CustomToJSObject
</ins><span class="cx"> ] interface DocumentFragment : Node {
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>