Title: [182760] trunk/Source/WebKit2
Revision
182760
Author
[email protected]
Date
2015-04-13 15:26:34 -0700 (Mon, 13 Apr 2015)

Log Message

Rename SharedMemory::create overloads
https://bugs.webkit.org/show_bug.cgi?id=143679

Reviewed by Beth Dakin.

Rename the SharedMemory::create overload that allocates memory to SharedMemory::allocate,
and the SharedMemory::create overload that maps in a handle to SharedMemory::map.

* Platform/SharedMemory.h:
* Platform/mac/SharedMemoryMac.cpp:
(WebKit::SharedMemory::allocate):
(WebKit::SharedMemory::map):
(WebKit::SharedMemory::create): Deleted.
* Shared/ShareableBitmap.cpp:
(WebKit::ShareableBitmap::createShareable):
(WebKit::ShareableBitmap::create):
* Shared/ShareableResource.cpp:
(WebKit::ShareableResource::create):
* Shared/ShareableResource.h:
* Shared/WebCompiledContentExtension.cpp:
(WebKit::WebCompiledContentExtension::createFromCompiledContentExtensionData):
* Shared/WebCompiledContentExtensionData.cpp:
(WebKit::WebCompiledContentExtensionData::decode):
* Shared/WebHitTestResult.cpp:
(WebKit::WebHitTestResult::Data::Data):
(WebKit::WebHitTestResult::Data::decode):
* UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
(WebKit::WebPasteboardProxy::getPasteboardBufferForType):
(WebKit::WebPasteboardProxy::setPasteboardBufferForType):
* UIProcess/VisitedLinkProvider.cpp:
(WebKit::VisitedLinkProvider::resizeTable):
* 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):
* WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
(WebKit::WebDragClient::declareAndWriteDragImage):
* WebProcess/WebPage/VisitedLinkTableController.cpp:
(WebKit::VisitedLinkTableController::setVisitedLinkTable):
* WebProcess/WebPage/mac/WebPageMac.mm:
(WebKit::WebPage::getDataSelectionForPasteboard):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (182759 => 182760)


--- trunk/Source/WebKit2/ChangeLog	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/ChangeLog	2015-04-13 22:26:34 UTC (rev 182760)
@@ -1,3 +1,51 @@
+2015-04-13  Anders Carlsson  <[email protected]>
+
+        Rename SharedMemory::create overloads
+        https://bugs.webkit.org/show_bug.cgi?id=143679
+
+        Reviewed by Beth Dakin.
+
+        Rename the SharedMemory::create overload that allocates memory to SharedMemory::allocate,
+        and the SharedMemory::create overload that maps in a handle to SharedMemory::map.
+
+        * Platform/SharedMemory.h:
+        * Platform/mac/SharedMemoryMac.cpp:
+        (WebKit::SharedMemory::allocate):
+        (WebKit::SharedMemory::map):
+        (WebKit::SharedMemory::create): Deleted.
+        * Shared/ShareableBitmap.cpp:
+        (WebKit::ShareableBitmap::createShareable):
+        (WebKit::ShareableBitmap::create):
+        * Shared/ShareableResource.cpp:
+        (WebKit::ShareableResource::create):
+        * Shared/ShareableResource.h:
+        * Shared/WebCompiledContentExtension.cpp:
+        (WebKit::WebCompiledContentExtension::createFromCompiledContentExtensionData):
+        * Shared/WebCompiledContentExtensionData.cpp:
+        (WebKit::WebCompiledContentExtensionData::decode):
+        * Shared/WebHitTestResult.cpp:
+        (WebKit::WebHitTestResult::Data::Data):
+        (WebKit::WebHitTestResult::Data::decode):
+        * UIProcess/Cocoa/WebPasteboardProxyCocoa.mm:
+        (WebKit::WebPasteboardProxy::getPasteboardBufferForType):
+        (WebKit::WebPasteboardProxy::setPasteboardBufferForType):
+        * UIProcess/VisitedLinkProvider.cpp:
+        (WebKit::VisitedLinkProvider::resizeTable):
+        * 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):
+        * WebProcess/WebCoreSupport/mac/WebDragClientMac.mm:
+        (WebKit::WebDragClient::declareAndWriteDragImage):
+        * WebProcess/WebPage/VisitedLinkTableController.cpp:
+        (WebKit::VisitedLinkTableController::setVisitedLinkTable):
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        (WebKit::WebPage::getDataSelectionForPasteboard):
+
 2015-04-13  Brady Eidson  <[email protected]>
 
         Share sheets from Share menus appear outside the browser window.

Modified: trunk/Source/WebKit2/Platform/SharedMemory.h (182759 => 182760)


