Diff
Modified: trunk/Source/WebCore/ChangeLog (186074 => 186075)
--- trunk/Source/WebCore/ChangeLog 2015-06-29 18:46:37 UTC (rev 186074)
+++ trunk/Source/WebCore/ChangeLog 2015-06-29 18:56:56 UTC (rev 186075)
@@ -1,3 +1,19 @@
+2015-06-29 Anders Carlsson <ander...@apple.com>
+
+ Use DISPATCH_SOURCE_TYPE_MEMORYPRESSURE instead of DISPATCH_SOURCE_TYPE_MEMORYSTATUS
+ https://bugs.webkit.org/show_bug.cgi?id=146413
+ rdar://problem/21295036
+
+ Reviewed by Andreas Kling.
+
+ Replace SPI with API.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/cocoa/MemoryPressureHandlerCocoa.mm:
+ (WebCore::MemoryPressureHandler::install):
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/spi/cocoa/DispatchSPI.h: Removed.
+
2015-06-29 Andreas Kling <akl...@apple.com>
[iOS] Pausing a media element should discard buffered data immediately if under memory pressure.
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (186074 => 186075)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-06-29 18:46:37 UTC (rev 186074)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-06-29 18:56:56 UTC (rev 186075)
@@ -5901,7 +5901,6 @@
CE1252451A16C22500864480 /* DynamicLinkerSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252441A16C22500864480 /* DynamicLinkerSPI.h */; };
CE1252471A16C2C200864480 /* NSPointerFunctionsSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252461A16C2C200864480 /* NSPointerFunctionsSPI.h */; };
CE1252491A16C3BC00864480 /* MobileGestaltSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252481A16C3BC00864480 /* MobileGestaltSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
- CE12524B1A16C79B00864480 /* DispatchSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12524A1A16C79B00864480 /* DispatchSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE12524D1A1A77DE00864480 /* IOPMLibSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */; };
CE12524F1A1A78D200864480 /* MachVMSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE12524E1A1A78D200864480 /* MachVMSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
CE1252511A1BEBD800864480 /* NSCalendarDateSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1252501A1BEBD800864480 /* NSCalendarDateSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -13539,7 +13538,6 @@
CE1252441A16C22500864480 /* DynamicLinkerSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLinkerSPI.h; sourceTree = "<group>"; };
CE1252461A16C2C200864480 /* NSPointerFunctionsSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSPointerFunctionsSPI.h; sourceTree = "<group>"; };
CE1252481A16C3BC00864480 /* MobileGestaltSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MobileGestaltSPI.h; sourceTree = "<group>"; };
- CE12524A1A16C79B00864480 /* DispatchSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DispatchSPI.h; sourceTree = "<group>"; };
CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IOPMLibSPI.h; sourceTree = "<group>"; };
CE12524E1A1A78D200864480 /* MachVMSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MachVMSPI.h; sourceTree = "<group>"; };
CE1252501A1BEBD800864480 /* NSCalendarDateSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSCalendarDateSPI.h; sourceTree = "<group>"; };
@@ -16619,7 +16617,6 @@
CD4097FF1A8C855F004C65E9 /* CFNSURLConnectionSPI.h */,
1C5E980F1A02CEFA002DB55F /* CoreTextSPI.h */,
935E2B4D1AFF06CA00976F9F /* DataDetectorsCoreSPI.h */,
- CE12524A1A16C79B00864480 /* DispatchSPI.h */,
CE1252441A16C22500864480 /* DynamicLinkerSPI.h */,
CE12524C1A1A77DE00864480 /* IOPMLibSPI.h */,
44DEF6421A6FF92700D45EEC /* IOReturnSPI.h */,
@@ -24318,7 +24315,6 @@
937FF3D51A1012D6008EBA31 /* DictionaryLookup.h in Headers */,
FDAF19991513D131008DB0C3 /* DirectConvolver.h in Headers */,
7EDAAFC919A2CCDC0034DFD1 /* DiskCacheMonitorCocoa.h in Headers */,
- CE12524B1A16C79B00864480 /* DispatchSPI.h in Headers */,
49AF2D6914435D050016A784 /* DisplayRefreshMonitor.h in Headers */,
2D29ECC6192ECC8300984B78 /* DisplayRefreshMonitorClient.h in Headers */,
2D29ECCA192F1F1D00984B78 /* DisplayRefreshMonitorIOS.h in Headers */,
Modified: trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm (186074 => 186075)
--- trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2015-06-29 18:46:37 UTC (rev 186074)
+++ trunk/Source/WebCore/platform/cocoa/MemoryPressureHandlerCocoa.mm 2015-06-29 18:56:56 UTC (rev 186075)
@@ -26,7 +26,6 @@
#import "config.h"
#import "MemoryPressureHandler.h"
-#import "DispatchSPI.h"
#import "IOSurfacePool.h"
#import "GCController.h"
#import "JSDOMWindow.h"
@@ -102,36 +101,33 @@
return;
dispatch_async(dispatch_get_main_queue(), ^{
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
- _cache_event_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS, 0, DISPATCH_MEMORYSTATUS_PRESSURE_NORMAL | DISPATCH_MEMORYSTATUS_PRESSURE_WARN | DISPATCH_MEMORYSTATUS_PRESSURE_CRITICAL, dispatch_get_main_queue());
+#if PLATFORM(IOS)
+ _cache_event_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYPRESSURE, 0, DISPATCH_MEMORYPRESSURE_NORMAL | DISPATCH_MEMORYPRESSURE_WARN | DISPATCH_MEMORYPRESSURE_CRITICAL, dispatch_get_main_queue());
#elif PLATFORM(MAC)
- _cache_event_source = wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue();
-#else
- _cache_event_source = wkCreateVMPressureDispatchOnMainQueue();
+ _cache_event_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYPRESSURE, 0, DISPATCH_MEMORYPRESSURE_CRITICAL, dispatch_get_main_queue());
#endif
- if (_cache_event_source) {
- dispatch_set_context(_cache_event_source, this);
- dispatch_source_set_event_handler(_cache_event_source, ^{
- bool critical = true;
-#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000
- unsigned long status = dispatch_source_get_data(_cache_event_source);
- critical = status == DISPATCH_MEMORYPRESSURE_CRITICAL;
- auto& memoryPressureHandler = MemoryPressureHandler::singleton();
- bool wasCritical = memoryPressureHandler.isUnderMemoryPressure();
- memoryPressureHandler.setUnderMemoryPressure(critical);
- if (status == DISPATCH_MEMORYSTATUS_PRESSURE_NORMAL) {
- if (ReliefLogger::loggingEnabled())
- NSLog(@"System is no longer under (%s) memory pressure.", wasCritical ? "critical" : "non-critical");
- return;
- }
+ dispatch_set_context(_cache_event_source, this);
+ dispatch_source_set_event_handler(_cache_event_source, ^{
+ bool critical = true;
+#if PLATFORM(IOS)
+ unsigned long status = dispatch_source_get_data(_cache_event_source);
+ critical = status == DISPATCH_MEMORYPRESSURE_CRITICAL;
+ auto& memoryPressureHandler = MemoryPressureHandler::singleton();
+ bool wasCritical = memoryPressureHandler.isUnderMemoryPressure();
+ memoryPressureHandler.setUnderMemoryPressure(critical);
+ if (status == DISPATCH_MEMORYPRESSURE_NORMAL) {
if (ReliefLogger::loggingEnabled())
- NSLog(@"Got memory pressure notification (%s)", critical ? "critical" : "non-critical");
+ NSLog(@"System is no longer under (%s) memory pressure.", wasCritical ? "critical" : "non-critical");
+ return;
+ }
+
+ if (ReliefLogger::loggingEnabled())
+ NSLog(@"Got memory pressure notification (%s)", critical ? "critical" : "non-critical");
#endif
- MemoryPressureHandler::singleton().respondToMemoryPressure(critical ? Critical::Yes : Critical::No);
- });
- dispatch_resume(_cache_event_source);
- }
+ MemoryPressureHandler::singleton().respondToMemoryPressure(critical ? Critical::Yes : Critical::No);
+ });
+ dispatch_resume(_cache_event_source);
});
// Allow simulation of memory pressure with "notifyutil -p org.WebKit.lowMemory"
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h (186074 => 186075)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-06-29 18:46:37 UTC (rev 186074)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2015-06-29 18:56:56 UTC (rev 186075)
@@ -287,16 +287,6 @@
#endif
#if !PLATFORM(IOS)
-#import <dispatch/dispatch.h>
-
-extern dispatch_source_t (*wkCreateVMPressureDispatchOnMainQueue)(void);
-#endif
-
-#if PLATFORM(MAC)
-extern dispatch_source_t (*wkCreateMemoryStatusPressureCriticalDispatchOnMainQueue)(void);
-#endif
-
-#if !PLATFORM(IOS)
extern bool (*wkExecutableWasLinkedOnOrBeforeLion)(void);
#endif
Deleted: trunk/Source/WebCore/platform/spi/cocoa/DispatchSPI.h (186074 => 186075)
--- trunk/Source/WebCore/platform/spi/cocoa/DispatchSPI.h 2015-06-29 18:46:37 UTC (rev 186074)
+++ trunk/Source/WebCore/platform/spi/cocoa/DispatchSPI.h 2015-06-29 18:56:56 UTC (rev 186075)
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef DispatchSPI_h
-#define DispatchSPI_h
-
-#include <dispatch/dispatch.h>
-
-#if USE(APPLE_INTERNAL_SDK)
-
-// FIXME: As a workaround for <rdar://problem/18337182>, we conditionally enclose the header
-// <dispatch/private.h> in an extern "C" linkage block to make it suitable for C++ use.
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include <dispatch/private.h>
-
-#ifdef __cplusplus
-}
-#endif
-
-#else // USE(APPLE_INTERNAL_SDK)
-
-enum {
- DISPATCH_MEMORYSTATUS_PRESSURE_NORMAL = 0x01,
- DISPATCH_MEMORYSTATUS_PRESSURE_WARN = 0x02,
- DISPATCH_MEMORYSTATUS_PRESSURE_CRITICAL = 0x04,
-};
-#define DISPATCH_SOURCE_TYPE_MEMORYSTATUS (&_dispatch_source_type_memorystatus)
-
-#endif
-
-EXTERN_C const struct dispatch_source_type_s _dispatch_source_type_memorystatus;
-
-#endif // DispatchSPI_h
Modified: trunk/Source/WebKit/mac/ChangeLog (186074 => 186075)
--- trunk/Source/WebKit/mac/ChangeLog 2015-06-29 18:46:37 UTC (rev 186074)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-06-29 18:56:56 UTC (rev 186075)
@@ -1,3 +1,17 @@
+2015-06-29 Anders Carlsson <ander...@apple.com>
+
+ Use DISPATCH_SOURCE_TYPE_MEMORYPRESSURE instead of DISPATCH_SOURCE_TYPE_MEMORYSTATUS
+ https://bugs.webkit.org/show_bug.cgi?id=146413
+
+ Reviewed by Andreas Kling.
+
+ Replace SPI with API.
+
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Deleted.
+ * WebView/WebView.mm:
+ (+[WebView registerForMemoryNotifications]):
+
2015-06-28 Darin Adler <da...@apple.com>
[Mac] Remove redundant call to colorUsingColorSpaceName:
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (186074 => 186075)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2015-06-29 18:46:37 UTC (rev 186074)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2015-06-29 18:56:56 UTC (rev 186075)
@@ -178,8 +178,6 @@
INIT(DestroyRenderingResources);
#if !PLATFORM(IOS)
- INIT(CreateVMPressureDispatchOnMainQueue);
- INIT(CreateMemoryStatusPressureCriticalDispatchOnMainQueue);
INIT(ExecutableWasLinkedOnOrBeforeLion);
#endif
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (186074 => 186075)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-06-29 18:46:37 UTC (rev 186074)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-06-29 18:56:56 UTC (rev 186075)
@@ -243,7 +243,6 @@
#import "WebStorageManagerPrivate.h"
#import "WebUIKitSupport.h"
#import "WebVisiblePosition.h"
-#import <WebCore/DispatchSPI.h>
#import <WebCore/EventNames.h>
#import <WebCore/FontCache.h>
#import <WebCore/GraphicsLayer.h>
@@ -1285,7 +1284,7 @@
[WebView _handleMemoryWarning];
}, shouldAutoClearPressureOnMemoryRelease);
- static dispatch_source_t memoryNotificationEventSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS, 0, DISPATCH_MEMORYSTATUS_PRESSURE_WARN, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0));
+ static dispatch_source_t memoryNotificationEventSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYPRESSURE, 0, DISPATCH_MEMORYPRESSURE_WARN, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0));
dispatch_source_set_event_handler(memoryNotificationEventSource, ^{
// Set memory pressure flag and schedule releasing memory in web thread runloop exit.
MemoryPressureHandler::singleton().setReceivedMemoryPressure(WebCore::MemoryPressureReasonVMPressure);
@@ -1295,15 +1294,15 @@
if (!shouldAutoClearPressureOnMemoryRelease) {
// Listen to memory status notification to reset the memory pressure flag.
- static dispatch_source_t memoryStatusEventSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS,
+ static dispatch_source_t memoryStatusEventSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYPRESSURE,
0,
- DISPATCH_MEMORYSTATUS_PRESSURE_WARN | DISPATCH_MEMORYSTATUS_PRESSURE_NORMAL,
+ DISPATCH_MEMORYPRESSURE_WARN | DISPATCH_MEMORYPRESSURE_NORMAL,
dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0));
dispatch_source_set_event_handler(memoryStatusEventSource, ^{
unsigned long currentStatus = dispatch_source_get_data(memoryStatusEventSource);
- if (currentStatus == DISPATCH_MEMORYSTATUS_PRESSURE_NORMAL)
+ if (currentStatus == DISPATCH_MEMORYPRESSURE_NORMAL)
MemoryPressureHandler::singleton().clearMemoryPressure();
- else if (currentStatus == DISPATCH_MEMORYSTATUS_PRESSURE_WARN)
+ else if (currentStatus == DISPATCH_MEMORYPRESSURE_WARN)
MemoryPressureHandler::singleton().setReceivedMemoryPressure(WebCore::MemoryPressureReasonVMStatus);
});
Modified: trunk/Source/WebKit2/ChangeLog (186074 => 186075)
--- trunk/Source/WebKit2/ChangeLog 2015-06-29 18:46:37 UTC (rev 186074)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-29 18:56:56 UTC (rev 186075)
@@ -1,3 +1,17 @@
+2015-06-29 Anders Carlsson <ander...@apple.com>
+
+ Use DISPATCH_SOURCE_TYPE_MEMORYPRESSURE instead of DISPATCH_SOURCE_TYPE_MEMORYSTATUS
+ https://bugs.webkit.org/show_bug.cgi?id=146413
+
+ Reviewed by Andreas Kling.
+
+ Replace SPI with API.
+
+ * UIProcess/ios/WebMemoryPressureHandlerIOS.mm:
+ (WebKit::WebMemoryPressureHandler::WebMemoryPressureHandler):
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface): Deleted.
+
2015-06-29 Enrica Casucci <enr...@apple.com>
[iOS] Hardware Keyboard: All combinations of arrow keys and space key do not scroll the view.
Modified: trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.mm (186074 => 186075)
--- trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.mm 2015-06-29 18:46:37 UTC (rev 186074)
+++ trunk/Source/WebKit2/UIProcess/ios/WebMemoryPressureHandlerIOS.mm 2015-06-29 18:56:56 UTC (rev 186075)
@@ -29,7 +29,6 @@
#if PLATFORM(IOS)
#import "ViewSnapshotStore.h"
-#import <WebCore/DispatchSPI.h>
namespace WebKit {
@@ -45,7 +44,7 @@
// Right now it cannot because WebKit1 and WebKit2 need to be able to coexist in the UI process,
// and you can only have one WebCore::MemoryPressureHandler.
- _source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYSTATUS, 0, DISPATCH_MEMORYSTATUS_PRESSURE_WARN, dispatch_get_main_queue());
+ _source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MEMORYPRESSURE, 0, DISPATCH_MEMORYPRESSURE_WARN, dispatch_get_main_queue());
dispatch_set_context(_source, this);
dispatch_source_set_event_handler(_source, ^{
ViewSnapshotStore::singleton().discardSnapshotImages();
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (186074 => 186075)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-06-29 18:46:37 UTC (rev 186074)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2015-06-29 18:56:56 UTC (rev 186075)
@@ -156,15 +156,10 @@
INIT(CopyCFURLResponseSuggestedFilename);
INIT(SetCFURLResponseMIMEType);
-#if !PLATFORM(IOS)
- INIT(CreateVMPressureDispatchOnMainQueue);
-#endif
-
INIT(DestroyRenderingResources);
#if PLATFORM(MAC)
INIT(ExecutableWasLinkedOnOrBeforeLion);
- INIT(CreateMemoryStatusPressureCriticalDispatchOnMainQueue);
#endif
INIT(CGPathAddRoundedRect);
