Diff
Modified: branches/safari-537.43-branch/Source/WebCore/ChangeLog (151047 => 151048)
--- branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-31 22:14:28 UTC (rev 151047)
+++ branches/safari-537.43-branch/Source/WebCore/ChangeLog 2013-05-31 22:23:03 UTC (rev 151048)
@@ -1,5 +1,21 @@
2013-05-31 Lucas Forschler <[email protected]>
+ Merge r151040
+
+ 2013-05-31 Tiancheng Jiang <[email protected]>
+
+ [BlackBerry] Update Button UX.
+ https://bugs.webkit.org/show_bug.cgi?id=116992
+
+ Reviewed by Rob Buis.
+
+ BlackBerry PR 342298.
+ Internally Review by Jeff Rogers.
+
+ * css/themeBlackBerry.css:
+
+2013-05-31 Lucas Forschler <[email protected]>
+
Merge r151042
2013-05-31 Anders Carlsson <[email protected]>
Modified: branches/safari-537.43-branch/Source/WebCore/WebCore.exp.in (151047 => 151048)
--- branches/safari-537.43-branch/Source/WebCore/WebCore.exp.in 2013-05-31 22:14:28 UTC (rev 151047)
+++ branches/safari-537.43-branch/Source/WebCore/WebCore.exp.in 2013-05-31 22:23:03 UTC (rev 151048)
@@ -2315,6 +2315,10 @@
_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 (151047 => 151048)
--- branches/safari-537.43-branch/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2013-05-31 22:14:28 UTC (rev 151047)
+++ branches/safari-537.43-branch/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2013-05-31 22:23:03 UTC (rev 151048)
@@ -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: branches/safari-537.43-branch/Source/WebCore/platform/mac/WebCoreSystemInterface.h (151047 => 151048)
--- branches/safari-537.43-branch/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-05-31 22:14:28 UTC (rev 151047)
+++ branches/safari-537.43-branch/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2013-05-31 22:23:03 UTC (rev 151048)
@@ -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: branches/safari-537.43-branch/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (151047 => 151048)
--- branches/safari-537.43-branch/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-05-31 22:14:28 UTC (rev 151047)
+++ branches/safari-537.43-branch/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2013-05-31 22:23:03 UTC (rev 151048)
@@ -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: branches/safari-537.43-branch/Source/WebKit/mac/ChangeLog (151047 => 151048)
--- branches/safari-537.43-branch/Source/WebKit/mac/ChangeLog 2013-05-31 22:14:28 UTC (rev 151047)
+++ branches/safari-537.43-branch/Source/WebKit/mac/ChangeLog 2013-05-31 22:23:03 UTC (rev 151048)
@@ -1,3 +1,17 @@
+2013-05-31 Lucas Forschler <[email protected]>
+
+ Merge r151040
+
+ 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-28 Roger Fong <[email protected]>
Disable some feature flags.
Modified: branches/safari-537.43-branch/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (151047 => 151048)
--- branches/safari-537.43-branch/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-05-31 22:14:28 UTC (rev 151047)
+++ branches/safari-537.43-branch/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2013-05-31 22:23:03 UTC (rev 151048)
@@ -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: branches/safari-537.43-branch/Source/WebKit2/ChangeLog (151047 => 151048)
--- branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-05-31 22:14:28 UTC (rev 151047)
+++ branches/safari-537.43-branch/Source/WebKit2/ChangeLog 2013-05-31 22:23:03 UTC (rev 151048)
@@ -1,5 +1,20 @@
2013-05-31 Lucas Forschler <[email protected]>
+ Merge r151040
+
+ 2013-05-31 Alexey Proskuryakov <[email protected]>
+
+ REGRESSION (r141445): MPEG-4 videos do not play on certain hardware configurations
+ https://bugs.webkit.org/show_bug.cgi?id=117089
+ <rdar://problem/13839717>
+
+ Reviewed by Mark Rowe.
+
+ * Configurations/WebContentProcess.xcconfig: Statically link to a framework that
+ uses an XPC service to work around a libxpc limitation on Lion.
+
+2013-05-31 Lucas Forschler <[email protected]>
+
Merge r151026
2013-05-31 Dean Jackson <[email protected]>
Modified: branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (151047 => 151048)
--- branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-05-31 22:14:28 UTC (rev 151047)
+++ branches/safari-537.43-branch/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2013-05-31 22:23:03 UTC (rev 151048)
@@ -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);
