Changeset 160653 in webkit
- Timestamp:
- Dec 16, 2013 12:21:24 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 31 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r160643 r160653 1 2013-12-16 Anders Carlsson <andersca@apple.com> 2 3 Rename WebData to API::Data 4 https://bugs.webkit.org/show_bug.cgi?id=125797 5 6 Reviewed by Beth Dakin. 7 8 * Shared/API/Cocoa/WKRemoteObjectCoder.mm: 9 (-[WKRemoteObjectEncoder encodeBytes:length:forKey:]): 10 (-[WKRemoteObjectDecoder decodeBytesForKey:returnedLength:]): 11 * Shared/API/c/WKData.cpp: 12 (WKDataGetTypeID): 13 (WKDataCreate): 14 * Shared/API/c/WKSharedAPICast.h: 15 * Shared/API/c/mac/WKWebArchive.cpp: 16 (WKWebArchiveCopyData): 17 * Shared/API/c/mac/WKWebArchiveResource.cpp: 18 (WKWebArchiveResourceCopyData): 19 * Shared/APIData.h: Renamed from Source/WebKit2/Shared/WebData.h. 20 (API::Data::createWithoutCopying): 21 (API::Data::create): 22 (API::Data::~Data): 23 (API::Data::bytes): 24 (API::Data::size): 25 (API::Data::dataReference): 26 (API::Data::Data): 27 (API::Data::fastFreeBytes): 28 * Shared/Cocoa/WKNSData.h: 29 (WebKit::wrapper): 30 * Shared/Cocoa/WKNSData.mm: 31 (-[WKNSData dealloc]): 32 * Shared/UserMessageCoders.h: 33 (WebKit::UserMessageEncoder::baseEncode): 34 (WebKit::UserMessageDecoder::baseDecode): 35 * Shared/WebArchive.cpp: 36 (WebKit::WebArchive::create): 37 (WebKit::WebArchive::WebArchive): 38 (WebKit::WebArchive::data): 39 * Shared/WebArchive.h: 40 * Shared/WebArchiveResource.cpp: 41 (WebKit::WebArchiveResource::create): 42 (WebKit::WebArchiveResource::WebArchiveResource): 43 (WebKit::WebArchiveResource::data): 44 * Shared/WebArchiveResource.h: 45 * UIProcess/API/C/WKPage.cpp: 46 * UIProcess/API/Cocoa/WKBrowsingContextController.mm: 47 (-[WKBrowsingContextController loadData:MIMEType:textEncodingName:baseURL:userData:]): 48 * UIProcess/API/mac/WKPrintingView.mm: 49 (pageDidDrawToPDF): 50 * UIProcess/Downloads/DownloadProxy.cpp: 51 (WebKit::createData): 52 (WebKit::DownloadProxy::didFail): 53 (WebKit::DownloadProxy::didCancel): 54 * UIProcess/Downloads/DownloadProxy.h: 55 (WebKit::DownloadProxy::resumeData): 56 * UIProcess/WebPageProxy.cpp: 57 (WebKit::WebPageProxy::loadData): 58 (WebKit::WebPageProxy::loadWebArchiveData): 59 (WebKit::WebPageProxy::dataCallback): 60 (WebKit::WebPageProxy::saveDataToFileInDownloadsFolder): 61 (WebKit::WebPageProxy::savePDFToFileInDownloadsFolder): 62 * UIProcess/WebPageProxy.h: 63 * UIProcess/WebUIClient.cpp: 64 (WebKit::WebUIClient::saveDataToFileInDownloadsFolder): 65 * UIProcess/WebUIClient.h: 66 * UIProcess/cf/WebPageProxyCF.cpp: 67 (WebKit::WebPageProxy::sessionStateData): 68 (WebKit::WebPageProxy::restoreFromSessionStateData): 69 * WebKit2.xcodeproj/project.pbxproj: 70 * WebProcess/InjectedBundle/API/c/WKBundle.cpp: 71 (WKBundleCreateWKDataFromUInt8Array): 72 * WebProcess/InjectedBundle/InjectedBundle.cpp: 73 (WebKit::InjectedBundle::createWebDataFromUint8Array): 74 * WebProcess/InjectedBundle/InjectedBundle.h: 75 * WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp: 76 (WebKit::InjectedBundlePageEditorClient::getPasteboardDataForRange): 77 * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp: 78 (WebKit::InjectedBundlePageLoaderClient::willLoadDataRequest): 79 * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h: 80 * WebProcess/WebPage/WebPage.cpp: 81 (WebKit::WebPage::loadDataImpl): 82 1 83 2013-12-16 Michał Pakuła vel Rutka <m.pakula@samsung.com> 2 84 -
trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectCoder.mm
r160608 r160653 30 30 31 31 #import "APIArray.h" 32 #import "APIData.h" 32 33 #import "APINumber.h" 33 34 #import "APIString.h" 34 35 #import "MutableDictionary.h" 35 36 #import "WKRemoteObjectInterfaceInternal.h" 36 #import "WebData.h"37 37 #import <objc/runtime.h> 38 38 #import <wtf/RetainPtr.h> … … 238 238 - (void)encodeBytes:(const uint8_t *)bytes length:(NSUInteger)length forKey:(NSString *)key 239 239 { 240 _currentDictionary->set(escapeKey(key), WebData::create(bytes, length));240 _currentDictionary->set(escapeKey(key), API::Data::create(bytes, length)); 241 241 } 242 242 … … 506 506 - (const uint8_t *)decodeBytesForKey:(NSString *)key returnedLength:(NSUInteger *)length 507 507 { 508 WebData* data = _currentDictionary->get<WebData>(escapeKey(key));508 auto* data = _currentDictionary->get<API::Data>(escapeKey(key)); 509 509 if (!data || !data->size()) 510 510 return nullptr; -
trunk/Source/WebKit2/Shared/API/c/WKData.cpp
r99239 r160653 27 27 #include "WKData.h" 28 28 29 #include " WebData.h"29 #include "APIData.h" 30 30 #include "WKAPICast.h" 31 31 … … 34 34 WKTypeID WKDataGetTypeID() 35 35 { 36 return toAPI( WebData::APIType);36 return toAPI(API::Data::APIType); 37 37 } 38 38 39 39 WKDataRef WKDataCreate(const unsigned char* bytes, size_t size) 40 40 { 41 RefPtr<WebData> data = WebData::create(bytes, size); 42 return toAPI(data.release().leakRef()); 41 return toAPI(API::Data::create(bytes, size).leakRef()); 43 42 } 44 43 -
trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h
r160608 r160653 61 61 namespace API { 62 62 class Array; 63 class Data; 63 64 class Point; 64 65 class Rect; … … 76 77 class WebConnection; 77 78 class WebContextMenuItem; 78 class WebData;79 79 class WebGraphicsContext; 80 80 class WebImage; … … 97 97 WK_ADD_API_MAPPING(WKConnectionRef, WebConnection) 98 98 WK_ADD_API_MAPPING(WKContextMenuItemRef, WebContextMenuItem) 99 WK_ADD_API_MAPPING(WKDataRef, WebData)99 WK_ADD_API_MAPPING(WKDataRef, API::Data) 100 100 WK_ADD_API_MAPPING(WKDictionaryRef, ImmutableDictionary) 101 101 WK_ADD_API_MAPPING(WKDoubleRef, API::Double) -
trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchive.cpp
r159234 r160653 28 28 29 29 #include "APIArray.h" 30 #include "APIData.h" 30 31 #include "InjectedBundleRangeHandle.h" 31 32 #include "WKBundleAPICast.h" … … 33 34 #include "WebArchive.h" 34 35 #include "WebArchiveResource.h" 35 #include "WebData.h"36 36 37 37 using namespace WebKit; … … 80 80 WKDataRef WKWebArchiveCopyData(WKWebArchiveRef webArchiveRef) 81 81 { 82 RefPtr<WebData> data = toImpl(webArchiveRef)->data(); 83 return toAPI(data.release().leakRef()); 82 return toAPI(toImpl(webArchiveRef)->data().leakRef()); 84 83 } -
trunk/Source/WebKit2/Shared/API/c/mac/WKWebArchiveResource.cpp
r141473 r160653 27 27 #include "WKWebArchiveResource.h" 28 28 29 #include "APIData.h" 29 30 #include "WKSharedAPICast.h" 30 31 #include "WebArchiveResource.h" 31 #include "WebData.h"32 32 33 33 using namespace WebKit; … … 46 46 WKDataRef WKWebArchiveResourceCopyData(WKWebArchiveResourceRef webArchiveResourceRef) 47 47 { 48 RefPtr<WebData> data = toImpl(webArchiveResourceRef)->data(); 49 return toAPI(data.release().leakRef()); 48 return toAPI(toImpl(webArchiveResourceRef)->data().leakRef()); 50 49 } 51 50 -
trunk/Source/WebKit2/Shared/APIData.h
r160649 r160653 24 24 */ 25 25 26 #ifndef WebData_h27 #define WebData_h26 #ifndef APIData_h 27 #define APIData_h 28 28 29 29 #include "APIObject.h" … … 32 32 #include <wtf/Vector.h> 33 33 34 namespace WebKit{34 namespace API { 35 35 36 // WebData - A data buffer type suitable for vending to an API. 37 38 class WebData : public API::ObjectImpl<API::Object::Type::Data> { 36 class Data : public ObjectImpl<API::Object::Type::Data> { 39 37 public: 40 38 typedef void (*FreeDataFunction)(unsigned char*, const void* context); 41 39 42 static PassRefPtr< WebData> createWithoutCopying(const unsigned char* bytes, size_t size, FreeDataFunction freeDataFunction, const void* context)40 static PassRefPtr<Data> createWithoutCopying(const unsigned char* bytes, size_t size, FreeDataFunction freeDataFunction, const void* context) 43 41 { 44 return adoptRef(new WebData(bytes, size, freeDataFunction, context));42 return adoptRef(new Data(bytes, size, freeDataFunction, context)); 45 43 } 46 44 47 static PassRefPtr< WebData> create(const unsigned char* bytes, size_t size)45 static PassRefPtr<Data> create(const unsigned char* bytes, size_t size) 48 46 { 49 47 unsigned char *copiedBytes = 0; … … 57 55 } 58 56 59 static PassRefPtr< WebData> create(const Vector<unsigned char>& buffer)57 static PassRefPtr<Data> create(const Vector<unsigned char>& buffer) 60 58 { 61 59 return create(buffer.data(), buffer.size()); 62 60 } 63 61 64 ~ WebData()62 ~Data() 65 63 { 66 64 m_freeDataFunction(const_cast<unsigned char*>(m_bytes), m_context); … … 70 68 size_t size() const { return m_size; } 71 69 72 CoreIPC::DataReference dataReference() const { return CoreIPC::DataReference(m_bytes, m_size); }70 IPC::DataReference dataReference() const { return IPC::DataReference(m_bytes, m_size); } 73 71 74 72 private: 75 WebData(const unsigned char* bytes, size_t size, FreeDataFunction freeDataFunction, const void* context)73 Data(const unsigned char* bytes, size_t size, FreeDataFunction freeDataFunction, const void* context) 76 74 : m_bytes(bytes) 77 75 , m_size(size) … … 94 92 }; 95 93 96 } // namespace WebKit94 } // namespace API 97 95 98 #endif // WebData_h96 #endif // APIData_h -
trunk/Source/WebKit2/Shared/Cocoa/WKNSData.h
r160278 r160653 28 28 #if WK_API_ENABLED 29 29 30 #import "APIData.h" 30 31 #import "WKObject.h" 31 #import "WebData.h"32 32 33 namespace WebKit { 34 35 inline NSData *wrapper(WebData& data) 33 inline NSData *wrapper(API::Data& data) 36 34 { 37 35 ASSERT([data.wrapper() isKindOfClass:[NSData self]]); 38 36 return (NSData *)data.wrapper(); 39 }40 41 37 } 42 38 -
trunk/Source/WebKit2/Shared/Cocoa/WKNSData.mm
r160278 r160653 29 29 #if WK_API_ENABLED 30 30 31 using namespace WebKit;32 33 31 @implementation WKNSData { 34 API::ObjectStorage< WebData> _data;32 API::ObjectStorage<API::Data> _data; 35 33 } 36 34 37 35 - (void)dealloc 38 36 { 39 _data->~ WebData();37 _data->~Data(); 40 38 41 39 [super dealloc]; -
trunk/Source/WebKit2/Shared/UserMessageCoders.h
r160608 r160653 28 28 29 29 #include "APIArray.h" 30 #include "APIData.h" 30 31 #include "APIGeometry.h" 31 32 #include "APINumber.h" … … 38 39 #include "WebCertificateInfo.h" 39 40 #include "WebCoreArgumentCoders.h" 40 #include "WebData.h"41 41 #include "WebError.h" 42 42 #include "WebImage.h" … … 58 58 // - UserContentURLPattern -> UserContentURLPattern 59 59 // - WebCertificateInfo -> WebCertificateInfo 60 // - WebData -> WebData60 // - API::Data -> API::Data 61 61 // - API::Double -> API::Double 62 62 // - WebImage -> WebImage … … 210 210 } 211 211 case API::Object::Type::Data: { 212 WebData* data = static_cast<WebData*>(m_root);212 API::Data* data = static_cast<API::Data*>(m_root); 213 213 encoder << data->dataReference(); 214 214 return true; … … 501 501 if (!decoder.decode(dataReference)) 502 502 return false; 503 coder.m_root = WebData::create(dataReference.data(), dataReference.size());503 coder.m_root = API::Data::create(dataReference.data(), dataReference.size()); 504 504 break; 505 505 } -
trunk/Source/WebKit2/Shared/WebArchive.cpp
r159234 r160653 30 30 31 31 #include "APIArray.h" 32 #include "APIData.h" 32 33 #include "WebArchiveResource.h" 33 #include "WebData.h"34 34 #include <WebCore/LegacyWebArchive.h> 35 35 #include <wtf/RetainPtr.h> … … 44 44 } 45 45 46 PassRefPtr<WebArchive> WebArchive::create( WebData* data)46 PassRefPtr<WebArchive> WebArchive::create(API::Data* data) 47 47 { 48 48 return adoptRef(new WebArchive(data)); … … 83 83 } 84 84 85 WebArchive::WebArchive( WebData* data)85 WebArchive::WebArchive(API::Data* data) 86 86 { 87 87 RefPtr<SharedBuffer> buffer = SharedBuffer::create(data->bytes(), data->size()); … … 141 141 } 142 142 143 PassRefPtr< WebData> WebArchive::data()143 PassRefPtr<API::Data> WebArchive::data() 144 144 { 145 145 RetainPtr<CFDataRef> rawDataRepresentation = m_legacyWebArchive->rawDataRepresentation(); … … 148 148 CFRetain(rawDataRepresentation.get()); 149 149 150 return WebData::createWithoutCopying(CFDataGetBytePtr(rawDataRepresentation.get()), CFDataGetLength(rawDataRepresentation.get()), releaseCFData, rawDataRepresentation.get());150 return API::Data::createWithoutCopying(CFDataGetBytePtr(rawDataRepresentation.get()), CFDataGetLength(rawDataRepresentation.get()), releaseCFData, rawDataRepresentation.get()); 151 151 } 152 152 -
trunk/Source/WebKit2/Shared/WebArchive.h
r160384 r160653 35 35 namespace API { 36 36 class Array; 37 class Data; 37 38 } 38 39 … … 45 46 46 47 class WebArchiveResource; 47 class WebData;48 48 49 49 class WebArchive : public API::ObjectImpl<API::Object::Type::WebArchive> { … … 52 52 53 53 static PassRefPtr<WebArchive> create(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives); 54 static PassRefPtr<WebArchive> create( WebData*);54 static PassRefPtr<WebArchive> create(API::Data*); 55 55 static PassRefPtr<WebArchive> create(PassRefPtr<WebCore::LegacyWebArchive>); 56 56 static PassRefPtr<WebArchive> create(WebCore::Range*); … … 60 60 API::Array* subframeArchives(); 61 61 62 PassRefPtr< WebData> data();62 PassRefPtr<API::Data> data(); 63 63 64 64 WebCore::LegacyWebArchive* coreLegacyWebArchive(); … … 66 66 private: 67 67 WebArchive(WebArchiveResource* mainResource, PassRefPtr<API::Array> subresources, PassRefPtr<API::Array> subframeArchives); 68 WebArchive( WebData*);68 WebArchive(API::Data*); 69 69 WebArchive(PassRefPtr<WebCore::LegacyWebArchive>); 70 70 -
trunk/Source/WebKit2/Shared/WebArchiveResource.cpp
r156550 r160653 29 29 #if PLATFORM(MAC) 30 30 31 #include " WebData.h"31 #include "APIData.h" 32 32 #include <WebCore/ArchiveResource.h> 33 33 #include <WebCore/URL.h> … … 38 38 namespace WebKit { 39 39 40 PassRefPtr<WebArchiveResource> WebArchiveResource::create( WebData* data, const String& URL, const String& MIMEType, const String& textEncoding)40 PassRefPtr<WebArchiveResource> WebArchiveResource::create(API::Data* data, const String& URL, const String& MIMEType, const String& textEncoding) 41 41 { 42 42 return adoptRef(new WebArchiveResource(data, URL, MIMEType, textEncoding)); … … 48 48 } 49 49 50 WebArchiveResource::WebArchiveResource( WebData* data, const String& URL, const String& MIMEType, const String& textEncoding)50 WebArchiveResource::WebArchiveResource(API::Data* data, const String& URL, const String& MIMEType, const String& textEncoding) 51 51 : m_archiveResource(ArchiveResource::create(SharedBuffer::create(data->bytes(), data->size()), WebCore::URL(WebCore::URL(), URL), MIMEType, textEncoding, String())) 52 52 { … … 68 68 } 69 69 70 PassRefPtr< WebData> WebArchiveResource::data()70 PassRefPtr<API::Data> WebArchiveResource::data() 71 71 { 72 72 RetainPtr<CFDataRef> cfData = m_archiveResource->data()->createCFData(); … … 75 75 CFRetain(cfData.get()); 76 76 77 return WebData::createWithoutCopying(CFDataGetBytePtr(cfData.get()), CFDataGetLength(cfData.get()), releaseCFData, cfData.get());77 return API::Data::createWithoutCopying(CFDataGetBytePtr(cfData.get()), CFDataGetLength(cfData.get()), releaseCFData, cfData.get()); 78 78 } 79 79 -
trunk/Source/WebKit2/Shared/WebArchiveResource.h
r160608 r160653 34 34 #include <wtf/RefPtr.h> 35 35 36 namespace API { 37 class Data; 38 } 39 36 40 namespace WebCore { 37 41 class ArchiveResource; … … 40 44 namespace WebKit { 41 45 42 class WebData;43 46 class WebURL; 44 47 … … 47 50 virtual ~WebArchiveResource(); 48 51 49 static PassRefPtr<WebArchiveResource> create( WebData*, const String& URL, const String& MIMEType, const String& textEncoding);52 static PassRefPtr<WebArchiveResource> create(API::Data*, const String& URL, const String& MIMEType, const String& textEncoding); 50 53 static PassRefPtr<WebArchiveResource> create(PassRefPtr<WebCore::ArchiveResource>); 51 54 52 PassRefPtr< WebData> data();55 PassRefPtr<API::Data> data(); 53 56 String URL(); 54 57 String MIMEType(); … … 58 61 59 62 private: 60 WebArchiveResource( WebData*, const String& URL, const String& MIMEType, const String& textEncoding);63 WebArchiveResource(API::Data*, const String& URL, const String& MIMEType, const String& textEncoding); 61 64 WebArchiveResource(PassRefPtr<WebCore::ArchiveResource>); 62 65 -
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
r160608 r160653 29 29 30 30 #include "APIArray.h" 31 #include "APIData.h" 31 32 #include "PrintInfo.h" 32 33 #include "WKAPICast.h" 33 34 #include "WKPluginInformation.h" 34 35 #include "WebBackForwardList.h" 35 #include "WebData.h"36 36 #include "WebPageProxy.h" 37 37 #include "WebProcessProxy.h" -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm
r160626 r160653 29 29 #if WK_API_ENABLED 30 30 31 #import " WeakObjCPtr.h"31 #import "APIData.h" 32 32 #import "ObjCObjectGraph.h" 33 33 #import "WKBackForwardListInternal.h" 34 34 #import "WKBackForwardListItemInternal.h" 35 #import "WKBrowsingContextGroupInternal.h" 36 #import "WKBrowsingContextHandleInternal.h" 37 #import "WKBrowsingContextLoadDelegatePrivate.h" 38 #import "WKBrowsingContextPolicyDelegate.h" 35 39 #import "WKErrorRecoveryAttempting.h" 36 40 #import "WKFrame.h" … … 41 45 #import "WKNSURLExtras.h" 42 46 #import "WKNSURLProtectionSpace.h" 47 #import "WKProcessGroupInternal.h" 43 48 #import "WKRetainPtr.h" 44 49 #import "WKURLRequestNS.h" 45 50 #import "WKURLResponseNS.h" 51 #import "WeakObjCPtr.h" 46 52 #import "WebCertificateInfo.h" 47 53 #import "WebContext.h" 48 #import "WebData.h"49 54 #import "WebPageProxy.h" 50 51 #import "WKBrowsingContextGroupInternal.h"52 #import "WKBrowsingContextHandleInternal.h"53 #import "WKBrowsingContextLoadDelegatePrivate.h"54 #import "WKBrowsingContextPolicyDelegate.h"55 #import "WKProcessGroupInternal.h"56 55 57 56 using namespace WebCore; … … 243 242 - (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)encodingName baseURL:(NSURL *)baseURL userData:(id)userData 244 243 { 245 RefPtr< WebData> wkData;244 RefPtr<API::Data> apiData; 246 245 if (data) { 246 // FIXME: This should copy the data. 247 247 [data retain]; 248 wkData = WebData::createWithoutCopying((const unsigned char*)[data bytes], [data length], releaseNSData, data);248 apiData = API::Data::createWithoutCopying((const unsigned char*)[data bytes], [data length], releaseNSData, data); 249 249 } 250 250 … … 253 253 wkUserData = ObjCObjectGraph::create(userData); 254 254 255 _page->loadData( wkData.get(), MIMEType, encodingName, [baseURL _web_originalDataAsWTFString], wkUserData.get());255 _page->loadData(apiData.get(), MIMEType, encodingName, [baseURL _web_originalDataAsWTFString], wkUserData.get()); 256 256 } 257 257 -
trunk/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm
r159001 r160653 27 27 #import "WKPrintingView.h" 28 28 29 #import "APIData.h" 29 30 #import "Logging.h" 30 31 #import "PDFKitImports.h" 31 32 #import "PrintInfo.h" 32 33 #import "ShareableBitmap.h" 33 #import "WebData.h"34 34 #import "WebPageProxy.h" 35 35 #import <PDFKit/PDFKit.h> … … 243 243 OwnPtr<IPCCallbackContext> context = adoptPtr(static_cast<IPCCallbackContext*>(untypedContext)); 244 244 WKPrintingView *view = context->view.get(); 245 WebData* data = toImpl(dataRef);245 API::Data* data = toImpl(dataRef); 246 246 247 247 if (context->callbackID == view->_expectedPrintCallback) { -
trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.cpp
r159903 r160653 27 27 #include "DownloadProxy.h" 28 28 29 #include "APIData.h" 29 30 #include "AuthenticationChallengeProxy.h" 30 31 #include "DataReference.h" 31 32 #include "DownloadProxyMap.h" 32 33 #include "WebContext.h" 33 #include "WebData.h"34 34 #include "WebProcessMessages.h" 35 35 #include <wtf/text/CString.h> … … 176 176 } 177 177 178 static PassRefPtr< WebData> createWebData(const CoreIPC::DataReference& data)178 static PassRefPtr<API::Data> createData(const CoreIPC::DataReference& data) 179 179 { 180 180 if (data.isEmpty()) 181 181 return 0; 182 182 183 return WebData::create(data.data(), data.size());183 return API::Data::create(data.data(), data.size()); 184 184 } 185 185 … … 189 189 return; 190 190 191 m_resumeData = create WebData(resumeData);191 m_resumeData = createData(resumeData); 192 192 193 193 m_webContext->downloadClient().didFail(m_webContext.get(), this, error); … … 199 199 void DownloadProxy::didCancel(const CoreIPC::DataReference& resumeData) 200 200 { 201 m_resumeData = create WebData(resumeData);201 m_resumeData = createData(resumeData); 202 202 203 203 m_webContext->downloadClient().didCancel(m_webContext.get(), this); -
trunk/Source/WebKit2/UIProcess/Downloads/DownloadProxy.h
r160384 r160653 34 34 #include <wtf/PassRefPtr.h> 35 35 36 namespace API { 37 class Data; 38 } 39 36 40 namespace WebCore { 37 41 class AuthenticationChallenge; … … 44 48 class DownloadProxyMap; 45 49 class WebContext; 46 class WebData;47 50 class WebPageProxy; 48 51 … … 54 57 uint64_t downloadID() const { return m_downloadID; } 55 58 const WebCore::ResourceRequest& request() const { return m_request; } 56 WebData* resumeData() const { return m_resumeData.get(); }59 API::Data* resumeData() const { return m_resumeData.get(); } 57 60 58 61 void cancel(); … … 87 90 uint64_t m_downloadID; 88 91 89 RefPtr< WebData> m_resumeData;92 RefPtr<API::Data> m_resumeData; 90 93 WebCore::ResourceRequest m_request; 91 94 }; -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r160566 r160653 59 59 #include "WebContextUserMessageCoders.h" 60 60 #include "WebCoreArgumentCoders.h" 61 #include "WebData.h"62 61 #include "WebEditCommandProxy.h" 63 62 #include "WebEvent.h" … … 660 659 } 661 660 662 void WebPageProxy::loadData( WebData* data, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData)661 void WebPageProxy::loadData(API::Data* data, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData) 663 662 { 664 663 if (!isValid()) … … 706 705 } 707 706 708 void WebPageProxy::loadWebArchiveData( const WebData* webArchiveData, API::Object* userData)707 void WebPageProxy::loadWebArchiveData(API::Data* webArchiveData, API::Object* userData) 709 708 { 710 709 if (!isValid()) … … 3606 3605 } 3607 3606 3608 callback->performCallbackWithReturnValue( WebData::create(dataReference.data(), dataReference.size()).get());3607 callback->performCallbackWithReturnValue(API::Data::create(dataReference.data(), dataReference.size()).get()); 3609 3608 } 3610 3609 … … 4259 4258 } 4260 4259 4261 void WebPageProxy::saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData* data)4260 void WebPageProxy::saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data* data) 4262 4261 { 4263 4262 m_uiClient.saveDataToFileInDownloadsFolder(this, suggestedFilename, mimeType, originatingURLString, data); 4264 4263 } 4265 4264 4266 void WebPageProxy::savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const CoreIPC::DataReference& data )4265 void WebPageProxy::savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const CoreIPC::DataReference& dataReference) 4267 4266 { 4268 4267 if (!suggestedFilename.endsWith(".pdf", false)) 4269 4268 return; 4270 4269 4271 RefPtr< WebData> webData = WebData::create(data.data(), data.size());4272 4273 saveDataToFileInDownloadsFolder(suggestedFilename, "application/pdf", originatingURLString, webData.get());4270 RefPtr<API::Data> data = API::Data::create(dataReference.data(), dataReference.size()); 4271 4272 saveDataToFileInDownloadsFolder(suggestedFilename, "application/pdf", originatingURLString, data.get()); 4274 4273 } 4275 4274 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r160566 r160653 138 138 class WebColorPickerResultListenerProxy; 139 139 class WebContextMenuProxy; 140 class WebData;141 140 class WebEditCommandProxy; 142 141 class WebFullScreenManagerProxy; … … 371 370 void loadURLRequest(WebURLRequest*, API::Object* userData = nullptr); 372 371 void loadFile(const String& fileURL, const String& resourceDirectoryURL, API::Object* userData = nullptr); 373 void loadData( WebData*, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr);372 void loadData(API::Data*, const String& MIMEType, const String& encoding, const String& baseURL, API::Object* userData = nullptr); 374 373 void loadHTMLString(const String& htmlString, const String& baseURL, API::Object* userData = nullptr); 375 374 void loadAlternateHTMLString(const String& htmlString, const String& baseURL, const String& unreachableURL, API::Object* userData = nullptr); 376 375 void loadPlainTextString(const String&, API::Object* userData = nullptr); 377 void loadWebArchiveData( const WebData*, API::Object* userData = nullptr);376 void loadWebArchiveData(API::Data*, API::Object* userData = nullptr); 378 377 379 378 void stopLoading(); … … 536 535 537 536 typedef bool (*WebPageProxySessionStateFilterCallback)(WKPageRef, WKStringRef type, WKTypeRef object, void* context); 538 PassRefPtr< WebData> sessionStateData(WebPageProxySessionStateFilterCallback, void* context) const;539 void restoreFromSessionStateData( WebData*);537 PassRefPtr<API::Data> sessionStateData(WebPageProxySessionStateFilterCallback, void* context) const; 538 void restoreFromSessionStateData(API::Data*); 540 539 541 540 bool supportsTextZoom() const; … … 779 778 #endif 780 779 781 void saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData*);780 void saveDataToFileInDownloadsFolder(const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data*); 782 781 void savePDFToFileInDownloadsFolder(const String& suggestedFilename, const String& originatingURLString, const CoreIPC::DataReference&); 783 782 #if PLATFORM(MAC) -
trunk/Source/WebKit2/UIProcess/WebUIClient.cpp
r160608 r160653 421 421 } 422 422 423 void WebUIClient::saveDataToFileInDownloadsFolder(WebPageProxy* page, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData* data)423 void WebUIClient::saveDataToFileInDownloadsFolder(WebPageProxy* page, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data* data) 424 424 { 425 425 if (!m_client.saveDataToFileInDownloadsFolder) -
trunk/Source/WebKit2/UIProcess/WebUIClient.h
r159994 r160653 36 36 37 37 namespace API { 38 class Data; 39 38 40 template<> struct ClientTraits<WKPageUIClientBase> { 39 41 typedef std::tuple<WKPageUIClientV0, WKPageUIClientV1, WKPageUIClientV2> Versions; … … 56 58 class NotificationPermissionRequest; 57 59 class WebColorPickerResultListenerProxy; 58 class WebData;59 60 class WebFrameProxy; 60 61 class WebPageProxy; … … 122 123 void runModal(WebPageProxy*); 123 124 124 void saveDataToFileInDownloadsFolder(WebPageProxy*, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, WebData*);125 void saveDataToFileInDownloadsFolder(WebPageProxy*, const String& suggestedFilename, const String& mimeType, const String& originatingURLString, API::Data*); 125 126 126 127 bool shouldInterruptJavaScript(WebPageProxy*); -
trunk/Source/WebKit2/UIProcess/cf/WebPageProxyCF.cpp
r160405 r160653 27 27 #include "WebPageProxy.h" 28 28 29 #include "APIData.h" 29 30 #include "DataReference.h" 30 31 #include "Logging.h" 31 32 #include "SessionState.h" 32 33 #include "WebBackForwardList.h" 33 #include "WebData.h"34 34 #include "WebPageMessages.h" 35 35 #include "WebProcessProxy.h" … … 47 47 static const UInt32 CurrentSessionStateDataVersion = 2; 48 48 49 PassRefPtr< WebData> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback filter, void* context) const49 PassRefPtr<API::Data> WebPageProxy::sessionStateData(WebPageProxySessionStateFilterCallback filter, void* context) const 50 50 { 51 51 const void* keys[2]; … … 102 102 CFDataGetBytes(stateCFData.get(), CFRangeMake(0, length), stateVector.data() + sizeof(UInt32)); 103 103 104 return WebData::create(stateVector);105 } 106 107 void WebPageProxy::restoreFromSessionStateData( WebData* webData)108 { 109 if (! webData || webData->size() < sizeof(UInt32))110 return; 111 112 const unsigned char* buffer = webData->bytes();104 return API::Data::create(stateVector); 105 } 106 107 void WebPageProxy::restoreFromSessionStateData(API::Data* apiData) 108 { 109 if (!apiData || apiData->size() < sizeof(UInt32)) 110 return; 111 112 const unsigned char* buffer = apiData->bytes(); 113 113 UInt32 versionHeader = (buffer[0] << 24) + (buffer[1] << 16) + (buffer[2] << 8) + buffer[3]; 114 114 … … 118 118 } 119 119 120 RetainPtr<CFDataRef> data = adoptCF(CFDataCreate(0, webData->bytes() + sizeof(UInt32), webData->size() - sizeof(UInt32)));120 RetainPtr<CFDataRef> data = adoptCF(CFDataCreate(0, apiData->bytes() + sizeof(UInt32), apiData->size() - sizeof(UInt32))); 121 121 122 122 CFErrorRef propertyListError = 0; -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r160616 r160653 584 584 5153569C1291B1D2000749DC /* WebPageContextMenuClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5153569A1291B1D2000749DC /* WebPageContextMenuClient.cpp */; }; 585 585 5153569D1291B1D2000749DC /* WebPageContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 5153569B1291B1D2000749DC /* WebPageContextMenuClient.h */; }; 586 51578B831209ECEF00A37C4A /* WebData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51578B821209ECEF00A37C4A /* WebData.h */; };586 51578B831209ECEF00A37C4A /* APIData.h in Headers */ = {isa = PBXBuildFile; fileRef = 51578B821209ECEF00A37C4A /* APIData.h */; }; 587 587 515E7727183DD6F60007203F /* AsyncRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515E7725183DD6F60007203F /* AsyncRequest.cpp */; }; 588 588 515E7728183DD6F60007203F /* AsyncRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 515E7726183DD6F60007203F /* AsyncRequest.h */; }; … … 2171 2171 5153569A1291B1D2000749DC /* WebPageContextMenuClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPageContextMenuClient.cpp; sourceTree = "<group>"; }; 2172 2172 5153569B1291B1D2000749DC /* WebPageContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPageContextMenuClient.h; sourceTree = "<group>"; }; 2173 51578B821209ECEF00A37C4A /* WebData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebData.h; sourceTree = "<group>"; };2173 51578B821209ECEF00A37C4A /* APIData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIData.h; sourceTree = "<group>"; }; 2174 2174 515E7725183DD6F60007203F /* AsyncRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AsyncRequest.cpp; sourceTree = "<group>"; }; 2175 2175 515E7726183DD6F60007203F /* AsyncRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AsyncRequest.h; sourceTree = "<group>"; }; … … 3469 3469 BC64696E11DBE603006455B0 /* APIArray.h */, 3470 3470 1A3DD205125E5A2F004515E6 /* APIClient.h */, 3471 51578B821209ECEF00A37C4A /* APIData.h */, 3471 3472 1AC1336F18566C7C00F3EC05 /* APIFrameHandle.cpp */, 3472 3473 1AC1337018566C7C00F3EC05 /* APIFrameHandle.h */, … … 3564 3565 51BA24451858F41500EA2811 /* WebCrossThreadCopier.cpp */, 3565 3566 516311861858446600534647 /* WebCrossThreadCopier.h */, 3566 51578B821209ECEF00A37C4A /* WebData.h */,3567 3567 BC575612126E0138006F0F12 /* WebError.cpp */, 3568 3568 516A4A5B120A2CCD00C05B7F /* WebError.h */, … … 6000 6000 1A9E329718219BEA00F5D04C /* WKRemoteObjectRegistryPrivate.h in Headers */, 6001 6001 512F589B12A8838800629530 /* WebCredential.h in Headers */, 6002 51578B831209ECEF00A37C4A /* WebData.h in Headers */,6002 51578B831209ECEF00A37C4A /* APIData.h in Headers */, 6003 6003 F6A25FDD12ADC6CC00DC40CC /* WebDatabaseManager.h in Headers */, 6004 6004 F62A76B712B1B25F0005F1B6 /* WebDatabaseManagerMessages.h in Headers */, -
trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundle.cpp
r160104 r160653 28 28 29 29 #include "APIArray.h" 30 #include "APIData.h" 30 31 #include "InjectedBundle.h" 31 32 #include "WKAPICast.h" 32 33 #include "WKBundleAPICast.h" 33 34 #include "WKBundlePrivate.h" 34 #include "WebData.h"35 35 36 36 using namespace WebKit; … … 267 267 WKDataRef WKBundleCreateWKDataFromUInt8Array(WKBundleRef bundle, JSContextRef context, JSValueRef data) 268 268 { 269 RefPtr<WebData> webData = toImpl(bundle)->createWebDataFromUint8Array(context, data); 270 return toAPI(webData.release().leakRef()); 269 return toAPI(toImpl(bundle)->createWebDataFromUint8Array(context, data).leakRef()); 271 270 } 272 271 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.cpp
r160608 r160653 40 40 #include "WebCookieManager.h" 41 41 #include "WebCoreArgumentCoders.h" 42 #include "WebData.h"43 42 #include "WebDatabaseManager.h" 44 43 #include "WebFrame.h" … … 627 626 } 628 627 629 PassRefPtr<WebData> InjectedBundle::createWebDataFromUint8Array(JSContextRef context, JSValueRef data) 628 // FIXME Get rid of this function and move it into WKBundle.cpp. 629 PassRefPtr<API::Data> InjectedBundle::createWebDataFromUint8Array(JSContextRef context, JSValueRef data) 630 630 { 631 631 JSC::ExecState* execState = toJS(context); 632 632 RefPtr<Uint8Array> arrayData = WebCore::toUint8Array(toJS(execState, data)); 633 return WebData::create(static_cast<unsigned char*>(arrayData->baseAddress()), arrayData->byteLength());633 return API::Data::create(static_cast<unsigned char*>(arrayData->baseAddress()), arrayData->byteLength()); 634 634 } 635 635 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundle.h
r160384 r160653 50 50 namespace API { 51 51 class Array; 52 class Data; 52 53 } 53 54 54 namespace CoreIPC {55 56 55 namespace IPC { 56 class ArgumentDecoder; 57 class Connection; 57 58 } 58 59 … … 70 71 class WebCertificateInfo; 71 72 class WebConnection; 72 class WebData;73 73 class WebFrame; 74 74 class WebPage; … … 123 123 void removeAllWebNotificationPermissions(WebPage*); 124 124 uint64_t webNotificationID(JSContextRef, JSValueRef); 125 PassRefPtr< WebData> createWebDataFromUint8Array(JSContextRef, JSValueRef);125 PassRefPtr<API::Data> createWebDataFromUint8Array(JSContextRef, JSValueRef); 126 126 127 127 // UserContent API -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
r160608 r160653 28 28 29 29 #include "APIArray.h" 30 #include "APIData.h" 30 31 #include "InjectedBundleNodeHandle.h" 31 32 #include "InjectedBundleRangeHandle.h" … … 33 34 #include "WKBundleAPICast.h" 34 35 #include "WKString.h" 35 #include "WebData.h"36 36 #include <wtf/text/WTFString.h> 37 37 … … 158 158 pasteboardTypes.append(type->string()); 159 159 160 for (const auto& item : dataArray->elementsOfType< WebData>()) {160 for (const auto& item : dataArray->elementsOfType<API::Data>()) { 161 161 RefPtr<SharedBuffer> buffer = SharedBuffer::create(item->bytes(), item->size()); 162 162 pasteboardData.append(buffer); -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp
r159988 r160653 28 28 29 29 #include "APIArray.h" 30 #include "APIData.h" 30 31 #include "InjectedBundleDOMWindowExtension.h" 31 32 #include "InjectedBundleScriptWorld.h" 32 33 #include "WKAPICast.h" 33 34 #include "WKBundleAPICast.h" 34 #include "WebData.h"35 35 #include "WebError.h" 36 36 #include "WebURLRequest.h" … … 56 56 } 57 57 58 void InjectedBundlePageLoaderClient::willLoadDataRequest(WebPage* page, const ResourceRequest& request, const SharedBuffer* data, const String& MIMEType, const String& encodingName, const URL& unreachableURL, API::Object* userData)58 void InjectedBundlePageLoaderClient::willLoadDataRequest(WebPage* page, const ResourceRequest& request, SharedBuffer* sharedBuffer, const String& MIMEType, const String& encodingName, const URL& unreachableURL, API::Object* userData) 59 59 { 60 60 if (!m_client.willLoadDataRequest) 61 61 return; 62 62 63 RefPtr< WebData> webData;63 RefPtr<API::Data> data; 64 64 if (data) { 65 const_cast<SharedBuffer*>(data)->ref();66 webData = WebData::createWithoutCopying((const unsigned char*)data->data(), data->size(), releaseSharedBuffer, data);65 sharedBuffer->ref(); 66 data = API::Data::createWithoutCopying((const unsigned char*)sharedBuffer->data(), sharedBuffer->size(), releaseSharedBuffer, sharedBuffer); 67 67 } 68 68 69 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);69 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); 70 70 } 71 71 -
trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h
r159994 r160653 62 62 public: 63 63 void willLoadURLRequest(WebPage*, const WebCore::ResourceRequest&, API::Object*); 64 void willLoadDataRequest(WebPage*, const WebCore::ResourceRequest&, constWebCore::SharedBuffer*, const String&, const String&, const WebCore::URL&, API::Object*);64 void willLoadDataRequest(WebPage*, const WebCore::ResourceRequest&, WebCore::SharedBuffer*, const String&, const String&, const WebCore::URL&, API::Object*); 65 65 66 66 bool shouldGoToBackForwardListItem(WebPage*, InjectedBundleBackForwardListItem*, RefPtr<API::Object>& userData); -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r160572 r160653 912 912 // Let the InjectedBundle know we are about to start the load, passing the user data from the UIProcess 913 913 // to all the client to set up any needed state. 914 m_loaderClient.willLoadDataRequest(this, request, substituteData.content(), substituteData.mimeType(), substituteData.textEncoding(), substituteData.failingURL(), userData.get());914 m_loaderClient.willLoadDataRequest(this, request, const_cast<SharedBuffer*>(substituteData.content()), substituteData.mimeType(), substituteData.textEncoding(), substituteData.failingURL(), userData.get()); 915 915 916 916 // Initate the load in WebCore.
Note: See TracChangeset
for help on using the changeset viewer.