Title: [173378] trunk/Source
- Revision
- 173378
- Author
- [email protected]
- Date
- 2014-09-08 08:21:47 -0700 (Mon, 08 Sep 2014)
Log Message
Source/WebKit/mac:
iOS Simulator build fix.
* Misc/WebKitSystemBits.m:
(WebMemorySize):
Source/WebKit2:
Build fix.
* Platform/IPC/Connection.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (173377 => 173378)
--- trunk/Source/WebKit/mac/ChangeLog 2014-09-08 15:21:34 UTC (rev 173377)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-09-08 15:21:47 UTC (rev 173378)
@@ -1,3 +1,10 @@
+2014-09-08 Dan Bernstein <[email protected]>
+
+ iOS Simulator build fix.
+
+ * Misc/WebKitSystemBits.m:
+ (WebMemorySize):
+
2014-09-07 Darin Adler <[email protected]>
Fix build failure seen on Mountain Lion buildbot.
Modified: trunk/Source/WebKit/mac/Misc/WebKitSystemBits.m (173377 => 173378)
--- trunk/Source/WebKit/mac/Misc/WebKitSystemBits.m 2014-09-08 15:21:34 UTC (rev 173377)
+++ trunk/Source/WebKit/mac/Misc/WebKitSystemBits.m 2014-09-08 15:21:47 UTC (rev 173378)
@@ -36,6 +36,8 @@
#import <sys/types.h>
#import <wtf/Assertions.h>
+#if !PLATFORM(IOS_SIMULATOR)
+
static host_basic_info_data_t gHostBasicInfo;
static pthread_once_t initControl = PTHREAD_ONCE_INIT;
@@ -55,12 +57,14 @@
}
}
+#endif
+
uint64_t WebMemorySize(void)
{
#if PLATFORM(IOS_SIMULATOR)
// Pretend we have 512MB of memory to make cache sizes behave like on device
return 512 * 1024 * 1024;
-#endif
+#else
pthread_once(&initControl, initCapabilities);
#if PLATFORM(IOS)
// On iOS, round up the memory size to a power of 2 because max_mem may not be exactly 256MB
@@ -69,6 +73,7 @@
#else
return gHostBasicInfo.max_mem;
#endif
+#endif
}
int WebNumberOfCPUs(void)
Modified: trunk/Source/WebKit2/ChangeLog (173377 => 173378)
--- trunk/Source/WebKit2/ChangeLog 2014-09-08 15:21:34 UTC (rev 173377)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-08 15:21:47 UTC (rev 173378)
@@ -1,3 +1,9 @@
+2014-09-08 Dan Bernstein <[email protected]>
+
+ Build fix.
+
+ * Platform/IPC/Connection.h:
+
2014-09-06 Sam Weinig <[email protected]>
XPCPtr should be converted into an all purpose smart pointer for os_objects
Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (173377 => 173378)
--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-09-08 15:21:34 UTC (rev 173377)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-09-08 15:21:47 UTC (rev 173378)
@@ -42,6 +42,7 @@
#if OS(DARWIN)
#include <mach/mach_port.h>
+#include <xpc/xpc.h>
#include <wtf/OSObjectPtr.h>
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
