Diff
Modified: trunk/Source/WebKit2/ChangeLog (182752 => 182753)
--- trunk/Source/WebKit2/ChangeLog 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-13 20:26:02 UTC (rev 182753)
@@ -1,3 +1,67 @@
+2015-04-13 Anders Carlsson <[email protected]>
+
+ Begin cleaning up the shared memory interface
+ https://bugs.webkit.org/show_bug.cgi?id=143677
+
+ Reviewed by Andreas Kling.
+
+ Rename createFromVMBuffer to create and add a protection parameter (which is currently unused).
+ Also, turn SharedMemory::Protection into a proper enum class.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::store):
+ * NetworkProcess/cache/NetworkCacheEntry.cpp:
+ (WebKit::NetworkCache::Entry::initializeBufferFromStorageRecord):
+ * NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+ (WebKit::tryGetShareableHandleFromCFData):
+ * Platform/SharedMemory.h:
+ * Platform/mac/SharedMemoryMac.cpp:
+ (WebKit::SharedMemory::create):
+ (WebKit::machProtection):
+ (WebKit::SharedMemory::createHandle):
+ (WebKit::SharedMemory::createFromVMBuffer): Deleted.
+ * Shared/ContextMenuContextData.cpp:
+ (WebKit::ContextMenuContextData::encode):
+ (WebKit::ContextMenuContextData::decode):
+ * Shared/ShareableBitmap.h:
+ * Shared/ShareableResource.cpp:
+ (WebKit::ShareableResource::create):
+ (WebKit::ShareableResource::createHandle):
+ * Shared/WebCompiledContentExtensionData.cpp:
+ (WebKit::WebCompiledContentExtensionData::encode):
+ (WebKit::WebCompiledContentExtensionData::decode):
+ * Shared/WebHitTestResult.cpp:
+ (WebKit::WebHitTestResult::Data::encode):
+ (WebKit::WebHitTestResult::Data::decode):
+ * UIProcess/API/APIUserContentExtensionStore.cpp:
+ (API::createExtension):
+ * UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
+ (WebKit::WebPasteboardProxy::getPasteboardBufferForType):
+ (WebKit::WebPasteboardProxy::setPasteboardBufferForType):
+ (WebKit::WebPasteboardProxy::readBufferFromPasteboard):
+ * UIProcess/VisitedLinkProvider.cpp:
+ (WebKit::VisitedLinkProvider::sendTable):
+ * UIProcess/mac/WKPrintingView.mm:
+ (pageDidDrawToImage):
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::dataSelectionForPasteboard):
+ (WebKit::WebPageProxy::setPromisedDataForImage):
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::PDFPlugin::writeItemsToPasteboard):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::bufferForType):
+ (WebKit::WebPlatformStrategies::setBufferForType):
+ (WebKit::WebPlatformStrategies::readBufferFromPasteboard):
+ * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+ (WebKit::WebDragClient::declareAndWriteDragImage):
+ * WebProcess/WebPage/VisitedLinkTableController.cpp:
+ (WebKit::VisitedLinkTableController::setVisitedLinkTable):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::takeSnapshot):
+ (WebKit::WebPage::drawRectToImage):
+ * WebProcess/WebPage/mac/WebPageMac.mm:
+ (WebKit::WebPage::getDataSelectionForPasteboard):
+
2015-04-10 Jon Honeycutt <[email protected]>
Cannot click "Next" button on Google two-factor auth setup page
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (182752 => 182753)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -374,7 +374,7 @@
MappedBody mappedBody;
#if ENABLE(SHAREABLE_RESOURCE)
if (bodyData.isMap()) {
- RefPtr<SharedMemory> sharedMemory = SharedMemory::createFromVMBuffer(const_cast<uint8_t*>(bodyData.data()), bodyData.size());
+ RefPtr<SharedMemory> sharedMemory = SharedMemory::create(const_cast<uint8_t*>(bodyData.data()), bodyData.size(), SharedMemory::Protection::ReadOnly);
mappedBody.shareableResource = sharedMemory ? ShareableResource::create(WTF::move(sharedMemory), 0, bodyData.size()) : nullptr;
if (mappedBody.shareableResource)
mappedBody.shareableResource->createHandle(mappedBody.shareableResourceHandle);
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp (182752 => 182753)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -107,7 +107,7 @@
auto* data = ""
size_t size = m_sourceStorageRecord.body.size();
#if ENABLE(SHAREABLE_RESOURCE)
- RefPtr<SharedMemory> sharedMemory = m_sourceStorageRecord.body.isMap() ? SharedMemory::createFromVMBuffer(const_cast<uint8_t*>(data), size) : nullptr;
+ RefPtr<SharedMemory> sharedMemory = m_sourceStorageRecord.body.isMap() ? SharedMemory::create(const_cast<uint8_t*>(data), size, SharedMemory::Protection::ReadOnly) : nullptr;
RefPtr<ShareableResource> shareableResource = sharedMemory ? ShareableResource::create(sharedMemory.release(), 0, m_sourceStorageRecord.body.size()) : nullptr;
if (shareableResource && shareableResource->createHandle(m_shareableResourceHandle))
Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (182752 => 182753)
--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2015-04-13 20:26:02 UTC (rev 182753)
@@ -40,7 +40,7 @@
static void tryGetShareableHandleFromCFData(ShareableResource::Handle& handle, CFDataRef data)
{
- RefPtr<SharedMemory> sharedMemory = SharedMemory::createFromVMBuffer((void*)CFDataGetBytePtr(data), CFDataGetLength(data));
+ RefPtr<SharedMemory> sharedMemory = SharedMemory::create((void*)CFDataGetBytePtr(data), CFDataGetLength(data), SharedMemory::Protection::ReadOnly);
if (!sharedMemory) {
LOG_ERROR("Failed to create VM shared memory for cached resource.");
return;
Modified: trunk/Source/WebKit2/Platform/SharedMemory.h (182752 => 182753)
--- trunk/Source/WebKit2/Platform/SharedMemory.h 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/Platform/SharedMemory.h 2015-04-13 20:26:02 UTC (rev 182753)
@@ -27,8 +27,8 @@
#define SharedMemory_h
#include <wtf/Noncopyable.h>
-#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
+#include <wtf/RefPtr.h>
#if PLATFORM(GTK) || PLATFORM(EFL)
#include "Attachment.h"
@@ -36,15 +36,15 @@
#endif
namespace IPC {
- class ArgumentDecoder;
- class ArgumentEncoder;
+class ArgumentDecoder;
+class ArgumentEncoder;
}
namespace WebKit {
class SharedMemory : public RefCounted<SharedMemory> {
public:
- enum Protection {
+ enum class Protection {
ReadOnly,
ReadWrite
};
@@ -76,16 +76,10 @@
size_t m_size;
};
- // Create a shared memory object with the given size. Will return 0 on failure.
- static PassRefPtr<SharedMemory> create(size_t);
+ static RefPtr<SharedMemory> create(size_t);
+ static RefPtr<SharedMemory> create(const Handle&, Protection);
+ static RefPtr<SharedMemory> create(void*, size_t, Protection);
- // Create a shared memory object from the given handle and the requested protection. Will return 0 on failure.
- static PassRefPtr<SharedMemory> create(const Handle&, Protection);
-
- // Create a shared memory object with the given size by vm_copy'ing the given buffer.
- // Will return 0 on failure.
- static PassRefPtr<SharedMemory> createFromVMBuffer(void*, size_t);
-
~SharedMemory();
bool createHandle(Handle&, Protection);
@@ -93,9 +87,6 @@
size_t size() const { return m_size; }
void* data() const { return m_data; }
- // Creates a copy-on-write copy of the first |size| bytes.
- PassRefPtr<SharedMemory> createCopyOnWriteCopy(size_t) const;
-
// Return the system page size in bytes.
static unsigned systemPageSize();
Modified: trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp (182752 => 182753)
--- trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -98,7 +98,7 @@
return static_cast<mach_vm_address_t>(reinterpret_cast<uintptr_t>(pointer));
}
-PassRefPtr<SharedMemory> SharedMemory::create(size_t size)
+RefPtr<SharedMemory> SharedMemory::create(size_t size)
{
ASSERT(size);
@@ -109,7 +109,7 @@
return 0;
}
- RefPtr<SharedMemory> sharedMemory = createFromVMBuffer(toPointer(address), size);
+ RefPtr<SharedMemory> sharedMemory = create(toPointer(address), size, Protection::ReadWrite);
if (!sharedMemory) {
mach_vm_deallocate(mach_task_self(), address, round_page(size));
return 0;
@@ -119,7 +119,7 @@
return sharedMemory.release();
}
-PassRefPtr<SharedMemory> SharedMemory::createFromVMBuffer(void* data, size_t size)
+RefPtr<SharedMemory> SharedMemory::create(void* data, size_t size, Protection)
{
ASSERT(size);
@@ -152,9 +152,9 @@
static inline vm_prot_t machProtection(SharedMemory::Protection protection)
{
switch (protection) {
- case SharedMemory::ReadOnly:
+ case SharedMemory::Protection::ReadOnly:
return VM_PROT_READ;
- case SharedMemory::ReadWrite:
+ case SharedMemory::Protection::ReadWrite:
return VM_PROT_READ | VM_PROT_WRITE;
}
@@ -162,7 +162,7 @@
return VM_PROT_NONE;
}
-PassRefPtr<SharedMemory> SharedMemory::create(const Handle& handle, Protection protection)
+RefPtr<SharedMemory> SharedMemory::create(const Handle& handle, Protection protection)
{
if (handle.isNull())
return 0;
@@ -208,7 +208,7 @@
mach_port_t port;
- if (protection == ReadWrite && m_port) {
+ if (protection == Protection::ReadWrite && m_port) {
// Just re-use the port we have.
port = m_port;
if (mach_port_mod_refs(mach_task_self(), port, MACH_PORT_RIGHT_SEND, 1) != KERN_SUCCESS)
Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp (182752 => 182753)
--- trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -70,7 +70,7 @@
#if ENABLE(SERVICE_CONTROLS)
ShareableBitmap::Handle handle;
if (m_controlledImage)
- m_controlledImage->createHandle(handle, SharedMemory::ReadOnly);
+ m_controlledImage->createHandle(handle, SharedMemory::Protection::ReadOnly);
encoder << handle;
#endif
}
@@ -89,7 +89,7 @@
return false;
if (!handle.isNull())
- contextMenuContextData.m_controlledImage = ShareableBitmap::create(handle, SharedMemory::ReadOnly);
+ contextMenuContextData.m_controlledImage = ShareableBitmap::create(handle, SharedMemory::Protection::ReadOnly);
#endif
return true;
Modified: trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp (182752 => 182753)
--- trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -46,7 +46,7 @@
ShareableBitmap::Handle handle;
if (image)
- image->createHandle(handle, SharedMemory::ReadOnly);
+ image->createHandle(handle, SharedMemory::Protection::ReadOnly);
encoder << handle;
}
@@ -84,7 +84,7 @@
return false;
if (!handle.isNull())
- result.image = ShareableBitmap::create(handle, SharedMemory::ReadOnly);
+ result.image = ShareableBitmap::create(handle, SharedMemory::Protection::ReadOnly);
return true;
}
Modified: trunk/Source/WebKit2/Shared/ShareableBitmap.h (182752 => 182753)
--- trunk/Source/WebKit2/Shared/ShareableBitmap.h 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/Shared/ShareableBitmap.h 2015-04-13 20:26:02 UTC (rev 182753)
@@ -85,10 +85,10 @@
static PassRefPtr<ShareableBitmap> create(const WebCore::IntSize&, Flags, PassRefPtr<SharedMemory>);
// Create a shareable bitmap from a handle.
- static PassRefPtr<ShareableBitmap> create(const Handle&, SharedMemory::Protection = SharedMemory::ReadWrite);
+ static PassRefPtr<ShareableBitmap> create(const Handle&, SharedMemory::Protection = SharedMemory::Protection::ReadWrite);
// Create a handle.
- bool createHandle(Handle&, SharedMemory::Protection = SharedMemory::ReadWrite);
+ bool createHandle(Handle&, SharedMemory::Protection = SharedMemory::Protection::ReadWrite);
~ShareableBitmap();
Modified: trunk/Source/WebKit2/Shared/ShareableResource.cpp (182752 => 182753)
--- trunk/Source/WebKit2/Shared/ShareableResource.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/Shared/ShareableResource.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -104,7 +104,7 @@
PassRefPtr<ShareableResource> ShareableResource::create(const Handle& handle)
{
- RefPtr<SharedMemory> sharedMemory = SharedMemory::create(handle.m_handle, SharedMemory::ReadOnly);
+ RefPtr<SharedMemory> sharedMemory = SharedMemory::create(handle.m_handle, SharedMemory::Protection::ReadOnly);
if (!sharedMemory)
return 0;
@@ -128,7 +128,7 @@
bool ShareableResource::createHandle(Handle& handle)
{
- if (!m_sharedMemory->createHandle(handle.m_handle, SharedMemory::ReadOnly))
+ if (!m_sharedMemory->createHandle(handle.m_handle, SharedMemory::Protection::ReadOnly))
return false;
handle.m_offset = m_offset;
Modified: trunk/Source/WebKit2/Shared/WebCompiledContentExtensionData.cpp (182752 => 182753)
--- trunk/Source/WebKit2/Shared/WebCompiledContentExtensionData.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/Shared/WebCompiledContentExtensionData.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -35,7 +35,7 @@
void WebCompiledContentExtensionData::encode(IPC::ArgumentEncoder& encoder) const
{
SharedMemory::Handle handle;
- data->createHandle(handle, SharedMemory::ReadOnly);
+ data->createHandle(handle, SharedMemory::Protection::ReadOnly);
encoder << handle;
encoder << actionsOffset;
@@ -49,7 +49,7 @@
SharedMemory::Handle handle;
if (!decoder.decode(handle))
return false;
- compiledContentExtensionData.data = "" SharedMemory::ReadOnly);
+ compiledContentExtensionData.data = "" SharedMemory::Protection::ReadOnly);
if (!decoder.decode(compiledContentExtensionData.actionsOffset))
return false;
Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (182752 => 182753)
--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -1170,7 +1170,7 @@
if (buffer) {
RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(buffer->size());
memcpy(sharedMemoryBuffer->data(), buffer->data(), buffer->size());
- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
+ sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
encoder << handle;
}
}
@@ -1186,7 +1186,7 @@
if (!decoder.decode(handle))
return false;
- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
buffer = SharedBuffer::create(static_cast<unsigned char*>(sharedMemoryBuffer->data()), bufferSize);
}
Modified: trunk/Source/WebKit2/Shared/WebHitTestResult.cpp (182752 => 182753)
--- trunk/Source/WebKit2/Shared/WebHitTestResult.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/Shared/WebHitTestResult.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -120,7 +120,7 @@
SharedMemory::Handle imageHandle;
if (imageSharedMemory && imageSharedMemory->data())
- imageSharedMemory->createHandle(imageHandle, SharedMemory::ReadOnly);
+ imageSharedMemory->createHandle(imageHandle, SharedMemory::Protection::ReadOnly);
encoder << imageHandle;
encoder << imageSize;
encoder << imageExtension;
@@ -159,7 +159,7 @@
return false;
if (!imageHandle.isNull())
- hitTestResultData.imageSharedMemory = SharedMemory::create(imageHandle, SharedMemory::ReadOnly);
+ hitTestResultData.imageSharedMemory = SharedMemory::create(imageHandle, SharedMemory::Protection::ReadOnly);
if (!decoder.decode(hitTestResultData.imageSize))
return false;
Modified: trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp (182752 => 182753)
--- trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -233,7 +233,7 @@
static RefPtr<API::UserContentExtension> createExtension(const String& identifier, const ContentExtensionMetaData& metaData, const Data& fileData)
{
- auto sharedMemory = WebKit::SharedMemory::createFromVMBuffer(const_cast<uint8_t*>(fileData.data()), fileData.size());
+ auto sharedMemory = WebKit::SharedMemory::create(const_cast<uint8_t*>(fileData.data()), fileData.size(), WebKit::SharedMemory::Protection::ReadOnly);
auto compiledContentExtensionData = WebKit::WebCompiledContentExtensionData(
WTF::move(sharedMemory),
fileData,
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (182752 => 182753)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2015-04-13 20:26:02 UTC (rev 182753)
@@ -2610,7 +2610,7 @@
return;
}
- RefPtr<WebKit::ShareableBitmap> bitmap = WebKit::ShareableBitmap::create(imageHandle, WebKit::SharedMemory::ReadOnly);
+ RefPtr<WebKit::ShareableBitmap> bitmap = WebKit::ShareableBitmap::create(imageHandle, WebKit::SharedMemory::Protection::ReadOnly);
if (!bitmap) {
copiedCompletionHandler(nullptr);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm (182752 => 182753)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm 2015-04-13 20:26:02 UTC (rev 182753)
@@ -120,7 +120,7 @@
bitmapSize.scale(_scale * _webPageProxy->deviceScaleFactor());
_lastSnapshotScale = _scale;
_webPageProxy->takeSnapshot(snapshotRect, bitmapSize, options, [thumbnailView](const ShareableBitmap::Handle& imageHandle, CallbackBase::Error) {
- RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(imageHandle, SharedMemory::ReadOnly);
+ RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(imageHandle, SharedMemory::Protection::ReadOnly);
RetainPtr<CGImageRef> cgImage = bitmap ? bitmap->makeCGImage() : nullptr;
[thumbnailView _didTakeSnapshot:cgImage.get()];
});
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm (182752 => 182753)
--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm 2015-04-13 20:26:02 UTC (rev 182753)
@@ -60,7 +60,7 @@
if (!sharedMemoryBuffer)
return;
memcpy(sharedMemoryBuffer->data(), buffer->data(), size);
- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
+ sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
}
void WebPasteboardProxy::pasteboardCopy(const String& fromPasteboard, const String& toPasteboard, uint64_t& newChangeCount)
@@ -114,7 +114,7 @@
newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(0, pasteboardType);
return;
}
- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
RefPtr<SharedBuffer> buffer = SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(buffer, pasteboardType);
}
@@ -155,7 +155,7 @@
if (!sharedMemoryBuffer)
return;
memcpy(sharedMemoryBuffer->data(), buffer->data(), size);
- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
+ sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
}
void WebPasteboardProxy::getPasteboardItemsCount(uint64_t& itemsCount)
Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp (182752 => 182753)
--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -248,7 +248,7 @@
ASSERT(process.processPool().processes().contains(&process));
SharedMemory::Handle handle;
- if (!m_table.sharedMemory()->createHandle(handle, SharedMemory::ReadOnly))
+ if (!m_table.sharedMemory()->createHandle(handle, SharedMemory::Protection::ReadOnly))
return;
process.connection()->send(Messages::VisitedLinkTableController::SetVisitedLinkTable(handle), m_identifier);
Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (182752 => 182753)
--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm 2015-04-13 20:26:02 UTC (rev 182753)
@@ -561,7 +561,7 @@
void WebPageProxy::saveImageToLibrary(const SharedMemory::Handle& imageHandle, uint64_t imageSize)
{
- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(imageHandle, SharedMemory::ReadOnly);
+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(imageHandle, SharedMemory::Protection::ReadOnly);
RefPtr<SharedBuffer> buffer = SharedBuffer::create(static_cast<unsigned char*>(sharedMemoryBuffer->data()), imageSize);
m_pageClient.saveImageToLibrary(buffer);
}
Modified: trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm (182752 => 182753)
--- trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm 2015-04-13 20:26:02 UTC (rev 182753)
@@ -222,7 +222,7 @@
ASSERT([view _isPrintingPreview]);
if (!imageHandle.isNull()) {
- RefPtr<ShareableBitmap> image = ShareableBitmap::create(imageHandle, SharedMemory::ReadOnly);
+ RefPtr<ShareableBitmap> image = ShareableBitmap::create(imageHandle, SharedMemory::Protection::ReadOnly);
if (image)
view->_pagePreviews.add(iter->value, image);
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (182752 => 182753)
--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2015-04-13 20:26:02 UTC (rev 182753)
@@ -377,7 +377,7 @@
Messages::WebPage::GetDataSelectionForPasteboard::Reply(handle, size), m_pageID, messageTimeout);
if (handle.isNull())
return 0;
- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
return SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
}
@@ -413,12 +413,12 @@
{
MESSAGE_CHECK_URL(url);
MESSAGE_CHECK_URL(visibleURL);
- RefPtr<SharedMemory> sharedMemoryImage = SharedMemory::create(imageHandle, SharedMemory::ReadOnly);
+ RefPtr<SharedMemory> sharedMemoryImage = SharedMemory::create(imageHandle, SharedMemory::Protection::ReadOnly);
RefPtr<SharedBuffer> imageBuffer = SharedBuffer::create(static_cast<unsigned char*>(sharedMemoryImage->data()), imageSize);
RefPtr<SharedBuffer> archiveBuffer;
if (!archiveHandle.isNull()) {
- RefPtr<SharedMemory> sharedMemoryArchive = SharedMemory::create(archiveHandle, SharedMemory::ReadOnly);;
+ RefPtr<SharedMemory> sharedMemoryArchive = SharedMemory::create(archiveHandle, SharedMemory::Protection::ReadOnly);
archiveBuffer = SharedBuffer::create(static_cast<unsigned char*>(sharedMemoryArchive->data()), archiveSize);
}
m_pageClient.setPromisedDataForImage(pasteboardName, imageBuffer, filename, extension, title, url, visibleURL, archiveBuffer);
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (182752 => 182753)
--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2015-04-13 20:26:02 UTC (rev 182753)
@@ -1692,7 +1692,7 @@
SharedMemory::Handle handle;
RefPtr<SharedMemory> sharedMemory = SharedMemory::create(buffer->size());
memcpy(sharedMemory->data(), buffer->data(), buffer->size());
- sharedMemory->createHandle(handle, SharedMemory::ReadOnly);
+ sharedMemory->createHandle(handle, SharedMemory::Protection::ReadOnly);
webProcess.parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardBufferForType(pasteboardName, type, handle, buffer->size()), Messages::WebPasteboardProxy::SetPasteboardBufferForType::Reply(newChangeCount), 0);
}
}
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (182752 => 182753)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -410,7 +410,7 @@
WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardBufferForType(pasteboardName, pasteboardType), Messages::WebPasteboardProxy::GetPasteboardBufferForType::Reply(handle, size), 0);
if (handle.isNull())
return 0;
- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
return SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
}
@@ -484,7 +484,7 @@
// because we've already set the types.
if (sharedMemoryBuffer) {
memcpy(sharedMemoryBuffer->data(), buffer->data(), buffer->size());
- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
+ sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
}
}
uint64_t newChangeCount;
@@ -536,7 +536,7 @@
WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadBufferFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadBufferFromPasteboard::Reply(handle, size), 0);
if (handle.isNull())
return 0;
- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
return SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
}
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (182752 => 182753)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm 2015-04-13 20:26:02 UTC (rev 182753)
@@ -139,7 +139,7 @@
if (!sharedMemoryBuffer)
return;
memcpy(sharedMemoryBuffer->data(), imageBuffer->data(), imageSize);
- sharedMemoryBuffer->createHandle(imageHandle, SharedMemory::ReadOnly);
+ sharedMemoryBuffer->createHandle(imageHandle, SharedMemory::Protection::ReadOnly);
RetainPtr<CFDataRef> data = "" ? archive->rawDataRepresentation() : 0;
SharedMemory::Handle archiveHandle;
@@ -151,7 +151,7 @@
return;
archiveSize = archiveBuffer->size();
memcpy(archiveSharedMemoryBuffer->data(), archiveBuffer->data(), archiveSize);
- archiveSharedMemoryBuffer->createHandle(archiveHandle, SharedMemory::ReadOnly);
+ archiveSharedMemoryBuffer->createHandle(archiveHandle, SharedMemory::Protection::ReadOnly);
}
m_page->send(Messages::WebPageProxy::SetPromisedDataForImage(pasteboardName, imageHandle, imageSize, String([response suggestedFilename]), extension, title, String([[response URL] absoluteString]), userVisibleString((NSURL *)url), archiveHandle, archiveSize));
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp (182752 => 182753)
--- trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -90,7 +90,7 @@
void VisitedLinkTableController::setVisitedLinkTable(const SharedMemory::Handle& handle)
{
- RefPtr<SharedMemory> sharedMemory = SharedMemory::create(handle, SharedMemory::ReadOnly);
+ RefPtr<SharedMemory> sharedMemory = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
if (!sharedMemory)
return;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (182752 => 182753)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-04-13 20:26:02 UTC (rev 182753)
@@ -1625,7 +1625,7 @@
ShareableBitmap::Handle handle;
if (image)
- image->bitmap()->createHandle(handle, SharedMemory::ReadOnly);
+ image->bitmap()->createHandle(handle, SharedMemory::Protection::ReadOnly);
send(Messages::WebPageProxy::ImageCallback(handle, callbackID));
}
@@ -3835,7 +3835,7 @@
ShareableBitmap::Handle handle;
if (image)
- image->bitmap()->createHandle(handle, SharedMemory::ReadOnly);
+ image->bitmap()->createHandle(handle, SharedMemory::Protection::ReadOnly);
send(Messages::WebPageProxy::ImageCallback(handle, callbackID));
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (182752 => 182753)
--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2015-04-13 20:26:02 UTC (rev 182753)
@@ -2180,7 +2180,7 @@
RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(bufferSize);
memcpy(sharedMemoryBuffer->data(), buffer->data(), bufferSize);
SharedMemory::Handle handle;
- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
+ sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
send(Messages::WebPageProxy::SaveImageToLibrary(handle, bufferSize));
}
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (182752 => 182753)
--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-04-13 20:16:34 UTC (rev 182752)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm 2015-04-13 20:26:02 UTC (rev 182753)
@@ -712,7 +712,7 @@
size = buffer->size();
RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(size);
memcpy(sharedMemoryBuffer->data(), buffer->data(), size);
- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
+ sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
}
WKAccessibilityWebPageObject* WebPage::accessibilityRemoteObject()
