Diff
Modified: branches/safari-537.43-branch/Source/WebCore/ChangeLog (151049 => 151050)
--- branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-31 22:32:27 UTC (rev 151049)
+++ branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-31 22:47:05 UTC (rev 151050)
@@ -1,5 +1,9 @@
2013-05-31 Lucas Forschler <[email protected]>
+ Rollout r151048
+
+2013-05-31 Lucas Forschler <[email protected]>
+
Merge r151040
2013-05-31 Tiancheng Jiang <[email protected]>
Modified: branches/safari-537.43-branch/Source/WebCore/WebCore.exp.in (151049 => 151050)
--- branches/safari-537.43-branch/Source/WebCore/WebCore.exp.in 2013-05-31 22:32:27 UTC (rev 151049)
+++ branches/safari-537.43-branch/Source/WebCore/WebCore.exp.in 2013-05-31 22:47:05 UTC (rev 151050)
@@ -2315,10 +2315,6 @@
_wkRecommendedScrollerStyle
#endif
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-_wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue
-#endif
-
#if USE(CONTENT_FILTERING)
_wkFilterAddData
_wkFilterCreateInstance
Modified: branches/safari-537.43-branch/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm (151049 => 151050)
--- branches/safari-537.43-branch/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2013-05-31 22:32:27 UTC (rev 151049)
+++ branches/safari-537.43-branch/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2013-05-31 22:47:05 UTC (rev 151050)
@@ -70,11 +70,7 @@
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: branches/safari-537.43-branch/Source/WebCore/platform/mac/WebCoreSystemInterface.h (151049 => 151050)
--- branches/safari-537.43-branch/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-05-31 22:32:27 UTC (rev 151049)
+++ branches/safari-537.43-branch/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-05-31 22:47:05 UTC (rev 151050)
@@ -334,10 +334,6 @@
#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: branches/safari-537.43-branch/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (151049 => 151050)
--- branches/safari-537.43-branch/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-05-31 22:32:27 UTC (rev 151049)
+++ branches/safari-537.43-branch/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-05-31 22:47:05 UTC (rev 151050)
@@ -204,10 +204,6 @@
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: branches/safari-537.43-branch/Source/WebKit/mac/ChangeLog (151049 => 151050)
--- branches/safari-537.43-branch/Source/WebKit/mac/ChangeLog 2013-05-31 22:32:27 UTC (rev 151049)
+++ branches/safari-537.43-branch/Source/WebKit/mac/ChangeLog 2013-05-31 22:47:05 UTC (rev 151050)
@@ -1,5 +1,9 @@
2013-05-31 Lucas Forschler <[email protected]>
+ Rollout r151048
+
+2013-05-31 Lucas Forschler <[email protected]>
+
Merge r151040
2013-05-31 Stephanie Lewis <[email protected]>
Modified: branches/safari-537.43-branch/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (151049 => 151050)
--- branches/safari-537.43-branch/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-05-31 22:32:27 UTC (rev 151049)
+++ branches/safari-537.43-branch/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-05-31 22:47:05 UTC (rev 151050)
@@ -198,10 +198,6 @@
#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: branches/safari-537.43-branch/Source/WebKit2/ChangeLog (151049 => 151050)
--- branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-05-31 22:32:27 UTC (rev 151049)
+++ branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-05-31 22:47:05 UTC (rev 151050)
@@ -1,5 +1,9 @@
2013-05-31 Lucas Forschler <[email protected]>
+ Rollout r151048
+
+2013-05-31 Lucas Forschler <[email protected]>
+
Merge r151040
2013-05-31 Alexey Proskuryakov <[email protected]>
Modified: branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (151049 => 151050)
--- branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-05-31 22:32:27 UTC (rev 151049)
+++ branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-05-31 22:47:05 UTC (rev 151050)
@@ -170,10 +170,6 @@
#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);
