<!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>[167794] 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/167794">167794</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-04-25 00:55:19 -0700 (Fri, 25 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>ASSERTION FAILED: "!m_isolatedWorld->isNormal() || m_wrapper || !m_jsFunction" in svg/custom/use-instanceRoot-event-listeners.xhtml
https://bugs.webkit.org/show_bug.cgi?id=132148
Reviewed by Andreas Kling.
Changed how JSCustomMarkFunction generation works. Instead of leaving out
the generated visitChildren function, just generate a call to visitAdditionalChildren.
This eliminates the need to repeat boilerplate.
The fix for the above bug was to correct mistaken logic where JSSVGElementInstance
had a visitChildren that did not properly mark event listeners because it explicitly
did not call through to the base class visitChildren. The new arrangement makes that
mistake impossible.
* bindings/js/JSAttrCustom.cpp:
(WebCore::JSAttr::visitAdditionalChildren): Use this instead of visitChildren.
* bindings/js/JSAudioTrackCustom.cpp:
(WebCore::JSAudioTrack::visitAdditionalChildren): Ditto.
* bindings/js/JSAudioTrackListCustom.cpp:
(WebCore::JSAudioTrackList::visitAdditionalChildren): Ditto.
* bindings/js/JSCSSRuleCustom.cpp:
(WebCore::JSCSSRule::visitAdditionalChildren): Ditto.
* bindings/js/JSCSSStyleDeclarationCustom.cpp:
(WebCore::JSCSSStyleDeclaration::visitAdditionalChildren): Ditto.
* bindings/js/JSCanvasRenderingContextCustom.cpp:
(WebCore::JSCanvasRenderingContext::visitAdditionalChildren): Ditto.
* bindings/js/JSCryptoKeyPairCustom.cpp:
(WebCore::JSCryptoKeyPair::visitAdditionalChildren): Ditto.
* bindings/js/JSDOMWindowCustom.cpp:
(WebCore::JSDOMWindow::visitAdditionalChildren): Ditto.
* bindings/js/JSMessageChannelCustom.cpp:
(WebCore::JSMessageChannel::visitAdditionalChildren): Ditto.
* bindings/js/JSMessagePortCustom.cpp:
(WebCore::JSMessagePort::visitAdditionalChildren): Ditto.
* bindings/js/JSNodeCustom.cpp:
(WebCore::JSNode::visitAdditionalChildren): Ditto.
* bindings/js/JSNodeFilterCustom.cpp:
(WebCore::JSNodeFilter::visitAdditionalChildren): Ditto.
* bindings/js/JSNodeIteratorCustom.cpp:
(WebCore::JSNodeIterator::visitAdditionalChildren): Ditto.
* bindings/js/JSSVGElementInstanceCustom.cpp:
(WebCore::JSSVGElementInstance::visitAdditionalChildren): Ditto.
* bindings/js/JSSharedWorkerCustom.cpp:
(WebCore::JSSharedWorker::visitAdditionalChildren): Ditto.
* bindings/js/JSStyleSheetCustom.cpp:
(WebCore::JSStyleSheet::visitAdditionalChildren): Ditto.
* bindings/js/JSTextTrackCueCustom.cpp:
(WebCore::JSTextTrackCue::visitAdditionalChildren): Ditto.
* bindings/js/JSTextTrackCustom.cpp:
(WebCore::JSTextTrack::visitAdditionalChildren): Ditto.
* bindings/js/JSTextTrackListCustom.cpp:
(WebCore::JSTextTrackList::visitAdditionalChildren): Ditto.
* bindings/js/JSTreeWalkerCustom.cpp:
(WebCore::JSTreeWalker::visitAdditionalChildren): Ditto.
* bindings/js/JSVideoTrackCustom.cpp:
(WebCore::JSVideoTrack::visitAdditionalChildren): Ditto.
* bindings/js/JSVideoTrackListCustom.cpp:
(WebCore::JSVideoTrackList::visitAdditionalChildren): Ditto.
* bindings/js/JSWebGLRenderingContextCustom.cpp:
(WebCore::JSWebGLRenderingContext::visitAdditionalChildren): Ditto.
* bindings/js/JSWorkerGlobalScopeCustom.cpp:
(WebCore::JSWorkerGlobalScope::visitAdditionalChildren): Ditto.
* bindings/js/JSXMLHttpRequestCustom.cpp:
(WebCore::JSXMLHttpRequest::visitAdditionalChildren): Ditto.
* bindings/js/JSXPathResultCustom.cpp:
(WebCore::JSXPathResult::visitAdditionalChildren): Ditto.
* bindings/js/JSDOMGlobalObject.cpp:
(WebCore::JSDOMGlobalObject::visitChildren): Rewrote to use modern for loops.
* bindings/scripts/CodeGeneratorJS.pm:
(GenerateHeader): Generate declaration of visitAdditionalChildren.
(GenerateImplementation): Generate call to visitAdditionalChildren.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSAttrCustomcpp">trunk/Source/WebCore/bindings/js/JSAttrCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSAudioTrackCustomcpp">trunk/Source/WebCore/bindings/js/JSAudioTrackCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSAudioTrackListCustomcpp">trunk/Source/WebCore/bindings/js/JSAudioTrackListCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSRuleCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp">trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCanvasRenderingContextCustomcpp">trunk/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSCryptoKeyPairCustomcpp">trunk/Source/WebCore/bindings/js/JSCryptoKeyPairCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMGlobalObjectcpp">trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp">trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMessageChannelCustomcpp">trunk/Source/WebCore/bindings/js/JSMessageChannelCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSMessagePortCustomcpp">trunk/Source/WebCore/bindings/js/JSMessagePortCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNodeCustomcpp">trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNodeFilterCustomcpp">trunk/Source/WebCore/bindings/js/JSNodeFilterCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSNodeIteratorCustomcpp">trunk/Source/WebCore/bindings/js/JSNodeIteratorCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSVGElementInstanceCustomcpp">trunk/Source/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSSharedWorkerCustomcpp">trunk/Source/WebCore/bindings/js/JSSharedWorkerCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSStyleSheetCustomcpp">trunk/Source/WebCore/bindings/js/JSStyleSheetCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSTextTrackCueCustomcpp">trunk/Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSTextTrackCustomcpp">trunk/Source/WebCore/bindings/js/JSTextTrackCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSTextTrackListCustomcpp">trunk/Source/WebCore/bindings/js/JSTextTrackListCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSTreeWalkerCustomcpp">trunk/Source/WebCore/bindings/js/JSTreeWalkerCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSVideoTrackCustomcpp">trunk/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSVideoTrackListCustomcpp">trunk/Source/WebCore/bindings/js/JSVideoTrackListCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWebGLRenderingContextCustomcpp">trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSWorkerGlobalScopeCustomcpp">trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSXMLHttpRequestCustomcpp">trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSXPathResultCustomcpp">trunk/Source/WebCore/bindings/js/JSXPathResultCustom.cpp</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="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/ChangeLog 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -1,3 +1,79 @@
</span><ins>+2014-04-25 Darin Adler <darin@apple.com>
+
+ ASSERTION FAILED: "!m_isolatedWorld->isNormal() || m_wrapper || !m_jsFunction" in svg/custom/use-instanceRoot-event-listeners.xhtml
+ https://bugs.webkit.org/show_bug.cgi?id=132148
+
+ Reviewed by Andreas Kling.
+
+ Changed how JSCustomMarkFunction generation works. Instead of leaving out
+ the generated visitChildren function, just generate a call to visitAdditionalChildren.
+ This eliminates the need to repeat boilerplate.
+
+ The fix for the above bug was to correct mistaken logic where JSSVGElementInstance
+ had a visitChildren that did not properly mark event listeners because it explicitly
+ did not call through to the base class visitChildren. The new arrangement makes that
+ mistake impossible.
+
+ * bindings/js/JSAttrCustom.cpp:
+ (WebCore::JSAttr::visitAdditionalChildren): Use this instead of visitChildren.
+ * bindings/js/JSAudioTrackCustom.cpp:
+ (WebCore::JSAudioTrack::visitAdditionalChildren): Ditto.
+ * bindings/js/JSAudioTrackListCustom.cpp:
+ (WebCore::JSAudioTrackList::visitAdditionalChildren): Ditto.
+ * bindings/js/JSCSSRuleCustom.cpp:
+ (WebCore::JSCSSRule::visitAdditionalChildren): Ditto.
+ * bindings/js/JSCSSStyleDeclarationCustom.cpp:
+ (WebCore::JSCSSStyleDeclaration::visitAdditionalChildren): Ditto.
+ * bindings/js/JSCanvasRenderingContextCustom.cpp:
+ (WebCore::JSCanvasRenderingContext::visitAdditionalChildren): Ditto.
+ * bindings/js/JSCryptoKeyPairCustom.cpp:
+ (WebCore::JSCryptoKeyPair::visitAdditionalChildren): Ditto.
+ * bindings/js/JSDOMWindowCustom.cpp:
+ (WebCore::JSDOMWindow::visitAdditionalChildren): Ditto.
+ * bindings/js/JSMessageChannelCustom.cpp:
+ (WebCore::JSMessageChannel::visitAdditionalChildren): Ditto.
+ * bindings/js/JSMessagePortCustom.cpp:
+ (WebCore::JSMessagePort::visitAdditionalChildren): Ditto.
+ * bindings/js/JSNodeCustom.cpp:
+ (WebCore::JSNode::visitAdditionalChildren): Ditto.
+ * bindings/js/JSNodeFilterCustom.cpp:
+ (WebCore::JSNodeFilter::visitAdditionalChildren): Ditto.
+ * bindings/js/JSNodeIteratorCustom.cpp:
+ (WebCore::JSNodeIterator::visitAdditionalChildren): Ditto.
+ * bindings/js/JSSVGElementInstanceCustom.cpp:
+ (WebCore::JSSVGElementInstance::visitAdditionalChildren): Ditto.
+ * bindings/js/JSSharedWorkerCustom.cpp:
+ (WebCore::JSSharedWorker::visitAdditionalChildren): Ditto.
+ * bindings/js/JSStyleSheetCustom.cpp:
+ (WebCore::JSStyleSheet::visitAdditionalChildren): Ditto.
+ * bindings/js/JSTextTrackCueCustom.cpp:
+ (WebCore::JSTextTrackCue::visitAdditionalChildren): Ditto.
+ * bindings/js/JSTextTrackCustom.cpp:
+ (WebCore::JSTextTrack::visitAdditionalChildren): Ditto.
+ * bindings/js/JSTextTrackListCustom.cpp:
+ (WebCore::JSTextTrackList::visitAdditionalChildren): Ditto.
+ * bindings/js/JSTreeWalkerCustom.cpp:
+ (WebCore::JSTreeWalker::visitAdditionalChildren): Ditto.
+ * bindings/js/JSVideoTrackCustom.cpp:
+ (WebCore::JSVideoTrack::visitAdditionalChildren): Ditto.
+ * bindings/js/JSVideoTrackListCustom.cpp:
+ (WebCore::JSVideoTrackList::visitAdditionalChildren): Ditto.
+ * bindings/js/JSWebGLRenderingContextCustom.cpp:
+ (WebCore::JSWebGLRenderingContext::visitAdditionalChildren): Ditto.
+ * bindings/js/JSWorkerGlobalScopeCustom.cpp:
+ (WebCore::JSWorkerGlobalScope::visitAdditionalChildren): Ditto.
+ * bindings/js/JSXMLHttpRequestCustom.cpp:
+ (WebCore::JSXMLHttpRequest::visitAdditionalChildren): Ditto.
+ * bindings/js/JSXPathResultCustom.cpp:
+ (WebCore::JSXPathResult::visitAdditionalChildren): Ditto.
+
+ * bindings/js/JSDOMGlobalObject.cpp:
+ (WebCore::JSDOMGlobalObject::visitChildren): Rewrote to use modern for loops.
+
+ * bindings/scripts/CodeGeneratorJS.pm:
+ (GenerateHeader): Generate declaration of visitAdditionalChildren.
+ (GenerateImplementation): Generate call to visitAdditionalChildren.
+
</ins><span class="cx"> 2014-04-24 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WebKit2] Enable optimization to mmap downloaded resources once they become file-backed.
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSAttrCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSAttrCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSAttrCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSAttrCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -29,28 +29,14 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSAttr.h"
</span><span class="cx">
</span><del>-#include "Document.h"
</del><span class="cx"> #include "Element.h"
</span><del>-#include "HTMLNames.h"
</del><span class="cx">
</span><del>-using namespace JSC;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-using namespace HTMLNames;
-
-void JSAttr::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSAttr::visitAdditionalChildren(JSC::SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSAttr* thisObject = jsCast<JSAttr*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
-
- Base::visitChildren(thisObject, visitor);
- Element* element = thisObject->impl().ownerElement();
- if (!element)
- return;
- visitor.addOpaqueRoot(root(element));
</del><ins>+ if (Element* element = impl().ownerElement())
+ visitor.addOpaqueRoot(root(element));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSAudioTrackCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSAudioTrackCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSAudioTrackCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSAudioTrackCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -35,43 +35,34 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSAudioTrack::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSAudioTrack::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSAudioTrack* jsAudioTrack = jsCast<JSAudioTrack*>(cell);
- ASSERT_GC_OBJECT_INHERITS(jsAudioTrack, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(jsAudioTrack->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(jsAudioTrack, visitor);
-
- AudioTrack& audioTrack = jsAudioTrack->impl();
- visitor.addOpaqueRoot(root(&audioTrack));
</del><ins>+ visitor.addOpaqueRoot(root(&impl()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSAudioTrack::setKind(ExecState* exec, JSValue value)
</span><span class="cx"> {
</span><del>- UNUSED_PARAM(exec);
</del><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> const String& nativeValue(value.isEmpty() ? String() : value.toString(exec)->value(exec));
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return;
</span><span class="cx"> impl().setKind(nativeValue);
</span><span class="cx"> #else
</span><ins>+ UNUSED_PARAM(exec);
</ins><span class="cx"> UNUSED_PARAM(value);
</span><del>- return;
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSAudioTrack::setLanguage(ExecState* exec, JSValue value)
</span><span class="cx"> {
</span><del>- UNUSED_PARAM(exec);
</del><span class="cx"> #if ENABLE(MEDIA_SOURCE)
</span><span class="cx"> const String& nativeValue(value.isEmpty() ? String() : value.toString(exec)->value(exec));
</span><span class="cx"> if (exec->hadException())
</span><span class="cx"> return;
</span><span class="cx"> impl().setLanguage(nativeValue);
</span><span class="cx"> #else
</span><ins>+ UNUSED_PARAM(exec);
</ins><span class="cx"> UNUSED_PARAM(value);
</span><del>- return;
</del><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSAudioTrackListCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSAudioTrackListCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSAudioTrackListCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSAudioTrackListCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><ins>+
</ins><span class="cx"> #include "JSAudioTrackList.h"
</span><span class="cx">
</span><span class="cx"> #include "Element.h"
</span><span class="lines">@@ -35,17 +36,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSAudioTrackList::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSAudioTrackList::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSAudioTrackList* jsAudioTrackList = jsCast<JSAudioTrackList*>(cell);
- ASSERT_GC_OBJECT_INHERITS(jsAudioTrackList, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(jsAudioTrackList->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(jsAudioTrackList, visitor);
-
- AudioTrackList& audioTrackList = jsAudioTrackList->impl();
- visitor.addOpaqueRoot(root(audioTrackList.element()));
- audioTrackList.visitJSEventListeners(visitor);
</del><ins>+ visitor.addOpaqueRoot(root(impl().element()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSRuleCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSCSSRuleCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -55,14 +55,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSCSSRule::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSCSSRule::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSCSSRule* thisObject = jsCast<JSCSSRule*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
- visitor.addOpaqueRoot(root(&thisObject->impl()));
</del><ins>+ visitor.addOpaqueRoot(root(&impl()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue toJS(ExecState*, JSDOMGlobalObject* globalObject, CSSRule* rule)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCSSStyleDeclarationCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSCSSStyleDeclarationCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -45,18 +45,12 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><del>-using namespace WTF;
</del><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSCSSStyleDeclaration::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSCSSStyleDeclaration::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSCSSStyleDeclaration* thisObject = jsCast<JSCSSStyleDeclaration*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
- visitor.addOpaqueRoot(root(&thisObject->impl()));
</del><ins>+ visitor.addOpaqueRoot(root(&impl()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class CSSPropertyInfo {
</span><span class="lines">@@ -65,8 +59,7 @@
</span><span class="cx"> bool hadPixelOrPosPrefix;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-enum PropertyNamePrefix
-{
</del><ins>+enum PropertyNamePrefix {
</ins><span class="cx"> PropertyNamePrefixNone,
</span><span class="cx"> PropertyNamePrefixCSS,
</span><span class="cx"> PropertyNamePrefixPixel,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCanvasRenderingContextCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSCanvasRenderingContextCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -30,24 +30,19 @@
</span><span class="cx"> #include "HTMLCanvasElement.h"
</span><span class="cx"> #include "JSCanvasRenderingContext2D.h"
</span><span class="cx"> #include "JSNode.h"
</span><ins>+
</ins><span class="cx"> #if ENABLE(WEBGL)
</span><del>-#include "WebGLRenderingContext.h"
</del><span class="cx"> #include "JSWebGLRenderingContext.h"
</span><ins>+#include "WebGLRenderingContext.h"
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSCanvasRenderingContext::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSCanvasRenderingContext::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSCanvasRenderingContext* thisObject = jsCast<JSCanvasRenderingContext*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
-
- visitor.addOpaqueRoot(root(thisObject->impl().canvas()));
</del><ins>+ visitor.addOpaqueRoot(root(impl().canvas()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, CanvasRenderingContext* object)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSCryptoKeyPairCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSCryptoKeyPairCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSCryptoKeyPairCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSCryptoKeyPairCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -28,20 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SUBTLE_CRYPTO)
</span><span class="cx">
</span><del>-using namespace JSC;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSCryptoKeyPair::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSCryptoKeyPair::visitAdditionalChildren(JSC::SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSCryptoKeyPair* thisObject = jsCast<JSCryptoKeyPair*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
-
- visitor.addOpaqueRoot(thisObject->m_impl->publicKey());
- visitor.addOpaqueRoot(thisObject->m_impl->privateKey());
</del><ins>+ visitor.addOpaqueRoot(impl().publicKey());
+ visitor.addOpaqueRoot(impl().privateKey());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -91,13 +91,11 @@
</span><span class="cx"> ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
</span><span class="cx"> Base::visitChildren(thisObject, visitor);
</span><span class="cx">
</span><del>- JSDOMStructureMap::iterator end = thisObject->structures().end();
- for (JSDOMStructureMap::iterator it = thisObject->structures().begin(); it != end; ++it)
- visitor.append(&it->value);
</del><ins>+ for (auto& structure : thisObject->structures().values())
+ visitor.append(&structure);
</ins><span class="cx">
</span><del>- JSDOMConstructorMap::iterator end2 = thisObject->constructors().end();
- for (JSDOMConstructorMap::iterator it2 = thisObject->constructors().begin(); it2 != end2; ++it2)
- visitor.append(&it2->value);
</del><ins>+ for (auto& constructor : thisObject->constructors().values())
+ visitor.append(&constructor);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSDOMGlobalObject::setCurrentEvent(Event* currentEvent)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMWindowCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSDOMWindowCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -58,16 +58,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSDOMWindow::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSDOMWindow::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSDOMWindow* thisObject = jsCast<JSDOMWindow*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
-
- thisObject->impl().visitJSEventListeners(visitor);
- if (Frame* frame = thisObject->impl().frame())
</del><ins>+ if (Frame* frame = impl().frame())
</ins><span class="cx"> visitor.addOpaqueRoot(frame);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMessageChannelCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMessageChannelCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMessageChannelCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSMessageChannelCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -29,25 +29,14 @@
</span><span class="cx">
</span><span class="cx"> #include "JSMessageChannel.h"
</span><span class="cx">
</span><del>-#include "MessageChannel.h"
-#include <runtime/Error.h>
-
-using namespace JSC;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSMessageChannel::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSMessageChannel::visitAdditionalChildren(JSC::SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSMessageChannel* thisObject = jsCast<JSMessageChannel*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
-
- if (MessagePort* port = thisObject->m_impl->port1())
</del><ins>+ if (MessagePort* port = impl().port1())
</ins><span class="cx"> visitor.addOpaqueRoot(port);
</span><span class="cx">
</span><del>- if (MessagePort* port = thisObject->m_impl->port2())
</del><ins>+ if (MessagePort* port = impl().port2())
</ins><span class="cx"> visitor.addOpaqueRoot(port);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSMessagePortCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSMessagePortCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSMessagePortCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSMessagePortCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -43,19 +43,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSMessagePort::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSMessagePort::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSMessagePort* thisObject = jsCast<JSMessagePort*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
-
</del><span class="cx"> // If we have a locally entangled port, we can directly mark it as reachable. Ports that are remotely entangled are marked in-use by markActiveObjectsForContext().
</span><del>- if (MessagePort* port = thisObject->m_impl->locallyEntangledPort())
</del><ins>+ if (MessagePort* port = impl().locallyEntangledPort())
</ins><span class="cx"> visitor.addOpaqueRoot(port);
</span><del>-
- thisObject->m_impl->visitJSEventListeners(visitor);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSC::JSValue JSMessagePort::postMessage(JSC::ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNodeCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSNodeCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -179,18 +179,9 @@
</span><span class="cx"> return node;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSNode::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSNode::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSNode* thisObject = jsCast<JSNode*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
-
- Node& node = thisObject->impl();
- node.visitJSEventListeners(visitor);
-
- visitor.addOpaqueRoot(root(node));
</del><ins>+ visitor.addOpaqueRoot(root(impl()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static ALWAYS_INLINE JSValue createWrapperInline(ExecState* exec, JSDOMGlobalObject* globalObject, Node* node)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNodeFilterCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSNodeFilterCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNodeFilterCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSNodeFilterCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -26,30 +26,19 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSNodeFilter.h"
</span><span class="cx">
</span><del>-#include "JSDOMWindowBase.h"
-#include "JSNode.h"
</del><span class="cx"> #include "JSNodeFilterCondition.h"
</span><del>-#include "NodeFilter.h"
-#include "JSDOMBinding.h"
</del><span class="cx">
</span><del>-using namespace JSC;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSNodeFilter::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSNodeFilter::visitAdditionalChildren(JSC::SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSNodeFilter* thisObject = jsCast<JSNodeFilter*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
- visitor.addOpaqueRoot(&thisObject->impl());
</del><ins>+ visitor.addOpaqueRoot(&impl());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<NodeFilter> toNodeFilter(VM& vm, JSValue value)
</del><ins>+PassRefPtr<NodeFilter> toNodeFilter(JSC::VM& vm, JSC::JSValue value)
</ins><span class="cx"> {
</span><span class="cx"> if (value.inherits(JSNodeFilter::info()))
</span><del>- return &jsCast<JSNodeFilter*>(asObject(value))->impl();
</del><ins>+ return &JSC::jsCast<JSNodeFilter*>(asObject(value))->impl();
</ins><span class="cx">
</span><span class="cx"> RefPtr<NodeFilter> result = NodeFilter::create();
</span><span class="cx"> result->setCondition(JSNodeFilterCondition::create(vm, result.get(), value));
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSNodeIteratorCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSNodeIteratorCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSNodeIteratorCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSNodeIteratorCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -20,24 +20,13 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSNodeIterator.h"
</span><span class="cx">
</span><del>-#include "JSNode.h"
</del><span class="cx"> #include "Node.h"
</span><del>-#include "NodeFilter.h"
-#include "NodeIterator.h"
</del><span class="cx">
</span><del>-using namespace JSC;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSNodeIterator::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSNodeIterator::visitAdditionalChildren(JSC::SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSNodeIterator* thisObject = jsCast<JSNodeIterator*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
-
- if (NodeFilter* filter = thisObject->m_impl->filter())
</del><ins>+ if (NodeFilter* filter = impl().filter())
</ins><span class="cx"> visitor.addOpaqueRoot(filter);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSVGElementInstanceCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSSVGElementInstanceCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -27,21 +27,13 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSSVGElementInstance.h"
</span><span class="cx">
</span><del>-#include "JSEventTarget.h"
</del><span class="cx"> #include "JSNodeCustom.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSSVGElementInstance::visitChildren(JSC::JSCell* cell, JSC::SlotVisitor& visitor)
</del><ins>+void JSSVGElementInstance::visitAdditionalChildren(JSC::SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSSVGElementInstance* thisObject = JSC::jsCast<JSSVGElementInstance*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & JSC::OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- // Skip JSEventTarget::visitChildren because event listener registration is
- // forwarded to the corresponding element.
- JSEventTarget::Base::visitChildren(thisObject, visitor);
- visitor.addOpaqueRoot(root(thisObject->impl().correspondingElement()));
</del><ins>+ visitor.addOpaqueRoot(root(impl().correspondingElement()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSSharedWorkerCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSSharedWorkerCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSSharedWorkerCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSSharedWorkerCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -44,15 +44,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSSharedWorker::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSSharedWorker::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSSharedWorker* thisObject = jsCast<JSSharedWorker*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
-
- if (MessagePort* port = thisObject->impl().port())
</del><ins>+ if (MessagePort* port = impl().port())
</ins><span class="cx"> visitor.addOpaqueRoot(port);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSStyleSheetCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSStyleSheetCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSStyleSheetCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSStyleSheetCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -26,40 +26,27 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSStyleSheet.h"
</span><span class="cx">
</span><del>-#include "CSSStyleSheet.h"
-#include "Node.h"
</del><span class="cx"> #include "JSCSSStyleSheet.h"
</span><del>-#include "JSNode.h"
</del><span class="cx">
</span><del>-using namespace JSC;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSStyleSheet::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSStyleSheet::visitAdditionalChildren(JSC::SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSStyleSheet* thisObject = jsCast<JSStyleSheet*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
- visitor.addOpaqueRoot(root(&thisObject->impl()));
</del><ins>+ visitor.addOpaqueRoot(root(&impl()));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue toJS(ExecState*, JSDOMGlobalObject* globalObject, StyleSheet* styleSheet)
</del><ins>+JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject* globalObject, StyleSheet* styleSheet)
</ins><span class="cx"> {
</span><span class="cx"> if (!styleSheet)
</span><del>- return jsNull();
</del><ins>+ return JSC::jsNull();
</ins><span class="cx">
</span><del>- JSObject* wrapper = getCachedWrapper(globalObject->world(), styleSheet);
- if (wrapper)
</del><ins>+ if (JSC::JSObject* wrapper = getCachedWrapper(globalObject->world(), styleSheet))
</ins><span class="cx"> return wrapper;
</span><span class="cx">
</span><span class="cx"> if (styleSheet->isCSSStyleSheet())
</span><del>- wrapper = CREATE_DOM_WRAPPER(globalObject, CSSStyleSheet, styleSheet);
- else
- wrapper = CREATE_DOM_WRAPPER(globalObject, StyleSheet, styleSheet);
</del><ins>+ return CREATE_DOM_WRAPPER(globalObject, CSSStyleSheet, styleSheet);
</ins><span class="cx">
</span><del>- return wrapper;
</del><ins>+ return CREATE_DOM_WRAPPER(globalObject, StyleSheet, styleSheet);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSTextTrackCueCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSTextTrackCueCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -27,8 +27,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx">
</span><del>-#include "JSDataCue.h"
</del><span class="cx"> #include "JSTextTrackCue.h"
</span><ins>+
+#include "JSDataCue.h"
</ins><span class="cx"> #include "JSTrackCustom.h"
</span><span class="cx"> #include "JSVTTCue.h"
</span><span class="cx"> #include "TextTrack.h"
</span><span class="lines">@@ -81,20 +82,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSTextTrackCue::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSTextTrackCue::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSTextTrackCue* jsTextTrackCue = jsCast<JSTextTrackCue*>(cell);
- ASSERT_GC_OBJECT_INHERITS(jsTextTrackCue, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(jsTextTrackCue->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(jsTextTrackCue, visitor);
-
- // Mark the cue's track root if it has one.
- TextTrackCue& textTrackCue = jsTextTrackCue->impl();
- if (TextTrack* textTrack = textTrackCue.track())
</del><ins>+ if (TextTrack* textTrack = impl().track())
</ins><span class="cx"> visitor.addOpaqueRoot(root(textTrack));
</span><del>-
- textTrackCue.visitJSEventListeners(visitor);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSTextTrackCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSTextTrackCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSTextTrackCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSTextTrackCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -26,7 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><ins>+
</ins><span class="cx"> #include "JSTextTrack.h"
</span><ins>+
</ins><span class="cx"> #include "JSTextTrackCueList.h"
</span><span class="cx"> #include "JSTrackCustom.h"
</span><span class="cx">
</span><span class="lines">@@ -34,18 +36,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSTextTrack::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSTextTrack::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSTextTrack* jsTextTrack = jsCast<JSTextTrack*>(cell);
- ASSERT_GC_OBJECT_INHERITS(jsTextTrack, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(jsTextTrack->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(jsTextTrack, visitor);
-
- TextTrack& textTrack = jsTextTrack->impl();
- visitor.addOpaqueRoot(root(&textTrack));
-
- textTrack.visitJSEventListeners(visitor);
</del><ins>+ visitor.addOpaqueRoot(root(&impl()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSTextTrack::setKind(ExecState* exec, JSValue value)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSTextTrackListCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSTextTrackListCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSTextTrackListCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSTextTrackListCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><ins>+
</ins><span class="cx"> #include "JSTextTrackList.h"
</span><span class="cx">
</span><span class="cx"> #include "Element.h"
</span><span class="lines">@@ -35,17 +36,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSTextTrackList::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSTextTrackList::visitAdditionalChildren(JSC::SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSTextTrackList* jsTextTrackList = jsCast<JSTextTrackList*>(cell);
- ASSERT_GC_OBJECT_INHERITS(jsTextTrackList, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(jsTextTrackList->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(jsTextTrackList, visitor);
-
- TextTrackList& textTrackList = jsTextTrackList->impl();
- visitor.addOpaqueRoot(root(textTrackList.element()));
- textTrackList.visitJSEventListeners(visitor);
</del><ins>+ visitor.addOpaqueRoot(root(impl().element()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSTreeWalkerCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSTreeWalkerCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSTreeWalkerCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSTreeWalkerCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -20,24 +20,13 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSTreeWalker.h"
</span><span class="cx">
</span><del>-#include "JSNode.h"
</del><span class="cx"> #include "Node.h"
</span><del>-#include "NodeFilter.h"
-#include "TreeWalker.h"
</del><span class="cx">
</span><del>-using namespace JSC;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSTreeWalker::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSTreeWalker::visitAdditionalChildren(JSC::SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSTreeWalker* thisObject = jsCast<JSTreeWalker*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
-
- if (NodeFilter* filter = thisObject->m_impl->filter())
</del><ins>+ if (NodeFilter* filter = impl().filter())
</ins><span class="cx"> visitor.addOpaqueRoot(filter);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSVideoTrackCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSVideoTrackCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -35,16 +35,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSVideoTrack::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSVideoTrack::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSVideoTrack* jsVideoTrack = jsCast<JSVideoTrack*>(cell);
- ASSERT_GC_OBJECT_INHERITS(jsVideoTrack, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(jsVideoTrack->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(jsVideoTrack, visitor);
-
- VideoTrack& videoTrack = jsVideoTrack->impl();
- visitor.addOpaqueRoot(root(&videoTrack));
</del><ins>+ visitor.addOpaqueRoot(root(&impl()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSVideoTrack::setKind(ExecState* exec, JSValue value)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSVideoTrackListCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSVideoTrackListCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSVideoTrackListCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSVideoTrackListCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -26,26 +26,18 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx">
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><ins>+
</ins><span class="cx"> #include "JSVideoTrackList.h"
</span><span class="cx">
</span><del>-#include "Element.h"
</del><span class="cx"> #include "JSNodeCustom.h"
</span><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSVideoTrackList::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSVideoTrackList::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSVideoTrackList* jsVideoTrackList = jsCast<JSVideoTrackList*>(cell);
- ASSERT_GC_OBJECT_INHERITS(jsVideoTrackList, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(jsVideoTrackList->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(jsVideoTrackList, visitor);
-
- VideoTrackList& videoTrackList = jsVideoTrackList->impl();
- visitor.addOpaqueRoot(root(videoTrackList.element()));
- videoTrackList.visitJSEventListeners(visitor);
</del><ins>+ visitor.addOpaqueRoot(root(impl().element()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWebGLRenderingContextCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -242,14 +242,9 @@
</span><span class="cx"> return jsNull();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void JSWebGLRenderingContext::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSWebGLRenderingContext::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSWebGLRenderingContext* thisObject = jsCast<JSWebGLRenderingContext*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
- visitor.addOpaqueRoot(&thisObject->impl());
</del><ins>+ visitor.addOpaqueRoot(&impl());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> JSValue JSWebGLRenderingContext::getAttachedShaders(ExecState* exec)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSWorkerGlobalScopeCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSWorkerGlobalScopeCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -51,20 +51,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSWorkerGlobalScope::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSWorkerGlobalScope::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSWorkerGlobalScope* thisObject = jsCast<JSWorkerGlobalScope*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
-
- if (WorkerLocation* location = thisObject->impl().optionalLocation())
</del><ins>+ if (WorkerLocation* location = impl().optionalLocation())
</ins><span class="cx"> visitor.addOpaqueRoot(location);
</span><del>- if (WorkerNavigator* navigator = thisObject->impl().optionalNavigator())
</del><ins>+ if (WorkerNavigator* navigator = impl().optionalNavigator())
</ins><span class="cx"> visitor.addOpaqueRoot(navigator);
</span><del>-
- thisObject->impl().visitJSEventListeners(visitor);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool JSWorkerGlobalScope::getOwnPropertySlotDelegate(ExecState* exec, PropertyName propertyName, PropertySlot& slot)
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSXMLHttpRequestCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSXMLHttpRequestCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -56,30 +56,22 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSXMLHttpRequest::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSXMLHttpRequest::visitAdditionalChildren(SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSXMLHttpRequest* thisObject = jsCast<JSXMLHttpRequest*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
-
- if (XMLHttpRequestUpload* upload = thisObject->m_impl->optionalUpload())
</del><ins>+ if (XMLHttpRequestUpload* upload = impl().optionalUpload())
</ins><span class="cx"> visitor.addOpaqueRoot(upload);
</span><span class="cx">
</span><del>- if (Document* responseDocument = thisObject->m_impl->optionalResponseXML())
</del><ins>+ if (Document* responseDocument = impl().optionalResponseXML())
</ins><span class="cx"> visitor.addOpaqueRoot(responseDocument);
</span><span class="cx">
</span><del>- if (ArrayBuffer* responseArrayBuffer = thisObject->m_impl->optionalResponseArrayBuffer())
</del><ins>+ if (ArrayBuffer* responseArrayBuffer = impl().optionalResponseArrayBuffer())
</ins><span class="cx"> visitor.addOpaqueRoot(responseArrayBuffer);
</span><span class="cx">
</span><del>- if (Blob* responseBlob = thisObject->m_impl->optionalResponseBlob())
</del><ins>+ if (Blob* responseBlob = impl().optionalResponseBlob())
</ins><span class="cx"> visitor.addOpaqueRoot(responseBlob);
</span><span class="cx">
</span><del>- if (thisObject->m_response)
- visitor.append(&thisObject->m_response);
-
- thisObject->m_impl->visitJSEventListeners(visitor);
</del><ins>+ if (m_response)
+ visitor.append(&m_response);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Custom functions
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSXPathResultCustomcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSXPathResultCustom.cpp (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSXPathResultCustom.cpp 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/js/JSXPathResultCustom.cpp 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -26,30 +26,17 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "JSXPathResult.h"
</span><span class="cx">
</span><del>-#include "JSDOMBinding.h"
</del><span class="cx"> #include "JSNodeCustom.h"
</span><del>-#include "XPathResult.h"
</del><span class="cx"> #include "XPathValue.h"
</span><span class="cx">
</span><del>-using namespace JSC;
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void JSXPathResult::visitChildren(JSCell* cell, SlotVisitor& visitor)
</del><ins>+void JSXPathResult::visitAdditionalChildren(JSC::SlotVisitor& visitor)
</ins><span class="cx"> {
</span><del>- JSXPathResult* thisObject = jsCast<JSXPathResult*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
- ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
- Base::visitChildren(thisObject, visitor);
-
- const XPath::Value& xpathValue = thisObject->impl().value();
- if (xpathValue.isNodeSet()) {
- const XPath::NodeSet& nodesToMark = xpathValue.toNodeSet();
- for (size_t i = 0; i < nodesToMark.size(); ++i) {
- Node* node = nodesToMark[i];
- visitor.addOpaqueRoot(root(node));
- }
</del><ins>+ auto& value = impl().value();
+ if (value.isNodeSet()) {
+ for (auto& node : value.toNodeSet())
+ visitor.addOpaqueRoot(root(node.get()));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsCodeGeneratorJSpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (167793 => 167794)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-04-25 07:19:31 UTC (rev 167793)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2014-04-25 07:55:19 UTC (rev 167794)
</span><span class="lines">@@ -766,9 +766,9 @@
</span><span class="cx"> {
</span><span class="cx"> my $interface = shift;
</span><span class="cx"> return $interface->extendedAttributes->{"JSCustomMarkFunction"}
</span><del>- || $interface->extendedAttributes->{"EventTarget"}
- || $interface->name eq "EventTarget"
- || $interface->extendedAttributes->{"ReportExtraMemoryCost"};
</del><ins>+ || $interface->extendedAttributes->{"EventTarget"}
+ || $interface->name eq "EventTarget"
+ || $interface->extendedAttributes->{"ReportExtraMemoryCost"};
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub GenerateHeader
</span><span class="lines">@@ -1017,7 +1017,9 @@
</span><span class="cx">
</span><span class="cx"> # visit function
</span><span class="cx"> if ($needsVisitChildren) {
</span><del>- push(@headerContent, " static void visitChildren(JSCell*, JSC::SlotVisitor&);\n\n");
</del><ins>+ push(@headerContent, " static void visitChildren(JSCell*, JSC::SlotVisitor&);\n");
+ push(@headerContent, " void visitAdditionalChildren(JSC::SlotVisitor&);\n") if $interface->extendedAttributes->{"JSCustomMarkFunction"};
+ push(@headerContent, "\n");
</ins><span class="cx"> $structureFlags{"JSC::OverridesVisitChildren"} = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2776,7 +2778,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ($needsVisitChildren && !$interface->extendedAttributes->{"JSCustomMarkFunction"}) {
</del><ins>+ if ($needsVisitChildren) {
</ins><span class="cx"> push(@implContent, "void ${className}::visitChildren(JSCell* cell, SlotVisitor& visitor)\n");
</span><span class="cx"> push(@implContent, "{\n");
</span><span class="cx"> push(@implContent, " ${className}* thisObject = jsCast<${className}*>(cell);\n");
</span><span class="lines">@@ -2787,6 +2789,7 @@
</span><span class="cx"> if ($interface->extendedAttributes->{"EventTarget"} || $interface->name eq "EventTarget") {
</span><span class="cx"> push(@implContent, " thisObject->impl().visitJSEventListeners(visitor);\n");
</span><span class="cx"> }
</span><ins>+ push(@implContent, " thisObject->visitAdditionalChildren(visitor);\n") if $interface->extendedAttributes->{"JSCustomMarkFunction"};
</ins><span class="cx"> if ($interface->extendedAttributes->{"ReportExtraMemoryCost"}) {
</span><span class="cx"> push(@implContent, " visitor.reportExtraMemoryUsage(cell, thisObject->impl().memoryCost());\n");
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>