Attachment 229129 Details for Bug 125558 – Patch

[patch] Patch

wk2-freebsd.diff (text/plain), 2.36 KB, created by Carlos Garcia Campos on 2014-04-11 06:01:52 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Carlos Garcia Campos

Created: 2014-04-11 06:01:52 PDT

Size: 2.36 KB

patch

obsolete

>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index de8f2d5..0336c19 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,5 +1,21 @@
> 2014-04-11  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>+        wk2-gtk does not display anything
>+        https://bugs.webkit.org/show_bug.cgi?id=125558
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Remove fcntl call to set access mode flags on the duplicated files
>+        descriptor. Those flags are ignored in Linux and make fcntl to
>+        fail in FreeBSD. We should handle the case where the passed
>+        protection is ReadOnly.
>+
>+        * Platform/unix/SharedMemoryUnix.cpp:
>+        (WebKit::SharedMemory::createHandle):
>+        (WebKit::accessModeFile): Deleted.
>+
>+2014-04-11  Carlos Garcia Campos  <cgarcia@igalia.com>
>+
>         [GTK] Windowed plugins visibility doesn't work
>         https://bugs.webkit.org/show_bug.cgi?id=131487
> 
>diff --git a/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp b/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp
>index 7781806..2e8dd22 100644
>--- a/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp
>+++ b/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp
>@@ -179,24 +179,13 @@ SharedMemory::~SharedMemory()
>     closeWithRetry(m_fileDescriptor);
> }
> 
>-static inline int accessModeFile(SharedMemory::Protection protection)
>-{
>-    switch (protection) {
>-    case SharedMemory::ReadOnly:
>-        return O_RDONLY;
>-    case SharedMemory::ReadWrite:
>-        return O_RDWR;
>-    }
>-
>-    ASSERT_NOT_REACHED();
>-    return O_RDWR;
>-}
>-
>-bool SharedMemory::createHandle(Handle& handle, Protection protection)
>+bool SharedMemory::createHandle(Handle& handle, Protection)
> {
>     ASSERT_ARG(handle, !handle.m_size);
>     ASSERT_ARG(handle, handle.isNull());
> 
>+    // FIXME: Handle the case where the passed Protection is ReadOnly.
>+
>     int duplicatedHandle;
>     while ((duplicatedHandle = dup(m_fileDescriptor)) == -1) {
>         if (errno != EINTR) {
>@@ -205,7 +194,7 @@ bool SharedMemory::createHandle(Handle& handle, Protection protection)
>         }
>     }
> 
>-    while (fcntl(duplicatedHandle, F_SETFD, FD_CLOEXEC) == -1 || fcntl(duplicatedHandle, F_SETFL, accessModeFile(protection)) == -1) {
>+    while (fcntl(duplicatedHandle, F_SETFD, FD_CLOEXEC) == -1) {
>         if (errno != EINTR) {
>             ASSERT_NOT_REACHED();
>             closeWithRetry(duplicatedHandle);

Flags:

mrobinson: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 125558: 218939 | 218952 | 229129