Diff
Modified: trunk/Source/WebCore/ChangeLog (98279 => 98280)
--- trunk/Source/WebCore/ChangeLog 2011-10-24 20:54:14 UTC (rev 98279)
+++ trunk/Source/WebCore/ChangeLog 2011-10-24 20:57:59 UTC (rev 98280)
@@ -1,3 +1,22 @@
+2011-10-24 Michael Saboff <msab...@apple.com>
+
+ WebKit doesn't build with recent changes to libdispatch
+ https://bugs.webkit.org/show_bug.cgi?id=70737
+
+ Added initialization for new WebKitSystemInterface function
+ CreateVMPressureDispatchOnMainQueue. Changed MemoryPressureHandler::install
+ to use new function.
+
+ Reviewed by Geoffrey Garen.
+
+ No new tests. Moved functionality to WebKitSystemInterface.
+
+ * WebCore.exp.in:
+ * platform/mac/MemoryPressureHandlerMac.mm:
+ (WebCore::MemoryPressureHandler::install):
+ * platform/mac/WebCoreSystemInterface.h:
+ * platform/mac/WebCoreSystemInterface.mm:
+
2011-10-24 Joshua Bell <jsb...@chromium.org>
IndexedDB: Throw DATA_ERR on invalid keys, remove null key support
Modified: trunk/Source/WebCore/WebCore.exp.in (98279 => 98280)
--- trunk/Source/WebCore/WebCore.exp.in 2011-10-24 20:54:14 UTC (rev 98279)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-10-24 20:57:59 UTC (rev 98280)
@@ -1981,3 +1981,7 @@
__ZN7WebCore7IntSizeC1ERK7_NSSize
__ZNK7WebCore7IntSizecv7_NSSizeEv
#endif
+
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+_wkCreateVMPressureDispatchOnMainQueue
+#endif
Modified: trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm (98279 => 98280)
--- trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2011-10-24 20:54:14 UTC (rev 98279)
+++ trunk/Source/WebCore/platform/mac/MemoryPressureHandlerMac.mm 2011-10-24 20:57:59 UTC (rev 98280)
@@ -33,20 +33,10 @@
#import <wtf/FastMalloc.h>
#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
-#import <dispatch/dispatch.h>
+#import "WebCoreSystemInterface.h"
#import <notify.h>
-
-#ifndef DISPATCH_SOURCE_TYPE_VM
-#define DISPATCH_SOURCE_TYPE_VM (&_dispatch_source_type_vm)
-DISPATCH_EXPORT const struct dispatch_source_type_s _dispatch_source_type_vm;
-
-enum {
- DISPATCH_VM_PRESSURE = 0x80000000,
-};
#endif
-#endif
-
namespace WebCore {
#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
@@ -66,7 +56,7 @@
return;
dispatch_async(dispatch_get_main_queue(), ^{
- _cache_event_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_VM, 0, DISPATCH_VM_PRESSURE, dispatch_get_main_queue());
+ _cache_event_source = wkCreateVMPressureDispatchOnMainQueue();
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 (98279 => 98280)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2011-10-24 20:54:14 UTC (rev 98279)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.h 2011-10-24 20:57:59 UTC (rev 98280)
@@ -310,6 +310,13 @@
extern void (*wkCFURLRequestSetHTTPRequestBodyParts)(CFMutableURLRequestRef, CFArrayRef bodyParts);
extern void (*wkSetRequestStorageSession)(CFURLStorageSessionRef, CFMutableURLRequestRef);
#endif
+
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+#import <dispatch/dispatch.h>
+
+extern dispatch_source_t (*wkCreateVMPressureDispatchOnMainQueue)(void);
+
+#endif
}
#endif
Modified: trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm (98279 => 98280)
--- trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2011-10-24 20:54:14 UTC (rev 98279)
+++ trunk/Source/WebCore/platform/mac/WebCoreSystemInterface.mm 2011-10-24 20:57:59 UTC (rev 98280)
@@ -171,3 +171,8 @@
CFHTTPMessageRef (*wkGetCFURLResponseHTTPResponse)(CFURLResponseRef);
CFStringRef (*wkCopyCFURLResponseSuggestedFilename)(CFURLResponseRef);
void (*wkSetCFURLResponseMIMEType)(CFURLResponseRef, CFStringRef mimeType);
+
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+dispatch_source_t (*wkCreateVMPressureDispatchOnMainQueue)(void);
+#endif
+
Modified: trunk/Source/WebKit/mac/ChangeLog (98279 => 98280)
--- trunk/Source/WebKit/mac/ChangeLog 2011-10-24 20:54:14 UTC (rev 98279)
+++ trunk/Source/WebKit/mac/ChangeLog 2011-10-24 20:57:59 UTC (rev 98280)
@@ -1,3 +1,16 @@
+2011-10-24 Michael Saboff <msab...@apple.com>
+
+ WebKit doesn't build with recent changes to libdispatch
+ https://bugs.webkit.org/show_bug.cgi?id=70737
+
+ Added initialization for new WebKitSystemInterface function
+ CreateVMPressureDispatchOnMainQueue.
+
+ Reviewed by Geoffrey Garen.
+
+ * WebCoreSupport/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
2011-10-23 Mark Hahnenberg <mhahnenb...@apple.com>
Remove getConstructDataVirtual
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm (98279 => 98280)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2011-10-24 20:54:14 UTC (rev 98279)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.mm 2011-10-24 20:57:59 UTC (rev 98280)
@@ -162,5 +162,9 @@
INIT(CopyCFURLResponseSuggestedFilename);
INIT(SetCFURLResponseMIMEType);
+#if !defined(BUILDING_ON_LEOPARD) && !defined(BUILDING_ON_SNOW_LEOPARD)
+ INIT(CreateVMPressureDispatchOnMainQueue);
+#endif
+
didInit = true;
}
Modified: trunk/Source/WebKit2/ChangeLog (98279 => 98280)
--- trunk/Source/WebKit2/ChangeLog 2011-10-24 20:54:14 UTC (rev 98279)
+++ trunk/Source/WebKit2/ChangeLog 2011-10-24 20:57:59 UTC (rev 98280)
@@ -1,3 +1,16 @@
+2011-10-24 Michael Saboff <msab...@apple.com>
+
+ WebKit doesn't build with recent changes to libdispatch
+ https://bugs.webkit.org/show_bug.cgi?id=70737
+
+ Added initialization for new WebKitSystemInterface function
+ CreateVMPressureDispatchOnMainQueue.
+
+ Reviewed by Geoffrey Garen.
+
+ * WebProcess/WebCoreSupport/mac/WebSystemInterface.mm:
+ (InitWebCoreSystemInterface):
+
2011-10-24 Sam Weinig <s...@webkit.org>
Add URL getters for the WKBrowsingContextController
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm (98279 => 98280)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2011-10-24 20:54:14 UTC (rev 98279)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebSystemInterface.mm 2011-10-24 20:57:59 UTC (rev 98280)
@@ -148,5 +148,10 @@
INIT(GetCFURLResponseHTTPResponse);
INIT(CopyCFURLResponseSuggestedFilename);
INIT(SetCFURLResponseMIMEType);
+
+#if !defined(BUILDING_ON_SNOW_LEOPARD)
+ INIT(CreateVMPressureDispatchOnMainQueue);
+#endif
+
});
}
