<!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>[160653] 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/160653">160653</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2013-12-16 12:21:24 -0800 (Mon, 16 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename WebData to API::Data
https://bugs.webkit.org/show_bug.cgi?id=125797
Reviewed by Beth Dakin.
* Shared/API/Cocoa/WKRemoteObjectCoder.mm:
(-[WKRemoteObjectEncoder encodeBytes:length:forKey:]):
(-[WKRemoteObjectDecoder decodeBytesForKey:returnedLength:]):
* Shared/API/c/WKData.cpp:
(WKDataGetTypeID):
(WKDataCreate):
* Shared/API/c/WKSharedAPICast.h:
* Shared/API/c/mac/WKWebArchive.cpp:
(WKWebArchiveCopyData):
* Shared/API/c/mac/WKWebArchiveResource.cpp:
(WKWebArchiveResourceCopyData):
* Shared/APIData.h: Renamed from Source/WebKit2/Shared/WebData.h.
(API::Data::createWithoutCopying):
(API::Data::create):
(API::Data::~Data):
(API::Data::bytes):
(API::Data::size):
(API::Data::dataReference):
(API::Data::Data):
(API::Data::fastFreeBytes):
* Shared/Cocoa/WKNSData.h:
(WebKit::wrapper):
* Shared/Cocoa/WKNSData.mm:
(-[WKNSData dealloc]):
* Shared/UserMessageCoders.h:
(WebKit::UserMessageEncoder::baseEncode):
(WebKit::UserMessageDecoder::baseDecode):
* Shared/WebArchive.cpp:
(WebKit::WebArchive::create):
(WebKit::WebArchive::WebArchive):
(WebKit::WebArchive::data):
* Shared/WebArchive.h:
* Shared/WebArchiveResource.cpp:
(WebKit::WebArchiveResource::create):
(WebKit::WebArchiveResource::WebArchiveResource):
(WebKit::WebArchiveResource::data):
* Shared/WebArchiveResource.h:
* UIProcess/API/C/WKPage.cpp:
* UIProcess/API/Cocoa/WKBrowsingContextController.mm:
(-[WKBrowsingContextController loadData:MIMEType:textEncodingName:baseURL:userData:]):
* UIProcess/API/mac/WKPrintingView.mm:
(pageDidDrawToPDF):
* UIProcess/Downloads/DownloadProxy.cpp:
(WebKit::createData):
(WebKit::DownloadProxy::didFail):
(WebKit::DownloadProxy::didCancel):
* UIProcess/Downloads/DownloadProxy.h:
(WebKit::DownloadProxy::resumeData):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::loadData):
(WebKit::WebPageProxy::loadWebArchiveData):
(WebKit::WebPageProxy::dataCallback):
(WebKit::WebPageProxy::saveDataToFileInDownloadsFolder):
(WebKit::WebPageProxy::savePDFToFileInDownloadsFolder):
* UIProcess/WebPageProxy.h:
* UIProcess/WebUIClient.cpp:
(WebKit::WebUIClient::saveDataToFileInDownloadsFolder):
* UIProcess/WebUIClient.h:
* UIProcess/cf/WebPageProxyCF.cpp:
(WebKit::WebPageProxy::sessionStateData):
(WebKit::WebPageProxy::restoreFromSessionStateData):
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/InjectedBundle/API/c/WKBundle.cpp:
(WKBundleCreateWKDataFromUInt8Array):
* WebProcess/InjectedBundle/InjectedBundle.cpp:
(WebKit::InjectedBundle::createWebDataFromUint8Array):
* WebProcess/InjectedBundle/InjectedBundle.h:
* WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp:
(WebKit::InjectedBundlePageEditorClient::getPasteboardDataForRange):
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
(WebKit::InjectedBundlePageLoaderClient::willLoadDataRequest):
* WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::loadDataImpl):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKRemoteObjectCodermm">trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDatacpp">trunk/Source/WebKit2/Shared/API/c/WKData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</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="#trunkSourceWebKit2SharedCocoaWKNSDatah">trunk/Source/WebKit2/Shared/Cocoa/WKNSData.h</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWKNSDatamm">trunk/Source/WebKit2/Shared/Cocoa/WKNSData.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedUserMessageCodersh">trunk/Source/WebKit2/Shared/UserMessageCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebArchivecpp">trunk/Source/WebKit2/Shared/WebArchive.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebArchiveh">trunk/Source/WebKit2/Shared/WebArchive.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebArchiveResourcecpp">trunk/Source/WebKit2/Shared/WebArchiveResource.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebArchiveResourceh">trunk/Source/WebKit2/Shared/WebArchiveResource.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPImacWKPrintingViewmm">trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxycpp">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDownloadsDownloadProxyh">trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebUIClientcpp">trunk/Source/WebKit2/UIProcess/WebUIClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebUIClienth">trunk/Source/WebKit2/UIProcess/WebUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcesscfWebPageProxyCFcpp">trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleh">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageEditorClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageLoaderClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageLoaderClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPIDatah">trunk/Source/WebKit2/Shared/APIData.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedWebDatah">trunk/Source/WebKit2/Shared/WebData.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -1,3 +1,85 @@
</span><ins>+2013-12-16 Anders Carlsson <andersca@apple.com>
+
+ Rename WebData to API::Data
+ https://bugs.webkit.org/show_bug.cgi?id=125797
+
+ Reviewed by Beth Dakin.
+
+ * Shared/API/Cocoa/WKRemoteObjectCoder.mm:
+ (-[WKRemoteObjectEncoder encodeBytes:length:forKey:]):
+ (-[WKRemoteObjectDecoder decodeBytesForKey:returnedLength:]):
+ * Shared/API/c/WKData.cpp:
+ (WKDataGetTypeID):
+ (WKDataCreate):
+ * Shared/API/c/WKSharedAPICast.h:
+ * Shared/API/c/mac/WKWebArchive.cpp:
+ (WKWebArchiveCopyData):
+ * Shared/API/c/mac/WKWebArchiveResource.cpp:
+ (WKWebArchiveResourceCopyData):
+ * Shared/APIData.h: Renamed from Source/WebKit2/Shared/WebData.h.
+ (API::Data::createWithoutCopying):
+ (API::Data::create):
+ (API::Data::~Data):
+ (API::Data::bytes):
+ (API::Data::size):
+ (API::Data::dataReference):
+ (API::Data::Data):
+ (API::Data::fastFreeBytes):
+ * Shared/Cocoa/WKNSData.h:
+ (WebKit::wrapper):
+ * Shared/Cocoa/WKNSData.mm:
+ (-[WKNSData dealloc]):
+ * Shared/UserMessageCoders.h:
+ (WebKit::UserMessageEncoder::baseEncode):
+ (WebKit::UserMessageDecoder::baseDecode):
+ * Shared/WebArchive.cpp:
+ (WebKit::WebArchive::create):
+ (WebKit::WebArchive::WebArchive):
+ (WebKit::WebArchive::data):
+ * Shared/WebArchive.h:
+ * Shared/WebArchiveResource.cpp:
+ (WebKit::WebArchiveResource::create):
+ (WebKit::WebArchiveResource::WebArchiveResource):
+ (WebKit::WebArchiveResource::data):
+ * Shared/WebArchiveResource.h:
+ * UIProcess/API/C/WKPage.cpp:
+ * UIProcess/API/Cocoa/WKBrowsingContextController.mm:
+ (-[WKBrowsingContextController loadData:MIMEType:textEncodingName:baseURL:userData:]):
+ * UIProcess/API/mac/WKPrintingView.mm:
+ (pageDidDrawToPDF):
+ * UIProcess/Downloads/DownloadProxy.cpp:
+ (WebKit::createData):
+ (WebKit::DownloadProxy::didFail):
+ (WebKit::DownloadProxy::didCancel):
+ * UIProcess/Downloads/DownloadProxy.h:
+ (WebKit::DownloadProxy::resumeData):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::loadData):
+ (WebKit::WebPageProxy::loadWebArchiveData):
+ (WebKit::WebPageProxy::dataCallback):
+ (WebKit::WebPageProxy::saveDataToFileInDownloadsFolder):
+ (WebKit::WebPageProxy::savePDFToFileInDownloadsFolder):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebUIClient.cpp:
+ (WebKit::WebUIClient::saveDataToFileInDownloadsFolder):
+ * UIProcess/WebUIClient.h:
+ * UIProcess/cf/WebPageProxyCF.cpp:
+ (WebKit::WebPageProxy::sessionStateData):
+ (WebKit::WebPageProxy::restoreFromSessionStateData):
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/API/c/WKBundle.cpp:
+ (WKBundleCreateWKDataFromUInt8Array):
+ * WebProcess/InjectedBundle/InjectedBundle.cpp:
+ (WebKit::InjectedBundle::createWebDataFromUint8Array):
+ * WebProcess/InjectedBundle/InjectedBundle.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp:
+ (WebKit::InjectedBundlePageEditorClient::getPasteboardDataForRange):
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
+ (WebKit::InjectedBundlePageLoaderClient::willLoadDataRequest):
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::loadDataImpl):
+
</ins><span class="cx"> 2013-12-16 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> Fix build warning in files including DrawingAreaProxy.h
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKRemoteObjectCodermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -29,11 +29,11 @@
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><span class="cx"> #import "APIArray.h"
</span><ins>+#import "APIData.h"
</ins><span class="cx"> #import "APINumber.h"
</span><span class="cx"> #import "APIString.h"
</span><span class="cx"> #import "MutableDictionary.h"
</span><span class="cx"> #import "WKRemoteObjectInterfaceInternal.h"
</span><del>-#import "WebData.h"
</del><span class="cx"> #import <objc/runtime.h>
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><span class="cx"> #import <wtf/TemporaryChange.h>
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)encodeBytes:(const uint8_t *)bytes length:(NSUInteger)length forKey:(NSString *)key
</span><span class="cx"> {
</span><del>- _currentDictionary->set(escapeKey(key), WebData::create(bytes, length));
</del><ins>+ _currentDictionary->set(escapeKey(key), API::Data::create(bytes, length));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)encodeBool:(BOOL)value forKey:(NSString *)key
</span><span class="lines">@@ -505,7 +505,7 @@
</span><span class="cx">
</span><span class="cx"> - (const uint8_t *)decodeBytesForKey:(NSString *)key returnedLength:(NSUInteger *)length
</span><span class="cx"> {
</span><del>- WebData* data = _currentDictionary->get<WebData>(escapeKey(key));
</del><ins>+ auto* data = _currentDictionary->get<API::Data>(escapeKey(key));
</ins><span class="cx"> if (!data || !data->size())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKData.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKData.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/Shared/API/c/WKData.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -26,20 +26,19 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKData.h"
</span><span class="cx">
</span><del>-#include "WebData.h"
</del><ins>+#include "APIData.h"
</ins><span class="cx"> #include "WKAPICast.h"
</span><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> WKTypeID WKDataGetTypeID()
</span><span class="cx"> {
</span><del>- return toAPI(WebData::APIType);
</del><ins>+ return toAPI(API::Data::APIType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKDataRef WKDataCreate(const unsigned char* bytes, size_t size)
</span><span class="cx"> {
</span><del>- RefPtr<WebData> data = WebData::create(bytes, size);
- return toAPI(data.release().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="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx"> class Array;
</span><ins>+class Data;
</ins><span class="cx"> class Point;
</span><span class="cx"> class Rect;
</span><span class="cx"> class Size;
</span><span class="lines">@@ -75,7 +76,6 @@
</span><span class="cx"> class WebCertificateInfo;
</span><span class="cx"> class WebConnection;
</span><span class="cx"> class WebContextMenuItem;
</span><del>-class WebData;
</del><span class="cx"> class WebGraphicsContext;
</span><span class="cx"> class WebImage;
</span><span class="cx"> class WebSecurityOrigin;
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> WK_ADD_API_MAPPING(WKCertificateInfoRef, WebCertificateInfo)
</span><span class="cx"> WK_ADD_API_MAPPING(WKConnectionRef, WebConnection)
</span><span class="cx"> WK_ADD_API_MAPPING(WKContextMenuItemRef, WebContextMenuItem)
</span><del>-WK_ADD_API_MAPPING(WKDataRef, WebData)
</del><ins>+WK_ADD_API_MAPPING(WKDataRef, API::Data)
</ins><span class="cx"> WK_ADD_API_MAPPING(WKDictionaryRef, ImmutableDictionary)
</span><span class="cx"> WK_ADD_API_MAPPING(WKDoubleRef, API::Double)
</span><span class="cx"> WK_ADD_API_MAPPING(WKErrorRef, WebError)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcmacWKWebArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchive.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchive.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchive.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -27,12 +27,12 @@
</span><span class="cx"> #include "WKWebArchive.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "InjectedBundleRangeHandle.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><span class="cx"> #include "WKSharedAPICast.h"
</span><span class="cx"> #include "WebArchive.h"
</span><span class="cx"> #include "WebArchiveResource.h"
</span><del>-#include "WebData.h"
</del><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -79,6 +79,5 @@
</span><span class="cx">
</span><span class="cx"> WKDataRef WKWebArchiveCopyData(WKWebArchiveRef webArchiveRef)
</span><span class="cx"> {
</span><del>- RefPtr<WebData> data = toImpl(webArchiveRef)->data();
- return toAPI(data.release().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 (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchiveResource.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchiveResource.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -26,9 +26,9 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKWebArchiveResource.h"
</span><span class="cx">
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "WKSharedAPICast.h"
</span><span class="cx"> #include "WebArchiveResource.h"
</span><del>-#include "WebData.h"
</del><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -45,8 +45,7 @@
</span><span class="cx">
</span><span class="cx"> WKDataRef WKWebArchiveResourceCopyData(WKWebArchiveResourceRef webArchiveResourceRef)
</span><span class="cx"> {
</span><del>- RefPtr<WebData> data = toImpl(webArchiveResourceRef)->data();
- return toAPI(data.release().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="trunkSourceWebKit2SharedAPIDatahfromrev160649trunkSourceWebKit2SharedWebDatah"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/APIData.h (from rev 160649, trunk/Source/WebKit2/Shared/WebData.h) (0 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/APIData.h (rev 0)
+++ trunk/Source/WebKit2/Shared/APIData.h 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -0,0 +1,96 @@
</span><ins>+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef APIData_h
+#define APIData_h
+
+#include "APIObject.h"
+#include "DataReference.h"
+#include <wtf/Forward.h>
+#include <wtf/Vector.h>
+
+namespace API {
+
+class Data : public ObjectImpl<API::Object::Type::Data> {
+public:
+ typedef void (*FreeDataFunction)(unsigned char*, const void* context);
+
+ static PassRefPtr<Data> createWithoutCopying(const unsigned char* bytes, size_t size, FreeDataFunction freeDataFunction, const void* context)
+ {
+ return adoptRef(new Data(bytes, size, freeDataFunction, context));
+ }
+
+ static PassRefPtr<Data> create(const unsigned char* bytes, size_t size)
+ {
+ unsigned char *copiedBytes = 0;
+
+ if (size) {
+ copiedBytes = static_cast<unsigned char*>(fastMalloc(size));
+ memcpy(copiedBytes, bytes, size);
+ }
+
+ return createWithoutCopying(copiedBytes, size, fastFreeBytes, 0);
+ }
+
+ static PassRefPtr<Data> create(const Vector<unsigned char>& buffer)
+ {
+ return create(buffer.data(), buffer.size());
+ }
+
+ ~Data()
+ {
+ m_freeDataFunction(const_cast<unsigned char*>(m_bytes), m_context);
+ }
+
+ const unsigned char* bytes() const { return m_bytes; }
+ size_t size() const { return m_size; }
+
+ IPC::DataReference dataReference() const { return IPC::DataReference(m_bytes, m_size); }
+
+private:
+ Data(const unsigned char* bytes, size_t size, FreeDataFunction freeDataFunction, const void* context)
+ : m_bytes(bytes)
+ , m_size(size)
+ , m_freeDataFunction(freeDataFunction)
+ , m_context(context)
+ {
+ }
+
+ static void fastFreeBytes(unsigned char* bytes, const void*)
+ {
+ if (bytes)
+ fastFree(static_cast<void*>(bytes));
+ }
+
+ const unsigned char* m_bytes;
+ size_t m_size;
+
+ FreeDataFunction m_freeDataFunction;
+ const void* m_context;
+};
+
+} // namespace API
+
+#endif // APIData_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSData.h (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSData.h 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSData.h 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -27,19 +27,15 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import "APIData.h"
</ins><span class="cx"> #import "WKObject.h"
</span><del>-#import "WebData.h"
</del><span class="cx">
</span><del>-namespace WebKit {
-
-inline NSData *wrapper(WebData& data)
</del><ins>+inline NSData *wrapper(API::Data& data)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT([data.wrapper() isKindOfClass:[NSData self]]);
</span><span class="cx"> return (NSData *)data.wrapper();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-}
-
</del><span class="cx"> @interface WKNSData : NSData <WKObject>
</span><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWKNSDatamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Cocoa/WKNSData.mm (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WKNSData.mm 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/Shared/Cocoa/WKNSData.mm 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -28,15 +28,13 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-using namespace WebKit;
-
</del><span class="cx"> @implementation WKNSData {
</span><del>- API::ObjectStorage<WebData> _data;
</del><ins>+ API::ObjectStorage<API::Data> _data;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="cx"> {
</span><del>- _data->~WebData();
</del><ins>+ _data->~Data();
</ins><span class="cx">
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedUserMessageCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/UserMessageCoders.h (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/Shared/UserMessageCoders.h 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define UserMessageCoders_h
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "APIGeometry.h"
</span><span class="cx"> #include "APINumber.h"
</span><span class="cx"> #include "APIString.h"
</span><span class="lines">@@ -37,7 +38,6 @@
</span><span class="cx"> #include "ShareableBitmap.h"
</span><span class="cx"> #include "WebCertificateInfo.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><del>-#include "WebData.h"
</del><span class="cx"> #include "WebError.h"
</span><span class="cx"> #include "WebImage.h"
</span><span class="cx"> #include "WebRenderLayer.h"
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> // - String -> String
</span><span class="cx"> // - UserContentURLPattern -> UserContentURLPattern
</span><span class="cx"> // - WebCertificateInfo -> WebCertificateInfo
</span><del>-// - WebData -> WebData
</del><ins>+// - API::Data -> API::Data
</ins><span class="cx"> // - API::Double -> API::Double
</span><span class="cx"> // - WebImage -> WebImage
</span><span class="cx"> // - WebRenderLayer -> WebRenderLayer
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::Data: {
</span><del>- WebData* data = static_cast<WebData*>(m_root);
</del><ins>+ API::Data* data = static_cast<API::Data*>(m_root);
</ins><span class="cx"> encoder << data->dataReference();
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx"> CoreIPC::DataReference dataReference;
</span><span class="cx"> if (!decoder.decode(dataReference))
</span><span class="cx"> return false;
</span><del>- coder.m_root = WebData::create(dataReference.data(), dataReference.size());
</del><ins>+ coder.m_root = API::Data::create(dataReference.data(), dataReference.size());
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case API::Object::Type::CertificateInfo: {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebArchivecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebArchive.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebArchive.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/Shared/WebArchive.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -29,8 +29,8 @@
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "WebArchiveResource.h"
</span><del>-#include "WebData.h"
</del><span class="cx"> #include <WebCore/LegacyWebArchive.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> return adoptRef(new WebArchive(mainResource, subresources, subframeArchives));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebArchive> WebArchive::create(WebData* data)
</del><ins>+PassRefPtr<WebArchive> WebArchive::create(API::Data* data)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new WebArchive(data));
</span><span class="cx"> }
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> m_legacyWebArchive = LegacyWebArchive::create(coreMainResource.release(), coreArchiveResources, coreSubframeLegacyWebArchives);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebArchive::WebArchive(WebData* data)
</del><ins>+WebArchive::WebArchive(API::Data* data)
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<SharedBuffer> buffer = SharedBuffer::create(data->bytes(), data->size());
</span><span class="cx"> m_legacyWebArchive = LegacyWebArchive::create(buffer.get());
</span><span class="lines">@@ -140,14 +140,14 @@
</span><span class="cx"> CFRelease(data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebData> WebArchive::data()
</del><ins>+PassRefPtr<API::Data> WebArchive::data()
</ins><span class="cx"> {
</span><span class="cx"> RetainPtr<CFDataRef> rawDataRepresentation = m_legacyWebArchive->rawDataRepresentation();
</span><span class="cx">
</span><span class="cx"> // Balanced by CFRelease in releaseCFData.
</span><span class="cx"> CFRetain(rawDataRepresentation.get());
</span><span class="cx">
</span><del>- return WebData::createWithoutCopying(CFDataGetBytePtr(rawDataRepresentation.get()), CFDataGetLength(rawDataRepresentation.get()), releaseCFData, rawDataRepresentation.get());
</del><ins>+ return API::Data::createWithoutCopying(CFDataGetBytePtr(rawDataRepresentation.get()), CFDataGetLength(rawDataRepresentation.get()), releaseCFData, rawDataRepresentation.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LegacyWebArchive* WebArchive::coreLegacyWebArchive()
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebArchiveh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebArchive.h (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebArchive.h 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/Shared/WebArchive.h 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx"> class Array;
</span><ins>+class Data;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -44,14 +45,13 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class WebArchiveResource;
</span><del>-class WebData;
</del><span class="cx">
</span><span class="cx"> class WebArchive : public API::ObjectImpl<API::Object::Type::WebArchive> {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebArchive();
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<WebArchive> create(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives);
</span><del>- static PassRefPtr<WebArchive> create(WebData*);
</del><ins>+ static PassRefPtr<WebArchive> create(API::Data*);
</ins><span class="cx"> static PassRefPtr<WebArchive> create(PassRefPtr<WebCore::LegacyWebArchive>);
</span><span class="cx"> static PassRefPtr<WebArchive> create(WebCore::Range*);
</span><span class="cx">
</span><span class="lines">@@ -59,13 +59,13 @@
</span><span class="cx"> API::Array* subresources();
</span><span class="cx"> API::Array* subframeArchives();
</span><span class="cx">
</span><del>- PassRefPtr<WebData> data();
</del><ins>+ PassRefPtr<API::Data> data();
</ins><span class="cx">
</span><span class="cx"> WebCore::LegacyWebArchive* coreLegacyWebArchive();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> WebArchive(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives);
</span><del>- WebArchive(WebData*);
</del><ins>+ WebArchive(API::Data*);
</ins><span class="cx"> WebArchive(PassRefPtr<WebCore::LegacyWebArchive>);
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCore::LegacyWebArchive> m_legacyWebArchive;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebArchiveResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebArchiveResource.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebArchiveResource.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/Shared/WebArchiveResource.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><del>-#include "WebData.h"
</del><ins>+#include "APIData.h"
</ins><span class="cx"> #include <WebCore/ArchiveResource.h>
</span><span class="cx"> #include <WebCore/URL.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PassRefPtr<WebArchiveResource> WebArchiveResource::create(WebData* data, const String& URL, const String& MIMEType, const String& textEncoding)
</del><ins>+PassRefPtr<WebArchiveResource> WebArchiveResource::create(API::Data* data, const String& URL, const String& MIMEType, const String& textEncoding)
</ins><span class="cx"> {
</span><span class="cx"> return adoptRef(new WebArchiveResource(data, URL, MIMEType, textEncoding));
</span><span class="cx"> }
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> return adoptRef(new WebArchiveResource(archiveResource));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebArchiveResource::WebArchiveResource(WebData* data, const String& URL, const String& MIMEType, const String& textEncoding)
</del><ins>+WebArchiveResource::WebArchiveResource(API::Data* data, const String& URL, const String& MIMEType, const String& textEncoding)
</ins><span class="cx"> : m_archiveResource(ArchiveResource::create(SharedBuffer::create(data->bytes(), data->size()), WebCore::URL(WebCore::URL(), URL), MIMEType, textEncoding, String()))
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -67,14 +67,14 @@
</span><span class="cx"> CFRelease(data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebData> WebArchiveResource::data()
</del><ins>+PassRefPtr<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 class="cx"> // Balanced by CFRelease in releaseCFData.
</span><span class="cx"> CFRetain(cfData.get());
</span><span class="cx">
</span><del>- return WebData::createWithoutCopying(CFDataGetBytePtr(cfData.get()), CFDataGetLength(cfData.get()), releaseCFData, cfData.get());
</del><ins>+ return API::Data::createWithoutCopying(CFDataGetBytePtr(cfData.get()), CFDataGetLength(cfData.get()), releaseCFData, cfData.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String WebArchiveResource::URL()
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebArchiveResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebArchiveResource.h (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebArchiveResource.h 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/Shared/WebArchiveResource.h 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -33,23 +33,26 @@
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><ins>+namespace API {
+class Data;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> class ArchiveResource;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class WebData;
</del><span class="cx"> class WebURL;
</span><span class="cx">
</span><span class="cx"> class WebArchiveResource : public API::ObjectImpl<API::Object::Type::WebArchiveResource> {
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebArchiveResource();
</span><span class="cx">
</span><del>- static PassRefPtr<WebArchiveResource> create(WebData*, const String& URL, const String& MIMEType, const String& textEncoding);
</del><ins>+ static PassRefPtr<WebArchiveResource> create(API::Data*, const String& URL, const String& MIMEType, const String& textEncoding);
</ins><span class="cx"> static PassRefPtr<WebArchiveResource> create(PassRefPtr<WebCore::ArchiveResource>);
</span><span class="cx">
</span><del>- PassRefPtr<WebData> data();
</del><ins>+ PassRefPtr<API::Data> data();
</ins><span class="cx"> String URL();
</span><span class="cx"> String MIMEType();
</span><span class="cx"> String textEncoding();
</span><span class="lines">@@ -57,7 +60,7 @@
</span><span class="cx"> WebCore::ArchiveResource* coreArchiveResource();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebArchiveResource(WebData*, const String& URL, const String& MIMEType, const String& textEncoding);
</del><ins>+ WebArchiveResource(API::Data*, const String& URL, const String& MIMEType, const String& textEncoding);
</ins><span class="cx"> WebArchiveResource(PassRefPtr<WebCore::ArchiveResource>);
</span><span class="cx">
</span><span class="cx"> RefPtr<WebCore::ArchiveResource> m_archiveResource;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebDatah"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebData.h (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebData.h 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/Shared/WebData.h 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -1,98 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebData_h
-#define WebData_h
-
-#include "APIObject.h"
-#include "DataReference.h"
-#include <wtf/Forward.h>
-#include <wtf/Vector.h>
-
-namespace WebKit {
-
-// WebData - A data buffer type suitable for vending to an API.
-
-class WebData : public API::ObjectImpl<API::Object::Type::Data> {
-public:
- typedef void (*FreeDataFunction)(unsigned char*, const void* context);
-
- static PassRefPtr<WebData> createWithoutCopying(const unsigned char* bytes, size_t size, FreeDataFunction freeDataFunction, const void* context)
- {
- return adoptRef(new WebData(bytes, size, freeDataFunction, context));
- }
-
- static PassRefPtr<WebData> create(const unsigned char* bytes, size_t size)
- {
- unsigned char *copiedBytes = 0;
-
- if (size) {
- copiedBytes = static_cast<unsigned char*>(fastMalloc(size));
- memcpy(copiedBytes, bytes, size);
- }
-
- return createWithoutCopying(copiedBytes, size, fastFreeBytes, 0);
- }
-
- static PassRefPtr<WebData> create(const Vector<unsigned char>& buffer)
- {
- return create(buffer.data(), buffer.size());
- }
-
- ~WebData()
- {
- m_freeDataFunction(const_cast<unsigned char*>(m_bytes), m_context);
- }
-
- const unsigned char* bytes() const { return m_bytes; }
- size_t size() const { return m_size; }
-
- CoreIPC::DataReference dataReference() const { return CoreIPC::DataReference(m_bytes, m_size); }
-
-private:
- WebData(const unsigned char* bytes, size_t size, FreeDataFunction freeDataFunction, const void* context)
- : m_bytes(bytes)
- , m_size(size)
- , m_freeDataFunction(freeDataFunction)
- , m_context(context)
- {
- }
-
- static void fastFreeBytes(unsigned char* bytes, const void*)
- {
- if (bytes)
- fastFree(static_cast<void*>(bytes));
- }
-
- const unsigned char* m_bytes;
- size_t m_size;
-
- FreeDataFunction m_freeDataFunction;
- const void* m_context;
-};
-
-} // namespace WebKit
-
-#endif // WebData_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -28,11 +28,11 @@
</span><span class="cx"> #include "WKPagePrivate.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "PrintInfo.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKPluginInformation.h"
</span><span class="cx"> #include "WebBackForwardList.h"
</span><del>-#include "WebData.h"
</del><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx"> #include <WebCore/Page.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBrowsingContextControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -28,10 +28,14 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-#import "WeakObjCPtr.h"
</del><ins>+#import "APIData.h"
</ins><span class="cx"> #import "ObjCObjectGraph.h"
</span><span class="cx"> #import "WKBackForwardListInternal.h"
</span><span class="cx"> #import "WKBackForwardListItemInternal.h"
</span><ins>+#import "WKBrowsingContextGroupInternal.h"
+#import "WKBrowsingContextHandleInternal.h"
+#import "WKBrowsingContextLoadDelegatePrivate.h"
+#import "WKBrowsingContextPolicyDelegate.h"
</ins><span class="cx"> #import "WKErrorRecoveryAttempting.h"
</span><span class="cx"> #import "WKFrame.h"
</span><span class="cx"> #import "WKFramePolicyListener.h"
</span><span class="lines">@@ -40,20 +44,15 @@
</span><span class="cx"> #import "WKNSURLAuthenticationChallenge.h"
</span><span class="cx"> #import "WKNSURLExtras.h"
</span><span class="cx"> #import "WKNSURLProtectionSpace.h"
</span><ins>+#import "WKProcessGroupInternal.h"
</ins><span class="cx"> #import "WKRetainPtr.h"
</span><span class="cx"> #import "WKURLRequestNS.h"
</span><span class="cx"> #import "WKURLResponseNS.h"
</span><ins>+#import "WeakObjCPtr.h"
</ins><span class="cx"> #import "WebCertificateInfo.h"
</span><span class="cx"> #import "WebContext.h"
</span><del>-#import "WebData.h"
</del><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx">
</span><del>-#import "WKBrowsingContextGroupInternal.h"
-#import "WKBrowsingContextHandleInternal.h"
-#import "WKBrowsingContextLoadDelegatePrivate.h"
-#import "WKBrowsingContextPolicyDelegate.h"
-#import "WKProcessGroupInternal.h"
-
</del><span class="cx"> using namespace WebCore;
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -242,17 +241,18 @@
</span><span class="cx">
</span><span class="cx"> - (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL userData:(id)userData
</span><span class="cx"> {
</span><del>- RefPtr<WebData> wkData;
</del><ins>+ RefPtr<API::Data> apiData;
</ins><span class="cx"> if (data) {
</span><ins>+ // FIXME: This should copy the data.
</ins><span class="cx"> [data retain];
</span><del>- wkData = WebData::createWithoutCopying((const unsigned char*)[data bytes], [data length], releaseNSData, data);
</del><ins>+ apiData = API::Data::createWithoutCopying((const unsigned char*)[data bytes], [data length], releaseNSData, data);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<ObjCObjectGraph> wkUserData;
</span><span class="cx"> if (userData)
</span><span class="cx"> wkUserData = ObjCObjectGraph::create(userData);
</span><span class="cx">
</span><del>- _page->loadData(wkData.get(), MIMEType, encodingName, [baseURL _web_originalDataAsWTFString], wkUserData.get());
</del><ins>+ _page->loadData(apiData.get(), MIMEType, encodingName, [baseURL _web_originalDataAsWTFString], wkUserData.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)stopLoading
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPImacWKPrintingViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "WKPrintingView.h"
</span><span class="cx">
</span><ins>+#import "APIData.h"
</ins><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "PDFKitImports.h"
</span><span class="cx"> #import "PrintInfo.h"
</span><span class="cx"> #import "ShareableBitmap.h"
</span><del>-#import "WebData.h"
</del><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import <PDFKit/PDFKit.h>
</span><span class="cx"> #import <WebCore/GraphicsContext.h>
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx">
</span><span class="cx"> OwnPtr<IPCCallbackContext> context = adoptPtr(static_cast<IPCCallbackContext*>(untypedContext));
</span><span class="cx"> WKPrintingView *view = context->view.get();
</span><del>- WebData* data = toImpl(dataRef);
</del><ins>+ API::Data* data = toImpl(dataRef);
</ins><span class="cx">
</span><span class="cx"> if (context->callbackID == view->_expectedPrintCallback) {
</span><span class="cx"> ASSERT(![view _isPrintingPreview]);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "DownloadProxy.h"
</span><span class="cx">
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "AuthenticationChallengeProxy.h"
</span><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "DownloadProxyMap.h"
</span><span class="cx"> #include "WebContext.h"
</span><del>-#include "WebData.h"
</del><span class="cx"> #include "WebProcessMessages.h"
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="lines">@@ -175,12 +175,12 @@
</span><span class="cx"> m_downloadProxyMap.downloadFinished(this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static PassRefPtr<WebData> createWebData(const CoreIPC::DataReference& data)
</del><ins>+static PassRefPtr<API::Data> createData(const CoreIPC::DataReference& data)
</ins><span class="cx"> {
</span><span class="cx"> if (data.isEmpty())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- return WebData::create(data.data(), data.size());
</del><ins>+ return API::Data::create(data.data(), data.size());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DownloadProxy::didFail(const ResourceError& error, const CoreIPC::DataReference& resumeData)
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> if (!m_webContext)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_resumeData = createWebData(resumeData);
</del><ins>+ m_resumeData = createData(resumeData);
</ins><span class="cx">
</span><span class="cx"> m_webContext->downloadClient().didFail(m_webContext.get(), this, error);
</span><span class="cx">
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> void DownloadProxy::didCancel(const CoreIPC::DataReference& resumeData)
</span><span class="cx"> {
</span><del>- m_resumeData = createWebData(resumeData);
</del><ins>+ m_resumeData = createData(resumeData);
</ins><span class="cx">
</span><span class="cx"> m_webContext->downloadClient().didCancel(m_webContext.get(), this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDownloadsDownloadProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -33,6 +33,10 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><ins>+namespace API {
+class Data;
+}
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> class AuthenticationChallenge;
</span><span class="cx"> class ResourceError;
</span><span class="lines">@@ -43,7 +47,6 @@
</span><span class="cx">
</span><span class="cx"> class DownloadProxyMap;
</span><span class="cx"> class WebContext;
</span><del>-class WebData;
</del><span class="cx"> class WebPageProxy;
</span><span class="cx">
</span><span class="cx"> class DownloadProxy : public API::ObjectImpl<API::Object::Type::Download>, public CoreIPC::MessageReceiver {
</span><span class="lines">@@ -53,7 +56,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t downloadID() const { return m_downloadID; }
</span><span class="cx"> const WebCore::ResourceRequest& request() const { return m_request; }
</span><del>- WebData* resumeData() const { return m_resumeData.get(); }
</del><ins>+ API::Data* resumeData() const { return m_resumeData.get(); }
</ins><span class="cx">
</span><span class="cx"> void cancel();
</span><span class="cx">
</span><span class="lines">@@ -86,7 +89,7 @@
</span><span class="cx"> RefPtr<WebContext> m_webContext;
</span><span class="cx"> uint64_t m_downloadID;
</span><span class="cx">
</span><del>- RefPtr<WebData> m_resumeData;
</del><ins>+ RefPtr<API::Data> m_resumeData;
</ins><span class="cx"> WebCore::ResourceRequest m_request;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -58,7 +58,6 @@
</span><span class="cx"> #include "WebContextMenuProxy.h"
</span><span class="cx"> #include "WebContextUserMessageCoders.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><del>-#include "WebData.h"
</del><span class="cx"> #include "WebEditCommandProxy.h"
</span><span class="cx"> #include "WebEvent.h"
</span><span class="cx"> #include "WebFormSubmissionListenerProxy.h"
</span><span class="lines">@@ -659,7 +658,7 @@
</span><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::loadData(WebData* data, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData)
</del><ins>+void WebPageProxy::loadData(API::Data* data, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData)
</ins><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span><span class="cx"> reattachToWebProcess();
</span><span class="lines">@@ -705,7 +704,7 @@
</span><span class="cx"> m_process->responsivenessTimer()->start();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::loadWebArchiveData(const WebData* webArchiveData, API::Object* userData)
</del><ins>+void WebPageProxy::loadWebArchiveData(API::Data* webArchiveData, API::Object* userData)
</ins><span class="cx"> {
</span><span class="cx"> if (!isValid())
</span><span class="cx"> reattachToWebProcess();
</span><span class="lines">@@ -3605,7 +3604,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- callback->performCallbackWithReturnValue(WebData::create(dataReference.data(), dataReference.size()).get());
</del><ins>+ callback->performCallbackWithReturnValue(API::Data::create(dataReference.data(), dataReference.size()).get());
</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">@@ -4258,19 +4257,19 @@
</span><span class="cx"> m_drawingArea->setBackingStoreIsDiscardable(isDiscardable);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData* data)
</del><ins>+void WebPageProxy::saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data* data)
</ins><span class="cx"> {
</span><span class="cx"> m_uiClient.saveDataToFileInDownloadsFolder(this, suggestedFilename, mimeType, originatingURLString, data);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const CoreIPC::DataReference& data)
</del><ins>+void WebPageProxy::savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const CoreIPC::DataReference& dataReference)
</ins><span class="cx"> {
</span><span class="cx"> if (!suggestedFilename.endsWith(".pdf", false))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<WebData> webData = WebData::create(data.data(), data.size());
</del><ins>+ RefPtr<API::Data> data = API::Data::create(dataReference.data(), dataReference.size());
</ins><span class="cx">
</span><del>- saveDataToFileInDownloadsFolder(suggestedFilename, "application/pdf", originatingURLString, webData.get());
</del><ins>+ saveDataToFileInDownloadsFolder(suggestedFilename, "application/pdf", originatingURLString, data.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::linkClicked(const String& url, const WebMouseEvent& event)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -137,7 +137,6 @@
</span><span class="cx"> class WebBackForwardListItem;
</span><span class="cx"> class WebColorPickerResultListenerProxy;
</span><span class="cx"> class WebContextMenuProxy;
</span><del>-class WebData;
</del><span class="cx"> class WebEditCommandProxy;
</span><span class="cx"> class WebFullScreenManagerProxy;
</span><span class="cx"> class WebKeyboardEvent;
</span><span class="lines">@@ -370,11 +369,11 @@
</span><span class="cx"> void loadURL(const String&, API::Object* userData = nullptr);
</span><span class="cx"> void loadURLRequest(WebURLRequest*, API::Object* userData = nullptr);
</span><span class="cx"> void loadFile(const String& fileURL, const String& resourceDirectoryURL, API::Object* userData = nullptr);
</span><del>- void loadData(WebData*, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr);
</del><ins>+ void loadData(API::Data*, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr);
</ins><span class="cx"> void loadHTMLString(const String& htmlString, const String& baseURL, API::Object* userData = nullptr);
</span><span class="cx"> void loadAlternateHTMLString(const String& htmlString, const String& baseURL, const String& unreachableURL, API::Object* userData = nullptr);
</span><span class="cx"> void loadPlainTextString(const String&, API::Object* userData = nullptr);
</span><del>- void loadWebArchiveData(const WebData*, API::Object* userData = nullptr);
</del><ins>+ void loadWebArchiveData(API::Data*, API::Object* userData = nullptr);
</ins><span class="cx">
</span><span class="cx"> void stopLoading();
</span><span class="cx"> void reload(bool reloadFromOrigin);
</span><span class="lines">@@ -535,8 +534,8 @@
</span><span class="cx"> void terminateProcess();
</span><span class="cx">
</span><span class="cx"> typedef bool (*WebPageProxySessionStateFilterCallback)(WKPageRef, WKStringRef type, WKTypeRef object, void* context);
</span><del>- PassRefPtr<WebData> sessionStateData(WebPageProxySessionStateFilterCallback, void* context) const;
- void restoreFromSessionStateData(WebData*);
</del><ins>+ PassRefPtr<API::Data> sessionStateData(WebPageProxySessionStateFilterCallback, void* context) const;
+ void restoreFromSessionStateData(API::Data*);
</ins><span class="cx">
</span><span class="cx"> bool supportsTextZoom() const;
</span><span class="cx"> double textZoomFactor() const { return m_textZoomFactor; }
</span><span class="lines">@@ -778,7 +777,7 @@
</span><span class="cx"> void handleAlternativeTextUIResult(const String& result);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData*);
</del><ins>+ void saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data*);
</ins><span class="cx"> void savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const CoreIPC::DataReference&);
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> void savePDFToTemporaryFolderAndOpenWithNativeApplicationRaw(const String& suggestedFilename, const String& originatingURLString, const uint8_t* data, unsigned long size, const String& pdfUUID);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebUIClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebUIClient.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/UIProcess/WebUIClient.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -420,7 +420,7 @@
</span><span class="cx"> m_client.runModal(toAPI(page), m_client.base.clientInfo);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebUIClient::saveDataToFileInDownloadsFolder(WebPageProxy* page, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData* data)
</del><ins>+void WebUIClient::saveDataToFileInDownloadsFolder(WebPageProxy* page, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data* data)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.saveDataToFileInDownloadsFolder)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebUIClient.h (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebUIClient.h 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/UIProcess/WebUIClient.h 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><ins>+class Data;
+
</ins><span class="cx"> template<> struct ClientTraits<WKPageUIClientBase> {
</span><span class="cx"> typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2> Versions;
</span><span class="cx"> };
</span><span class="lines">@@ -55,7 +57,6 @@
</span><span class="cx"> class NativeWebWheelEvent;
</span><span class="cx"> class NotificationPermissionRequest;
</span><span class="cx"> class WebColorPickerResultListenerProxy;
</span><del>-class WebData;
</del><span class="cx"> class WebFrameProxy;
</span><span class="cx"> class WebPageProxy;
</span><span class="cx"> class WebSecurityOrigin;
</span><span class="lines">@@ -121,7 +122,7 @@
</span><span class="cx"> bool canRunModal() const;
</span><span class="cx"> void runModal(WebPageProxy*);
</span><span class="cx">
</span><del>- void saveDataToFileInDownloadsFolder(WebPageProxy*, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData*);
</del><ins>+ void saveDataToFileInDownloadsFolder(WebPageProxy*, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data*);
</ins><span class="cx">
</span><span class="cx"> bool shouldInterruptJavaScript(WebPageProxy*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcesscfWebPageProxyCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -26,11 +26,11 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx">
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "DataReference.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "SessionState.h"
</span><span class="cx"> #include "WebBackForwardList.h"
</span><del>-#include "WebData.h"
</del><span class="cx"> #include "WebPageMessages.h"
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx">
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> static const UInt32 CurrentSessionStateDataVersion = 2;
</span><span class="cx">
</span><del>-PassRefPtr<WebData> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback filter, void* context) const
</del><ins>+PassRefPtr<API::Data> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback filter, void* context) const
</ins><span class="cx"> {
</span><span class="cx"> const void* keys[2];
</span><span class="cx"> const void* values[2];
</span><span class="lines">@@ -101,15 +101,15 @@
</span><span class="cx"> // Copy in the actual session state data
</span><span class="cx"> CFDataGetBytes(stateCFData.get(), CFRangeMake(0, length), stateVector.data() + sizeof(UInt32));
</span><span class="cx">
</span><del>- return WebData::create(stateVector);
</del><ins>+ return API::Data::create(stateVector);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::restoreFromSessionStateData(WebData* webData)
</del><ins>+void WebPageProxy::restoreFromSessionStateData(API::Data* apiData)
</ins><span class="cx"> {
</span><del>- if (!webData || webData->size() < sizeof(UInt32))
</del><ins>+ if (!apiData || apiData->size() < sizeof(UInt32))
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- const unsigned char* buffer = webData->bytes();
</del><ins>+ const unsigned char* buffer = apiData->bytes();
</ins><span class="cx"> UInt32 versionHeader = (buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3];
</span><span class="cx">
</span><span class="cx"> if (versionHeader != CurrentSessionStateDataVersion) {
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RetainPtr<CFDataRef> data = adoptCF(CFDataCreate(0, webData->bytes() + sizeof(UInt32), webData->size() - sizeof(UInt32)));
</del><ins>+ RetainPtr<CFDataRef> data = adoptCF(CFDataCreate(0, apiData->bytes() + sizeof(UInt32), apiData->size() - sizeof(UInt32)));
</ins><span class="cx">
</span><span class="cx"> CFErrorRef propertyListError = 0;
</span><span class="cx"> auto propertyList = adoptCF(CFPropertyListCreateWithData(0, data.get(), kCFPropertyListImmutable, 0, &propertyListError));
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -583,7 +583,7 @@
</span><span class="cx"> 514BDED316C98EDD00E4E25E /* StatisticsRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 514BDED216C98EDD00E4E25E /* StatisticsRequest.h */; };
</span><span class="cx"> 5153569C1291B1D2000749DC /* WebPageContextMenuClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5153569A1291B1D2000749DC /* WebPageContextMenuClient.cpp */; };
</span><span class="cx"> 5153569D1291B1D2000749DC /* WebPageContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 5153569B1291B1D2000749DC /* WebPageContextMenuClient.h */; };
</span><del>- 51578B831209ECEF00A37C4A /* WebData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51578B821209ECEF00A37C4A /* WebData.h */; };
</del><ins>+ 51578B831209ECEF00A37C4A /* APIData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51578B821209ECEF00A37C4A /* APIData.h */; };
</ins><span class="cx"> 515E7727183DD6F60007203F /* AsyncRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E7725183DD6F60007203F /* AsyncRequest.cpp */; };
</span><span class="cx"> 515E7728183DD6F60007203F /* AsyncRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E7726183DD6F60007203F /* AsyncRequest.h */; };
</span><span class="cx"> 515E772B184008B90007203F /* DatabaseProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E7729184008B90007203F /* DatabaseProcessCreationParameters.cpp */; };
</span><span class="lines">@@ -2170,7 +2170,7 @@
</span><span class="cx"> 514BDED216C98EDD00E4E25E /* StatisticsRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatisticsRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> 5153569A1291B1D2000749DC /* WebPageContextMenuClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPageContextMenuClient.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 5153569B1291B1D2000749DC /* WebPageContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPageContextMenuClient.h; sourceTree = "<group>"; };
</span><del>- 51578B821209ECEF00A37C4A /* WebData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebData.h; sourceTree = "<group>"; };
</del><ins>+ 51578B821209ECEF00A37C4A /* APIData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIData.h; sourceTree = "<group>"; };
</ins><span class="cx"> 515E7725183DD6F60007203F /* AsyncRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncRequest.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 515E7726183DD6F60007203F /* AsyncRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> 515E7729184008B90007203F /* DatabaseProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DatabaseProcessCreationParameters.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3468,6 +3468,7 @@
</span><span class="cx"> BC64696D11DBE603006455B0 /* APIArray.cpp */,
</span><span class="cx"> BC64696E11DBE603006455B0 /* APIArray.h */,
</span><span class="cx"> 1A3DD205125E5A2F004515E6 /* APIClient.h */,
</span><ins>+ 51578B821209ECEF00A37C4A /* APIData.h */,
</ins><span class="cx"> 1AC1336F18566C7C00F3EC05 /* APIFrameHandle.cpp */,
</span><span class="cx"> 1AC1337018566C7C00F3EC05 /* APIFrameHandle.h */,
</span><span class="cx"> 1AC133731857C21E00F3EC05 /* APIGeometry.cpp */,
</span><span class="lines">@@ -3563,7 +3564,6 @@
</span><span class="cx"> BC1DD7B1114DC396005ADAF3 /* WebCoreArgumentCoders.h */,
</span><span class="cx"> 51BA24451858F41500EA2811 /* WebCrossThreadCopier.cpp */,
</span><span class="cx"> 516311861858446600534647 /* WebCrossThreadCopier.h */,
</span><del>- 51578B821209ECEF00A37C4A /* WebData.h */,
</del><span class="cx"> BC575612126E0138006F0F12 /* WebError.cpp */,
</span><span class="cx"> 516A4A5B120A2CCD00C05B7F /* WebError.h */,
</span><span class="cx"> C0337DAD127A24FE008FF4F4 /* WebEvent.cpp */,
</span><span class="lines">@@ -5999,7 +5999,7 @@
</span><span class="cx"> BC1DD7B2114DC396005ADAF3 /* WebCoreArgumentCoders.h in Headers */,
</span><span class="cx"> 1A9E329718219BEA00F5D04C /* WKRemoteObjectRegistryPrivate.h in Headers */,
</span><span class="cx"> 512F589B12A8838800629530 /* WebCredential.h in Headers */,
</span><del>- 51578B831209ECEF00A37C4A /* WebData.h in Headers */,
</del><ins>+ 51578B831209ECEF00A37C4A /* APIData.h in Headers */,
</ins><span class="cx"> F6A25FDD12ADC6CC00DC40CC /* WebDatabaseManager.h in Headers */,
</span><span class="cx"> F62A76B712B1B25F0005F1B6 /* WebDatabaseManagerMessages.h in Headers */,
</span><span class="cx"> F62A765D12B1ABC30005F1B6 /* WebDatabaseManagerProxy.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx"> #include "WKBundle.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "InjectedBundle.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><span class="cx"> #include "WKBundlePrivate.h"
</span><del>-#include "WebData.h"
</del><span class="cx">
</span><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="lines">@@ -266,8 +266,7 @@
</span><span class="cx">
</span><span class="cx"> WKDataRef WKBundleCreateWKDataFromUInt8Array(WKBundleRef bundle, JSContextRef context, JSValueRef data)
</span><span class="cx"> {
</span><del>- RefPtr<WebData> webData = toImpl(bundle)->createWebDataFromUint8Array(context, data);
- return toAPI(webData.release().leakRef());
</del><ins>+ return toAPI(toImpl(bundle)->createWebDataFromUint8Array(context, data).leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int WKBundleNumberOfPages(WKBundleRef bundleRef, WKBundleFrameRef frameRef, double pageWidthInPixels, double pageHeightInPixels)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx"> #include "WebContextMessageKinds.h"
</span><span class="cx"> #include "WebCookieManager.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><del>-#include "WebData.h"
</del><span class="cx"> #include "WebDatabaseManager.h"
</span><span class="cx"> #include "WebFrame.h"
</span><span class="cx"> #include "WebFrameNetworkingContext.h"
</span><span class="lines">@@ -626,11 +625,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<WebData> InjectedBundle::createWebDataFromUint8Array(JSContextRef context, JSValueRef data)
</del><ins>+// FIXME Get rid of this function and move it into WKBundle.cpp.
+PassRefPtr<API::Data> InjectedBundle::createWebDataFromUint8Array(JSContextRef context, JSValueRef data)
</ins><span class="cx"> {
</span><span class="cx"> JSC::ExecState* execState = toJS(context);
</span><span class="cx"> RefPtr<Uint8Array> arrayData = WebCore::toUint8Array(toJS(execState, data));
</span><del>- return WebData::create(static_cast<unsigned char*>(arrayData->baseAddress()), arrayData->byteLength());
</del><ins>+ return API::Data::create(static_cast<unsigned char*>(arrayData->baseAddress()), arrayData->byteLength());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InjectedBundle::setTabKeyCyclesThroughElements(WebPage* page, bool enabled)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -49,11 +49,12 @@
</span><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx"> class Array;
</span><ins>+class Data;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-namespace CoreIPC {
- class ArgumentDecoder;
- class Connection;
</del><ins>+namespace IPC {
+class ArgumentDecoder;
+class Connection;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -69,7 +70,6 @@
</span><span class="cx"> class InjectedBundleScriptWorld;
</span><span class="cx"> class WebCertificateInfo;
</span><span class="cx"> class WebConnection;
</span><del>-class WebData;
</del><span class="cx"> class WebFrame;
</span><span class="cx"> class WebPage;
</span><span class="cx"> class WebPageGroupProxy;
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> void setWebNotificationPermission(WebPage*, const String& originString, bool allowed);
</span><span class="cx"> void removeAllWebNotificationPermissions(WebPage*);
</span><span class="cx"> uint64_t webNotificationID(JSContextRef, JSValueRef);
</span><del>- PassRefPtr<WebData> createWebDataFromUint8Array(JSContextRef, JSValueRef);
</del><ins>+ PassRefPtr<API::Data> createWebDataFromUint8Array(JSContextRef, JSValueRef);
</ins><span class="cx">
</span><span class="cx"> // UserContent API
</span><span class="cx"> void addUserScript(WebPageGroupProxy*, InjectedBundleScriptWorld*, const String& source, const String& url, API::Array* whitelist, API::Array* blacklist, WebCore::UserScriptInjectionTime, WebCore::UserContentInjectedFrames);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageEditorClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -27,12 +27,12 @@
</span><span class="cx"> #include "InjectedBundlePageEditorClient.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "InjectedBundleNodeHandle.h"
</span><span class="cx"> #include "InjectedBundleRangeHandle.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><span class="cx"> #include "WKString.h"
</span><del>-#include "WebData.h"
</del><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> for (const auto& type : typesArray->elementsOfType<API::String>())
</span><span class="cx"> pasteboardTypes.append(type->string());
</span><span class="cx">
</span><del>- for (const auto& item : dataArray->elementsOfType<WebData>()) {
</del><ins>+ for (const auto& item : dataArray->elementsOfType<API::Data>()) {
</ins><span class="cx"> RefPtr<SharedBuffer> buffer = SharedBuffer::create(item->bytes(), item->size());
</span><span class="cx"> pasteboardData.append(buffer);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx"> #include "InjectedBundlePageLoaderClient.h"
</span><span class="cx">
</span><span class="cx"> #include "APIArray.h"
</span><ins>+#include "APIData.h"
</ins><span class="cx"> #include "InjectedBundleDOMWindowExtension.h"
</span><span class="cx"> #include "InjectedBundleScriptWorld.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><del>-#include "WebData.h"
</del><span class="cx"> #include "WebError.h"
</span><span class="cx"> #include "WebURLRequest.h"
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><span class="lines">@@ -55,18 +55,18 @@
</span><span class="cx"> static_cast<SharedBuffer*>(const_cast<void*>(data))->deref();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void InjectedBundlePageLoaderClient::willLoadDataRequest(WebPage* page, const ResourceRequest& request, const SharedBuffer* data, const String& MIMEType, const String& encodingName, const URL& unreachableURL, API::Object* userData)
</del><ins>+void InjectedBundlePageLoaderClient::willLoadDataRequest(WebPage* page, const ResourceRequest& request, SharedBuffer* sharedBuffer, const String& MIMEType, const String& encodingName, const URL& unreachableURL, API::Object* userData)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_client.willLoadDataRequest)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- RefPtr<WebData> webData;
</del><ins>+ RefPtr<API::Data> data;
</ins><span class="cx"> if (data) {
</span><del>- const_cast<SharedBuffer*>(data)->ref();
- webData = WebData::createWithoutCopying((const unsigned char*)data->data(), data->size(), releaseSharedBuffer, data);
</del><ins>+ sharedBuffer->ref();
+ data = API::Data::createWithoutCopying((const unsigned char*)sharedBuffer->data(), sharedBuffer->size(), releaseSharedBuffer, sharedBuffer);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- m_client.willLoadDataRequest(toAPI(page), toAPI(request), toAPI(webData.get()), toAPI(MIMEType.impl()), toAPI(encodingName.impl()), toURLRef(unreachableURL.string().impl()), toAPI(userData), m_client.base.clientInfo);
</del><ins>+ m_client.willLoadDataRequest(toAPI(page), toAPI(request), toAPI(data.get()), toAPI(MIMEType.impl()), toAPI(encodingName.impl()), toURLRef(unreachableURL.string().impl()), toAPI(userData), m_client.base.clientInfo);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool InjectedBundlePageLoaderClient::shouldGoToBackForwardListItem(WebPage* page, InjectedBundleBackForwardListItem* item, RefPtr<API::Object>& userData)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> class InjectedBundlePageLoaderClient : public API::Client<WKBundlePageLoaderClientBase> {
</span><span class="cx"> public:
</span><span class="cx"> void willLoadURLRequest(WebPage*, const WebCore::ResourceRequest&, API::Object*);
</span><del>- void willLoadDataRequest(WebPage*, const WebCore::ResourceRequest&, const WebCore::SharedBuffer*, const String&, const String&, const WebCore::URL&, API::Object*);
</del><ins>+ void willLoadDataRequest(WebPage*, const WebCore::ResourceRequest&, WebCore::SharedBuffer*, const String&, const String&, const WebCore::URL&, API::Object*);
</ins><span class="cx">
</span><span class="cx"> bool shouldGoToBackForwardListItem(WebPage*, InjectedBundleBackForwardListItem*, RefPtr<API::Object>& userData);
</span><span class="cx"> void didStartProvisionalLoadForFrame(WebPage*, WebFrame*, RefPtr<API::Object>& userData);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (160652 => 160653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-16 19:57:27 UTC (rev 160652)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-12-16 20:21:24 UTC (rev 160653)
</span><span class="lines">@@ -911,7 +911,7 @@
</span><span class="cx">
</span><span class="cx"> // Let the InjectedBundle know we are about to start the load, passing the user data from the UIProcess
</span><span class="cx"> // to all the client to set up any needed state.
</span><del>- m_loaderClient.willLoadDataRequest(this, request, substituteData.content(), substituteData.mimeType(), substituteData.textEncoding(), substituteData.failingURL(), userData.get());
</del><ins>+ m_loaderClient.willLoadDataRequest(this, request, const_cast<SharedBuffer*>(substituteData.content()), substituteData.mimeType(), substituteData.textEncoding(), substituteData.failingURL(), userData.get());
</ins><span class="cx">
</span><span class="cx"> // Initate the load in WebCore.
</span><span class="cx"> m_mainFrame->coreFrame()->loader().load(FrameLoadRequest(m_mainFrame->coreFrame(), request, substituteData));
</span></span></pre>
</div>
</div>
</body>
</html>