Fix Cocoa build.

* platform/cocoa/MemoryPressureHandlerCocoa.mm:
(WebCore::MemoryPressureHandler::ReliefLogger::platformMemoryUsage):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@167449 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 437d683..d582b90 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,10 @@
+2014-04-17  Andreas Kling  <akling@apple.com>
+
+        Fix Cocoa build.
+
+        * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+        (WebCore::MemoryPressureHandler::ReliefLogger::platformMemoryUsage):
+
 2014-04-17  Rik Cabanier  <cabanier@adobe.com>
 
         [CSS Blending] Remove the -webkit- prefix for mix-blend-mode and isolation CSS properties

diff --git a/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm b/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm
index 167a496..52919ef 100644 (file)
--- a/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm
+++ b/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm
@@ -175,7 +175,7 @@ size_t MemoryPressureHandler::ReliefLogger::platformMemoryUsage()
     if (err != KERN_SUCCESS)
         return static_cast<size_t>(-1);
 
-    return vmInfo.internal;
+    return static_cast<size_t>(vmInfo.internal);
 }
 
 void MemoryPressureHandler::ReliefLogger::platformLog()