--- trunk/Source/WebKit2/Platform/SharedMemory.h	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/Platform/SharedMemory.h	2015-04-13 22:26:34 UTC (rev 182760)
@@ -26,9 +26,9 @@
 #ifndef SharedMemory_h
 #define SharedMemory_h
 
+#include <wtf/Forward.h>
 #include <wtf/Noncopyable.h>
 #include <wtf/RefCounted.h>
-#include <wtf/RefPtr.h>
 
 #if PLATFORM(GTK) || PLATFORM(EFL)
 #include "Attachment.h"
@@ -75,10 +75,10 @@
 #endif
         size_t m_size;
     };
-    
-    static RefPtr<SharedMemory> create(size_t);
-    static RefPtr<SharedMemory> create(const Handle&, Protection);
+
+    static RefPtr<SharedMemory> allocate(size_t);
     static RefPtr<SharedMemory> create(void*, size_t, Protection);
+    static RefPtr<SharedMemory> map(const Handle&, Protection);
 
     ~SharedMemory();
 

Modified: trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp (182759 => 182760)


--- trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp	2015-04-13 22:26:34 UTC (rev 182760)
@@ -98,7 +98,7 @@
     return static_cast<mach_vm_address_t>(reinterpret_cast<uintptr_t>(pointer));
 }
     
-RefPtr<SharedMemory> SharedMemory::create(size_t size)
+RefPtr<SharedMemory> SharedMemory::allocate(size_t size)
 {
     ASSERT(size);
 
@@ -162,14 +162,13 @@
     return VM_PROT_NONE;    
 }
 
