<!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>[182753] 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/182753">182753</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-04-13 13:26:02 -0700 (Mon, 13 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheEntrycpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacNetworkResourceLoaderMacmm">trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformSharedMemoryh">trunk/Source/WebKit2/Platform/SharedMemory.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacSharedMemoryMaccpp">trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedContextMenuContextDatacpp">trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedInteractionInformationAtPositioncpp">trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedShareableBitmaph">trunk/Source/WebKit2/Shared/ShareableBitmap.h</a></li>
<li><a href="#trunkSourceWebKit2SharedShareableResourcecpp">trunk/Source/WebKit2/Shared/ShareableResource.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCompiledContentExtensionDatacpp">trunk/Source/WebKit2/Shared/WebCompiledContentExtensionData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCoderscpp">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebHitTestResultcpp">trunk/Source/WebKit2/Shared/WebHitTestResult.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStorecpp">trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaWebPasteboardProxyCocoamm">trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessVisitedLinkProvidercpp">trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm">trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKPrintingViewmm">trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPageProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm">trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageVisitedLinkTableControllercpp">trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,67 @@
</span><ins>+2015-04-13 Anders Carlsson <andersca@apple.com>
+
+ 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):
+
</ins><span class="cx"> 2015-04-10 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> Cannot click "Next" button on Google two-factor auth setup page
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> MappedBody mappedBody;
</span><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><span class="cx"> if (bodyData.isMap()) {
</span><del>- RefPtr<SharedMemory> sharedMemory = SharedMemory::createFromVMBuffer(const_cast<uint8_t*>(bodyData.data()), bodyData.size());
</del><ins>+ RefPtr<SharedMemory> sharedMemory = SharedMemory::create(const_cast<uint8_t*>(bodyData.data()), bodyData.size(), SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> mappedBody.shareableResource = sharedMemory ? ShareableResource::create(WTF::move(sharedMemory), 0, bodyData.size()) : nullptr;
</span><span class="cx"> if (mappedBody.shareableResource)
</span><span class="cx"> mappedBody.shareableResource->createHandle(mappedBody.shareableResourceHandle);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheEntrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheEntry.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> auto* data = m_sourceStorageRecord.body.data();
</span><span class="cx"> size_t size = m_sourceStorageRecord.body.size();
</span><span class="cx"> #if ENABLE(SHAREABLE_RESOURCE)
</span><del>- RefPtr<SharedMemory> sharedMemory = m_sourceStorageRecord.body.isMap() ? SharedMemory::createFromVMBuffer(const_cast<uint8_t*>(data), size) : nullptr;
</del><ins>+ RefPtr<SharedMemory> sharedMemory = m_sourceStorageRecord.body.isMap() ? SharedMemory::create(const_cast<uint8_t*>(data), size, SharedMemory::Protection::ReadOnly) : nullptr;
</ins><span class="cx"> RefPtr<ShareableResource> shareableResource = sharedMemory ? ShareableResource::create(sharedMemory.release(), 0, m_sourceStorageRecord.body.size()) : nullptr;
</span><span class="cx">
</span><span class="cx"> if (shareableResource && shareableResource->createHandle(m_shareableResourceHandle))
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacNetworkResourceLoaderMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> static void tryGetShareableHandleFromCFData(ShareableResource::Handle& handle, CFDataRef data)
</span><span class="cx"> {
</span><del>- RefPtr<SharedMemory> sharedMemory = SharedMemory::createFromVMBuffer((void*)CFDataGetBytePtr(data), CFDataGetLength(data));
</del><ins>+ RefPtr<SharedMemory> sharedMemory = SharedMemory::create((void*)CFDataGetBytePtr(data), CFDataGetLength(data), SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> if (!sharedMemory) {
</span><span class="cx"> LOG_ERROR("Failed to create VM shared memory for cached resource.");
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformSharedMemoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/SharedMemory.h (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> #define SharedMemory_h
</span><span class="cx">
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><ins>+#include <wtf/RefPtr.h>
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK) || PLATFORM(EFL)
</span><span class="cx"> #include "Attachment.h"
</span><span class="lines">@@ -36,15 +36,15 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><del>- class ArgumentDecoder;
- class ArgumentEncoder;
</del><ins>+class ArgumentDecoder;
+class ArgumentEncoder;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class SharedMemory : public RefCounted<SharedMemory> {
</span><span class="cx"> public:
</span><del>- enum Protection {
</del><ins>+ enum class Protection {
</ins><span class="cx"> ReadOnly,
</span><span class="cx"> ReadWrite
</span><span class="cx"> };
</span><span class="lines">@@ -76,16 +76,10 @@
</span><span class="cx"> size_t m_size;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- // Create a shared memory object with the given size. Will return 0 on failure.
- static PassRefPtr<SharedMemory> create(size_t);
</del><ins>+ static RefPtr<SharedMemory> create(size_t);
+ static RefPtr<SharedMemory> create(const Handle&, Protection);
+ static RefPtr<SharedMemory> create(void*, size_t, Protection);
</ins><span class="cx">
</span><del>- // 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);
-
</del><span class="cx"> ~SharedMemory();
</span><span class="cx">
</span><span class="cx"> bool createHandle(Handle&, Protection);
</span><span class="lines">@@ -93,9 +87,6 @@
</span><span class="cx"> size_t size() const { return m_size; }
</span><span class="cx"> void* data() const { return m_data; }
</span><span class="cx">
</span><del>- // Creates a copy-on-write copy of the first |size| bytes.
- PassRefPtr<SharedMemory> createCopyOnWriteCopy(size_t) const;
-
</del><span class="cx"> // Return the system page size in bytes.
</span><span class="cx"> static unsigned systemPageSize();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacSharedMemoryMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> return static_cast<mach_vm_address_t>(reinterpret_cast<uintptr_t>(pointer));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedMemory> SharedMemory::create(size_t size)
</del><ins>+RefPtr<SharedMemory> SharedMemory::create(size_t size)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(size);
</span><span class="cx">
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<SharedMemory> sharedMemory = createFromVMBuffer(toPointer(address), size);
</del><ins>+ RefPtr<SharedMemory> sharedMemory = create(toPointer(address), size, Protection::ReadWrite);
</ins><span class="cx"> if (!sharedMemory) {
</span><span class="cx"> mach_vm_deallocate(mach_task_self(), address, round_page(size));
</span><span class="cx"> return 0;
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> return sharedMemory.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedMemory> SharedMemory::createFromVMBuffer(void* data, size_t size)
</del><ins>+RefPtr<SharedMemory> SharedMemory::create(void* data, size_t size, Protection)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(size);
</span><span class="cx">
</span><span class="lines">@@ -152,9 +152,9 @@
</span><span class="cx"> static inline vm_prot_t machProtection(SharedMemory::Protection protection)
</span><span class="cx"> {
</span><span class="cx"> switch (protection) {
</span><del>- case SharedMemory::ReadOnly:
</del><ins>+ case SharedMemory::Protection::ReadOnly:
</ins><span class="cx"> return VM_PROT_READ;
</span><del>- case SharedMemory::ReadWrite:
</del><ins>+ case SharedMemory::Protection::ReadWrite:
</ins><span class="cx"> return VM_PROT_READ | VM_PROT_WRITE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> return VM_PROT_NONE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedMemory> SharedMemory::create(const Handle& handle, Protection protection)
</del><ins>+RefPtr<SharedMemory> SharedMemory::create(const Handle& handle, Protection protection)
</ins><span class="cx"> {
</span><span class="cx"> if (handle.isNull())
</span><span class="cx"> return 0;
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx">
</span><span class="cx"> mach_port_t port;
</span><span class="cx">
</span><del>- if (protection == ReadWrite && m_port) {
</del><ins>+ if (protection == Protection::ReadWrite && m_port) {
</ins><span class="cx"> // Just re-use the port we have.
</span><span class="cx"> port = m_port;
</span><span class="cx"> if (mach_port_mod_refs(mach_task_self(), port, MACH_PORT_RIGHT_SEND, 1) != KERN_SUCCESS)
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedContextMenuContextDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ContextMenuContextData.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> if (m_controlledImage)
</span><del>- m_controlledImage->createHandle(handle, SharedMemory::ReadOnly);
</del><ins>+ m_controlledImage->createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> encoder << handle;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!handle.isNull())
</span><del>- contextMenuContextData.m_controlledImage = ShareableBitmap::create(handle, SharedMemory::ReadOnly);
</del><ins>+ contextMenuContextData.m_controlledImage = ShareableBitmap::create(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedInteractionInformationAtPositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/InteractionInformationAtPosition.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> if (image)
</span><del>- image->createHandle(handle, SharedMemory::ReadOnly);
</del><ins>+ image->createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> encoder << handle;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!handle.isNull())
</span><del>- result.image = ShareableBitmap::create(handle, SharedMemory::ReadOnly);
</del><ins>+ result.image = ShareableBitmap::create(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedShareableBitmaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ShareableBitmap.h (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -85,10 +85,10 @@
</span><span class="cx"> static PassRefPtr<ShareableBitmap> create(const WebCore::IntSize&, Flags, PassRefPtr<SharedMemory>);
</span><span class="cx">
</span><span class="cx"> // Create a shareable bitmap from a handle.
</span><del>- static PassRefPtr<ShareableBitmap> create(const Handle&, SharedMemory::Protection = SharedMemory::ReadWrite);
</del><ins>+ static PassRefPtr<ShareableBitmap> create(const Handle&, SharedMemory::Protection = SharedMemory::Protection::ReadWrite);
</ins><span class="cx">
</span><span class="cx"> // Create a handle.
</span><del>- bool createHandle(Handle&, SharedMemory::Protection = SharedMemory::ReadWrite);
</del><ins>+ bool createHandle(Handle&, SharedMemory::Protection = SharedMemory::Protection::ReadWrite);
</ins><span class="cx">
</span><span class="cx"> ~ShareableBitmap();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedShareableResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/ShareableResource.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<ShareableResource> ShareableResource::create(const Handle& handle)
</span><span class="cx"> {
</span><del>- RefPtr<SharedMemory> sharedMemory = SharedMemory::create(handle.m_handle, SharedMemory::ReadOnly);
</del><ins>+ RefPtr<SharedMemory> sharedMemory = SharedMemory::create(handle.m_handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> if (!sharedMemory)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx">
</span><span class="cx"> bool ShareableResource::createHandle(Handle& handle)
</span><span class="cx"> {
</span><del>- if (!m_sharedMemory->createHandle(handle.m_handle, SharedMemory::ReadOnly))
</del><ins>+ if (!m_sharedMemory->createHandle(handle.m_handle, SharedMemory::Protection::ReadOnly))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> handle.m_offset = m_offset;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCompiledContentExtensionDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCompiledContentExtensionData.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> void WebCompiledContentExtensionData::encode(IPC::ArgumentEncoder& encoder) const
</span><span class="cx"> {
</span><span class="cx"> SharedMemory::Handle handle;
</span><del>- data->createHandle(handle, SharedMemory::ReadOnly);
</del><ins>+ data->createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> encoder << handle;
</span><span class="cx">
</span><span class="cx"> encoder << actionsOffset;
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> SharedMemory::Handle handle;
</span><span class="cx"> if (!decoder.decode(handle))
</span><span class="cx"> return false;
</span><del>- compiledContentExtensionData.data = SharedMemory::create(handle, SharedMemory::ReadOnly);
</del><ins>+ compiledContentExtensionData.data = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx">
</span><span class="cx"> if (!decoder.decode(compiledContentExtensionData.actionsOffset))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1170,7 +1170,7 @@
</span><span class="cx"> if (buffer) {
</span><span class="cx"> RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(buffer->size());
</span><span class="cx"> memcpy(sharedMemoryBuffer->data(), buffer->data(), buffer->size());
</span><del>- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
</del><ins>+ sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> encoder << handle;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1186,7 +1186,7 @@
</span><span class="cx"> if (!decoder.decode(handle))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
</del><ins>+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> buffer = SharedBuffer::create(static_cast<unsigned char*>(sharedMemoryBuffer->data()), bufferSize);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebHitTestResultcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebHitTestResult.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx">
</span><span class="cx"> SharedMemory::Handle imageHandle;
</span><span class="cx"> if (imageSharedMemory && imageSharedMemory->data())
</span><del>- imageSharedMemory->createHandle(imageHandle, SharedMemory::ReadOnly);
</del><ins>+ imageSharedMemory->createHandle(imageHandle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> encoder << imageHandle;
</span><span class="cx"> encoder << imageSize;
</span><span class="cx"> encoder << imageExtension;
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (!imageHandle.isNull())
</span><del>- hitTestResultData.imageSharedMemory = SharedMemory::create(imageHandle, SharedMemory::ReadOnly);
</del><ins>+ hitTestResultData.imageSharedMemory = SharedMemory::create(imageHandle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx">
</span><span class="cx"> if (!decoder.decode(hitTestResultData.imageSize))
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUserContentExtensionStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx">
</span><span class="cx"> static RefPtr<API::UserContentExtension> createExtension(const String& identifier, const ContentExtensionMetaData& metaData, const Data& fileData)
</span><span class="cx"> {
</span><del>- auto sharedMemory = WebKit::SharedMemory::createFromVMBuffer(const_cast<uint8_t*>(fileData.data()), fileData.size());
</del><ins>+ auto sharedMemory = WebKit::SharedMemory::create(const_cast<uint8_t*>(fileData.data()), fileData.size(), WebKit::SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> auto compiledContentExtensionData = WebKit::WebCompiledContentExtensionData(
</span><span class="cx"> WTF::move(sharedMemory),
</span><span class="cx"> fileData,
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2610,7 +2610,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<WebKit::ShareableBitmap> bitmap = WebKit::ShareableBitmap::create(imageHandle, WebKit::SharedMemory::ReadOnly);
</del><ins>+ RefPtr<WebKit::ShareableBitmap> bitmap = WebKit::ShareableBitmap::create(imageHandle, WebKit::SharedMemory::Protection::ReadOnly);
</ins><span class="cx">
</span><span class="cx"> if (!bitmap) {
</span><span class="cx"> copiedCompletionHandler(nullptr);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKThumbnailViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKThumbnailView.mm (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> bitmapSize.scale(_scale * _webPageProxy->deviceScaleFactor());
</span><span class="cx"> _lastSnapshotScale = _scale;
</span><span class="cx"> _webPageProxy->takeSnapshot(snapshotRect, bitmapSize, options, [thumbnailView](const ShareableBitmap::Handle& imageHandle, CallbackBase::Error) {
</span><del>- RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(imageHandle, SharedMemory::ReadOnly);
</del><ins>+ RefPtr<ShareableBitmap> bitmap = ShareableBitmap::create(imageHandle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> RetainPtr<CGImageRef> cgImage = bitmap ? bitmap->makeCGImage() : nullptr;
</span><span class="cx"> [thumbnailView _didTakeSnapshot:cgImage.get()];
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaWebPasteboardProxyCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/WebPasteboardProxyCocoa.mm (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> if (!sharedMemoryBuffer)
</span><span class="cx"> return;
</span><span class="cx"> memcpy(sharedMemoryBuffer->data(), buffer->data(), size);
</span><del>- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
</del><ins>+ sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPasteboardProxy::pasteboardCopy(const String& fromPasteboard, const String& toPasteboard, uint64_t& newChangeCount)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(0, pasteboardType);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
</del><ins>+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> RefPtr<SharedBuffer> buffer = SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
</span><span class="cx"> newChangeCount = PlatformPasteboard(pasteboardName).setBufferForType(buffer, pasteboardType);
</span><span class="cx"> }
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> if (!sharedMemoryBuffer)
</span><span class="cx"> return;
</span><span class="cx"> memcpy(sharedMemoryBuffer->data(), buffer->data(), size);
</span><del>- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
</del><ins>+ sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPasteboardProxy::getPasteboardItemsCount(uint64_t& itemsCount)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessVisitedLinkProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/VisitedLinkProvider.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -248,7 +248,7 @@
</span><span class="cx"> ASSERT(process.processPool().processes().contains(&process));
</span><span class="cx">
</span><span class="cx"> SharedMemory::Handle handle;
</span><del>- if (!m_table.sharedMemory()->createHandle(handle, SharedMemory::ReadOnly))
</del><ins>+ if (!m_table.sharedMemory()->createHandle(handle, SharedMemory::Protection::ReadOnly))
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> process.connection()->send(Messages::VisitedLinkTableController::SetVisitedLinkTable(handle), m_identifier);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWebPageProxyIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -561,7 +561,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::saveImageToLibrary(const SharedMemory::Handle& imageHandle, uint64_t imageSize)
</span><span class="cx"> {
</span><del>- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(imageHandle, SharedMemory::ReadOnly);
</del><ins>+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(imageHandle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> RefPtr<SharedBuffer> buffer = SharedBuffer::create(static_cast<unsigned char*>(sharedMemoryBuffer->data()), imageSize);
</span><span class="cx"> m_pageClient.saveImageToLibrary(buffer);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKPrintingViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WKPrintingView.mm (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> ASSERT([view _isPrintingPreview]);
</span><span class="cx">
</span><span class="cx"> if (!imageHandle.isNull()) {
</span><del>- RefPtr<ShareableBitmap> image = ShareableBitmap::create(imageHandle, SharedMemory::ReadOnly);
</del><ins>+ RefPtr<ShareableBitmap> image = ShareableBitmap::create(imageHandle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx">
</span><span class="cx"> if (image)
</span><span class="cx"> view->_pagePreviews.add(iter->value, image);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -377,7 +377,7 @@
</span><span class="cx"> Messages::WebPage::GetDataSelectionForPasteboard::Reply(handle, size), m_pageID, messageTimeout);
</span><span class="cx"> if (handle.isNull())
</span><span class="cx"> return 0;
</span><del>- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
</del><ins>+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> return SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -413,12 +413,12 @@
</span><span class="cx"> {
</span><span class="cx"> MESSAGE_CHECK_URL(url);
</span><span class="cx"> MESSAGE_CHECK_URL(visibleURL);
</span><del>- RefPtr<SharedMemory> sharedMemoryImage = SharedMemory::create(imageHandle, SharedMemory::ReadOnly);
</del><ins>+ RefPtr<SharedMemory> sharedMemoryImage = SharedMemory::create(imageHandle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> RefPtr<SharedBuffer> imageBuffer = SharedBuffer::create(static_cast<unsigned char*>(sharedMemoryImage->data()), imageSize);
</span><span class="cx"> RefPtr<SharedBuffer> archiveBuffer;
</span><span class="cx">
</span><span class="cx"> if (!archiveHandle.isNull()) {
</span><del>- RefPtr<SharedMemory> sharedMemoryArchive = SharedMemory::create(archiveHandle, SharedMemory::ReadOnly);;
</del><ins>+ RefPtr<SharedMemory> sharedMemoryArchive = SharedMemory::create(archiveHandle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> archiveBuffer = SharedBuffer::create(static_cast<unsigned char*>(sharedMemoryArchive->data()), archiveSize);
</span><span class="cx"> }
</span><span class="cx"> m_pageClient.setPromisedDataForImage(pasteboardName, imageBuffer, filename, extension, title, url, visibleURL, archiveBuffer);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPDFPDFPluginmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1692,7 +1692,7 @@
</span><span class="cx"> SharedMemory::Handle handle;
</span><span class="cx"> RefPtr<SharedMemory> sharedMemory = SharedMemory::create(buffer->size());
</span><span class="cx"> memcpy(sharedMemory->data(), buffer->data(), buffer->size());
</span><del>- sharedMemory->createHandle(handle, SharedMemory::ReadOnly);
</del><ins>+ sharedMemory->createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> webProcess.parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::SetPasteboardBufferForType(pasteboardName, type, handle, buffer->size()), Messages::WebPasteboardProxy::SetPasteboardBufferForType::Reply(newChangeCount), 0);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -410,7 +410,7 @@
</span><span class="cx"> WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::GetPasteboardBufferForType(pasteboardName, pasteboardType), Messages::WebPasteboardProxy::GetPasteboardBufferForType::Reply(handle, size), 0);
</span><span class="cx"> if (handle.isNull())
</span><span class="cx"> return 0;
</span><del>- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
</del><ins>+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> return SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx"> // because we've already set the types.
</span><span class="cx"> if (sharedMemoryBuffer) {
</span><span class="cx"> memcpy(sharedMemoryBuffer->data(), buffer->data(), buffer->size());
</span><del>- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
</del><ins>+ sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> uint64_t newChangeCount;
</span><span class="lines">@@ -536,7 +536,7 @@
</span><span class="cx"> WebProcess::singleton().parentProcessConnection()->sendSync(Messages::WebPasteboardProxy::ReadBufferFromPasteboard(index, pasteboardType), Messages::WebPasteboardProxy::ReadBufferFromPasteboard::Reply(handle, size), 0);
</span><span class="cx"> if (handle.isNull())
</span><span class="cx"> return 0;
</span><del>- RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::ReadOnly);
</del><ins>+ RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> return SharedBuffer::create(static_cast<unsigned char *>(sharedMemoryBuffer->data()), size);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebDragClientMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebDragClientMac.mm (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> if (!sharedMemoryBuffer)
</span><span class="cx"> return;
</span><span class="cx"> memcpy(sharedMemoryBuffer->data(), imageBuffer->data(), imageSize);
</span><del>- sharedMemoryBuffer->createHandle(imageHandle, SharedMemory::ReadOnly);
</del><ins>+ sharedMemoryBuffer->createHandle(imageHandle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx">
</span><span class="cx"> RetainPtr<CFDataRef> data = archive ? archive->rawDataRepresentation() : 0;
</span><span class="cx"> SharedMemory::Handle archiveHandle;
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> return;
</span><span class="cx"> archiveSize = archiveBuffer->size();
</span><span class="cx"> memcpy(archiveSharedMemoryBuffer->data(), archiveBuffer->data(), archiveSize);
</span><del>- archiveSharedMemoryBuffer->createHandle(archiveHandle, SharedMemory::ReadOnly);
</del><ins>+ archiveSharedMemoryBuffer->createHandle(archiveHandle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> }
</span><span class="cx"> m_page->send(Messages::WebPageProxy::SetPromisedDataForImage(pasteboardName, imageHandle, imageSize, String([response suggestedFilename]), extension, title, String([[response URL] absoluteString]), userVisibleString((NSURL *)url), archiveHandle, archiveSize));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageVisitedLinkTableControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/VisitedLinkTableController.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> void VisitedLinkTableController::setVisitedLinkTable(const SharedMemory::Handle& handle)
</span><span class="cx"> {
</span><del>- RefPtr<SharedMemory> sharedMemory = SharedMemory::create(handle, SharedMemory::ReadOnly);
</del><ins>+ RefPtr<SharedMemory> sharedMemory = SharedMemory::create(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> if (!sharedMemory)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1625,7 +1625,7 @@
</span><span class="cx">
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx"> if (image)
</span><del>- image->bitmap()->createHandle(handle, SharedMemory::ReadOnly);
</del><ins>+ image->bitmap()->createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx">
</span><span class="cx"> send(Messages::WebPageProxy::ImageCallback(handle, callbackID));
</span><span class="cx"> }
</span><span class="lines">@@ -3835,7 +3835,7 @@
</span><span class="cx"> ShareableBitmap::Handle handle;
</span><span class="cx">
</span><span class="cx"> if (image)
</span><del>- image->bitmap()->createHandle(handle, SharedMemory::ReadOnly);
</del><ins>+ image->bitmap()->createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx">
</span><span class="cx"> send(Messages::WebPageProxy::ImageCallback(handle, callbackID));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2180,7 +2180,7 @@
</span><span class="cx"> RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(bufferSize);
</span><span class="cx"> memcpy(sharedMemoryBuffer->data(), buffer->data(), bufferSize);
</span><span class="cx"> SharedMemory::Handle handle;
</span><del>- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
</del><ins>+ sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> send(Messages::WebPageProxy::SaveImageToLibrary(handle, bufferSize));
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebPageMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (182752 => 182753)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx"> size = buffer->size();
</span><span class="cx"> RefPtr<SharedMemory> sharedMemoryBuffer = SharedMemory::create(size);
</span><span class="cx"> memcpy(sharedMemoryBuffer->data(), buffer->data(), size);
</span><del>- sharedMemoryBuffer->createHandle(handle, SharedMemory::ReadOnly);
</del><ins>+ sharedMemoryBuffer->createHandle(handle, SharedMemory::Protection::ReadOnly);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKAccessibilityWebPageObject* WebPage::accessibilityRemoteObject()
</span></span></pre>
</div>
</div>
</body>
</html>