<!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>[183462] 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/183462">183462</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-04-28 01:06:58 -0700 (Tue, 28 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] API::URLRequest, API::URLResponse creation functions should return Ref<>
https://bugs.webkit.org/show_bug.cgi?id=144224
Reviewed by Darin Adler.
Have API::URLRequest and API::URLResponse creation functions return Ref<>.
The call-sites are also updated, using and operating on the returned Ref<> object
where possible.
* Shared/API/APIURLRequest.h:
(API::URLRequest::create):
* Shared/API/APIURLResponse.h:
(API::URLResponse::create):
* Shared/API/c/WKURLRequest.cpp:
(WKURLRequestCreateWithWKURL):
* Shared/API/c/mac/WKURLRequestNS.mm:
(WKURLRequestCreateWithNSURLRequest):
* Shared/API/c/mac/WKURLResponseNS.mm:
(WKURLResponseCreateWithNSURLResponse):
* UIProcess/API/C/WKContext.cpp:
(WKContextSetDownloadClient):
* UIProcess/API/C/WKDownload.cpp:
(WKDownloadCopyRequest):
* UIProcess/API/C/WKNavigationDataRef.cpp:
(WKNavigationDataCopyOriginalRequest):
* UIProcess/API/C/WKPage.cpp:
(WKPageSetPagePolicyClient):
(WKPageSetPageUIClient):
* UIProcess/Cocoa/NavigationState.mm:
(WebKit::NavigationState::NavigationClient::decidePolicyForNavigationAction):
* UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp:
(WebKit::WebSoupCustomProtocolRequestManagerClient::startLoading):
* WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
(willSendRequestForFrame):
* WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp:
(WebKit::InjectedBundlePagePolicyClient::decidePolicyForNavigationAction):
(WebKit::InjectedBundlePagePolicyClient::decidePolicyForNewWindowAction):
(WebKit::InjectedBundlePagePolicyClient::decidePolicyForResponse):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIURLRequesth">trunk/Source/WebKit2/Shared/API/APIURLRequest.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIURLResponseh">trunk/Source/WebKit2/Shared/API/APIURLResponse.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKURLRequestcpp">trunk/Source/WebKit2/Shared/API/c/WKURLRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcmacWKURLRequestNSmm">trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcmacWKURLResponseNSmm">trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKDownloadcpp">trunk/Source/WebKit2/UIProcess/API/C/WKDownload.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKNavigationDataRefcpp">trunk/Source/WebKit2/UIProcess/API/C/WKNavigationDataRef.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaNavigationStatemm">trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupWebSoupCustomProtocolRequestManagerClientcpp">trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePagePolicyClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -1,3 +1,44 @@
</span><ins>+2015-04-28 Zan Dobersek <zdobersek@igalia.com>
+
+ [WK2] API::URLRequest, API::URLResponse creation functions should return Ref<>
+ https://bugs.webkit.org/show_bug.cgi?id=144224
+
+ Reviewed by Darin Adler.
+
+ Have API::URLRequest and API::URLResponse creation functions return Ref<>.
+ The call-sites are also updated, using and operating on the returned Ref<> object
+ where possible.
+
+ * Shared/API/APIURLRequest.h:
+ (API::URLRequest::create):
+ * Shared/API/APIURLResponse.h:
+ (API::URLResponse::create):
+ * Shared/API/c/WKURLRequest.cpp:
+ (WKURLRequestCreateWithWKURL):
+ * Shared/API/c/mac/WKURLRequestNS.mm:
+ (WKURLRequestCreateWithNSURLRequest):
+ * Shared/API/c/mac/WKURLResponseNS.mm:
+ (WKURLResponseCreateWithNSURLResponse):
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextSetDownloadClient):
+ * UIProcess/API/C/WKDownload.cpp:
+ (WKDownloadCopyRequest):
+ * UIProcess/API/C/WKNavigationDataRef.cpp:
+ (WKNavigationDataCopyOriginalRequest):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetPagePolicyClient):
+ (WKPageSetPageUIClient):
+ * UIProcess/Cocoa/NavigationState.mm:
+ (WebKit::NavigationState::NavigationClient::decidePolicyForNavigationAction):
+ * UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp:
+ (WebKit::WebSoupCustomProtocolRequestManagerClient::startLoading):
+ * WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp:
+ (willSendRequestForFrame):
+ * WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp:
+ (WebKit::InjectedBundlePagePolicyClient::decidePolicyForNavigationAction):
+ (WebKit::InjectedBundlePagePolicyClient::decidePolicyForNewWindowAction):
+ (WebKit::InjectedBundlePagePolicyClient::decidePolicyForResponse):
+
</ins><span class="cx"> 2015-04-27 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [WK2] API::Point, API::Size, API::Rect creation functions should return Ref<>
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIURLRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIURLRequest.h (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIURLRequest.h 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/Shared/API/APIURLRequest.h 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -39,9 +39,9 @@
</span><span class="cx">
</span><span class="cx"> class URLRequest : public ObjectImpl<Object::Type::URLRequest> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<URLRequest> create(const WebCore::ResourceRequest& request)
</del><ins>+ static Ref<URLRequest> create(const WebCore::ResourceRequest& request)
</ins><span class="cx"> {
</span><del>- return adoptRef(new URLRequest(request));
</del><ins>+ return adoptRef(*new URLRequest(request));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const WebCore::ResourceRequest& resourceRequest() const { return m_request; }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIURLResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIURLResponse.h (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIURLResponse.h 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/Shared/API/APIURLResponse.h 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -39,9 +39,9 @@
</span><span class="cx">
</span><span class="cx"> class URLResponse : public ObjectImpl<Object::Type::URLResponse> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<URLResponse> create(const WebCore::ResourceResponse& response)
</del><ins>+ static Ref<URLResponse> create(const WebCore::ResourceResponse& response)
</ins><span class="cx"> {
</span><del>- return adoptRef(new URLResponse(response));
</del><ins>+ return adoptRef(*new URLResponse(response));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const WebCore::ResourceResponse& resourceResponse() const { return m_response; }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKURLRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKURLRequest.cpp (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKURLRequest.cpp 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/Shared/API/c/WKURLRequest.cpp 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> WKURLRequestRef WKURLRequestCreateWithWKURL(WKURLRef url)
</span><span class="cx"> {
</span><del>- return toAPI(API::URLRequest::create(URL(URL(), toImpl(url)->string())).leakRef());
</del><ins>+ return toAPI(&API::URLRequest::create(URL(URL(), toImpl(url)->string())).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKURLRef WKURLRequestCopyURL(WKURLRequestRef requestRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcmacWKURLRequestNSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.mm (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.mm 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKURLRequestNS.mm 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -35,8 +35,7 @@
</span><span class="cx"> WKURLRequestRef WKURLRequestCreateWithNSURLRequest(NSURLRequest* urlRequest)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<NSURLRequest> copiedURLRequest = adoptNS([urlRequest copy]);
</span><del>- RefPtr<API::URLRequest> request = API::URLRequest::create(copiedURLRequest.get());
- return toAPI(request.release().leakRef());
</del><ins>+ return toAPI(&API::URLRequest::create(copiedURLRequest.get()).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSURLRequest* WKURLRequestCopyNSURLRequest(WKURLRequestRef urlRequest)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcmacWKURLResponseNSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKURLResponseNS.mm 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -34,8 +34,7 @@
</span><span class="cx"> WKURLResponseRef WKURLResponseCreateWithNSURLResponse(NSURLResponse* urlResponse)
</span><span class="cx"> {
</span><span class="cx"> RetainPtr<NSURLResponse> copiedURLResponse = adoptNS([urlResponse copy]);
</span><del>- RefPtr<API::URLResponse> response = API::URLResponse::create(copiedURLResponse.get());
- return toAPI(response.release().leakRef());
</del><ins>+ return toAPI(&API::URLResponse::create(copiedURLResponse.get()).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> NSURLResponse* WKURLResponseCopyNSURLResponse(WKURLResponseRef urlResponse)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> if (!m_client.didReceiveResponse)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_client.didReceiveResponse(toAPI(processPool), toAPI(downloadProxy), toAPI(API::URLResponse::create(response).get()), m_client.base.clientInfo);
</del><ins>+ m_client.didReceiveResponse(toAPI(processPool), toAPI(downloadProxy), toAPI(API::URLResponse::create(response).ptr()), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void didReceiveData(WebProcessPool* processPool, DownloadProxy* downloadProxy, uint64_t length) override
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKDownloadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKDownload.cpp (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKDownload.cpp 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDownload.cpp 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> WKURLRequestRef WKDownloadCopyRequest(WKDownloadRef download)
</span><span class="cx"> {
</span><del>- return toAPI(API::URLRequest::create(toImpl(download)->request()).leakRef());
</del><ins>+ return toAPI(&API::URLRequest::create(toImpl(download)->request()).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKDataRef WKDownloadGetResumeData(WKDownloadRef download)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKNavigationDataRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKNavigationDataRef.cpp (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKNavigationDataRef.cpp 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKNavigationDataRef.cpp 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -55,5 +55,5 @@
</span><span class="cx">
</span><span class="cx"> WKURLRequestRef WKNavigationDataCopyOriginalRequest(WKNavigationDataRef navigationData)
</span><span class="cx"> {
</span><del>- return toAPI(API::URLRequest::create(toImpl(navigationData)->originalRequest()).leakRef());
</del><ins>+ return toAPI(&API::URLRequest::create(toImpl(navigationData)->originalRequest()).leakRef());
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -1257,15 +1257,15 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<API::URLRequest> originalRequest = API::URLRequest::create(originalResourceRequest);
- RefPtr<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</del><ins>+ Ref<API::URLRequest> originalRequest = API::URLRequest::create(originalResourceRequest);
+ Ref<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</ins><span class="cx">
</span><span class="cx"> if (m_client.decidePolicyForNavigationAction_deprecatedForUseWithV0)
</span><del>- m_client.decidePolicyForNavigationAction_deprecatedForUseWithV0(toAPI(&page), toAPI(frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(request.get()), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
</del><ins>+ m_client.decidePolicyForNavigationAction_deprecatedForUseWithV0(toAPI(&page), toAPI(frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(request.ptr()), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
</ins><span class="cx"> else if (m_client.decidePolicyForNavigationAction_deprecatedForUseWithV1)
</span><del>- m_client.decidePolicyForNavigationAction_deprecatedForUseWithV1(toAPI(&page), toAPI(frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(originatingFrame), toAPI(request.get()), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
</del><ins>+ m_client.decidePolicyForNavigationAction_deprecatedForUseWithV1(toAPI(&page), toAPI(frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(originatingFrame), toAPI(request.ptr()), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
</ins><span class="cx"> else
</span><del>- m_client.decidePolicyForNavigationAction(toAPI(&page), toAPI(frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(originatingFrame), toAPI(originalRequest.get()), toAPI(request.get()), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
</del><ins>+ m_client.decidePolicyForNavigationAction(toAPI(&page), toAPI(frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(originatingFrame), toAPI(originalRequest.ptr()), toAPI(request.ptr()), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void decidePolicyForNewWindowAction(WebPageProxy& page, WebFrameProxy& frame, const NavigationActionData& navigationActionData, const ResourceRequest& resourceRequest, const String& frameName, Ref<WebFramePolicyListenerProxy>&& listener, API::Object* userData) override
</span><span class="lines">@@ -1275,9 +1275,9 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</del><ins>+ Ref<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</ins><span class="cx">
</span><del>- m_client.decidePolicyForNewWindowAction(toAPI(&page), toAPI(&frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(request.get()), toAPI(frameName.impl()), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
</del><ins>+ m_client.decidePolicyForNewWindowAction(toAPI(&page), toAPI(&frame), toAPI(navigationActionData.navigationType), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), toAPI(request.ptr()), toAPI(frameName.impl()), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void decidePolicyForResponse(WebPageProxy& page, WebFrameProxy& frame, const ResourceResponse& resourceResponse, const ResourceRequest& resourceRequest, bool canShowMIMEType, Ref<WebFramePolicyListenerProxy>&& listener, API::Object* userData) override
</span><span class="lines">@@ -1287,13 +1287,13 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<API::URLResponse> response = API::URLResponse::create(resourceResponse);
- RefPtr<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</del><ins>+ Ref<API::URLResponse> response = API::URLResponse::create(resourceResponse);
+ Ref<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</ins><span class="cx">
</span><span class="cx"> if (m_client.decidePolicyForResponse_deprecatedForUseWithV0)
</span><del>- m_client.decidePolicyForResponse_deprecatedForUseWithV0(toAPI(&page), toAPI(&frame), toAPI(response.get()), toAPI(request.get()), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
</del><ins>+ m_client.decidePolicyForResponse_deprecatedForUseWithV0(toAPI(&page), toAPI(&frame), toAPI(response.ptr()), toAPI(request.ptr()), toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
</ins><span class="cx"> else
</span><del>- m_client.decidePolicyForResponse(toAPI(&page), toAPI(&frame), toAPI(response.get()), toAPI(request.get()), canShowMIMEType, toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
</del><ins>+ m_client.decidePolicyForResponse(toAPI(&page), toAPI(&frame), toAPI(response.ptr()), toAPI(request.ptr()), canShowMIMEType, toAPI(listener.ptr()), toAPI(userData), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void unableToImplementPolicy(WebPageProxy& page, WebFrameProxy& frame, const ResourceError& error, API::Object* userData) override
</span><span class="lines">@@ -1348,8 +1348,8 @@
</span><span class="cx"> if (!m_client.base.version)
</span><span class="cx"> return adoptRef(toImpl(m_client.createNewPage_deprecatedForUseWithV0(toAPI(page), toAPI(featuresMap.ptr()), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), m_client.base.clientInfo)));
</span><span class="cx">
</span><del>- RefPtr<API::URLRequest> request = API::URLRequest::create(resourceRequest);
- return adoptRef(toImpl(m_client.createNewPage(toAPI(page), toAPI(request.get()), toAPI(featuresMap.ptr()), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), m_client.base.clientInfo)));
</del><ins>+ Ref<API::URLRequest> request = API::URLRequest::create(resourceRequest);
+ return adoptRef(toImpl(m_client.createNewPage(toAPI(page), toAPI(request.ptr()), toAPI(featuresMap.ptr()), toAPI(navigationActionData.modifiers), toAPI(navigationActionData.mouseButton), m_client.base.clientInfo)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual void showPage(WebPageProxy* page) override
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaNavigationStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/NavigationState.mm 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RetainPtr<NSURLRequest> nsURLRequest = adoptNS(wrapper(*API::URLRequest::create(localNavigationAction->request()).leakRef()));
</del><ins>+ RetainPtr<NSURLRequest> nsURLRequest = adoptNS(wrapper(API::URLRequest::create(localNavigationAction->request()).leakRef()));
</ins><span class="cx"> if ([NSURLConnection canHandleRequest:nsURLRequest.get()]) {
</span><span class="cx"> localListener->use();
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkCustomProtocolssoupWebSoupCustomProtocolRequestManagerClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/UIProcess/Network/CustomProtocols/soup/WebSoupCustomProtocolRequestManagerClient.cpp 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> if (!m_client.startLoading)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RefPtr<API::URLRequest> urlRequest = API::URLRequest::create(request);
- m_client.startLoading(toAPI(soupRequestManager), customProtocolID, toAPI(urlRequest.get()), m_client.base.clientInfo);
</del><ins>+ Ref<API::URLRequest> urlRequest = API::URLRequest::create(request);
+ m_client.startLoading(toAPI(soupRequestManager), customProtocolID, toAPI(urlRequest.ptr()), m_client.base.clientInfo);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIgtkWebKitWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -203,17 +203,17 @@
</span><span class="cx"> ResourceRequest resourceRequest;
</span><span class="cx"> webkitURIRequestGetResourceRequest(request.get(), resourceRequest);
</span><span class="cx"> resourceRequest.setInitiatingPageID(toImpl(page)->pageID());
</span><del>- RefPtr<API::URLRequest> newRequest = API::URLRequest::create(resourceRequest);
</del><ins>+ Ref<API::URLRequest> newRequest = API::URLRequest::create(resourceRequest);
</ins><span class="cx">
</span><span class="cx"> API::Dictionary::MapType message;
</span><span class="cx"> message.set(String::fromUTF8("Page"), toImpl(page));
</span><span class="cx"> message.set(String::fromUTF8("Identifier"), API::UInt64::create(identifier));
</span><del>- message.set(String::fromUTF8("Request"), newRequest.get());
</del><ins>+ message.set(String::fromUTF8("Request"), newRequest.ptr());
</ins><span class="cx"> if (!redirectResourceResponse.isNull())
</span><span class="cx"> message.set(String::fromUTF8("RedirectResponse"), toImpl(wkRedirectResponse));
</span><span class="cx"> WebProcess::singleton().injectedBundle()->postMessage(String::fromUTF8("WebPage.DidSendRequestForResource"), API::Dictionary::create(WTF::move(message)).ptr());
</span><span class="cx">
</span><del>- return toAPI(newRequest.release().leakRef());
</del><ins>+ return toAPI(&newRequest.leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didReceiveResponseForResource(WKBundlePageRef page, WKBundleFrameRef, uint64_t identifier, WKURLResponseRef response, const void*)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePagePolicyClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp (183461 => 183462)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp 2015-04-28 06:52:20 UTC (rev 183461)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePagePolicyClient.cpp 2015-04-28 08:06:58 UTC (rev 183462)
</span><span class="lines">@@ -42,10 +42,10 @@
</span><span class="cx"> if (!m_client.decidePolicyForNavigationAction)
</span><span class="cx"> return WKBundlePagePolicyActionPassThrough;
</span><span class="cx">
</span><del>- RefPtr<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</del><ins>+ Ref<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</ins><span class="cx">
</span><span class="cx"> WKTypeRef userDataToPass = 0;
</span><del>- WKBundlePagePolicyAction policy = m_client.decidePolicyForNavigationAction(toAPI(page), toAPI(frame), toAPI(action), toAPI(request.get()), &userDataToPass, m_client.base.clientInfo);
</del><ins>+ WKBundlePagePolicyAction policy = m_client.decidePolicyForNavigationAction(toAPI(page), toAPI(frame), toAPI(action), toAPI(request.ptr()), &userDataToPass, m_client.base.clientInfo);
</ins><span class="cx"> userData = adoptRef(toImpl(userDataToPass));
</span><span class="cx"> return policy;
</span><span class="cx"> }
</span><span class="lines">@@ -55,10 +55,10 @@
</span><span class="cx"> if (!m_client.decidePolicyForNewWindowAction)
</span><span class="cx"> return WKBundlePagePolicyActionPassThrough;
</span><span class="cx">
</span><del>- RefPtr<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</del><ins>+ Ref<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</ins><span class="cx">
</span><span class="cx"> WKTypeRef userDataToPass = 0;
</span><del>- WKBundlePagePolicyAction policy = m_client.decidePolicyForNewWindowAction(toAPI(page), toAPI(frame), toAPI(action), toAPI(request.get()), toAPI(frameName.impl()), &userDataToPass, m_client.base.clientInfo);
</del><ins>+ WKBundlePagePolicyAction policy = m_client.decidePolicyForNewWindowAction(toAPI(page), toAPI(frame), toAPI(action), toAPI(request.ptr()), toAPI(frameName.impl()), &userDataToPass, m_client.base.clientInfo);
</ins><span class="cx"> userData = adoptRef(toImpl(userDataToPass));
</span><span class="cx"> return policy;
</span><span class="cx"> }
</span><span class="lines">@@ -68,11 +68,11 @@
</span><span class="cx"> if (!m_client.decidePolicyForResponse)
</span><span class="cx"> return WKBundlePagePolicyActionPassThrough;
</span><span class="cx">
</span><del>- RefPtr<API::URLResponse> response = API::URLResponse::create(resourceResponse);
- RefPtr<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</del><ins>+ Ref<API::URLResponse> response = API::URLResponse::create(resourceResponse);
+ Ref<API::URLRequest> request = API::URLRequest::create(resourceRequest);
</ins><span class="cx">
</span><span class="cx"> WKTypeRef userDataToPass = 0;
</span><del>- WKBundlePagePolicyAction policy = m_client.decidePolicyForResponse(toAPI(page), toAPI(frame), toAPI(response.get()), toAPI(request.get()), &userDataToPass, m_client.base.clientInfo);
</del><ins>+ WKBundlePagePolicyAction policy = m_client.decidePolicyForResponse(toAPI(page), toAPI(frame), toAPI(response.ptr()), toAPI(request.ptr()), &userDataToPass, m_client.base.clientInfo);
</ins><span class="cx"> userData = adoptRef(toImpl(userDataToPass));
</span><span class="cx"> return policy;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>