-RefPtr<SharedMemory> SharedMemory::create(const Handle& handle, Protection protection)
+RefPtr<SharedMemory> SharedMemory::map(const Handle& handle, Protection protection)
 {
     if (handle.isNull())
         return 0;
     
     ASSERT(round_page(handle.m_size) == handle.m_size);
 
-    // Map the memory.
     vm_prot_t vmProtection = machProtection(protection);
     mach_vm_address_t mappedAddress = 0;
     kern_return_t kr = mach_vm_map(mach_task_self(), &mappedAddress, round_page(handle.m_size), 0, VM_FLAGS_ANYWHERE, handle.m_port, 0, false, vmProtection, vmProtection, VM_INHERIT_NONE);

Modified: trunk/Source/WebKit2/Shared/ShareableBitmap.cpp (182759 => 182760)


--- trunk/Source/WebKit2/Shared/ShareableBitmap.cpp	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/Shared/ShareableBitmap.cpp	2015-04-13 22:26:34 UTC (rev 182760)
@@ -79,7 +79,7 @@
 {
     size_t numBytes = numBytesForSize(size);
 
-    RefPtr<SharedMemory> sharedMemory = SharedMemory::create(numBytes);
+    RefPtr<SharedMemory> sharedMemory = SharedMemory::allocate(numBytes);
     if (!sharedMemory)
         return nullptr;
 
@@ -99,7 +99,7 @@
 PassRefPtr<ShareableBitmap> ShareableBitmap::create(const Handle& handle, SharedMemory::Protection protection)
 {
     // Create the shared memory.
-    RefPtr<SharedMemory> sharedMemory = SharedMemory::create(handle.m_handle, protection);
+    RefPtr<SharedMemory> sharedMemory = SharedMemory::map(handle.m_handle, protection);
     if (!sharedMemory)
         return nullptr;
 

Modified: trunk/Source/WebKit2/Shared/ShareableResource.cpp (182759 => 182760)


--- trunk/Source/WebKit2/Shared/ShareableResource.cpp	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/Shared/ShareableResource.cpp	2015-04-13 22:26:34 UTC (rev 182760)
@@ -104,7 +104,7 @@
 
 PassRefPtr<ShareableResource> ShareableResource::create(const Handle& handle)
 {
-    RefPtr<SharedMemory> sharedMemory = SharedMemory::create(handle.m_handle, SharedMemory::Protection::ReadOnly);
+    RefPtr<SharedMemory> sharedMemory = SharedMemory::map(handle.m_handle, SharedMemory::Protection::ReadOnly);
     if (!sharedMemory)
         return 0;
 

Modified: trunk/Source/WebKit2/Shared/ShareableResource.h (182759 => 182760)


--- trunk/Source/WebKit2/Shared/ShareableResource.h	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/Shared/ShareableResource.h	2015-04-13 22:26:34 UTC (rev 182760)
@@ -73,6 +73,7 @@
     static PassRefPtr<ShareableResource> create(PassRefPtr<SharedMemory>, unsigned offset, unsigned size);
 
     // Create a shareable resource from a handle.
+    // FIXME: Rename this to map.
     static PassRefPtr<ShareableResource> create(const Handle&);
 
     // Create a handle.

Modified: trunk/Source/WebKit2/Shared/WebCompiledContentExtension.cpp (182759 => 182760)


--- trunk/Source/WebKit2/Shared/WebCompiledContentExtension.cpp	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/Shared/WebCompiledContentExtension.cpp	2015-04-13 22:26:34 UTC (rev 182760)
@@ -48,7 +48,7 @@
 
 Ref<WebCompiledContentExtension> WebCompiledContentExtension::createFromCompiledContentExtensionData(const WebCore::ContentExtensions::CompiledContentExtensionData& compilerData)
 {
-    RefPtr<SharedMemory> sharedMemory = SharedMemory::create(compilerData.bytecode.size() + compilerData.actions.size());
+    RefPtr<SharedMemory> sharedMemory = SharedMemory::allocate(compilerData.bytecode.size() + compilerData.actions.size());
     memcpy(static_cast<char*>(sharedMemory->data()), compilerData.actions.data(), compilerData.actions.size());
     memcpy(static_cast<char*>(sharedMemory->data()) + compilerData.actions.size(), compilerData.bytecode.data(), compilerData.bytecode.size());
 

Modified: trunk/Source/WebKit2/Shared/WebCompiledContentExtensionData.cpp (182759 => 182760)


--- trunk/Source/WebKit2/Shared/WebCompiledContentExtensionData.cpp	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/Shared/WebCompiledContentExtensionData.cpp	2015-04-13 22:26:34 UTC (rev 182760)
@@ -49,7 +49,7 @@
     SharedMemory::Handle handle;
     if (!decoder.decode(handle))
         return false;
-    compiledContentExtensionData.data = "" SharedMemory::Protection::ReadOnly);
+    compiledContentExtensionData.data = "" SharedMemory::Protection::ReadOnly);
 
     if (!decoder.decode(compiledContentExtensionData.actionsOffset))
         return false;

Modified: trunk/Source/WebKit2/Shared/WebHitTestResult.cpp (182759 => 182760)


--- trunk/Source/WebKit2/Shared/WebHitTestResult.cpp	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/Shared/WebHitTestResult.cpp	2015-04-13 22:26:34 UTC (rev 182760)
@@ -86,7 +86,7 @@
         RefPtr<SharedBuffer> buffer = image->data();
         String filenameExtension = image->filenameExtension();
         if (!filenameExtension.isEmpty() && buffer) {
-            imageSharedMemory = SharedMemory::create(buffer->size());
+            imageSharedMemory = SharedMemory::allocate(buffer->size());
             memcpy(imageSharedMemory->data(), buffer->data(), buffer->size());
             imageExtension = filenameExtension;
             imageSize = buffer->size();
@@ -159,7 +159,7 @@
         return false;
 
     if (!imageHandle.isNull())
-        hitTestResultData.imageSharedMemory = SharedMemory::create(imageHandle, SharedMemory::Protection::ReadOnly);
+        hitTestResultData.imageSharedMemory = SharedMemory::map(imageHandle, SharedMemory::Protection::ReadOnly);
 
     if (!decoder.decode(hitTestResultData.imageSize))
         return false;

Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm (182759 => 182760)


--- trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm	2015-04-13 22:26:34 UTC (rev 182760)
@@ -56,7 +56,7 @@
     if (!buffer)
         return;
     size = buffer->size();
-    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(size);
+    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::allocate(size);
     if (!sharedMemoryBuffer)
         return;
     memcpy(sharedMemoryBuffer->data(), buffer->data(), size);
@@ -114,7 +114,7 @@
         newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(0, pasteboardType);
         return;
     }
-    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
+    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::map(handle, SharedMemory::Protection::ReadOnly);
     RefPtr<SharedBuffer> buffer = SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
     newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(buffer, pasteboardType);
 }
@@ -151,7 +151,7 @@
     if (!buffer)
         return;
     size = buffer->size();
-    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(size);
+    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::allocate(size);
     if (!sharedMemoryBuffer)
         return;
     memcpy(sharedMemoryBuffer->data(), buffer->data(), size);

Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp (182759 => 182760)


--- trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp	2015-04-13 22:26:34 UTC (rev 182760)
@@ -200,7 +200,7 @@
 
 void VisitedLinkProvider::resizeTable(unsigned newTableSize)
 {
-    RefPtr<SharedMemory> newTableMemory = SharedMemory::create(newTableSize * sizeof(LinkHash));
+    RefPtr<SharedMemory> newTableMemory = SharedMemory::allocate(newTableSize * sizeof(LinkHash));
 
     if (!newTableMemory) {
         LOG_ERROR("Could not allocate shared memory for visited link table");

Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (182759 => 182760)


--- trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm	2015-04-13 22:26:34 UTC (rev 182760)
@@ -561,7 +561,7 @@
 
 void WebPageProxy::saveImageToLibrary(const SharedMemory::Handle& imageHandle, uint64_t imageSize)
 {
-    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(imageHandle, SharedMemory::Protection::ReadOnly);
+    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::map(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/WebPageProxyMac.mm (182759 => 182760)


--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm	2015-04-13 22:26:34 UTC (rev 182760)
@@ -379,7 +379,7 @@
                                                 Messages::WebPage::GetDataSelectionForPasteboard::Reply(handle, size), m_pageID, messageTimeout);
     if (handle.isNull())
         return 0;
-    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
+    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::map(handle, SharedMemory::Protection::ReadOnly);
     return SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
 }
 
@@ -415,12 +415,12 @@
 {
     MESSAGE_CHECK_URL(url);
     MESSAGE_CHECK_URL(visibleURL);
-    RefPtr<SharedMemory> sharedMemoryImage = SharedMemory::create(imageHandle, SharedMemory::Protection::ReadOnly);
+    RefPtr<SharedMemory> sharedMemoryImage = SharedMemory::map(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::Protection::ReadOnly);
+        RefPtr<SharedMemory> sharedMemoryArchive = SharedMemory::map(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 (182759 => 182760)


--- trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm	2015-04-13 22:26:34 UTC (rev 182760)
@@ -1690,7 +1690,7 @@
                 continue;
 
             SharedMemory::Handle handle;
-            RefPtr<SharedMemory> sharedMemory = SharedMemory::create(buffer->size());
+            RefPtr<SharedMemory> sharedMemory = SharedMemory::allocate(buffer->size());
             memcpy(sharedMemory->data(), buffer->data(), buffer->size());
             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 (182759 => 182760)


--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp	2015-04-13 22:26:34 UTC (rev 182760)
@@ -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::Protection::ReadOnly);
+    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::map(handle, SharedMemory::Protection::ReadOnly);
     return SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
 }
 
@@ -479,7 +479,7 @@
 {
     SharedMemory::Handle handle;
     if (buffer) {
-        RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(buffer->size());
+        RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::allocate(buffer->size());
         // FIXME: Null check prevents crashing, but it is not great that we will have empty pasteboard content for this type,
         // because we've already set the types.
         if (sharedMemoryBuffer) {
@@ -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::Protection::ReadOnly);
+    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::map(handle, SharedMemory::Protection::ReadOnly);
     return SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
 }
 

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (182759 => 182760)


--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm	2015-04-13 22:26:34 UTC (rev 182760)
@@ -135,7 +135,7 @@
     size_t imageSize = imageBuffer->size();
     SharedMemory::Handle imageHandle;
     
-    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(imageBuffer->size());
+    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::allocate(imageBuffer->size());
     if (!sharedMemoryBuffer)
         return;
     memcpy(sharedMemoryBuffer->data(), imageBuffer->data(), imageSize);
@@ -146,7 +146,7 @@
     size_t archiveSize = 0;
     if (data) {
         RefPtr<SharedBuffer> archiveBuffer = SharedBuffer::wrapNSData((NSData *)data.get());
-        RefPtr<SharedMemory> archiveSharedMemoryBuffer = SharedMemory::create(archiveBuffer->size());
+        RefPtr<SharedMemory> archiveSharedMemoryBuffer = SharedMemory::allocate(archiveBuffer->size());
         if (!archiveSharedMemoryBuffer)
             return;
         archiveSize = archiveBuffer->size();

Modified: trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp (182759 => 182760)


--- trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp	2015-04-13 22:26:34 UTC (rev 182760)
@@ -90,7 +90,7 @@
 
 void VisitedLinkTableController::setVisitedLinkTable(const SharedMemory::Handle& handle)
 {
-    RefPtr<SharedMemory> sharedMemory = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
+    RefPtr<SharedMemory> sharedMemory = SharedMemory::map(handle, SharedMemory::Protection::ReadOnly);
     if (!sharedMemory)
         return;
 

Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (182759 => 182760)


--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm	2015-04-13 22:26:34 UTC (rev 182760)
@@ -2177,7 +2177,7 @@
         if (!buffer)
             return;
         uint64_t bufferSize = buffer->size();
-        RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(bufferSize);
+        RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::allocate(bufferSize);
         memcpy(sharedMemoryBuffer->data(), buffer->data(), bufferSize);
         SharedMemory::Handle handle;
         sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);

Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (182759 => 182760)


--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm	2015-04-13 22:13:12 UTC (rev 182759)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm	2015-04-13 22:26:34 UTC (rev 182760)
@@ -710,7 +710,7 @@
         return;
     }
     size = buffer->size();
-    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(size);
+    RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::allocate(size);
     memcpy(sharedMemoryBuffer->data(), buffer->data(), size);
     sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
 }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to