Diff
Modified: trunk/Source/WebKit2/ChangeLog (183069 => 183070)
--- trunk/Source/WebKit2/ChangeLog 2015-04-21 18:50:16 UTC (rev 183069)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-21 19:30:33 UTC (rev 183070)
@@ -1,3 +1,26 @@
+2015-04-21 Anders Carlsson <ander...@apple.com>
+
+ Fix block signatures
+ https://bugs.webkit.org/show_bug.cgi?id=144002
+
+ Reviewed by Andreas Kling.
+
+ * UIProcess/API/Cocoa/WKUIDelegate.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (-[WKWebsiteDataStore removeDataOfTypes:modifiedSince:completionHandler:]):
+ (-[WKWebsiteDataStore removeDataOfTypes:forDataRecords:completionHandler:]):
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
+ (-[_WKWebsiteDataStore removeDataOfTypes:forDataRecords:completionHandler:]):
+ (-[_WKWebsiteDataStore removeDataOfTypes:modifiedSince:completionHandler:]):
+ * UIProcess/ios/WKPDFView.mm:
+ (-[WKPDFView _highlightLinkAnnotation:forDuration:completionHandler:]):
+ * UIProcess/ios/forms/WKFileUploadPanel.mm:
+ (-[WKFileUploadPanel _processMediaInfoDictionaries:successBlock:failureBlock:]):
+ (-[WKFileUploadPanel _processMediaInfoDictionaries:atIndex:processedResults:processedImageCount:processedVideoCount:successBlock:failureBlock:]):
+ (-[WKFileUploadPanel _uploadItemFromMediaInfo:successBlock:failureBlock:]):
+
2015-04-21 Timothy Horton <timothy_hor...@apple.com>
PDFs still don't snapshot properly in iOS Safari
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h (183069 => 183070)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h 2015-04-21 18:50:16 UTC (rev 183069)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegate.h 2015-04-21 19:30:33 UTC (rev 183070)
@@ -71,7 +71,7 @@
If you do not implement this method, the web view will behave as if the user selected the OK button.
*/
-- (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)())completionHandler;
+- (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler;
/*! @abstract Displays a _javascript_ confirm panel.
@param webView The web view invoking the delegate method.
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h (183069 => 183070)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2015-04-21 18:50:16 UTC (rev 183069)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2015-04-21 19:30:33 UTC (rev 183070)
@@ -47,8 +47,8 @@
+ (NSSet *)allWebsiteDataTypes;
- (void)fetchDataRecordsOfTypes:(NSSet *)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler;
-- (void)removeDataOfTypes:(NSSet *)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler;
-- (void)removeDataOfTypes:(NSSet *)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler;
+- (void)removeDataOfTypes:(NSSet *)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)(void))completionHandler;
+- (void)removeDataOfTypes:(NSSet *)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)(void))completionHandler;
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (183069 => 183070)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2015-04-21 18:50:16 UTC (rev 183069)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2015-04-21 19:30:33 UTC (rev 183070)
@@ -91,7 +91,7 @@
});
}
-- (void)removeDataOfTypes:(NSSet *)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler
+- (void)removeDataOfTypes:(NSSet *)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)(void))completionHandler
{
auto completionHandlerCopy = Block_copy(completionHandler);
_websiteDataStore->websiteDataStore().removeData(WebKit::toWebsiteDataTypes(websiteDataTypes), toSystemClockTime(date ? date : [NSDate distantPast]), [completionHandlerCopy] {
@@ -110,7 +110,7 @@
return result;
}
-- (void)removeDataOfTypes:(NSSet *)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler
+- (void)removeDataOfTypes:(NSSet *)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)(void))completionHandler
{
auto completionHandlerCopy = Block_copy(completionHandler);
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h (183069 => 183070)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-04-21 18:50:16 UTC (rev 183069)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-04-21 19:30:33 UTC (rev 183070)
@@ -41,8 +41,8 @@
+ (_WKWebsiteDataStore *)nonPersistentDataStore;
- (void)fetchDataRecordsOfTypes:(WKWebsiteDataTypes)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler;
-- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler;
-- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler;
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)(void))completionHandler;
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)(void))completionHandler;
@end
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm (183069 => 183070)
--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-04-21 18:50:16 UTC (rev 183069)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-04-21 19:30:33 UTC (rev 183070)
@@ -80,12 +80,12 @@
[super fetchDataRecordsOfTypes:toWKWebsiteDataTypes(websiteDataTypes).get() completionHandler:completionHandler];
}
-- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)(void))completionHandler
{
[super removeDataOfTypes:toWKWebsiteDataTypes(websiteDataTypes).get() forDataRecords:dataRecords completionHandler:completionHandler];
}
-- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)(void))completionHandler
{
[super removeDataOfTypes:toWKWebsiteDataTypes(websiteDataTypes).get() modifiedSince:date completionHandler:completionHandler];
}
Modified: trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm (183069 => 183070)
--- trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-04-21 18:50:16 UTC (rev 183069)
+++ trunk/Source/WebKit2/UIProcess/ios/WKPDFView.mm 2015-04-21 19:30:33 UTC (rev 183070)
@@ -373,7 +373,7 @@
_isStartingZoom = NO;
}
-- (void)_highlightLinkAnnotation:(UIPDFLinkAnnotation *)linkAnnotation forDuration:(NSTimeInterval)duration completionHandler:(void (^)())completionHandler
+- (void)_highlightLinkAnnotation:(UIPDFLinkAnnotation *)linkAnnotation forDuration:(NSTimeInterval)duration completionHandler:(void (^)(void))completionHandler
{
static const CGFloat highlightBorderRadius = 3;
static const CGFloat highlightColorComponent = 26.0 / 255;
Modified: trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm (183069 => 183070)
--- trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-04-21 18:50:16 UTC (rev 183069)
+++ trunk/Source/WebKit2/UIProcess/ios/forms/WKFileUploadPanel.mm 2015-04-21 19:30:33 UTC (rev 183070)
@@ -689,12 +689,12 @@
#pragma mark - Process UIImagePicker results
-- (void)_processMediaInfoDictionaries:(NSArray *)infos successBlock:(void (^)(NSArray *processedResults, NSString *displayString))successBlock failureBlock:(void (^)())failureBlock
+- (void)_processMediaInfoDictionaries:(NSArray *)infos successBlock:(void (^)(NSArray *processedResults, NSString *displayString))successBlock failureBlock:(void (^)(void))failureBlock
{
[self _processMediaInfoDictionaries:infos atIndex:0 processedResults:[NSMutableArray array] processedImageCount:0 processedVideoCount:0 successBlock:successBlock failureBlock:failureBlock];
}
-- (void)_processMediaInfoDictionaries:(NSArray *)infos atIndex:(NSUInteger)index processedResults:(NSMutableArray *)processedResults processedImageCount:(NSUInteger)processedImageCount processedVideoCount:(NSUInteger)processedVideoCount successBlock:(void (^)(NSArray *processedResults, NSString *displayString))successBlock failureBlock:(void (^)())failureBlock
+- (void)_processMediaInfoDictionaries:(NSArray *)infos atIndex:(NSUInteger)index processedResults:(NSMutableArray *)processedResults processedImageCount:(NSUInteger)processedImageCount processedVideoCount:(NSUInteger)processedVideoCount successBlock:(void (^)(NSArray *processedResults, NSString *displayString))successBlock failureBlock:(void (^)(void))failureBlock
{
NSUInteger count = [infos count];
if (index == count) {
@@ -717,7 +717,7 @@
[self _uploadItemFromMediaInfo:info successBlock:uploadItemSuccessBlock failureBlock:failureBlock];
}
-- (void)_uploadItemFromMediaInfo:(NSDictionary *)info successBlock:(void (^)(_WKFileUploadItem *))successBlock failureBlock:(void (^)())failureBlock
+- (void)_uploadItemFromMediaInfo:(NSDictionary *)info successBlock:(void (^)(_WKFileUploadItem *))successBlock failureBlock:(void (^)(void))failureBlock
{
NSString *mediaType = [info objectForKey:UIImagePickerControllerMediaType];
Modified: trunk/Tools/ChangeLog (183069 => 183070)
--- trunk/Tools/ChangeLog 2015-04-21 18:50:16 UTC (rev 183069)
+++ trunk/Tools/ChangeLog 2015-04-21 19:30:33 UTC (rev 183070)
@@ -1,3 +1,13 @@
+2015-04-21 Anders Carlsson <ander...@apple.com>
+
+ Fix block signatures
+ https://bugs.webkit.org/show_bug.cgi?id=144002
+
+ Reviewed by Andreas Kling.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:]):
+
2015-04-21 Philippe Normand <pnorm...@igalia.com>
[GTK] jhbuild should not use a branch for openwebrtc
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (183069 => 183070)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-04-21 18:50:16 UTC (rev 183069)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-04-21 19:30:33 UTC (rev 183070)
@@ -362,7 +362,7 @@
[self updateTextFieldFromURL:_webView.URL];
}
-- (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)())completionHandler
+- (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler
{
NSAlert* alert = [[NSAlert alloc] init];
