<!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>[208342] trunk/Source/WebKit2</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/208342">208342</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2016-11-03 13:53:00 -0700 (Thu, 03 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/208330">r208330</a>.
This change appears to have caused two editing tests to fail
on macOS.
Reverted changeset:
"Reduce PassRefPtr use in WebKit2"
https://bugs.webkit.org/show_bug.cgi?id=164360
http://trac.webkit.org/changeset/208330</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPISecurityOriginh">trunk/Source/WebKit2/Shared/API/APISecurityOrigin.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPISerializedScriptValueh">trunk/Source/WebKit2/Shared/API/APISerializedScriptValue.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIWebArchiveh">trunk/Source/WebKit2/Shared/APIWebArchive.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIWebArchivemm">trunk/Source/WebKit2/Shared/APIWebArchive.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIHitTestResultcpp">trunk/Source/WebKit2/UIProcess/API/APIHitTestResult.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIHitTestResulth">trunk/Source/WebKit2/UIProcess/API/APIHitTestResult.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUIClienth">trunk/Source/WebKit2/UIProcess/API/APIUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitUIClientcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegateh">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegatemm">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKGeolocationProviderIOSmm">trunk/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKImmediateActionControllermm">trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessUserContentWebUserContentControllercpp">trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebUndoStepcpp">trunk/Source/WebKit2/WebProcess/WebPage/WebUndoStep.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebUndoSteph">trunk/Source/WebKit2/WebProcess/WebPage/WebUndoStep.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-11-03 Ryan Haddad <ryanhaddad@apple.com>
+
+ Unreviewed, rolling out r208330.
+
+ This change appears to have caused two editing tests to fail
+ on macOS.
+
+ Reverted changeset:
+
+ "Reduce PassRefPtr use in WebKit2"
+ https://bugs.webkit.org/show_bug.cgi?id=164360
+ http://trac.webkit.org/changeset/208330
+
</ins><span class="cx"> 2016-11-03 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> WKWebView’s _observedRenderingProgressEvents not restored after web process crash
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPISecurityOriginh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APISecurityOrigin.h (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APISecurityOrigin.h 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/Shared/API/APISecurityOrigin.h 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="lines">@@ -50,8 +51,8 @@
</span><span class="cx"> WebCore::SecurityOrigin& securityOrigin() const { return *m_securityOrigin; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- SecurityOrigin(RefPtr<WebCore::SecurityOrigin>&& securityOrigin)
- : m_securityOrigin(WTFMove(securityOrigin))
</del><ins>+ SecurityOrigin(PassRefPtr<WebCore::SecurityOrigin> securityOrigin)
+ : m_securityOrigin(securityOrigin)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPISerializedScriptValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APISerializedScriptValue.h (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APISerializedScriptValue.h 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/Shared/API/APISerializedScriptValue.h 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx">
</span><span class="cx"> class SerializedScriptValue : public API::ObjectImpl<API::Object::Type::SerializedScriptValue> {
</span><span class="cx"> public:
</span><del>- static Ref<SerializedScriptValue> create(RefPtr<WebCore::SerializedScriptValue>&& serializedValue)
</del><ins>+ static Ref<SerializedScriptValue> create(PassRefPtr<WebCore::SerializedScriptValue> serializedValue)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new SerializedScriptValue(WTFMove(serializedValue)));
</del><ins>+ return adoptRef(*new SerializedScriptValue(serializedValue));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static RefPtr<SerializedScriptValue> create(JSContextRef context, JSValueRef value, JSValueRef* exception)
</span><span class="lines">@@ -68,8 +68,8 @@
</span><span class="cx"> WebCore::SerializedScriptValue* internalRepresentation() { return m_serializedScriptValue.get(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit SerializedScriptValue(RefPtr<WebCore::SerializedScriptValue>&& serializedScriptValue)
- : m_serializedScriptValue(WTFMove(serializedScriptValue))
</del><ins>+ explicit SerializedScriptValue(PassRefPtr<WebCore::SerializedScriptValue> serializedScriptValue)
+ : m_serializedScriptValue(serializedScriptValue)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -23,9 +23,9 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef WKSharedAPICast_h
+#define WKSharedAPICast_h
</ins><span class="cx">
</span><del>-#include "APIArray.h"
</del><span class="cx"> #include "APIError.h"
</span><span class="cx"> #include "APINumber.h"
</span><span class="cx"> #include "APISecurityOrigin.h"
</span><span class="lines">@@ -136,8 +136,8 @@
</span><span class="cx"> template<typename ImplType, typename APIType = typename ImplTypeInfo<ImplType>::APIType>
</span><span class="cx"> class ProxyingRefPtr {
</span><span class="cx"> public:
</span><del>- ProxyingRefPtr(RefPtr<ImplType>&& impl)
- : m_impl(WTFMove(impl))
</del><ins>+ ProxyingRefPtr(PassRefPtr<ImplType> impl)
+ : m_impl(impl)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -154,11 +154,6 @@
</span><span class="cx">
</span><span class="cx"> /* Special cases. */
</span><span class="cx">
</span><del>-inline ProxyingRefPtr<API::Array> toAPI(Ref<API::Array>&& array)
-{
- return ProxyingRefPtr<API::Array>(WTFMove(array));
-}
-
</del><span class="cx"> inline ProxyingRefPtr<API::String> toAPI(StringImpl* string)
</span><span class="cx"> {
</span><span class="cx"> return ProxyingRefPtr<API::String>(API::String::create(string));
</span><span class="lines">@@ -1001,3 +996,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // WKSharedAPICast_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIWebArchiveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIWebArchive.h (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIWebArchive.h 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/Shared/APIWebArchive.h 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -23,12 +23,13 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef WebArchive_h
+#define WebArchive_h
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><del>-#include <wtf/Ref.h>
</del><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="lines">@@ -49,9 +50,9 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebArchive();
</span><span class="cx">
</span><del>- static Ref<WebArchive> create(WebArchiveResource* mainResource, RefPtr<API::Array>&& subresources, RefPtr<API::Array>&& subframeArchives);
</del><ins>+ static Ref<WebArchive> create(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives);
</ins><span class="cx"> static Ref<WebArchive> create(API::Data*);
</span><del>- static Ref<WebArchive> create(RefPtr<WebCore::LegacyWebArchive>&&);
</del><ins>+ static Ref<WebArchive> create(PassRefPtr<WebCore::LegacyWebArchive>);
</ins><span class="cx"> static Ref<WebArchive> create(WebCore::Range*);
</span><span class="cx">
</span><span class="cx"> WebArchiveResource* mainResource();
</span><span class="lines">@@ -63,9 +64,9 @@
</span><span class="cx"> WebCore::LegacyWebArchive* coreLegacyWebArchive();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebArchive(WebArchiveResource* mainResource, RefPtr<API::Array>&& subresources, RefPtr<API::Array>&& subframeArchives);
</del><ins>+ WebArchive(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives);
</ins><span class="cx"> WebArchive(API::Data*);
</span><del>- WebArchive(RefPtr<WebCore::LegacyWebArchive>&&);
</del><ins>+ WebArchive(PassRefPtr<WebCore::LegacyWebArchive>);
</ins><span class="cx">
</span><span class="cx"> RefPtr<WebCore::LegacyWebArchive> m_legacyWebArchive;
</span><span class="cx"> RefPtr<WebArchiveResource> m_cachedMainResource;
</span><span class="lines">@@ -76,3 +77,5 @@
</span><span class="cx"> } // namespace API
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(COCOA)
</span><ins>+
+#endif // WebArchive_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIWebArchivemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIWebArchive.mm (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIWebArchive.mm 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/Shared/APIWebArchive.mm 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -38,9 +38,9 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><del>-Ref<WebArchive> WebArchive::create(WebArchiveResource* mainResource, RefPtr<API::Array>&& subresources, RefPtr<API::Array>&& subframeArchives)
</del><ins>+Ref<WebArchive> WebArchive::create(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new WebArchive(mainResource, WTFMove(subresources), WTFMove(subframeArchives)));
</del><ins>+ return adoptRef(*new WebArchive(mainResource, subresources, subframeArchives));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<WebArchive> WebArchive::create(API::Data* data)
</span><span class="lines">@@ -48,9 +48,9 @@
</span><span class="cx"> return adoptRef(*new WebArchive(data));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<WebArchive> WebArchive::create(RefPtr<LegacyWebArchive>&& legacyWebArchive)
</del><ins>+Ref<WebArchive> WebArchive::create(PassRefPtr<LegacyWebArchive> legacyWebArchive)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new WebArchive(WTFMove(legacyWebArchive)));
</del><ins>+ return adoptRef(*new WebArchive(legacyWebArchive));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<WebArchive> WebArchive::create(Range* range)
</span><span class="lines">@@ -58,10 +58,10 @@
</span><span class="cx"> return adoptRef(*new WebArchive(LegacyWebArchive::create(range)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebArchive::WebArchive(WebArchiveResource* mainResource, RefPtr<API::Array>&& subresources, RefPtr<API::Array>&& subframeArchives)
</del><ins>+WebArchive::WebArchive(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives)
</ins><span class="cx"> : m_cachedMainResource(mainResource)
</span><del>- , m_cachedSubresources(WTFMove(subresources))
- , m_cachedSubframeArchives(WTFMove(subframeArchives))
</del><ins>+ , m_cachedSubresources(subresources)
+ , m_cachedSubframeArchives(subframeArchives)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<ArchiveResource> coreMainResource = m_cachedMainResource->coreArchiveResource();
</span><span class="cx">
</span><span class="lines">@@ -90,8 +90,8 @@
</span><span class="cx"> m_legacyWebArchive = LegacyWebArchive::create(SharedBuffer::create(data->bytes(), data->size()).get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebArchive::WebArchive(RefPtr<LegacyWebArchive>&& legacyWebArchive)
- : m_legacyWebArchive(WTFMove(legacyWebArchive))
</del><ins>+WebArchive::WebArchive(PassRefPtr<LegacyWebArchive> legacyWebArchive)
+ : m_legacyWebArchive(legacyWebArchive)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIHitTestResult.cpp (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIHitTestResult.cpp 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/UIProcess/API/APIHitTestResult.cpp 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -24,9 +24,9 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><del>-Ref<HitTestResult> HitTestResult::create(const WebKit::WebHitTestResultData& hitTestResultData)
</del><ins>+PassRefPtr<HitTestResult> HitTestResult::create(const WebKit::WebHitTestResultData& hitTestResultData)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new HitTestResult(hitTestResultData));
</del><ins>+ return adoptRef(new HitTestResult(hitTestResultData));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace API
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIHitTestResulth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIHitTestResult.h (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIHitTestResult.h 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/UIProcess/API/APIHitTestResult.h 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -17,7 +17,8 @@
</span><span class="cx"> * Boston, MA 02110-1301, USA.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef APIHitTestResult_h
+#define APIHitTestResult_h
</ins><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "SharedMemory.h"
</span><span class="lines">@@ -27,7 +28,7 @@
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="cx"> #include <WebCore/PageOverlay.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><del>-#include <wtf/Ref.h>
</del><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -48,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> class HitTestResult : public API::ObjectImpl<API::Object::Type::HitTestResult> {
</span><span class="cx"> public:
</span><del>- static Ref<HitTestResult> create(const WebKit::WebHitTestResultData&);
</del><ins>+ static PassRefPtr<HitTestResult> create(const WebKit::WebHitTestResultData&);
</ins><span class="cx">
</span><span class="cx"> WTF::String absoluteImageURL() const { return m_data.absoluteImageURL; }
</span><span class="cx"> WTF::String absolutePDFURL() const { return m_data.absolutePDFURL; }
</span><span class="lines">@@ -85,3 +86,5 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace API
</span><ins>+
+#endif // APIHitTestResult_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -23,7 +23,8 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef APIUIClient_h
+#define APIUIClient_h
</ins><span class="cx">
</span><span class="cx"> #include "WKPage.h"
</span><span class="cx"> #include "WebEvent.h"
</span><span class="lines">@@ -31,6 +32,7 @@
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="cx"> #include <functional>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> OBJC_CLASS NSArray;
</span><span class="lines">@@ -73,7 +75,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~UIClient() { }
</span><span class="cx">
</span><del>- virtual RefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) { return nullptr; }
</del><ins>+ virtual PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) { return nullptr; }
</ins><span class="cx"> virtual void showPage(WebKit::WebPageProxy*) { }
</span><span class="cx"> virtual void fullscreenMayReturnToInline(WebKit::WebPageProxy*) { }
</span><span class="cx"> virtual void didEnterFullscreen(WebKit::WebPageProxy*) { }
</span><span class="lines">@@ -171,3 +173,5 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace API
</span><ins>+
+#endif // APIUIClient_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -1541,9 +1541,9 @@
</span><span class="cx">
</span><span class="cx"> class RunBeforeUnloadConfirmPanelResultListener : public API::ObjectImpl<API::Object::Type::RunBeforeUnloadConfirmPanelResultListener> {
</span><span class="cx"> public:
</span><del>- static Ref<RunBeforeUnloadConfirmPanelResultListener> create(Function<void(bool)>&& completionHandler)
</del><ins>+ static PassRefPtr<RunBeforeUnloadConfirmPanelResultListener> create(Function<void (bool)>&& completionHandler)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new RunBeforeUnloadConfirmPanelResultListener(WTFMove(completionHandler)));
</del><ins>+ return adoptRef(new RunBeforeUnloadConfirmPanelResultListener(WTFMove(completionHandler)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~RunBeforeUnloadConfirmPanelResultListener()
</span><span class="lines">@@ -1556,7 +1556,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit RunBeforeUnloadConfirmPanelResultListener(Function<void(bool)>&& completionHandler)
</del><ins>+ explicit RunBeforeUnloadConfirmPanelResultListener(Function<void (bool)>&& completionHandler)
</ins><span class="cx"> : m_completionHandler(WTFMove(completionHandler))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -1566,9 +1566,9 @@
</span><span class="cx">
</span><span class="cx"> class RunJavaScriptAlertResultListener : public API::ObjectImpl<API::Object::Type::RunJavaScriptAlertResultListener> {
</span><span class="cx"> public:
</span><del>- static Ref<RunJavaScriptAlertResultListener> create(Function<void()>&& completionHandler)
</del><ins>+ static PassRefPtr<RunJavaScriptAlertResultListener> create(Function<void ()>&& completionHandler)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new RunJavaScriptAlertResultListener(WTFMove(completionHandler)));
</del><ins>+ return adoptRef(new RunJavaScriptAlertResultListener(WTFMove(completionHandler)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~RunJavaScriptAlertResultListener()
</span><span class="lines">@@ -1581,7 +1581,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit RunJavaScriptAlertResultListener(Function<void()>&& completionHandler)
</del><ins>+ explicit RunJavaScriptAlertResultListener(Function<void ()>&& completionHandler)
</ins><span class="cx"> : m_completionHandler(WTFMove(completionHandler))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -1591,9 +1591,9 @@
</span><span class="cx">
</span><span class="cx"> class RunJavaScriptConfirmResultListener : public API::ObjectImpl<API::Object::Type::RunJavaScriptConfirmResultListener> {
</span><span class="cx"> public:
</span><del>- static Ref<RunJavaScriptConfirmResultListener> create(Function<void(bool)>&& completionHandler)
</del><ins>+ static PassRefPtr<RunJavaScriptConfirmResultListener> create(Function<void (bool)>&& completionHandler)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new RunJavaScriptConfirmResultListener(WTFMove(completionHandler)));
</del><ins>+ return adoptRef(new RunJavaScriptConfirmResultListener(WTFMove(completionHandler)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~RunJavaScriptConfirmResultListener()
</span><span class="lines">@@ -1606,7 +1606,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit RunJavaScriptConfirmResultListener(Function<void(bool)>&& completionHandler)
</del><ins>+ explicit RunJavaScriptConfirmResultListener(Function<void (bool)>&& completionHandler)
</ins><span class="cx"> : m_completionHandler(WTFMove(completionHandler))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -1616,9 +1616,9 @@
</span><span class="cx">
</span><span class="cx"> class RunJavaScriptPromptResultListener : public API::ObjectImpl<API::Object::Type::RunJavaScriptPromptResultListener> {
</span><span class="cx"> public:
</span><del>- static Ref<RunJavaScriptPromptResultListener> create(Function<void(const String&)>&& completionHandler)
</del><ins>+ static PassRefPtr<RunJavaScriptPromptResultListener> create(Function<void (const String&)>&& completionHandler)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new RunJavaScriptPromptResultListener(WTFMove(completionHandler)));
</del><ins>+ return adoptRef(new RunJavaScriptPromptResultListener(WTFMove(completionHandler)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~RunJavaScriptPromptResultListener()
</span><span class="lines">@@ -1631,7 +1631,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit RunJavaScriptPromptResultListener(Function<void(const String&)>&& completionHandler)
</del><ins>+ explicit RunJavaScriptPromptResultListener(Function<void (const String&)>&& completionHandler)
</ins><span class="cx"> : m_completionHandler(WTFMove(completionHandler))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -1703,7 +1703,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RefPtr<WebPageProxy> createNewPage(WebPageProxy* page, WebFrameProxy* initiatingFrame, const SecurityOriginData& securityOriginData, const ResourceRequest& resourceRequest, const WindowFeatures& windowFeatures, const NavigationActionData& navigationActionData) override
</del><ins>+ PassRefPtr<WebPageProxy> createNewPage(WebPageProxy* page, WebFrameProxy* initiatingFrame, const SecurityOriginData& securityOriginData, const ResourceRequest& resourceRequest, const WindowFeatures& windowFeatures, const NavigationActionData& navigationActionData) override
</ins><span class="cx"> {
</span><span class="cx"> if (m_client.createNewPage) {
</span><span class="cx"> auto configuration = page->configuration().copy();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -1385,7 +1385,7 @@
</span><span class="cx"> _scaleToRestore = scale;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (RefPtr<WebKit::ViewSnapshot>)_takeViewSnapshot
</del><ins>+- (PassRefPtr<WebKit::ViewSnapshot>)_takeViewSnapshot
</ins><span class="cx"> {
</span><span class="cx"> float deviceScale = WebCore::screenScaleFactor();
</span><span class="cx"> WebCore::FloatSize snapshotSize(self.bounds.size);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewInternal.h 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> - (void)_restorePageScrollPosition:(WebCore::FloatPoint)scrollPosition scrollOrigin:(WebCore::FloatPoint)scrollOrigin previousObscuredInset:(WebCore::FloatSize)topInset scale:(double)scale;
</span><span class="cx"> - (void)_restorePageStateToUnobscuredCenter:(WebCore::FloatPoint)center scale:(double)scale; // FIXME: needs scroll origin?
</span><span class="cx">
</span><del>-- (RefPtr<WebKit::ViewSnapshot>)_takeViewSnapshot;
</del><ins>+- (PassRefPtr<WebKit::ViewSnapshot>)_takeViewSnapshot;
</ins><span class="cx">
</span><span class="cx"> - (void)_scrollToContentScrollPosition:(WebCore::FloatPoint)scrollPosition scrollOrigin:(WebCore::IntPoint)scrollOrigin;
</span><span class="cx"> - (BOOL)_scrollToRect:(WebCore::FloatRect)targetRect origin:(WebCore::FloatPoint)origin minimumScrollDistance:(float)minimumScrollDistance;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitUIClient.cpp 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- RefPtr<WebPageProxy> createNewPage(WebPageProxy*, WebFrameProxy*, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest& resourceRequest, const WebCore::WindowFeatures& windowFeatures, const NavigationActionData& navigationActionData) override
</del><ins>+ PassRefPtr<WebPageProxy> createNewPage(WebPageProxy*, WebFrameProxy*, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest& resourceRequest, const WebCore::WindowFeatures& windowFeatures, const NavigationActionData& navigationActionData) override
</ins><span class="cx"> {
</span><span class="cx"> GRefPtr<WebKitURIRequest> request = adoptGRef(webkitURIRequestCreateForResourceRequest(resourceRequest));
</span><span class="cx"> WebKitNavigationAction navigationAction(request.get(), navigationActionData);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> // API::UIClient
</span><del>- RefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) override;
</del><ins>+ PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) override;
</ins><span class="cx"> void close(WebKit::WebPageProxy*) override;
</span><span class="cx"> void fullscreenMayReturnToInline(WebKit::WebPageProxy*) override;
</span><span class="cx"> void didEnterFullscreen(WebKit::WebPageProxy*) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebKit::WebPageProxy> UIDelegate::UIClient::createNewPage(WebKit::WebPageProxy* page, WebKit::WebFrameProxy* initiatingFrame, const WebCore::SecurityOriginData& securityOriginData, const WebCore::ResourceRequest& request, const WebCore::WindowFeatures& windowFeatures, const WebKit::NavigationActionData& navigationActionData)
</del><ins>+PassRefPtr<WebKit::WebPageProxy> UIDelegate::UIClient::createNewPage(WebKit::WebPageProxy* page, WebKit::WebFrameProxy* initiatingFrame, const WebCore::SecurityOriginData& securityOriginData, const WebCore::ResourceRequest& request, const WebCore::WindowFeatures& windowFeatures, const WebKit::NavigationActionData& navigationActionData)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_uiDelegate.m_delegateMethods.webViewCreateWebViewWithConfigurationForNavigationActionWindowFeatures)
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKGeolocationProviderIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.mm (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.mm 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/UIProcess/ios/WKGeolocationProviderIOS.mm 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx"> #import <WebGeolocationPosition.h>
</span><span class="cx"> #import <wtf/Assertions.h>
</span><span class="cx"> #import <wtf/HashSet.h>
</span><ins>+#import <wtf/PassRefPtr.h>
</ins><span class="cx"> #import <wtf/RefPtr.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -56,7 +57,7 @@
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @interface WKWebAllowDenyPolicyListener : NSObject<WebAllowDenyPolicyListener>
</span><del>-- (id)initWithPermissionRequestProxy:(RefPtr<GeolocationPermissionRequestProxy>)permissionRequestProxy;
</del><ins>+- (id)initWithPermissionRequestProxy:(PassRefPtr<GeolocationPermissionRequestProxy>)permissionRequestProxy;
</ins><span class="cx"> - (void)denyOnlyThisRequest NO_RETURN_DUE_TO_ASSERT;
</span><span class="cx"> @end
</span><span class="cx">
</span><span class="lines">@@ -225,7 +226,7 @@
</span><span class="cx"> RefPtr<GeolocationPermissionRequestProxy> _permissionRequestProxy;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (id)initWithPermissionRequestProxy:(RefPtr<GeolocationPermissionRequestProxy>)permissionRequestProxy
</del><ins>+- (id)initWithPermissionRequestProxy:(PassRefPtr<GeolocationPermissionRequestProxy>)permissionRequestProxy
</ins><span class="cx"> {
</span><span class="cx"> self = [super init];
</span><span class="cx"> if (!self)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKImmediateActionControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/UIProcess/mac/WKImmediateActionController.mm 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> _page->setTextIndicatorAnimationProgress(1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (RefPtr<API::HitTestResult>)_webHitTestResult
</del><ins>+- (PassRefPtr<API::HitTestResult>)_webHitTestResult
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<API::HitTestResult> hitTestResult;
</span><span class="cx"> if (_state == ImmediateActionState::Ready)
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> else
</span><span class="cx"> hitTestResult = _page->lastMouseMoveHitTestResult();
</span><span class="cx">
</span><del>- return hitTestResult;
</del><ins>+ return WTFMove(hitTestResult);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark Immediate actions
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><del>-static Ref<API::Array> contextMenuItems(const WebContextMenu& contextMenu)
</del><ins>+static PassRefPtr<API::Array> contextMenuItems(const WebContextMenu& contextMenu)
</ins><span class="cx"> {
</span><span class="cx"> auto items = contextMenu.items();
</span><span class="cx">
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> WebContextMenu* contextMenu = toImpl(pageRef)->contextMenu();
</span><span class="cx">
</span><del>- return toAPI(contextMenuItems(*contextMenu));
</del><ins>+ return toAPI(contextMenuItems(*contextMenu).leakRef());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pageRef);
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -215,7 +215,7 @@
</span><span class="cx"> if (!contextMenu)
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- return toAPI(contextMenuItems(*contextMenu));
</del><ins>+ return toAPI(contextMenuItems(*contextMenu).leakRef());
</ins><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(pageRef);
</span><span class="cx"> UNUSED_PARAM(point);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessUserContentWebUserContentControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/WebProcess/UserContent/WebUserContentController.cpp 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -208,9 +208,9 @@
</span><span class="cx"> #if ENABLE(USER_MESSAGE_HANDLERS)
</span><span class="cx"> class WebUserMessageHandlerDescriptorProxy : public WebCore::UserMessageHandlerDescriptor {
</span><span class="cx"> public:
</span><del>- static Ref<WebUserMessageHandlerDescriptorProxy> create(WebUserContentController* controller, const String& name, InjectedBundleScriptWorld& world, uint64_t identifier)
</del><ins>+ static PassRefPtr<WebUserMessageHandlerDescriptorProxy> create(WebUserContentController* controller, const String& name, InjectedBundleScriptWorld& world, uint64_t identifier)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new WebUserMessageHandlerDescriptorProxy(controller, name, world, identifier));
</del><ins>+ return adoptRef(new WebUserMessageHandlerDescriptorProxy(controller, name, world, identifier));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual ~WebUserMessageHandlerDescriptorProxy()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebUndoStepcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebUndoStep.cpp (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebUndoStep.cpp 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebUndoStep.cpp 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -34,9 +34,9 @@
</span><span class="cx"> return uniqueEntryID++;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<WebUndoStep> WebUndoStep::create(RefPtr<WebCore::UndoStep>&& step)
</del><ins>+Ref<WebUndoStep> WebUndoStep::create(PassRefPtr<WebCore::UndoStep> step)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new WebUndoStep(WTFMove(step), generateUndoStep()));
</del><ins>+ return adoptRef(*new WebUndoStep(step, generateUndoStep()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebUndoStep::~WebUndoStep()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebUndoSteph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebUndoStep.h (208341 => 208342)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebUndoStep.h 2016-11-03 20:47:57 UTC (rev 208341)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebUndoStep.h 2016-11-03 20:53:00 UTC (rev 208342)
</span><span class="lines">@@ -23,9 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#pragma once
</del><ins>+#ifndef WebUndoStep_h
+#define WebUndoStep_h
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/UndoStep.h>
</span><ins>+#include <wtf/PassRefPtr.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -32,7 +34,7 @@
</span><span class="cx">
</span><span class="cx"> class WebUndoStep : public RefCounted<WebUndoStep> {
</span><span class="cx"> public:
</span><del>- static Ref<WebUndoStep> create(RefPtr<WebCore::UndoStep>&&);
</del><ins>+ static Ref<WebUndoStep> create(PassRefPtr<WebCore::UndoStep>);
</ins><span class="cx"> ~WebUndoStep();
</span><span class="cx">
</span><span class="cx"> WebCore::UndoStep* step() const { return m_step.get(); }
</span><span class="lines">@@ -39,8 +41,8 @@
</span><span class="cx"> uint64_t stepID() const { return m_stepID; }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebUndoStep(RefPtr<WebCore::UndoStep>&& step, uint64_t stepID)
- : m_step(WTFMove(step))
</del><ins>+ WebUndoStep(PassRefPtr<WebCore::UndoStep> step, uint64_t stepID)
+ : m_step(step)
</ins><span class="cx"> , m_stepID(stepID)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -50,3 +52,5 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // WebEditCommand_h
</ins></span></pre>
</div>
</div>
</body>
</html>