<!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>[194222] 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/194222">194222</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-12-17 11:52:25 -0800 (Thu, 17 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/194201">r194201</a>.
https://bugs.webkit.org/show_bug.cgi?id=152391
Caused crashes with GuardMalloc (Requested by ap|away on
#webkit).
Reverted changeset:
"Reduce PassRefPtr uses in dom - 2"
https://bugs.webkit.org/show_bug.cgi?id=151936
http://trac.webkit.org/changeset/194201</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNamedFlowCollectioncpp">trunk/Source/WebCore/dom/NamedFlowCollection.cpp</a></li>
<li><a href="#trunkSourceWebCoredomNodeIteratorcpp">trunk/Source/WebCore/dom/NodeIterator.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScopedEventQueueh">trunk/Source/WebCore/dom/ScopedEventQueue.h</a></li>
<li><a href="#trunkSourceWebCoredomStaticNodeListh">trunk/Source/WebCore/dom/StaticNodeList.h</a></li>
<li><a href="#trunkSourceWebCoredomTraversalcpp">trunk/Source/WebCore/dom/Traversal.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTraversalh">trunk/Source/WebCore/dom/Traversal.h</a></li>
<li><a href="#trunkSourceWebCoredomTreeWalkercpp">trunk/Source/WebCore/dom/TreeWalker.cpp</a></li>
<li><a href="#trunkSourceWebCoredomTreeWalkerh">trunk/Source/WebCore/dom/TreeWalker.h</a></li>
<li><a href="#trunkSourceWebCoredomUserActionElementSeth">trunk/Source/WebCore/dom/UserActionElementSet.h</a></li>
<li><a href="#trunkSourceWebCoredomWebKitNamedFlowcpp">trunk/Source/WebCore/dom/WebKitNamedFlow.cpp</a></li>
<li><a href="#trunkSourceWebCoredomWebKitNamedFlowh">trunk/Source/WebCore/dom/WebKitNamedFlow.h</a></li>
<li><a href="#trunkSourceWebCoredomWheelEventcpp">trunk/Source/WebCore/dom/WheelEvent.cpp</a></li>
<li><a href="#trunkSourceWebCoredomWheelEventh">trunk/Source/WebCore/dom/WheelEvent.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/ChangeLog 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-12-17 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r194201.
+ https://bugs.webkit.org/show_bug.cgi?id=152391
+
+ Caused crashes with GuardMalloc (Requested by ap|away on
+ #webkit).
+
+ Reverted changeset:
+
+ "Reduce PassRefPtr uses in dom - 2"
+ https://bugs.webkit.org/show_bug.cgi?id=151936
+ http://trac.webkit.org/changeset/194201
+
</ins><span class="cx"> 2015-12-17 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix unused parameter handling in WebGLRenderingContextBase.cp
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -1748,7 +1748,7 @@
</span><span class="cx"> ec = TypeError;
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><del>- return TreeWalker::create(*root, whatToShow, WTF::move(filter));
</del><ins>+ return TreeWalker::create(root, whatToShow, WTF::move(filter));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<TreeWalker> Document::createTreeWalker(Node* root, unsigned long whatToShow, ExceptionCode& ec)
</span></span></pre></div>
<a id="trunkSourceWebCoredomNamedFlowCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NamedFlowCollection.cpp (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NamedFlowCollection.cpp 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/NamedFlowCollection.cpp 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> return *namedFlow;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<WebKitNamedFlow> newFlow = WebKitNamedFlow::create(*this, flowName);
</del><ins>+ RefPtr<WebKitNamedFlow> newFlow = WebKitNamedFlow::create(this, flowName);
</ins><span class="cx"> m_namedFlows.add(newFlow.get());
</span><span class="cx">
</span><span class="cx"> InspectorInstrumentation::didCreateNamedFlow(document(), *newFlow);
</span></span></pre></div>
<a id="trunkSourceWebCoredomNodeIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/NodeIterator.cpp (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/NodeIterator.cpp 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/NodeIterator.cpp 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NodeIterator::NodeIterator(PassRefPtr<Node> rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& filter)
</span><del>- : NodeIteratorBase(*rootNode, whatToShow, WTF::move(filter))
</del><ins>+ : NodeIteratorBase(rootNode, whatToShow, WTF::move(filter))
</ins><span class="cx"> , m_referenceNode(root(), true)
</span><span class="cx"> {
</span><span class="cx"> root()->document().attachNodeIterator(this);
</span></span></pre></div>
<a id="trunkSourceWebCoredomScopedEventQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScopedEventQueue.h (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScopedEventQueue.h 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/ScopedEventQueue.h 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomStaticNodeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/StaticNodeList.h (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/StaticNodeList.h 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/StaticNodeList.h 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -62,11 +62,11 @@
</span><span class="cx">
</span><span class="cx"> class StaticElementList final : public NodeList {
</span><span class="cx"> public:
</span><del>- static Ref<StaticElementList> adopt(Vector<Ref<Element>>& elements)
</del><ins>+ static PassRefPtr<StaticElementList> adopt(Vector<Ref<Element>>& elements)
</ins><span class="cx"> {
</span><del>- Ref<StaticElementList> nodeList = adoptRef(*new StaticElementList);
</del><ins>+ RefPtr<StaticElementList> nodeList = adoptRef(new StaticElementList);
</ins><span class="cx"> nodeList->m_elements.swap(elements);
</span><del>- return nodeList;
</del><ins>+ return nodeList.release();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static Ref<StaticElementList> createEmpty()
</span></span></pre></div>
<a id="trunkSourceWebCoredomTraversalcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Traversal.cpp (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Traversal.cpp 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/Traversal.cpp 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-NodeIteratorBase::NodeIteratorBase(Node& rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& nodeFilter)
</del><ins>+NodeIteratorBase::NodeIteratorBase(PassRefPtr<Node> rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& nodeFilter)
</ins><span class="cx"> : m_root(rootNode)
</span><span class="cx"> , m_whatToShow(whatToShow)
</span><span class="cx"> , m_filter(WTF::move(nodeFilter))
</span></span></pre></div>
<a id="trunkSourceWebCoredomTraversalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Traversal.h (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Traversal.h 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/Traversal.h 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -35,17 +35,17 @@
</span><span class="cx">
</span><span class="cx"> class NodeIteratorBase {
</span><span class="cx"> public:
</span><del>- Node* root() const { return &m_root; }
</del><ins>+ Node* root() const { return m_root.get(); }
</ins><span class="cx"> unsigned long whatToShow() const { return m_whatToShow; }
</span><span class="cx"> NodeFilter* filter() const { return m_filter.get(); }
</span><span class="cx"> bool expandEntityReferences() const { return false; }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- NodeIteratorBase(Node&, unsigned long whatToShow, RefPtr<NodeFilter>&&);
</del><ins>+ NodeIteratorBase(PassRefPtr<Node>, unsigned long whatToShow, RefPtr<NodeFilter>&&);
</ins><span class="cx"> short acceptNode(Node*) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Node& m_root;
</del><ins>+ RefPtr<Node> m_root;
</ins><span class="cx"> unsigned long m_whatToShow;
</span><span class="cx"> RefPtr<NodeFilter> m_filter;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoredomTreeWalkercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TreeWalker.cpp (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TreeWalker.cpp 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/TreeWalker.cpp 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -33,13 +33,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-TreeWalker::TreeWalker(Node& rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& filter)
</del><ins>+TreeWalker::TreeWalker(PassRefPtr<Node> rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& filter)
</ins><span class="cx"> : NodeIteratorBase(rootNode, whatToShow, WTF::move(filter))
</span><span class="cx"> , m_current(root())
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void TreeWalker::setCurrentNode(Node* node, ExceptionCode& ec)
</del><ins>+void TreeWalker::setCurrentNode(PassRefPtr<Node> node, ExceptionCode& ec)
</ins><span class="cx"> {
</span><span class="cx"> if (!node) {
</span><span class="cx"> ec = NOT_SUPPORTED_ERR;
</span></span></pre></div>
<a id="trunkSourceWebCoredomTreeWalkerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/TreeWalker.h (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/TreeWalker.h 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/TreeWalker.h 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -37,13 +37,13 @@
</span><span class="cx">
</span><span class="cx"> class TreeWalker : public ScriptWrappable, public RefCounted<TreeWalker>, public NodeIteratorBase {
</span><span class="cx"> public:
</span><del>- static Ref<TreeWalker> create(Node& rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& filter)
</del><ins>+ static Ref<TreeWalker> create(PassRefPtr<Node> rootNode, unsigned long whatToShow, RefPtr<NodeFilter>&& filter)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new TreeWalker(rootNode, whatToShow, WTF::move(filter)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* currentNode() const { return m_current.get(); }
</span><del>- void setCurrentNode(Node*, ExceptionCode&);
</del><ins>+ void setCurrentNode(PassRefPtr<Node>, ExceptionCode&);
</ins><span class="cx">
</span><span class="cx"> Node* parentNode();
</span><span class="cx"> Node* firstChild();
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> Node* nextNode();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- TreeWalker(Node&, unsigned long whatToShow, RefPtr<NodeFilter>&&);
</del><ins>+ TreeWalker(PassRefPtr<Node>, unsigned long whatToShow, RefPtr<NodeFilter>&&);
</ins><span class="cx"> enum class SiblingTraversalType { Previous, Next };
</span><span class="cx"> template<SiblingTraversalType> Node* traverseSiblings();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomUserActionElementSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/UserActionElementSet.h (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/UserActionElementSet.h 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/UserActionElementSet.h 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #define UserActionElementSet_h
</span><span class="cx">
</span><span class="cx"> #include <wtf/HashMap.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCoredomWebKitNamedFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/WebKitNamedFlow.cpp (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/WebKitNamedFlow.cpp 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/WebKitNamedFlow.cpp 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WebKitNamedFlow::WebKitNamedFlow(NamedFlowCollection& manager, const AtomicString& flowThreadName)
</del><ins>+WebKitNamedFlow::WebKitNamedFlow(PassRefPtr<NamedFlowCollection> manager, const AtomicString& flowThreadName)
</ins><span class="cx"> : m_flowThreadName(flowThreadName)
</span><span class="cx"> , m_flowManager(manager)
</span><span class="cx"> , m_parentFlowThread(nullptr)
</span><span class="lines">@@ -49,10 +49,10 @@
</span><span class="cx"> WebKitNamedFlow::~WebKitNamedFlow()
</span><span class="cx"> {
</span><span class="cx"> // The named flow is not "strong" referenced from anywhere at this time so it shouldn't be reused if the named flow is recreated.
</span><del>- m_flowManager.discardNamedFlow(this);
</del><ins>+ m_flowManager->discardNamedFlow(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<WebKitNamedFlow> WebKitNamedFlow::create(NamedFlowCollection& manager, const AtomicString& flowThreadName)
</del><ins>+Ref<WebKitNamedFlow> WebKitNamedFlow::create(PassRefPtr<NamedFlowCollection> manager, const AtomicString& flowThreadName)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebKitNamedFlow(manager, flowThreadName));
</span><span class="cx"> }
</span><span class="lines">@@ -64,8 +64,8 @@
</span><span class="cx">
</span><span class="cx"> bool WebKitNamedFlow::overset() const
</span><span class="cx"> {
</span><del>- if (m_flowManager.document())
- m_flowManager.document()->updateLayoutIgnorePendingStylesheets();
</del><ins>+ if (m_flowManager->document())
+ m_flowManager->document()->updateLayoutIgnorePendingStylesheets();
</ins><span class="cx">
</span><span class="cx"> // The renderer may be destroyed or created after the style update.
</span><span class="cx"> // Because this is called from JS, where the wrapper keeps a reference to the NamedFlow, no guard is necessary.
</span><span class="lines">@@ -92,8 +92,8 @@
</span><span class="cx">
</span><span class="cx"> int WebKitNamedFlow::firstEmptyRegionIndex() const
</span><span class="cx"> {
</span><del>- if (m_flowManager.document())
- m_flowManager.document()->updateLayoutIgnorePendingStylesheets();
</del><ins>+ if (m_flowManager->document())
+ m_flowManager->document()->updateLayoutIgnorePendingStylesheets();
</ins><span class="cx">
</span><span class="cx"> if (!m_parentFlowThread)
</span><span class="cx"> return -1;
</span><span class="lines">@@ -117,13 +117,13 @@
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<NodeList> WebKitNamedFlow::getRegionsByContent(Node* contentNode)
</del><ins>+PassRefPtr<NodeList> WebKitNamedFlow::getRegionsByContent(Node* contentNode)
</ins><span class="cx"> {
</span><span class="cx"> if (!contentNode)
</span><span class="cx"> return StaticElementList::createEmpty();
</span><span class="cx">
</span><del>- if (m_flowManager.document())
- m_flowManager.document()->updateLayoutIgnorePendingStylesheets();
</del><ins>+ if (m_flowManager->document())
+ m_flowManager->document()->updateLayoutIgnorePendingStylesheets();
</ins><span class="cx">
</span><span class="cx"> // The renderer may be destroyed or created after the style update.
</span><span class="cx"> // Because this is called from JS, where the wrapper keeps a reference to the NamedFlow, no guard is necessary.
</span><span class="lines">@@ -151,10 +151,10 @@
</span><span class="cx"> return StaticElementList::adopt(regionElements);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<NodeList> WebKitNamedFlow::getRegions()
</del><ins>+PassRefPtr<NodeList> WebKitNamedFlow::getRegions()
</ins><span class="cx"> {
</span><del>- if (m_flowManager.document())
- m_flowManager.document()->updateLayoutIgnorePendingStylesheets();
</del><ins>+ if (m_flowManager->document())
+ m_flowManager->document()->updateLayoutIgnorePendingStylesheets();
</ins><span class="cx">
</span><span class="cx"> // The renderer may be destroyed or created after the style update.
</span><span class="cx"> // Because this is called from JS, where the wrapper keeps a reference to the NamedFlow, no guard is necessary.
</span><span class="lines">@@ -178,10 +178,10 @@
</span><span class="cx"> return StaticElementList::adopt(regionElements);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<NodeList> WebKitNamedFlow::getContent()
</del><ins>+PassRefPtr<NodeList> WebKitNamedFlow::getContent()
</ins><span class="cx"> {
</span><del>- if (m_flowManager.document())
- m_flowManager.document()->updateLayoutIgnorePendingStylesheets();
</del><ins>+ if (m_flowManager->document())
+ m_flowManager->document()->updateLayoutIgnorePendingStylesheets();
</ins><span class="cx">
</span><span class="cx"> // The renderer may be destroyed or created after the style update.
</span><span class="cx"> // Because this is called from JS, where the wrapper keeps a reference to the NamedFlow, no guard is necessary.
</span><span class="lines">@@ -216,17 +216,17 @@
</span><span class="cx"> if (flowState() == FlowStateNull)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- dispatchEvent(UIEvent::create(eventNames().webkitregionoversetchangeEvent, false, false, m_flowManager.document()->defaultView(), 0));
</del><ins>+ dispatchEvent(UIEvent::create(eventNames().webkitregionoversetchangeEvent, false, false, m_flowManager->document()->defaultView(), 0));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ScriptExecutionContext* WebKitNamedFlow::scriptExecutionContext() const
</span><span class="cx"> {
</span><del>- return m_flowManager.document();
</del><ins>+ return m_flowManager->document();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Node* WebKitNamedFlow::ownerNode() const
</span><span class="cx"> {
</span><del>- return m_flowManager.document();
</del><ins>+ return m_flowManager->document();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoredomWebKitNamedFlowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/WebKitNamedFlow.h (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/WebKitNamedFlow.h 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/WebKitNamedFlow.h 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -48,16 +48,16 @@
</span><span class="cx">
</span><span class="cx"> class WebKitNamedFlow final : public RefCounted<WebKitNamedFlow>, public EventTargetWithInlineData {
</span><span class="cx"> public:
</span><del>- static Ref<WebKitNamedFlow> create(NamedFlowCollection& manager, const AtomicString& flowThreadName);
</del><ins>+ static Ref<WebKitNamedFlow> create(PassRefPtr<NamedFlowCollection> manager, const AtomicString& flowThreadName);
</ins><span class="cx">
</span><span class="cx"> ~WebKitNamedFlow();
</span><span class="cx">
</span><span class="cx"> const AtomicString& name() const;
</span><span class="cx"> bool overset() const;
</span><span class="cx"> int firstEmptyRegionIndex() const;
</span><del>- Ref<NodeList> getRegionsByContent(Node*);
- Ref<NodeList> getRegions();
- Ref<NodeList> getContent();
</del><ins>+ PassRefPtr<NodeList> getRegionsByContent(Node*);
+ PassRefPtr<NodeList> getRegions();
+ PassRefPtr<NodeList> getContent();
</ins><span class="cx">
</span><span class="cx"> using RefCounted<WebKitNamedFlow>::ref;
</span><span class="cx"> using RefCounted<WebKitNamedFlow>::deref;
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> void dispatchRegionOversetChangeEvent();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebKitNamedFlow(NamedFlowCollection&, const AtomicString&);
</del><ins>+ WebKitNamedFlow(PassRefPtr<NamedFlowCollection>, const AtomicString&);
</ins><span class="cx">
</span><span class="cx"> // EventTarget implementation.
</span><span class="cx"> virtual void refEventTarget() override { ref(); }
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> // The name of the flow thread as specified in CSS.
</span><span class="cx"> AtomicString m_flowThreadName;
</span><span class="cx">
</span><del>- NamedFlowCollection& m_flowManager;
</del><ins>+ RefPtr<NamedFlowCollection> m_flowManager;
</ins><span class="cx"> RenderNamedFlowThread* m_parentFlowThread;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomWheelEventcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/WheelEvent.cpp (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/WheelEvent.cpp 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/WheelEvent.cpp 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WheelEvent::WheelEvent(const PlatformWheelEvent& event, AbstractView* view)
</del><ins>+WheelEvent::WheelEvent(const PlatformWheelEvent& event, PassRefPtr<AbstractView> view)
</ins><span class="cx"> : MouseEvent(eventNames().wheelEvent, true, true, event.timestamp(), view, 0, event.globalPosition().x(), event.globalPosition().y(), event.position().x(), event.position().y()
</span><span class="cx"> #if ENABLE(POINTER_LOCK)
</span><span class="cx"> , 0, 0
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WheelEvent::initWheelEvent(int rawDeltaX, int rawDeltaY, AbstractView* view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
</del><ins>+void WheelEvent::initWheelEvent(int rawDeltaX, int rawDeltaY, PassRefPtr<AbstractView> view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
</ins><span class="cx"> {
</span><span class="cx"> if (dispatched())
</span><span class="cx"> return;
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> initCoordinates(IntPoint(pageX, pageY));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WheelEvent::initWebKitWheelEvent(int rawDeltaX, int rawDeltaY, AbstractView* view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
</del><ins>+void WheelEvent::initWebKitWheelEvent(int rawDeltaX, int rawDeltaY, PassRefPtr<AbstractView> view, int screenX, int screenY, int pageX, int pageY, bool ctrlKey, bool altKey, bool shiftKey, bool metaKey)
</ins><span class="cx"> {
</span><span class="cx"> initWheelEvent(rawDeltaX, rawDeltaY, view, screenX, screenY, pageX, pageY, ctrlKey, altKey, shiftKey, metaKey);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoredomWheelEventh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/WheelEvent.h (194221 => 194222)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/WheelEvent.h 2015-12-17 19:42:04 UTC (rev 194221)
+++ trunk/Source/WebCore/dom/WheelEvent.h 2015-12-17 19:52:25 UTC (rev 194222)
</span><span class="lines">@@ -64,16 +64,16 @@
</span><span class="cx"> return adoptRef(*new WheelEvent(type, initializer));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static Ref<WheelEvent> create(const PlatformWheelEvent& event, AbstractView* view)
</del><ins>+ static Ref<WheelEvent> create(const PlatformWheelEvent& event, PassRefPtr<AbstractView> view)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WheelEvent(event, view));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void initWheelEvent(int rawDeltaX, int rawDeltaY, AbstractView*,
</del><ins>+ void initWheelEvent(int rawDeltaX, int rawDeltaY, PassRefPtr<AbstractView>,
</ins><span class="cx"> int screenX, int screenY, int pageX, int pageY,
</span><span class="cx"> bool ctrlKey, bool altKey, bool shiftKey, bool metaKey);
</span><span class="cx">
</span><del>- void initWebKitWheelEvent(int rawDeltaX, int rawDeltaY, AbstractView*,
</del><ins>+ void initWebKitWheelEvent(int rawDeltaX, int rawDeltaY, PassRefPtr<AbstractView>,
</ins><span class="cx"> int screenX, int screenY, int pageX, int pageY,
</span><span class="cx"> bool ctrlKey, bool altKey, bool shiftKey, bool metaKey);
</span><span class="cx">
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> private:
</span><span class="cx"> WheelEvent();
</span><span class="cx"> WheelEvent(const AtomicString&, const WheelEventInit&);
</span><del>- WheelEvent(const PlatformWheelEvent&, AbstractView*);
</del><ins>+ WheelEvent(const PlatformWheelEvent&, PassRefPtr<AbstractView>);
</ins><span class="cx">
</span><span class="cx"> virtual bool isWheelEvent() const override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>