Title: [182776] trunk/Source/WebKit2
- Revision
- 182776
- Author
- [email protected]
- Date
- 2015-04-13 19:44:52 -0700 (Mon, 13 Apr 2015)
Log Message
[EFL][GTK] Fix build break after r182753
https://bugs.webkit.org/show_bug.cgi?id=143689
Patch by Hunseop Jeong <[email protected]> on 2015-04-13
Reviewed by Anders Carlsson.
* Platform/IPC/unix/ConnectionUnix.cpp:
(IPC::Connection::processMessage):
(IPC::Connection::sendOutgoingMessage):
* Platform/unix/SharedMemoryUnix.cpp:
(WebKit::SharedMemory::allocate):
(WebKit::accessModeMMap):
(WebKit::SharedMemory::map):
(WebKit::SharedMemory::create): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (182775 => 182776)
--- trunk/Source/WebKit2/ChangeLog 2015-04-14 01:36:03 UTC (rev 182775)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-14 02:44:52 UTC (rev 182776)
@@ -1,3 +1,19 @@
+2015-04-13 Hunseop Jeong <[email protected]>
+
+ [EFL][GTK] Fix build break after r182753
+ https://bugs.webkit.org/show_bug.cgi?id=143689
+
+ Reviewed by Anders Carlsson.
+
+ * Platform/IPC/unix/ConnectionUnix.cpp:
+ (IPC::Connection::processMessage):
+ (IPC::Connection::sendOutgoingMessage):
+ * Platform/unix/SharedMemoryUnix.cpp:
+ (WebKit::SharedMemory::allocate):
+ (WebKit::accessModeMMap):
+ (WebKit::SharedMemory::map):
+ (WebKit::SharedMemory::create): Deleted.
+
2015-04-13 Alexey Proskuryakov <[email protected]>
Build fix.
Modified: trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp (182775 => 182776)
--- trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2015-04-14 01:36:03 UTC (rev 182775)
+++ trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2015-04-14 02:44:52 UTC (rev 182776)
@@ -249,7 +249,7 @@
WebKit::SharedMemory::Handle handle;
handle.adoptFromAttachment(m_fileDescriptors[attachmentFileDescriptorCount - 1], attachmentInfo[attachmentCount].getSize());
- oolMessageBody = WebKit::SharedMemory::create(handle, WebKit::SharedMemory::ReadOnly);
+ oolMessageBody = WebKit::SharedMemory::map(handle, WebKit::SharedMemory::Protection::ReadOnly);
if (!oolMessageBody) {
ASSERT_NOT_REACHED();
return false;
@@ -433,12 +433,12 @@
MessageInfo messageInfo(encoder->bufferSize(), attachments.size());
size_t messageSizeWithBodyInline = sizeof(messageInfo) + (attachments.size() * sizeof(AttachmentInfo)) + encoder->bufferSize();
if (messageSizeWithBodyInline > messageMaxSize && encoder->bufferSize()) {
- RefPtr<WebKit::SharedMemory> oolMessageBody = WebKit::SharedMemory::create(encoder->bufferSize());
+ RefPtr<WebKit::SharedMemory> oolMessageBody = WebKit::SharedMemory::allocate(encoder->bufferSize());
if (!oolMessageBody)
return false;
WebKit::SharedMemory::Handle handle;
- if (!oolMessageBody->createHandle(handle, WebKit::SharedMemory::ReadOnly))
+ if (!oolMessageBody->createHandle(handle, WebKit::SharedMemory::Protection::ReadOnly))
return false;
messageInfo.setMessageBodyIsOutOfLine();
Modified: trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp (182775 => 182776)
--- trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp 2015-04-14 01:36:03 UTC (rev 182775)
+++ trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp 2015-04-14 02:44:52 UTC (rev 182776)
@@ -102,7 +102,7 @@
m_size = size;
}
-PassRefPtr<SharedMemory> SharedMemory::create(size_t size)
+RefPtr<SharedMemory> SharedMemory::allocate(size_t size)
{
CString tempName;
@@ -147,9 +147,9 @@
static inline int accessModeMMap(SharedMemory::Protection protection)
{
switch (protection) {
- case SharedMemory::ReadOnly:
+ case SharedMemory::Protection::ReadOnly:
return PROT_READ;
- case SharedMemory::ReadWrite:
+ case SharedMemory::Protection::ReadWrite:
return PROT_READ | PROT_WRITE;
}
@@ -157,7 +157,7 @@
return PROT_READ | PROT_WRITE;
}
-PassRefPtr<SharedMemory> SharedMemory::create(const Handle& handle, Protection protection)
+RefPtr<SharedMemory> SharedMemory::map(const Handle& handle, Protection protection)
{
ASSERT(!handle.isNull());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
