<!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>[183411] 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/183411">183411</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-04-27 13:13:53 -0700 (Mon, 27 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] API::Data creation functions should return Ref<>
https://bugs.webkit.org/show_bug.cgi?id=144220
Reviewed by Darin Adler.
Have API::Data creation functions return Ref<>.
The call-sites are also updated, using and operating
on the returned Ref<> object where possible.
* Shared/API/APIData.h:
(API::Data::createWithoutCopying):
(API::Data::create):
* Shared/API/c/WKData.cpp:
(WKDataCreate):
* Shared/API/c/mac/WKWebArchive.cpp:
(WKWebArchiveCopyData):
* Shared/API/c/mac/WKWebArchiveResource.cpp:
(WKWebArchiveResourceCopyData):
* Shared/APIWebArchive.h:
* Shared/APIWebArchive.mm:
(API::WebArchive::data):
* Shared/APIWebArchiveResource.h:
* Shared/APIWebArchiveResource.mm:
(API::WebArchiveResource::data):
* Shared/Cocoa/APIDataCocoa.mm:
(API::Data::createWithoutCopying):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView loadData:MIMEType:characterEncodingName:baseURL:]):
* UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
(webkitURISchemeRequestReadCallback):
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkit_web_view_load_bytes):
* UIProcess/Downloads/DownloadProxy.cpp:
(WebKit::createData):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::dataCallback):
(WebKit::WebPageProxy::savePDFToFileInDownloadsFolder):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIAPIDatah">trunk/Source/WebKit2/Shared/API/APIData.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDatacpp">trunk/Source/WebKit2/Shared/API/c/WKData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcmacWKWebArchivecpp">trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchive.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcmacWKWebArchiveResourcecpp">trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchiveResource.cpp</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="#trunkSourceWebKit2SharedAPIWebArchiveResourceh">trunk/Source/WebKit2/Shared/APIWebArchiveResource.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIWebArchiveResourcemm">trunk/Source/WebKit2/Shared/APIWebArchiveResource.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaAPIDataCocoamm">trunk/Source/WebKit2/Shared/Cocoa/APIDataCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxycpp">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -1,5 +1,45 @@
</span><span class="cx"> 2015-04-27 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ [WK2] API::Data creation functions should return Ref<>
+ https://bugs.webkit.org/show_bug.cgi?id=144220
+
+ Reviewed by Darin Adler.
+
+ Have API::Data creation functions return Ref<>.
+ The call-sites are also updated, using and operating
+ on the returned Ref<> object where possible.
+
+ * Shared/API/APIData.h:
+ (API::Data::createWithoutCopying):
+ (API::Data::create):
+ * Shared/API/c/WKData.cpp:
+ (WKDataCreate):
+ * Shared/API/c/mac/WKWebArchive.cpp:
+ (WKWebArchiveCopyData):
+ * Shared/API/c/mac/WKWebArchiveResource.cpp:
+ (WKWebArchiveResourceCopyData):
+ * Shared/APIWebArchive.h:
+ * Shared/APIWebArchive.mm:
+ (API::WebArchive::data):
+ * Shared/APIWebArchiveResource.h:
+ * Shared/APIWebArchiveResource.mm:
+ (API::WebArchiveResource::data):
+ * Shared/Cocoa/APIDataCocoa.mm:
+ (API::Data::createWithoutCopying):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView loadData:MIMEType:characterEncodingName:baseURL:]):
+ * UIProcess/API/gtk/WebKitURISchemeRequest.cpp:
+ (webkitURISchemeRequestReadCallback):
+ * UIProcess/API/gtk/WebKitWebView.cpp:
+ (webkit_web_view_load_bytes):
+ * UIProcess/Downloads/DownloadProxy.cpp:
+ (WebKit::createData):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::dataCallback):
+ (WebKit::WebPageProxy::savePDFToFileInDownloadsFolder):
+
+2015-04-27 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> [WK2] API::URL creation functions should return Ref<>
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144219
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIAPIDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/APIData.h (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/APIData.h 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/Shared/API/APIData.h 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -44,12 +44,12 @@
</span><span class="cx"> public:
</span><span class="cx"> typedef void (*FreeDataFunction)(unsigned char*, const void* context);
</span><span class="cx">
</span><del>- static PassRefPtr<Data> createWithoutCopying(const unsigned char* bytes, size_t size, FreeDataFunction freeDataFunction, const void* context)
</del><ins>+ static Ref<Data> createWithoutCopying(const unsigned char* bytes, size_t size, FreeDataFunction freeDataFunction, const void* context)
</ins><span class="cx"> {
</span><del>- return adoptRef(new Data(bytes, size, freeDataFunction, context));
</del><ins>+ return adoptRef(*new Data(bytes, size, freeDataFunction, context));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<Data> create(const unsigned char* bytes, size_t size)
</del><ins>+ static Ref<Data> create(const unsigned char* bytes, size_t size)
</ins><span class="cx"> {
</span><span class="cx"> unsigned char *copiedBytes = 0;
</span><span class="cx">
</span><span class="lines">@@ -61,13 +61,13 @@
</span><span class="cx"> return createWithoutCopying(copiedBytes, size, fastFreeBytes, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- static PassRefPtr<Data> create(const Vector<unsigned char>& buffer)
</del><ins>+ static Ref<Data> create(const Vector<unsigned char>& buffer)
</ins><span class="cx"> {
</span><span class="cx"> return create(buffer.data(), buffer.size());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- static PassRefPtr<Data> createWithoutCopying(RetainPtr<NSData>);
</del><ins>+ static Ref<Data> createWithoutCopying(RetainPtr<NSData>);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> ~Data()
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKData.cpp (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKData.cpp 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/Shared/API/c/WKData.cpp 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> WKDataRef WKDataCreate(const unsigned char* bytes, size_t size)
</span><span class="cx"> {
</span><del>- return toAPI(API::Data::create(bytes, size).leakRef());
</del><ins>+ return toAPI(&API::Data::create(bytes, size).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const unsigned char* WKDataGetBytes(WKDataRef dataRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcmacWKWebArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchive.cpp (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchive.cpp 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchive.cpp 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -79,5 +79,5 @@
</span><span class="cx">
</span><span class="cx"> WKDataRef WKWebArchiveCopyData(WKWebArchiveRef webArchiveRef)
</span><span class="cx"> {
</span><del>- return toAPI(toImpl(webArchiveRef)->data().leakRef());
</del><ins>+ return toAPI(&toImpl(webArchiveRef)->data().leakRef());
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcmacWKWebArchiveResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchiveResource.cpp (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchiveResource.cpp 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchiveResource.cpp 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> WKDataRef WKWebArchiveResourceCopyData(WKWebArchiveResourceRef webArchiveResourceRef)
</span><span class="cx"> {
</span><del>- return toAPI(toImpl(webArchiveResourceRef)->data().leakRef());
</del><ins>+ return toAPI(&toImpl(webArchiveResourceRef)->data().leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKURLRef WKWebArchiveResourceCopyURL(WKWebArchiveResourceRef webArchiveResourceRef)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIWebArchiveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIWebArchive.h (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIWebArchive.h 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/Shared/APIWebArchive.h 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> API::Array* subresources();
</span><span class="cx"> API::Array* subframeArchives();
</span><span class="cx">
</span><del>- PassRefPtr<API::Data> data();
</del><ins>+ Ref<API::Data> data();
</ins><span class="cx">
</span><span class="cx"> WebCore::LegacyWebArchive* coreLegacyWebArchive();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIWebArchivemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIWebArchive.mm (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIWebArchive.mm 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/Shared/APIWebArchive.mm 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> CFRelease(data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<API::Data> WebArchive::data()
</del><ins>+Ref<API::Data> WebArchive::data()
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<CFDataRef> rawDataRepresentation = m_legacyWebArchive->rawDataRepresentation();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIWebArchiveResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIWebArchiveResource.h (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIWebArchiveResource.h 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/Shared/APIWebArchiveResource.h 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> static PassRefPtr<WebArchiveResource> create(API::Data*, const String& URL, const String& MIMEType, const String& textEncoding);
</span><span class="cx"> static PassRefPtr<WebArchiveResource> create(PassRefPtr<WebCore::ArchiveResource>);
</span><span class="cx">
</span><del>- PassRefPtr<API::Data> data();
</del><ins>+ Ref<API::Data> data();
</ins><span class="cx"> String URL();
</span><span class="cx"> String MIMEType();
</span><span class="cx"> String textEncoding();
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIWebArchiveResourcemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/APIWebArchiveResource.mm (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIWebArchiveResource.mm 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/Shared/APIWebArchiveResource.mm 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> CFRelease(data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<API::Data> WebArchiveResource::data()
</del><ins>+Ref<API::Data> WebArchiveResource::data()
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<CFDataRef> cfData = m_archiveResource->data()->createCFData();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaAPIDataCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/APIDataCocoa.mm (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/APIDataCocoa.mm 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/Shared/Cocoa/APIDataCocoa.mm 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><del>-PassRefPtr<Data> Data::createWithoutCopying(RetainPtr<NSData> data)
</del><ins>+Ref<Data> Data::createWithoutCopying(RetainPtr<NSData> data)
</ins><span class="cx"> {
</span><span class="cx"> const unsigned char* bytes = reinterpret_cast<const unsigned char*>([data bytes]);
</span><span class="cx"> size_t size = [data length];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -460,7 +460,7 @@
</span><span class="cx">
</span><span class="cx"> - (WKNavigation *)loadData:(NSData *)data MIMEType:(NSString *)MIMEType characterEncodingName:(NSString *)characterEncodingName baseURL:(NSURL *)baseURL
</span><span class="cx"> {
</span><del>- auto navigation = _page->loadData(API::Data::createWithoutCopying(data).get(), MIMEType, characterEncodingName, baseURL.absoluteString);
</del><ins>+ auto navigation = _page->loadData(API::Data::createWithoutCopying(data).ptr(), MIMEType, characterEncodingName, baseURL.absoluteString);
</ins><span class="cx"> if (!navigation)
</span><span class="cx"> return nil;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitURISchemeRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitURISchemeRequest.cpp 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -167,16 +167,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebKitURISchemeRequestPrivate* priv = request->priv;
</span><del>- RefPtr<API::Data> webData = API::Data::create(reinterpret_cast<const unsigned char*>(priv->readBuffer), bytesRead);
</del><ins>+ Ref<API::Data> webData = API::Data::create(reinterpret_cast<const unsigned char*>(priv->readBuffer), bytesRead);
</ins><span class="cx"> if (!priv->bytesRead) {
</span><span class="cx"> // First chunk read. In case of empty reply an empty API::Data is sent to the networking process.
</span><span class="cx"> WebCore::ResourceResponse response(WebCore::URL(WebCore::URL(), String::fromUTF8(priv->uri)), String::fromUTF8(priv->mimeType.data()),
</span><span class="cx"> priv->streamLength, emptyString());
</span><span class="cx"> priv->webRequestManager->didReceiveResponse(priv->requestID, response);
</span><del>- priv->webRequestManager->didLoadData(priv->requestID, webData.get());
</del><ins>+ priv->webRequestManager->didLoadData(priv->requestID, webData.ptr());
</ins><span class="cx"> } else if (bytesRead || (!bytesRead && !priv->streamLength)) {
</span><span class="cx"> // Subsequent chunk read. We only send an empty API::Data to the networking process when stream length is unknown.
</span><del>- priv->webRequestManager->didLoadData(priv->requestID, webData.get());
</del><ins>+ priv->webRequestManager->didLoadData(priv->requestID, webData.ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!bytesRead) {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -2382,8 +2382,8 @@
</span><span class="cx"> // Balanced by g_bytes_unref in releaseGBytes.
</span><span class="cx"> g_bytes_ref(bytes);
</span><span class="cx">
</span><del>- RefPtr<API::Data> data = API::Data::createWithoutCopying(static_cast<const unsigned char*>(bytesData), bytesDataSize, releaseGBytes, bytes);
- getPage(webView)->loadData(data.get(), mimeType ? String::fromUTF8(mimeType) : String::fromUTF8("text/html"),
</del><ins>+ Ref<API::Data> data = API::Data::createWithoutCopying(static_cast<const unsigned char*>(bytesData), bytesDataSize, releaseGBytes, bytes);
+ getPage(webView)->loadData(data.ptr(), mimeType ? String::fromUTF8(mimeType) : String::fromUTF8("text/html"),
</ins><span class="cx"> encoding ? String::fromUTF8(encoding) : String::fromUTF8("UTF-8"), String::fromUTF8(baseURI));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> m_downloadProxyMap.downloadFinished(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<API::Data> createData(const IPC::DataReference& data)
</del><ins>+static RefPtr<API::Data> createData(const IPC::DataReference& data)
</ins><span class="cx"> {
</span><span class="cx"> if (data.isEmpty())
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (183410 => 183411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-27 20:09:41 UTC (rev 183410)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-27 20:13:53 UTC (rev 183411)
</span><span class="lines">@@ -4540,7 +4540,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- callback->performCallbackWithReturnValue(API::Data::create(dataReference.data(), dataReference.size()).get());
</del><ins>+ callback->performCallbackWithReturnValue(API::Data::create(dataReference.data(), dataReference.size()).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::imageCallback(const ShareableBitmap::Handle& bitmapHandle, uint64_t callbackID)
</span><span class="lines">@@ -5356,9 +5356,8 @@
</span><span class="cx"> if (!suggestedFilename.endsWith(".pdf", false))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<API::Data> data = API::Data::create(dataReference.data(), dataReference.size());
-
- saveDataToFileInDownloadsFolder(suggestedFilename, "application/pdf", originatingURLString, data.get());
</del><ins>+ saveDataToFileInDownloadsFolder(suggestedFilename, "application/pdf", originatingURLString,
+ API::Data::create(dataReference.data(), dataReference.size()).ptr());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setMinimumLayoutSize(const IntSize& minimumLayoutSize)
</span></span></pre>
</div>
</div>
</body>
</html>