<!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>[215255] 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/215255">215255</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2017-04-11 16:24:26 -0700 (Tue, 11 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modernize and clean up code
https://bugs.webkit.org/show_bug.cgi?id=170752
Reviewed by Sam Weinig.
* NetworkProcess/NetworkResourceLoader.h:
* Shared/WebPreferencesStore.h:
* UIProcess/API/APIHitTestResult.cpp:
(API::HitTestResult::create):
* UIProcess/API/APIHitTestResult.h:
* UIProcess/API/C/WKPreferences.cpp:
(WKPreferencesCreate):
(WKPreferencesCreateWithIdentifier):
(WKPreferencesCreateCopy):
* UIProcess/Authentication/AuthenticationChallengeProxy.h:
* UIProcess/WebPreferences.cpp:
(WebKit::WebPreferences::createWithLegacyDefaults):
(WebKit::WebPreferences::copy):
* UIProcess/WebPreferences.h:
* WebProcess/Network/WebLoaderStrategy.h:
* WebProcess/WebCoreSupport/WebEditorClient.cpp:
(WebKit::WebEditorClient::requestCheckingOfString):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::addTextCheckingRequest):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::rangeForWebSelectionAtPosition):
(WebKit::WebPage::rangeForBlockAtPoint):
(WebKit::WebPage::expandedRangeFromHandle):
(WebKit::WebPage::contractedRangeFromHandle):
(WebKit::WebPage::computeExpandAndShrinkThresholdsForHandle):
(WebKit::WebPage::changeBlockSelection):
(WebKit::WebPage::rangeForGranularityAtPoint):
(WebKit::WebPage::computePagesForPrintingAndDrawToPDF):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesStoreh">trunk/Source/WebKit2/Shared/WebPreferencesStore.h</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="#trunkSourceWebKit2UIProcessAPICWKPreferencescpp">trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAuthenticationAuthenticationChallengeProxyh">trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPreferencescpp">trunk/Source/WebKit2/UIProcess/WebPreferences.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPreferencesh">trunk/Source/WebKit2/UIProcess/WebPreferences.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkWebLoaderStrategyh">trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -1,3 +1,40 @@
</span><ins>+2017-04-11 Alex Christensen <achristensen@webkit.org>
+
+ Modernize and clean up code
+ https://bugs.webkit.org/show_bug.cgi?id=170752
+
+ Reviewed by Sam Weinig.
+
+ * NetworkProcess/NetworkResourceLoader.h:
+ * Shared/WebPreferencesStore.h:
+ * UIProcess/API/APIHitTestResult.cpp:
+ (API::HitTestResult::create):
+ * UIProcess/API/APIHitTestResult.h:
+ * UIProcess/API/C/WKPreferences.cpp:
+ (WKPreferencesCreate):
+ (WKPreferencesCreateWithIdentifier):
+ (WKPreferencesCreateCopy):
+ * UIProcess/Authentication/AuthenticationChallengeProxy.h:
+ * UIProcess/WebPreferences.cpp:
+ (WebKit::WebPreferences::createWithLegacyDefaults):
+ (WebKit::WebPreferences::copy):
+ * UIProcess/WebPreferences.h:
+ * WebProcess/Network/WebLoaderStrategy.h:
+ * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+ (WebKit::WebEditorClient::requestCheckingOfString):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::addTextCheckingRequest):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::rangeForWebSelectionAtPosition):
+ (WebKit::WebPage::rangeForBlockAtPoint):
+ (WebKit::WebPage::expandedRangeFromHandle):
+ (WebKit::WebPage::contractedRangeFromHandle):
+ (WebKit::WebPage::computeExpandAndShrinkThresholdsForHandle):
+ (WebKit::WebPage::changeBlockSelection):
+ (WebKit::WebPage::rangeForGranularityAtPoint):
+ (WebKit::WebPage::computePagesForPrintingAndDrawToPDF):
+
</ins><span class="cx"> 2017-04-11 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> Disable outdated WritableStream API
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -74,7 +74,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> void continueWillSendRequest(WebCore::ResourceRequest&& newRequest);
</span><span class="cx">
</span><del>- WebCore::SharedBuffer* bufferedData() { return m_bufferedData.get(); }
</del><span class="cx"> const WebCore::ResourceResponse& response() const { return m_response; }
</span><span class="cx">
</span><span class="cx"> NetworkConnectionToWebProcess& connectionToWebProcess() { return m_connection; }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesStore.h (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/Shared/WebPreferencesStore.h 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebPreferencesStore_h
-#define WebPreferencesStore_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "Decoder.h"
</span><span class="cx"> #include "Encoder.h"
</span><span class="lines">@@ -183,5 +182,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // WebPreferencesStore_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIHitTestResult.cpp (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIHitTestResult.cpp 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/UIProcess/API/APIHitTestResult.cpp 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -24,9 +24,9 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><del>-PassRefPtr<HitTestResult> HitTestResult::create(const WebKit::WebHitTestResultData& hitTestResultData)
</del><ins>+Ref<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 (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIHitTestResult.h 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/UIProcess/API/APIHitTestResult.h 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -17,8 +17,7 @@
</span><span class="cx"> * Boston, MA 02110-1301, USA.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef APIHitTestResult_h
-#define APIHitTestResult_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "SharedMemory.h"
</span><span class="lines">@@ -28,7 +27,6 @@
</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/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -49,7 +47,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 PassRefPtr<HitTestResult> create(const WebKit::WebHitTestResultData&);
</del><ins>+ static Ref<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">@@ -86,5 +84,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace API
</span><del>-
-#endif // APIHitTestResult_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPreferences.cpp 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -42,19 +42,19 @@
</span><span class="cx"> WKPreferencesRef WKPreferencesCreate()
</span><span class="cx"> {
</span><span class="cx"> auto preferences = WebPreferences::createWithLegacyDefaults(String(), "WebKit2.", "WebKit2.");
</span><del>- return toAPI(preferences.leakRef());
</del><ins>+ return toAPI(&preferences.leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKPreferencesRef WKPreferencesCreateWithIdentifier(WKStringRef identifierRef)
</span><span class="cx"> {
</span><span class="cx"> auto preferences = WebPreferences::createWithLegacyDefaults(toWTFString(identifierRef), "WebKit2.", "WebKit2.");
</span><del>- return toAPI(preferences.leakRef());
</del><ins>+ return toAPI(&preferences.leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKPreferencesRef WKPreferencesCreateCopy(WKPreferencesRef preferencesRef)
</span><span class="cx"> {
</span><span class="cx"> auto preferences = toImpl(preferencesRef)->copy();
</span><del>- return toAPI(preferences.leakRef());
</del><ins>+ return toAPI(&preferences.leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKPreferencesEnableAllExperimentalFeatures(WKPreferencesRef preferencesRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAuthenticationAuthenticationChallengeProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/UIProcess/Authentication/AuthenticationChallengeProxy.h 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -23,12 +23,10 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef AuthenticationChallengeProxy_h
-#define AuthenticationChallengeProxy_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include <WebCore/AuthenticationChallenge.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx"> class Connection;
</span><span class="lines">@@ -73,5 +71,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // WebAuthenticationChallengeProxy_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.cpp (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.cpp 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> return adoptRef(*new WebPreferences(identifier, keyPrefix, globalDebugKeyPrefix));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebPreferences> WebPreferences::createWithLegacyDefaults(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix)
</del><ins>+Ref<WebPreferences> WebPreferences::createWithLegacyDefaults(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix)
</ins><span class="cx"> {
</span><span class="cx"> auto preferences = WebPreferences::create(identifier, keyPrefix, globalDebugKeyPrefix);
</span><span class="cx"> // FIXME: The registerDefault...ValueForKey machinery is unnecessarily heavyweight and complicated.
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> preferences->registerDefaultBoolValueForKey(WebPreferencesKey::javaEnabledForLocalFilesKey(), true);
</span><span class="cx"> preferences->registerDefaultBoolValueForKey(WebPreferencesKey::pluginsEnabledKey(), true);
</span><span class="cx"> preferences->registerDefaultUInt32ValueForKey(WebPreferencesKey::storageBlockingPolicyKey(), WebCore::SecurityOrigin::AllowAllStorage);
</span><del>- return WTFMove(preferences);
</del><ins>+ return preferences;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebPreferences::WebPreferences(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix)
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> ASSERT(m_pages.isEmpty());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebPreferences> WebPreferences::copy() const
</del><ins>+Ref<WebPreferences> WebPreferences::copy() const
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(*new WebPreferences(*this));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPreferences.h (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPreferences.h 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/UIProcess/WebPreferences.h 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebPreferences_h
-#define WebPreferences_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "APIExperimentalFeature.h"
</span><span class="cx"> #include "APIObject.h"
</span><span class="lines">@@ -32,7 +31,6 @@
</span><span class="cx"> #include "WebPreferencesDefinitions.h"
</span><span class="cx"> #include "WebPreferencesStore.h"
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> #define DECLARE_PREFERENCE_GETTER_AND_SETTERS(KeyUpper, KeyLower, TypeName, Type, DefaultValue, HumanReadableName, HumanReadableDescription) \
</span><span class="lines">@@ -46,7 +44,7 @@
</span><span class="cx"> class WebPreferences : public API::ObjectImpl<API::Object::Type::Preferences> {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<WebPreferences> create(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix);
</span><del>- static PassRefPtr<WebPreferences> createWithLegacyDefaults(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix);
</del><ins>+ static Ref<WebPreferences> createWithLegacyDefaults(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix);
</ins><span class="cx">
</span><span class="cx"> explicit WebPreferences(const String& identifier, const String& keyPrefix, const String& globalDebugKeyPrefix);
</span><span class="cx"> WebPreferences(const WebPreferences&);
</span><span class="lines">@@ -53,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> virtual ~WebPreferences();
</span><span class="cx">
</span><del>- PassRefPtr<WebPreferences> copy() const;
</del><ins>+ Ref<WebPreferences> copy() const;
</ins><span class="cx">
</span><span class="cx"> void addPage(WebPageProxy&);
</span><span class="cx"> void removePage(WebPageProxy&);
</span><span class="lines">@@ -110,5 +108,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // WebPreferences_h
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkWebLoaderStrategyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.h 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebLoaderStrategy_h
-#define WebLoaderStrategy_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "WebResourceLoader.h"
</span><span class="cx"> #include <WebCore/LoaderStrategy.h>
</span><span class="lines">@@ -81,5 +80,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebEditorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -529,7 +529,7 @@
</span><span class="cx"> void WebEditorClient::requestCheckingOfString(TextCheckingRequest& request, const WebCore::VisibleSelection& currentSelection)
</span><span class="cx"> {
</span><span class="cx"> uint64_t requestID = generateTextCheckingRequestID();
</span><del>- m_page->addTextCheckingRequest(requestID, &request);
</del><ins>+ m_page->addTextCheckingRequest(requestID, request);
</ins><span class="cx">
</span><span class="cx"> m_page->send(Messages::WebPageProxy::RequestCheckingOfString(requestID, request.data(), insertionPointFromCurrentSelection(currentSelection)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -5206,9 +5206,9 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPage::addTextCheckingRequest(uint64_t requestID, PassRefPtr<TextCheckingRequest> request)
</del><ins>+void WebPage::addTextCheckingRequest(uint64_t requestID, Ref<TextCheckingRequest>&& request)
</ins><span class="cx"> {
</span><del>- m_pendingTextCheckingRequestMap.add(requestID, request);
</del><ins>+ m_pendingTextCheckingRequestMap.add(requestID, WTFMove(request));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::didFinishCheckingText(uint64_t requestID, const Vector<TextCheckingResult>& result)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -751,7 +751,7 @@
</span><span class="cx"> void drawPagesToPDF(uint64_t frameID, const PrintInfo&, uint32_t first, uint32_t count, uint64_t callbackID);
</span><span class="cx"> void drawPagesToPDFImpl(uint64_t frameID, const PrintInfo&, uint32_t first, uint32_t count, RetainPtr<CFMutableDataRef>& pdfPageData);
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- void computePagesForPrintingAndDrawToPDF(uint64_t frameID, const PrintInfo&, uint64_t callbackID, PassRefPtr<Messages::WebPage::ComputePagesForPrintingAndDrawToPDF::DelayedReply>);
</del><ins>+ void computePagesForPrintingAndDrawToPDF(uint64_t frameID, const PrintInfo&, uint64_t callbackID, Ref<Messages::WebPage::ComputePagesForPrintingAndDrawToPDF::DelayedReply>&&);
</ins><span class="cx"> #endif
</span><span class="cx"> #elif PLATFORM(GTK)
</span><span class="cx"> void drawPagesForPrinting(uint64_t frameID, const PrintInfo&, uint64_t callbackID);
</span><span class="lines">@@ -878,7 +878,7 @@
</span><span class="cx">
</span><span class="cx"> bool canShowMIMEType(const String& MIMEType) const;
</span><span class="cx">
</span><del>- void addTextCheckingRequest(uint64_t requestID, PassRefPtr<WebCore::TextCheckingRequest>);
</del><ins>+ void addTextCheckingRequest(uint64_t requestID, Ref<WebCore::TextCheckingRequest>&&);
</ins><span class="cx"> void didFinishCheckingText(uint64_t requestID, const Vector<WebCore::TextCheckingResult>&);
</span><span class="cx"> void didCancelCheckingText(uint64_t requestID);
</span><span class="cx">
</span><span class="lines">@@ -997,12 +997,12 @@
</span><span class="cx"> void updateViewportSizeForCSSViewportUnits();
</span><span class="cx">
</span><span class="cx"> static void convertSelectionRectsToRootView(WebCore::FrameView*, Vector<WebCore::SelectionRect>&);
</span><del>- PassRefPtr<WebCore::Range> rangeForWebSelectionAtPosition(const WebCore::IntPoint&, const WebCore::VisiblePosition&, SelectionFlags&);
- PassRefPtr<WebCore::Range> rangeForBlockAtPoint(const WebCore::IntPoint&);
</del><ins>+ RefPtr<WebCore::Range> rangeForWebSelectionAtPosition(const WebCore::IntPoint&, const WebCore::VisiblePosition&, SelectionFlags&);
+ RefPtr<WebCore::Range> rangeForBlockAtPoint(const WebCore::IntPoint&);
</ins><span class="cx"> void computeExpandAndShrinkThresholdsForHandle(const WebCore::IntPoint&, SelectionHandlePosition, float& growThreshold, float& shrinkThreshold);
</span><del>- PassRefPtr<WebCore::Range> changeBlockSelection(const WebCore::IntPoint&, SelectionHandlePosition, float& growThreshold, float& shrinkThreshold, SelectionFlags&);
- PassRefPtr<WebCore::Range> expandedRangeFromHandle(WebCore::Range*, SelectionHandlePosition);
- PassRefPtr<WebCore::Range> contractedRangeFromHandle(WebCore::Range* currentRange, SelectionHandlePosition, SelectionFlags&);
</del><ins>+ RefPtr<WebCore::Range> changeBlockSelection(const WebCore::IntPoint&, SelectionHandlePosition, float& growThreshold, float& shrinkThreshold, SelectionFlags&);
+ Ref<WebCore::Range> expandedRangeFromHandle(WebCore::Range&, SelectionHandlePosition);
+ Ref<WebCore::Range> contractedRangeFromHandle(WebCore::Range& currentRange, SelectionHandlePosition, SelectionFlags&);
</ins><span class="cx"> void getAssistedNodeInformation(AssistedNodeInformation&);
</span><span class="cx"> void platformInitializeAccessibility();
</span><span class="cx"> void handleSyntheticClick(WebCore::Node* nodeRespondingToClick, const WebCore::FloatPoint& location);
</span><span class="lines">@@ -1010,7 +1010,7 @@
</span><span class="cx"> void sendTapHighlightForNodeIfNecessary(uint64_t requestID, WebCore::Node*);
</span><span class="cx"> void resetTextAutosizing();
</span><span class="cx"> WebCore::VisiblePosition visiblePositionInFocusedNodeForPoint(const WebCore::Frame&, const WebCore::IntPoint&, bool isInteractingWithAssistedNode);
</span><del>- PassRefPtr<WebCore::Range> rangeForGranularityAtPoint(const WebCore::Frame&, const WebCore::IntPoint&, uint32_t granularity, bool isInteractingWithAssistedNode);
</del><ins>+ RefPtr<WebCore::Range> rangeForGranularityAtPoint(const WebCore::Frame&, const WebCore::IntPoint&, uint32_t granularity, bool isInteractingWithAssistedNode);
</ins><span class="cx"> bool shouldSwitchToBlockModeForHandle(const WebCore::IntPoint& handlePoint, SelectionHandlePosition);
</span><span class="cx"> RefPtr<WebCore::Range> switchToBlockSelectionAtPoint(const WebCore::IntPoint&, SelectionHandlePosition);
</span><span class="cx"> #if ENABLE(DATA_INTERACTION)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (215254 => 215255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-04-11 23:03:47 UTC (rev 215254)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2017-04-11 23:24:26 UTC (rev 215255)
</span><span class="lines">@@ -941,7 +941,7 @@
</span><span class="cx"> return renderer && renderer->style().lineHeight().isSpecified();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> WebPage::rangeForWebSelectionAtPosition(const IntPoint& point, const VisiblePosition& position, SelectionFlags& flags)
</del><ins>+RefPtr<Range> WebPage::rangeForWebSelectionAtPosition(const IntPoint& point, const VisiblePosition& position, SelectionFlags& flags)
</ins><span class="cx"> {
</span><span class="cx"> HitTestResult result = m_page->mainFrame().eventHandler().hitTestResultAtPoint((point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent | HitTestRequest::AllowChildFrameContent);
</span><span class="cx">
</span><span class="lines">@@ -1014,7 +1014,7 @@
</span><span class="cx"> return range->collapsed() ? nullptr : range;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> WebPage::rangeForBlockAtPoint(const IntPoint& point)
</del><ins>+RefPtr<Range> WebPage::rangeForBlockAtPoint(const IntPoint& point)
</ins><span class="cx"> {
</span><span class="cx"> HitTestResult result = m_page->mainFrame().eventHandler().hitTestResultAtPoint((point), HitTestRequest::ReadOnly | HitTestRequest::Active | HitTestRequest::DisallowUserAgentShadowContent | HitTestRequest::IgnoreClipping);
</span><span class="cx">
</span><span class="lines">@@ -1320,9 +1320,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> WebPage::expandedRangeFromHandle(Range* currentRange, SelectionHandlePosition handlePosition)
</del><ins>+Ref<Range> WebPage::expandedRangeFromHandle(Range& currentRange, SelectionHandlePosition handlePosition)
</ins><span class="cx"> {
</span><del>- IntRect currentBox = selectionBoxForRange(currentRange);
</del><ins>+ IntRect currentBox = selectionBoxForRange(&currentRange);
</ins><span class="cx"> IntPoint edgeCenter = computeEdgeCenter(currentBox, handlePosition);
</span><span class="cx"> static const float maxDistance = 1000;
</span><span class="cx"> const float multiple = powf(maxDistance, 1.0/(maxHitTests - 1));
</span><span class="lines">@@ -1359,15 +1359,15 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> newRange;
</span><span class="cx"> RefPtr<Range> rangeAtPosition = rangeForBlockAtPoint(testPoint);
</span><del>- if (!rangeAtPosition || &currentRange->ownerDocument() != &rangeAtPosition->ownerDocument())
</del><ins>+ if (!rangeAtPosition || &currentRange.ownerDocument() != &rangeAtPosition->ownerDocument())
</ins><span class="cx"> continue;
</span><span class="cx">
</span><del>- if (rangeAtPosition->contains(*currentRange))
</del><ins>+ if (rangeAtPosition->contains(currentRange))
</ins><span class="cx"> newRange = rangeAtPosition;
</span><del>- else if (currentRange->contains(*rangeAtPosition.get()))
- newRange = currentRange;
</del><ins>+ else if (currentRange.contains(*rangeAtPosition.get()))
+ newRange = &currentRange;
</ins><span class="cx"> else
</span><del>- newRange = unionDOMRanges(currentRange, rangeAtPosition.get());
</del><ins>+ newRange = unionDOMRanges(&currentRange, rangeAtPosition.get());
</ins><span class="cx">
</span><span class="cx"> IntRect copyRect = selectionBoxForRange(newRange.get());
</span><span class="cx">
</span><span class="lines">@@ -1408,18 +1408,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (bestRange)
</span><del>- return bestRange;
</del><ins>+ return bestRange.releaseNonNull();
</ins><span class="cx">
</span><span class="cx"> return currentRange;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> WebPage::contractedRangeFromHandle(Range* currentRange, SelectionHandlePosition handlePosition, SelectionFlags& flags)
</del><ins>+Ref<Range> WebPage::contractedRangeFromHandle(Range& currentRange, SelectionHandlePosition handlePosition, SelectionFlags& flags)
</ins><span class="cx"> {
</span><span class="cx"> // Shrinking with a base and extent will always give better results. If we only have a single element,
</span><span class="cx"> // see if we can break that down to a base and extent. Shrinking base and extent is comparatively straightforward.
</span><span class="cx"> // Shrinking down to another element is unlikely to move just one edge, but we can try that as a fallback.
</span><span class="cx">
</span><del>- IntRect currentBox = selectionBoxForRange(currentRange);
</del><ins>+ IntRect currentBox = selectionBoxForRange(&currentRange);
</ins><span class="cx"> IntPoint edgeCenter = computeEdgeCenter(currentBox, handlePosition);
</span><span class="cx"> flags = IsBlockSelection;
</span><span class="cx">
</span><span class="lines">@@ -1479,13 +1479,13 @@
</span><span class="cx"> distance *= multiple;
</span><span class="cx">
</span><span class="cx"> RefPtr<Range> newRange = rangeForBlockAtPoint(testPoint);
</span><del>- if (!newRange || &newRange->ownerDocument() != &currentRange->ownerDocument())
</del><ins>+ if (!newRange || &newRange->ownerDocument() != &currentRange.ownerDocument())
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if (handlePosition == SelectionHandlePosition::Top || handlePosition == SelectionHandlePosition::Left)
</span><del>- newRange = Range::create(newRange->startContainer().document(), newRange->endPosition(), currentRange->endPosition());
</del><ins>+ newRange = Range::create(newRange->startContainer().document(), newRange->endPosition(), currentRange.endPosition());
</ins><span class="cx"> else
</span><del>- newRange = Range::create(newRange->startContainer().document(), currentRange->startPosition(), newRange->startPosition());
</del><ins>+ newRange = Range::create(newRange->startContainer().document(), currentRange.startPosition(), newRange->startPosition());
</ins><span class="cx">
</span><span class="cx"> IntRect copyRect = selectionBoxForRange(newRange.get());
</span><span class="cx"> if (copyRect.isEmpty()) {
</span><span class="lines">@@ -1508,7 +1508,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- isBetterChoice = isBetterChoice && !areRangesEqual(newRange.get(), currentRange);
</del><ins>+ isBetterChoice = isBetterChoice && !areRangesEqual(newRange.get(), &currentRange);
</ins><span class="cx"> if (bestRange && isBetterChoice) {
</span><span class="cx"> switch (handlePosition) {
</span><span class="cx"> case SelectionHandlePosition::Top:
</span><span class="lines">@@ -1529,7 +1529,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!bestRange)
</span><del>- bestRange = currentRange;
</del><ins>+ bestRange = &currentRange;
</ins><span class="cx">
</span><span class="cx"> // If we can shrink down to text only, the only reason we wouldn't is that
</span><span class="cx"> // there are multiple sub-element blocks beneath us. If we didn't find
</span><span class="lines">@@ -1538,7 +1538,7 @@
</span><span class="cx"> if (canShrinkToTextSelection(*bestRange.get()))
</span><span class="cx"> flags = None;
</span><span class="cx">
</span><del>- return bestRange;
</del><ins>+ return bestRange.releaseNonNull();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::computeExpandAndShrinkThresholdsForHandle(const IntPoint& point, SelectionHandlePosition handlePosition, float& growThreshold, float& shrinkThreshold)
</span><span class="lines">@@ -1549,12 +1549,12 @@
</span><span class="cx"> if (!currentRange)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<Range> expandedRange = expandedRangeFromHandle(currentRange.get(), handlePosition);
</del><ins>+ Ref<Range> expandedRange = expandedRangeFromHandle(*currentRange, handlePosition);
</ins><span class="cx"> SelectionFlags flags;
</span><del>- RefPtr<Range> contractedRange = contractedRangeFromHandle(currentRange.get(), handlePosition, flags);
</del><ins>+ RefPtr<Range> contractedRange = contractedRangeFromHandle(*currentRange, handlePosition, flags);
</ins><span class="cx">
</span><span class="cx"> IntRect currentBounds = selectionBoxForRange(currentRange.get());
</span><del>- IntRect expandedBounds = selectionBoxForRange(expandedRange.get());
</del><ins>+ IntRect expandedBounds = selectionBoxForRange(expandedRange.ptr());
</ins><span class="cx"> IntRect contractedBounds = selectionBoxForRange(contractedRange.get());
</span><span class="cx">
</span><span class="cx"> float current;
</span><span class="lines">@@ -1602,7 +1602,7 @@
</span><span class="cx">
</span><span class="cx"> growThreshold = current + (expanded - current) * fractionToGrow;
</span><span class="cx"> shrinkThreshold = current + (contracted - current) * (1 - fractionToGrow);
</span><del>- if (areRangesEqual(expandedRange.get(), currentRange.get()))
</del><ins>+ if (areRangesEqual(expandedRange.ptr(), currentRange.get()))
</ins><span class="cx"> growThreshold = maxThreshold;
</span><span class="cx">
</span><span class="cx"> if (flags & IsBlockSelection && areRangesEqual(contractedRange.get(), currentRange.get()))
</span><span class="lines">@@ -1623,13 +1623,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebCore::Range> WebPage::changeBlockSelection(const IntPoint& point, SelectionHandlePosition handlePosition, float& growThreshold, float& shrinkThreshold, SelectionFlags& flags)
</del><ins>+RefPtr<WebCore::Range> WebPage::changeBlockSelection(const IntPoint& point, SelectionHandlePosition handlePosition, float& growThreshold, float& shrinkThreshold, SelectionFlags& flags)
</ins><span class="cx"> {
</span><span class="cx"> Frame& frame = m_page->focusController().focusedOrMainFrame();
</span><span class="cx"> RefPtr<Range> currentRange = m_currentBlockSelection ? m_currentBlockSelection.get() : frame.selection().selection().toNormalizedRange();
</span><span class="cx"> if (!currentRange)
</span><span class="cx"> return nullptr;
</span><del>- RefPtr<Range> newRange = shouldExpand(handlePosition, selectionBoxForRange(currentRange.get()), point) ? expandedRangeFromHandle(currentRange.get(), handlePosition) : contractedRangeFromHandle(currentRange.get(), handlePosition, flags);
</del><ins>+ RefPtr<Range> newRange = shouldExpand(handlePosition, selectionBoxForRange(currentRange.get()), point) ? expandedRangeFromHandle(*currentRange, handlePosition) : contractedRangeFromHandle(*currentRange, handlePosition, flags);
</ins><span class="cx">
</span><span class="cx"> if (newRange) {
</span><span class="cx"> m_currentBlockSelection = newRange;
</span><span class="lines">@@ -1954,7 +1954,7 @@
</span><span class="cx"> send(Messages::WebPageProxy::VoidCallback(callbackID));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Range> WebPage::rangeForGranularityAtPoint(const Frame& frame, const WebCore::IntPoint& point, uint32_t granularity, bool isInteractingWithAssistedNode)
</del><ins>+RefPtr<Range> WebPage::rangeForGranularityAtPoint(const Frame& frame, const WebCore::IntPoint& point, uint32_t granularity, bool isInteractingWithAssistedNode)
</ins><span class="cx"> {
</span><span class="cx"> VisiblePosition position = visiblePositionInFocusedNodeForPoint(frame, point, isInteractingWithAssistedNode);
</span><span class="cx">
</span><span class="lines">@@ -3250,7 +3250,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebPage::computePagesForPrintingAndDrawToPDF(uint64_t frameID, const PrintInfo& printInfo, uint64_t callbackID, PassRefPtr<Messages::WebPage::ComputePagesForPrintingAndDrawToPDF::DelayedReply> reply)
</del><ins>+void WebPage::computePagesForPrintingAndDrawToPDF(uint64_t frameID, const PrintInfo& printInfo, uint64_t callbackID, Ref<Messages::WebPage::ComputePagesForPrintingAndDrawToPDF::DelayedReply>&& reply)
</ins><span class="cx"> {
</span><span class="cx"> if (printInfo.snapshotFirstPage) {
</span><span class="cx"> reply->send(1);
</span></span></pre>
</div>
</div>
</body>
</html>