[webkit-changes] [197173] trunk/Source

[commit-queue]

Title: [197173] trunk/Source

Revision

197173

Author

commit-qu...@webkit.org

Date

2016-02-26 09:54:32 -0800 (Fri, 26 Feb 2016)

Log Message

Unreviewed, rolling out r197168.
https://bugs.webkit.org/show_bug.cgi?id=154728

crashing on some devices (Requested by kling on #webkit).

Reverted changeset:

"[Darwin] Use vm_kernel_page_size for WTF::pageSize()."
https://bugs.webkit.org/show_bug.cgi?id=154726
http://trac.webkit.org/changeset/197168

Modified Paths

• trunk/Source/WTF/ChangeLog
• trunk/Source/WTF/wtf/PageBlock.cpp
• trunk/Source/WebKit2/ChangeLog
• trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp

Diff

Modified: trunk/Source/WTF/ChangeLog (197172 => 197173)

--- trunk/Source/WTF/ChangeLog	2016-02-26 17:50:50 UTC (rev 197172)
+++ trunk/Source/WTF/ChangeLog	2016-02-26 17:54:32 UTC (rev 197173)
@@ -1,3 +1,16 @@
+2016-02-26  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, rolling out r197168.
+        https://bugs.webkit.org/show_bug.cgi?id=154728
+
+        crashing on some devices (Requested by kling on #webkit).
+
+        Reverted changeset:
+
+        "[Darwin] Use vm_kernel_page_size for WTF::pageSize()."
+        https://bugs.webkit.org/show_bug.cgi?id=154726
+        http://trac.webkit.org/changeset/197168
+
 2016-02-26  Andreas Kling  <akl...@apple.com>
 
         [Darwin] Use vm_kernel_page_size for WTF::pageSize().

Modified: trunk/Source/WTF/wtf/PageBlock.cpp (197172 => 197173)

--- trunk/Source/WTF/wtf/PageBlock.cpp	2016-02-26 17:50:50 UTC (rev 197172)
+++ trunk/Source/WTF/wtf/PageBlock.cpp	2016-02-26 17:54:32 UTC (rev 197173)
@@ -26,10 +26,6 @@
 #include "config.h"
 #include "PageBlock.h"
 
-#if OS(DARWIN)
-#include <mach/vm_page_size.h>
-#endif
-
 #if OS(UNIX)
 #include <unistd.h>
 #endif
@@ -44,17 +40,10 @@
 static size_t s_pageSize;
 static size_t s_pageMask;
 
-#if OS(DARWIN)
+#if OS(UNIX)
 
 inline size_t systemPageSize()
 {
-    return vm_kernel_page_size;
-}
-
-#elif OS(UNIX)
-
-inline size_t systemPageSize()
-{
     return getpagesize();
 }
 

Modified: trunk/Source/WebKit2/ChangeLog (197172 => 197173)

--- trunk/Source/WebKit2/ChangeLog	2016-02-26 17:50:50 UTC (rev 197172)
+++ trunk/Source/WebKit2/ChangeLog	2016-02-26 17:54:32 UTC (rev 197173)
@@ -1,3 +1,16 @@
+2016-02-26  Commit Queue  <commit-qu...@webkit.org>
+
+        Unreviewed, rolling out r197168.
+        https://bugs.webkit.org/show_bug.cgi?id=154728
+
+        crashing on some devices (Requested by kling on #webkit).
+
+        Reverted changeset:
+
+        "[Darwin] Use vm_kernel_page_size for WTF::pageSize()."
+        https://bugs.webkit.org/show_bug.cgi?id=154726
+        http://trac.webkit.org/changeset/197168
+
 2016-02-25  Sam Weinig  <s...@webkit.org>
 
         Allow WKUserScripts to be run in isolated worlds

Modified: trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp (197172 => 197173)

--- trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp	2016-02-26 17:50:50 UTC (rev 197172)
+++ trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp	2016-02-26 17:54:32 UTC (rev 197173)
@@ -35,7 +35,6 @@
 #include <mach/mach_error.h>
 #include <mach/mach_port.h>
 #include <mach/vm_map.h>
-#include <wtf/PageBlock.h>
 #include <wtf/RefPtr.h>
 
 namespace WebKit {
@@ -218,7 +217,7 @@
 
 unsigned SharedMemory::systemPageSize()
 {
-    return WTF::pageSize();
+    return vm_page_size;
 }
 
 WebCore::MachSendRight SharedMemory::createSendRight(Protection protection) const

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes