Diff
Modified: trunk/Source/WebCore/ChangeLog (151039 => 151040)
--- trunk/Source/WebCore/ChangeLog 2013-05-31 21:40:33 UTC (rev 151039)
+++ trunk/Source/WebCore/ChangeLog 2013-05-31 21:44:26 UTC (rev 151040)
@@ -201,6 +201,21 @@
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::paintObject):
+2013-05-31 Stephanie Lewis <[email protected]>
+
+ Update low memory handler to use new memory pressure notifications on new OS versions.
+ <rdar://problem/14027095>
+
+ Reviewed by Mark Rowe.
+
+ No change in functionality.
+
+ * WebCore.exp.in:
+ * platform/mac/MemoryPressureHandlerMac.mm:
+ (WebCore::MemoryPressureHandler::install): Call new API
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+
2013-05-30 Rafael Brandao <[email protected]>
Fix double hash lookup in WebSocket::connect loop
Modified: trunk/Source/WebCore/WebCore.exp.in (151039 => 151040)
--- trunk/Source/WebCore/WebCore.exp.in 2013-05-31 21:40:33 UTC (rev 151039)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-05-31 21:44:26 UTC (rev 151040)
@@ -2312,6 +2312,10 @@
_wkRecommendedScrollerStyle
#endif
+#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+_wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue
+#endif
+
#if USE(CONTENT_FILTERING)
_wkFilterAddData
_wkFilterCreateInstance
Modified: trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm (151039 => 151040)
--- trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2013-05-31 21:40:33 UTC (rev 151039)
+++ trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2013-05-31 21:44:26 UTC (rev 151040)
@@ -70,7 +70,11 @@
return;
dispatch_async(dispatch_get_main_queue(), ^{
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ _cache_event_source = wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue();
+#else
_cache_event_source = wkCreateVMPressureDispatchOnMainQueue();
+#endif
if (_cache_event_source) {
dispatch_set_context(_cache_event_source, this);
dispatch_source_set_event_handler(_cache_event_source, ^{ memoryPressureHandler().respondToMemoryPressure();});
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (151039 => 151040)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-05-31 21:40:33 UTC (rev 151039)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-05-31 21:44:26 UTC (rev 151040)
@@ -334,6 +334,10 @@
#endif
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+extern dispatch_source_t (*wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue)(void);
+#endif
+
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
extern bool (*wkExecutableWasLinkedOnOrBeforeLion)(void);
#endif
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (151039 => 151040)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-05-31 21:40:33 UTC (rev 151039)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-05-31 21:44:26 UTC (rev 151040)
@@ -204,6 +204,10 @@
dispatch_source_t (*wkCreateVMPressureDispatchOnMainQueue)(void);
#endif
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+dispatch_source_t (*wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue)(void);
+#endif
+
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
bool (*wkExecutableWasLinkedOnOrBeforeLion)(void);
#endif
Modified: trunk/Source/WebKit/mac/ChangeLog (151039 => 151040)
--- trunk/Source/WebKit/mac/ChangeLog 2013-05-31 21:40:33 UTC (rev 151039)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-05-31 21:44:26 UTC (rev 151040)
@@ -1,3 +1,13 @@
+2013-05-31 Stephanie Lewis <[email protected]>
+
+ Update low memory handler to use new memory pressure notifications on new OS versions.
+ <rdar://problem/14027095>
+
+ Reviewed by Mark Rowe.
+
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
2013-05-29 Jeffrey Pfau <[email protected]>
[Mac] Enable cache partitioning and the public suffix list on 10.8
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (151039 => 151040)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-05-31 21:40:33 UTC (rev 151039)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-05-31 21:44:26 UTC (rev 151040)
@@ -198,6 +198,10 @@
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
INIT(CreateVMPressureDispatchOnMainQueue);
#endif
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ INIT(CreateMemoryStatusPressureCriticalDispatchOnMainQueue);
+#endif
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
INIT(ExecutableWasLinkedOnOrBeforeLion);
Modified: trunk/Source/WebKit2/ChangeLog (151039 => 151040)
--- trunk/Source/WebKit2/ChangeLog 2013-05-31 21:40:33 UTC (rev 151039)
+++ trunk/Source/WebKit2/ChangeLog 2013-05-31 21:44:26 UTC (rev 151040)
@@ -39,6 +39,16 @@
* WebProcess/InjectedBundle/API/mac/WKDOMInternals.mm:
(WebKit::WKDOMNodeClass):
+2013-05-31 Stephanie Lewis <[email protected]>
+
+ Update low memory handler to use new memory pressure notifications on new OS versions.
+ <rdar://problem/14027095>
+
+ Reviewed by Mark Rowe.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
2013-05-30 Tim Horton <[email protected]>
Remove ASSERT_NOT_REACHED from WKDOMNodeClass
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (151039 => 151040)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-05-31 21:40:33 UTC (rev 151039)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-05-31 21:44:26 UTC (rev 151040)
@@ -170,6 +170,10 @@
#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080
INIT(ExecutableWasLinkedOnOrBeforeLion);
#endif
+
+#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
+ INIT(CreateMemoryStatusPressureCriticalDispatchOnMainQueue);
+#endif
INIT(CGPathAddRoundedRect);
INIT(CFURLRequestAllowAllPostCaching);
