Diff
Modified: trunk/Tools/ChangeLog (235834 => 235835)
--- trunk/Tools/ChangeLog 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/ChangeLog 2018-09-09 04:24:33 UTC (rev 235835)
@@ -1,3 +1,63 @@
+2018-09-08 Wenson Hsieh <wenson_hs...@apple.com>
+
+ [Cocoa] Use more bridging casts in TestWebKitAPI
+ https://bugs.webkit.org/show_bug.cgi?id=189457
+
+ Reviewed by Darin Adler.
+
+ Adds some bridging casts to TestWebKitAPI, when converting betweeen several common types of objects, including:
+ CFStringRef <=> NSString
+ CFURLRef <=> NSURL
+ WKPreferences <=> WKPreferencesRef
+ CFDataRef <=> NSData
+
+ * TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm:
+ (TestWebKitAPI::TEST_F):
+ * TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm:
+ (readHTMLFromPasteboard):
+ (createWebViewWithCustomPasteboardDataEnabled):
+ * TestWebKitAPI/Tests/WebKitCocoa/CopyURL.mm:
+ (createWebViewWithCustomPasteboardDataEnabled):
+ * TestWebKitAPI/Tests/WebKitCocoa/DragAndDropTests.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/WebKitCocoa/PasteHTML.mm:
+ (writeHTMLToPasteboard):
+ (createWebViewWithCustomPasteboardDataSetting):
+ * TestWebKitAPI/Tests/WebKitCocoa/PasteImage.mm:
+ (TEST):
+ * TestWebKitAPI/Tests/WebKitCocoa/PasteMixedContent.mm:
+ (TestWebKitAPI::setUpWebView):
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKitCocoa/PasteRTFD.mm:
+ (writeRTFToPasteboard):
+ (writeRTFDToPasteboard):
+ (createWebViewWithCustomPasteboardDataEnabled):
+ (TEST):
+ * TestWebKitAPI/Tests/WebKitCocoa/PasteWebArchive.mm:
+ (createWebViewWithCustomPasteboardDataEnabled):
+ * TestWebKitAPI/Tests/WebKitCocoa/RestoreSessionStateWithoutNavigation.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:
+ (webViewForTestingAttachments):
+ * TestWebKitAPI/Tests/WebKitLegacy/mac/AccessingPastedImage.mm:
+ (writeRTFDToPasteboard):
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/ios/ActionSheetTests.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm:
+ (checkRichTextTypePrecedesPlainTextType):
+ (TestWebKitAPI::TEST):
+ (TestWebKitAPI::setUpTestWebViewForDataTransferItems):
+ * TestWebKitAPI/Tests/ios/UIPasteboardTests.mm:
+ (TestWebKitAPI::TEST):
+ * TestWebKitAPI/mac/PlatformUtilitiesMac.mm:
+ (TestWebKitAPI::Util::createInjectedBundlePath):
+ (TestWebKitAPI::Util::createURLForResource):
+ (TestWebKitAPI::Util::URLForNonExistentResource):
+ (TestWebKitAPI::Util::MIMETypeForWKURLResponse):
+ * TestWebKitAPI/mac/WebKitAgnosticTest.mm:
+ (TestWebKitAPI::WebKitAgnosticTest::loadURL):
+
2018-09-02 Darin Adler <da...@apple.com>
[Cocoa] Turn on ARC for WebKitTestRunner
Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -56,11 +56,11 @@
expectDataArraysEqual(@[ helloData ], buffer->createNSDataArray().get());
NSData *worldData = [NSData dataWithBytes:"world" length:5];
- buffer->append((CFDataRef)worldData);
+ buffer->append((__bridge CFDataRef)worldData);
expectDataArraysEqual(@[ helloData, worldData ], buffer->createNSDataArray().get());
expectDataArraysEqual(@[ helloData ], SharedBuffer::create(helloData)->createNSDataArray().get());
- expectDataArraysEqual(@[ worldData ], SharedBuffer::create((CFDataRef)worldData)->createNSDataArray().get());
+ expectDataArraysEqual(@[ worldData ], SharedBuffer::create((__bridge CFDataRef)worldData)->createNSDataArray().get());
expectDataArraysEqual(@[ [NSData dataWithContentsOfFile:tempFilePath()] ], SharedBuffer::createWithContentsOfFile(tempFilePath())->createNSDataArray().get());
}
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -51,7 +51,7 @@
#else
NSString *readHTMLFromPasteboard()
{
- id value = [[UIPasteboard generalPasteboard] valueForPasteboardType:(NSString *)kUTTypeHTML];
+ id value = [[UIPasteboard generalPasteboard] valueForPasteboardType:(__bridge NSString *)kUTTypeHTML];
if ([value isKindOfClass:[NSData class]])
value = [[[NSString alloc] initWithData:(NSData *)value encoding:NSUTF8StringEncoding] autorelease];
ASSERT([value isKindOfClass:[NSString class]]);
@@ -62,7 +62,7 @@
static RetainPtr<TestWKWebView> createWebViewWithCustomPasteboardDataEnabled()
{
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 400, 400)]);
- auto preferences = (WKPreferencesRef)[[webView configuration] preferences];
+ auto preferences = (__bridge WKPreferencesRef)[[webView configuration] preferences];
WKPreferencesSetDataTransferItemsEnabled(preferences, true);
WKPreferencesSetCustomPasteboardDataEnabled(preferences, true);
return webView;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyURL.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyURL.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyURL.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -65,7 +65,7 @@
#endif
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 400, 400)]);
- auto preferences = (WKPreferencesRef)[[webView configuration] preferences];
+ auto preferences = (__bridge WKPreferencesRef)[[webView configuration] preferences];
WKPreferencesSetDataTransferItemsEnabled(preferences, true);
WKPreferencesSetCustomPasteboardDataEnabled(preferences, true);
return webView;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DragAndDropTests.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DragAndDropTests.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/DragAndDropTests.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -48,7 +48,7 @@
{
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebViewFrame:CGRectMake(0, 0, 320, 500)]);
auto webView = [simulator webView];
- WKPreferencesSetCustomPasteboardDataEnabled((WKPreferencesRef)[webView configuration].preferences, true);
+ WKPreferencesSetCustomPasteboardDataEnabled((__bridge WKPreferencesRef)[webView configuration].preferences, true);
[webView synchronouslyLoadTestPageNamed:@"DataTransfer"];
NSString *stringData = @"Hello world";
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteHTML.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteHTML.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteHTML.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -53,7 +53,7 @@
#else
void writeHTMLToPasteboard(NSString *html)
{
- [[UIPasteboard generalPasteboard] setItems:@[@{ (NSString *)kUTTypeHTML : html}]];
+ [[UIPasteboard generalPasteboard] setItems:@[@{ (__bridge NSString *)kUTTypeHTML : html}]];
}
#endif
@@ -60,7 +60,7 @@
static RetainPtr<TestWKWebView> createWebViewWithCustomPasteboardDataSetting(bool enabled)
{
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 400, 400)]);
- auto preferences = (WKPreferencesRef)[[webView configuration] preferences];
+ auto preferences = (__bridge WKPreferencesRef)[[webView configuration] preferences];
WKPreferencesSetDataTransferItemsEnabled(preferences, true);
WKPreferencesSetCustomPasteboardDataEnabled(preferences, enabled);
return webView;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteImage.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteImage.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteImage.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -77,7 +77,7 @@
[webView synchronouslyLoadTestPageNamed:@"paste-image"];
auto *data = "" dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"sunset-in-cupertino-400px" ofType:@"gif" inDirectory:@"TestWebKitAPI.resources"]];
- writeImageDataToPasteboard((NSString *)kUTTypeGIF, data);
+ writeImageDataToPasteboard((__bridge NSString *)kUTTypeGIF, data);
[webView paste:nil];
EXPECT_WK_STREQ("false", [webView stringByEvaluatingJavaScript:@"dataTransfer.types.includes('image/gif').toString()"]);
@@ -99,7 +99,7 @@
[webView synchronouslyLoadTestPageNamed:@"paste-image"];
auto *data = "" dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"sunset-in-cupertino-600px" ofType:@"jpg" inDirectory:@"TestWebKitAPI.resources"]];
- writeImageDataToPasteboard((NSString *)kUTTypeJPEG, data);
+ writeImageDataToPasteboard((__bridge NSString *)kUTTypeJPEG, data);
[webView paste:nil];
EXPECT_WK_STREQ("false", [webView stringByEvaluatingJavaScript:@"dataTransfer.types.includes('image/gif').toString()"]);
@@ -121,7 +121,7 @@
[webView synchronouslyLoadTestPageNamed:@"paste-image"];
auto *data = "" dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"sunset-in-cupertino-200px" ofType:@"png" inDirectory:@"TestWebKitAPI.resources"]];
- writeImageDataToPasteboard((NSString *)kUTTypePNG, data);
+ writeImageDataToPasteboard((__bridge NSString *)kUTTypePNG, data);
[webView paste:nil];
EXPECT_WK_STREQ("false", [webView stringByEvaluatingJavaScript:@"dataTransfer.types.includes('image/gif').toString()"]);
@@ -259,7 +259,7 @@
[webView synchronouslyLoadTestPageNamed:@"paste-image"];
auto *data = "" dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"sunset-in-cupertino-100px" ofType:@"tiff" inDirectory:@"TestWebKitAPI.resources"]];
- writeImageDataToPasteboard((NSString *)kUTTypeTIFF, data);
+ writeImageDataToPasteboard((__bridge NSString *)kUTTypeTIFF, data);
[webView paste:nil];
EXPECT_WK_STREQ("false", [webView stringByEvaluatingJavaScript:@"dataTransfer.types.includes('image/gif').toString()"]);
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteMixedContent.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteMixedContent.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteMixedContent.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -90,7 +90,7 @@
static RetainPtr<TestWKWebView> setUpWebView()
{
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 400, 400)]);
- WKPreferencesSetCustomPasteboardDataEnabled((WKPreferencesRef)[webView configuration].preferences, true);
+ WKPreferencesSetCustomPasteboardDataEnabled((__bridge WKPreferencesRef)[webView configuration].preferences, true);
[webView synchronouslyLoadTestPageNamed:@"DataTransfer"];
return webView;
}
@@ -310,7 +310,7 @@
auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
[configuration setURLSchemeHandler:schemeHandler.get() forURLScheme:@"same"];
[configuration setURLSchemeHandler:schemeHandler.get() forURLScheme:@"different"];
- WKPreferencesSetCustomPasteboardDataEnabled((WKPreferencesRef)[configuration preferences], true);
+ WKPreferencesSetCustomPasteboardDataEnabled((__bridge WKPreferencesRef)[configuration preferences], true);
auto source = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 400, 400) configuration:configuration.get()]);
[source synchronouslyLoadHTMLString:markupForSource baseURL:[NSURL URLWithString:@"same://"]];
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteRTFD.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteRTFD.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteRTFD.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -67,12 +67,12 @@
void writeRTFToPasteboard(NSData *data)
{
- [[UIPasteboard generalPasteboard] setItems:@[@{ (NSString *)kUTTypeRTF : data}]];
+ [[UIPasteboard generalPasteboard] setItems:@[@{ (__bridge NSString *)kUTTypeRTF : data}]];
}
void writeRTFDToPasteboard(NSData *data)
{
- [[UIPasteboard generalPasteboard] setItems:@[@{ (NSString *)kUTTypeFlatRTFD : data}]];
+ [[UIPasteboard generalPasteboard] setItems:@[@{ (__bridge NSString *)kUTTypeFlatRTFD : data}]];
}
#endif
@@ -79,7 +79,7 @@
static RetainPtr<TestWKWebView> createWebViewWithCustomPasteboardDataEnabled()
{
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 400, 400)]);
- auto preferences = (WKPreferencesRef)[[webView configuration] preferences];
+ auto preferences = (__bridge WKPreferencesRef)[[webView configuration] preferences];
WKPreferencesSetDataTransferItemsEnabled(preferences, true);
WKPreferencesSetCustomPasteboardDataEnabled(preferences, true);
return webView;
@@ -145,7 +145,7 @@
[webView synchronouslyLoadTestPageNamed:@"paste-rtfd"];
auto *pngData = [NSData dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"sunset-in-cupertino-200px" ofType:@"png" inDirectory:@"TestWebKitAPI.resources"]];
- auto attachment = adoptNS([[NSTextAttachment alloc] initWithData:pngData ofType:(NSString *)kUTTypePNG]);
+ auto attachment = adoptNS([[NSTextAttachment alloc] initWithData:pngData ofType:(__bridge NSString *)kUTTypePNG]);
NSAttributedString *string = [NSAttributedString attributedStringWithAttachment:attachment.get()];
NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:@{ }];
@@ -163,7 +163,7 @@
[webView synchronouslyLoadTestPageNamed:@"paste-rtfd"];
auto *pngData = [NSData dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"sunset-in-cupertino-200px" ofType:@"png" inDirectory:@"TestWebKitAPI.resources"]];
- auto attachment = adoptNS([[NSTextAttachment alloc] initWithData:pngData ofType:(NSString *)kUTTypePNG]);
+ auto attachment = adoptNS([[NSTextAttachment alloc] initWithData:pngData ofType:(__bridge NSString *)kUTTypePNG]);
NSAttributedString *string = [NSAttributedString attributedStringWithAttachment:attachment.get()];
NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:@{ }];
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteWebArchive.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteWebArchive.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteWebArchive.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -42,7 +42,7 @@
static RetainPtr<TestWKWebView> createWebViewWithCustomPasteboardDataEnabled()
{
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 400, 400)]);
- auto preferences = (WKPreferencesRef)[[webView configuration] preferences];
+ auto preferences = (__bridge WKPreferencesRef)[[webView configuration] preferences];
WKPreferencesSetDataTransferItemsEnabled(preferences, true);
WKPreferencesSetCustomPasteboardDataEnabled(preferences, true);
return webView;
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/RestoreSessionStateWithoutNavigation.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/RestoreSessionStateWithoutNavigation.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/RestoreSessionStateWithoutNavigation.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -98,7 +98,7 @@
auto currentItem = WKBackForwardListGetCurrentItem(backForwardList);
auto currentItemURL = adoptWK(WKBackForwardListItemCopyURL(currentItem));
- auto expectedURL = adoptWK(WKURLCreateWithCFURL((CFURLRef)[[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]));
+ auto expectedURL = adoptWK(WKURLCreateWithCFURL((__bridge CFURLRef)[[NSBundle mainBundle] URLForResource:@"simple" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]));
EXPECT_NOT_NULL(expectedURL);
EXPECT_TRUE(WKURLIsEqual(currentItemURL.get(), expectedURL.get()));
}
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -153,7 +153,7 @@
static RetainPtr<TestWKWebView> webViewForTestingAttachments(CGSize webViewSize, WKWebViewConfiguration *configuration)
{
configuration._attachmentElementEnabled = YES;
- WKPreferencesSetCustomPasteboardDataEnabled((WKPreferencesRef)[configuration preferences], YES);
+ WKPreferencesSetCustomPasteboardDataEnabled((__bridge WKPreferencesRef)[configuration preferences], YES);
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, webViewSize.width, webViewSize.height) configuration:configuration]);
[webView synchronouslyLoadHTMLString:attachmentEditingTestMarkup];
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/AccessingPastedImage.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/AccessingPastedImage.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/AccessingPastedImage.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -53,7 +53,7 @@
static void writeRTFDToPasteboard(NSData *data)
{
- [[UIPasteboard generalPasteboard] setItems:@[@{ (NSString *)kUTTypeFlatRTFD : data}]];
+ [[UIPasteboard generalPasteboard] setItems:@[@{ (__bridge NSString *)kUTTypeFlatRTFD : data}]];
}
#endif
@@ -93,7 +93,7 @@
[webView.get() setEditable:YES];
auto *pngData = [NSData dataWithContentsOfFile:[[NSBundle mainBundle] pathForResource:@"sunset-in-cupertino-200px" ofType:@"png" inDirectory:@"TestWebKitAPI.resources"]];
- auto attachment = adoptNS([[NSTextAttachment alloc] initWithData:pngData ofType:(NSString *)kUTTypePNG]);
+ auto attachment = adoptNS([[NSTextAttachment alloc] initWithData:pngData ofType:(__bridge NSString *)kUTTypePNG]);
NSAttributedString *string = [NSAttributedString attributedStringWithAttachment:attachment.get()];
NSData *RTFDData = [string RTFDFromRange:NSMakeRange(0, [string length]) documentAttributes:@{ }];
Modified: trunk/Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -250,14 +250,14 @@
[webView _doAfterNextPresentationUpdate:^() {
NSArray <NSString *> *pasteboardTypes = [[UIPasteboard generalPasteboard] pasteboardTypes];
EXPECT_EQ(2UL, pasteboardTypes.count);
- EXPECT_WK_STREQ((NSString *)kUTTypePNG, pasteboardTypes.firstObject);
- EXPECT_WK_STREQ((NSString *)kUTTypeURL, pasteboardTypes.lastObject);
+ EXPECT_WK_STREQ((__bridge NSString *)kUTTypePNG, pasteboardTypes.firstObject);
+ EXPECT_WK_STREQ((__bridge NSString *)kUTTypeURL, pasteboardTypes.lastObject);
NSArray <NSItemProvider *> *itemProviders = [[UIPasteboard generalPasteboard] itemProviders];
EXPECT_EQ(1UL, itemProviders.count);
itemProvider = itemProviders.firstObject;
EXPECT_EQ(2UL, [itemProvider registeredTypeIdentifiers].count);
- EXPECT_WK_STREQ((NSString *)kUTTypePNG, [itemProvider registeredTypeIdentifiers].firstObject);
- EXPECT_WK_STREQ((NSString *)kUTTypeURL, [itemProvider registeredTypeIdentifiers].lastObject);
+ EXPECT_WK_STREQ((__bridge NSString *)kUTTypePNG, [itemProvider registeredTypeIdentifiers].firstObject);
+ EXPECT_WK_STREQ((__bridge NSString *)kUTTypeURL, [itemProvider registeredTypeIdentifiers].lastObject);
done = true;
}];
TestWebKitAPI::Util::run(&done);
@@ -290,14 +290,14 @@
[webView _doAfterNextPresentationUpdate:^() {
NSArray <NSString *> *pasteboardTypes = [[UIPasteboard generalPasteboard] pasteboardTypes];
EXPECT_EQ(2UL, pasteboardTypes.count);
- EXPECT_WK_STREQ((NSString *)kUTTypePNG, pasteboardTypes.firstObject);
- EXPECT_WK_STREQ((NSString *)kUTTypeURL, pasteboardTypes.lastObject);
+ EXPECT_WK_STREQ((__bridge NSString *)kUTTypePNG, pasteboardTypes.firstObject);
+ EXPECT_WK_STREQ((__bridge NSString *)kUTTypeURL, pasteboardTypes.lastObject);
NSArray <NSItemProvider *> *itemProviders = [[UIPasteboard generalPasteboard] itemProviders];
EXPECT_EQ(1UL, itemProviders.count);
itemProvider = itemProviders.firstObject;
EXPECT_EQ(2UL, [itemProvider registeredTypeIdentifiers].count);
- EXPECT_WK_STREQ((NSString *)kUTTypePNG, [itemProvider registeredTypeIdentifiers].firstObject);
- EXPECT_WK_STREQ((NSString *)kUTTypeURL, [itemProvider registeredTypeIdentifiers].lastObject);
+ EXPECT_WK_STREQ((__bridge NSString *)kUTTypePNG, [itemProvider registeredTypeIdentifiers].firstObject);
+ EXPECT_WK_STREQ((__bridge NSString *)kUTTypeURL, [itemProvider registeredTypeIdentifiers].lastObject);
done = true;
}];
TestWebKitAPI::Util::run(&done);
@@ -329,12 +329,12 @@
[webView _doAfterNextPresentationUpdate:^() {
NSArray <NSString *> *pasteboardTypes = [[UIPasteboard generalPasteboard] pasteboardTypes];
EXPECT_EQ(1UL, pasteboardTypes.count);
- EXPECT_WK_STREQ((NSString *)kUTTypePNG, pasteboardTypes.firstObject);
+ EXPECT_WK_STREQ((__bridge NSString *)kUTTypePNG, pasteboardTypes.firstObject);
NSArray <NSItemProvider *> *itemProviders = [[UIPasteboard generalPasteboard] itemProviders];
EXPECT_EQ(1UL, itemProviders.count);
NSItemProvider *itemProvider = itemProviders.firstObject;
EXPECT_EQ(1UL, itemProvider.registeredTypeIdentifiers.count);
- EXPECT_WK_STREQ((NSString *)kUTTypePNG, itemProvider.registeredTypeIdentifiers.firstObject);
+ EXPECT_WK_STREQ((__bridge NSString *)kUTTypePNG, itemProvider.registeredTypeIdentifiers.firstObject);
done = true;
}];
TestWebKitAPI::Util::run(&done);
Modified: trunk/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -122,9 +122,9 @@
{
// At least one of "com.apple.flat-rtfd" or "public.rtf" is expected to have higher precedence than "public.utf8-plain-text".
NSArray *registeredTypes = [simulator.sourceItemProviders.firstObject registeredTypeIdentifiers];
- auto indexOfRTFType = [registeredTypes indexOfObject:(NSString *)kUTTypeRTF];
- auto indexOfFlatRTFDType = [registeredTypes indexOfObject:(NSString *)kUTTypeFlatRTFD];
- auto indexOfPlainTextType = [registeredTypes indexOfObject:(NSString *)kUTTypeUTF8PlainText];
+ auto indexOfRTFType = [registeredTypes indexOfObject:(__bridge NSString *)kUTTypeRTF];
+ auto indexOfFlatRTFDType = [registeredTypes indexOfObject:(__bridge NSString *)kUTTypeFlatRTFD];
+ auto indexOfPlainTextType = [registeredTypes indexOfObject:(__bridge NSString *)kUTTypeUTF8PlainText];
EXPECT_NE((NSInteger)indexOfPlainTextType, NSNotFound);
EXPECT_TRUE((indexOfRTFType != NSNotFound && indexOfRTFType < indexOfPlainTextType) || (indexOfFlatRTFDType != NSNotFound && indexOfFlatRTFDType < indexOfPlainTextType));
}
@@ -274,7 +274,7 @@
[simulator runFrom:CGPointMake(100, 100) to:CGPointMake(100, 100)];
NSArray *registeredTypes = [[simulator sourceItemProviders].firstObject registeredTypeIdentifiers];
- EXPECT_WK_STREQ((NSString *)kUTTypeScalableVectorGraphics, [registeredTypes firstObject]);
+ EXPECT_WK_STREQ((__bridge NSString *)kUTTypeScalableVectorGraphics, [registeredTypes firstObject]);
}
TEST(DragAndDropTests, ImageToTextarea)
@@ -306,7 +306,7 @@
EXPECT_WK_STREQ("https://www.apple.com/", [webView editorValue].UTF8String);
checkSelectionRectsWithLogging(@[ makeCGRectValue(101, 241, 2057, 232) ], [simulator finalSelectionRects]);
checkSuggestedNameAndEstimatedSize(simulator.get(), @"icon.png", { 215, 174 });
- checkTypeIdentifierIsRegisteredAtIndex(simulator.get(), (NSString *)kUTTypePNG, 0);
+ checkTypeIdentifierIsRegisteredAtIndex(simulator.get(), (__bridge NSString *)kUTTypePNG, 0);
}
TEST(DragAndDropTests, ImageInLinkWithoutHREFToInput)
@@ -320,7 +320,7 @@
EXPECT_WK_STREQ("", [webView editorValue]);
checkEstimatedSize(simulator.get(), { 215, 174 });
- checkTypeIdentifierIsRegisteredAtIndex(simulator.get(), (NSString *)kUTTypePNG, 0);
+ checkTypeIdentifierIsRegisteredAtIndex(simulator.get(), (__bridge NSString *)kUTTypePNG, 0);
}
TEST(DragAndDropTests, ImageDoesNotUseElementSizeAsEstimatedSize)
@@ -331,7 +331,7 @@
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
[simulator runFrom: { 100, 100 } to: { 100, 300 }];
- checkTypeIdentifierIsRegisteredAtIndex(simulator.get(), (NSString *)kUTTypeGIF, 0);
+ checkTypeIdentifierIsRegisteredAtIndex(simulator.get(), (__bridge NSString *)kUTTypeGIF, 0);
checkSuggestedNameAndEstimatedSize(simulator.get(), @"apple.gif", { 52, 64 });
EXPECT_WK_STREQ("apple.gif (image/gif)", [webView stringByEvaluatingJavaScript:@"output.textContent"]);
}
@@ -446,7 +446,7 @@
NSItemProvider *itemProvider = [simulator sourceItemProviders].firstObject;
NSArray *registeredTypes = [itemProvider registeredTypeIdentifiers];
EXPECT_EQ(1UL, registeredTypes.count);
- EXPECT_WK_STREQ([(NSString *)kUTTypeUTF8PlainText UTF8String], [registeredTypes.firstObject UTF8String]);
+ EXPECT_WK_STREQ([(__bridge NSString *)kUTTypeUTF8PlainText UTF8String], [registeredTypes.firstObject UTF8String]);
EXPECT_EQ([webView stringByEvaluatingJavaScript:@"source.value"].length, 0UL);
EXPECT_EQ(UIPreferredPresentationStyleInline, itemProvider.preferredPresentationStyle);
EXPECT_WK_STREQ("pneumonoultramicroscopicsilicovolcanoconiosis", [webView editorValue].UTF8String);
@@ -467,8 +467,8 @@
NSItemProvider *itemProvider = [simulator sourceItemProviders].firstObject;
NSArray *registeredTypes = [itemProvider registeredTypeIdentifiers];
EXPECT_EQ(2UL, registeredTypes.count);
- EXPECT_WK_STREQ([(NSString *)kUTTypeURL UTF8String], [registeredTypes.firstObject UTF8String]);
- EXPECT_WK_STREQ([(NSString *)kUTTypeUTF8PlainText UTF8String], [registeredTypes.lastObject UTF8String]);
+ EXPECT_WK_STREQ([(__bridge NSString *)kUTTypeURL UTF8String], [registeredTypes.firstObject UTF8String]);
+ EXPECT_WK_STREQ([(__bridge NSString *)kUTTypeUTF8PlainText UTF8String], [registeredTypes.lastObject UTF8String]);
EXPECT_EQ(0UL, [webView stringByEvaluatingJavaScript:@"source.value"].length);
EXPECT_EQ(UIPreferredPresentationStyleInline, itemProvider.preferredPresentationStyle);
EXPECT_WK_STREQ("https://webkit.org/", [webView editorValue].UTF8String);
@@ -498,7 +498,7 @@
EXPECT_TRUE([observedEventNames containsObject:@"dragover"]);
EXPECT_TRUE([observedEventNames containsObject:@"drop"]);
checkSelectionRectsWithLogging(@[ makeCGRectValue(101, 273, 2057, 232) ], [simulator finalSelectionRects]);
- checkTypeIdentifierIsRegisteredAtIndex(simulator.get(), (NSString *)kUTTypeURL, 0);
+ checkTypeIdentifierIsRegisteredAtIndex(simulator.get(), (__bridge NSString *)kUTTypeURL, 0);
}
TEST(DragAndDropTests, BackgroundImageLinkToInput)
@@ -516,7 +516,7 @@
EXPECT_TRUE([observedEventNames containsObject:@"dragover"]);
EXPECT_TRUE([observedEventNames containsObject:@"drop"]);
checkSelectionRectsWithLogging(@[ makeCGRectValue(101, 241, 2057, 232) ], [simulator finalSelectionRects]);
- checkTypeIdentifierIsRegisteredAtIndex(simulator.get(), (NSString *)kUTTypeURL, 0);
+ checkTypeIdentifierIsRegisteredAtIndex(simulator.get(), (__bridge NSString *)kUTTypeURL, 0);
}
TEST(DragAndDropTests, CanPreventStart)
@@ -627,7 +627,7 @@
auto simulatedJSONItemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *jsonData = [@"{ \"foo\": \"bar\", \"bar\": \"baz\" }" dataUsingEncoding:NSUTF8StringEncoding];
- [simulatedJSONItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeJSON withData:jsonData];
+ [simulatedJSONItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeJSON withData:jsonData];
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
[simulator setExternalItemProviders:@[ simulatedJSONItemProvider.get() ]];
@@ -643,7 +643,7 @@
auto simulatedImageItemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *imageData = UIImageJPEGRepresentation(testIconImage(), 0.5);
- [simulatedImageItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeJPEG withData:imageData];
+ [simulatedImageItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeJPEG withData:imageData];
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
[simulator setExternalItemProviders:@[ simulatedImageItemProvider.get() ]];
@@ -660,7 +660,7 @@
auto simulatedHTMLItemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *htmlData = [@"<body contenteditable></body>" dataUsingEncoding:NSUTF8StringEncoding];
- [simulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeHTML withData:htmlData];
+ [simulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeHTML withData:htmlData];
[simulatedHTMLItemProvider setSuggestedName:@"index.html"];
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
@@ -680,7 +680,7 @@
auto simulatedHTMLItemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *htmlData = [@"<body contenteditable></body>" dataUsingEncoding:NSUTF8StringEncoding];
- [simulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeHTML withData:htmlData];
+ [simulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeHTML withData:htmlData];
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
[simulator setShouldAllowMoveOperation:NO];
@@ -696,7 +696,7 @@
[webView synchronouslyLoadTestPageNamed:@"file-uploading"];
auto archiveProvider = adoptNS([[UIItemProvider alloc] init]);
- [archiveProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeZipArchive withData:testZIPArchive()];
+ [archiveProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeZipArchive withData:testZIPArchive()];
auto urlProvider = adoptNS([[UIItemProvider alloc] init]);
[urlProvider registerObject:[NSURL URLWithString:@"https://webkit.org"] visibility:UIItemProviderRepresentationOptionsVisibilityAll];
@@ -715,7 +715,7 @@
[webView synchronouslyLoadTestPageNamed:@"file-uploading"];
auto itemProvider = adoptNS([[UIItemProvider alloc] init]);
- [itemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeZipArchive withData:testZIPArchive()];
+ [itemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeZipArchive withData:testZIPArchive()];
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
[simulator setExternalItemProviders:@[ itemProvider.get() ]];
@@ -732,11 +732,11 @@
auto simulatedImageItemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *imageData = UIImageJPEGRepresentation(testIconImage(), 0.5);
- [simulatedImageItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeJPEG withData:imageData];
+ [simulatedImageItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeJPEG withData:imageData];
auto simulatedHTMLItemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *htmlData = [@"<body contenteditable></body>" dataUsingEncoding:NSUTF8StringEncoding];
- [simulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeHTML withData:htmlData];
+ [simulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeHTML withData:htmlData];
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
[simulator setExternalItemProviders:@[ simulatedHTMLItemProvider.get(), simulatedImageItemProvider.get() ]];
@@ -754,11 +754,11 @@
auto simulatedImageItemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *imageData = UIImageJPEGRepresentation(testIconImage(), 0.5);
- [simulatedImageItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeJPEG withData:imageData];
+ [simulatedImageItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeJPEG withData:imageData];
auto simulatedHTMLItemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *htmlData = [@"<body contenteditable></body>" dataUsingEncoding:NSUTF8StringEncoding];
- [simulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeHTML withData:htmlData];
+ [simulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeHTML withData:htmlData];
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
[simulator setExternalItemProviders:@[ simulatedHTMLItemProvider.get(), simulatedImageItemProvider.get() ]];
@@ -775,15 +775,15 @@
auto simulatedImageItemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *imageData = UIImageJPEGRepresentation(testIconImage(), 0.5);
- [simulatedImageItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeJPEG withData:imageData];
+ [simulatedImageItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeJPEG withData:imageData];
auto firstSimulatedHTMLItemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *firstHTMLData = [@"<body contenteditable></body>" dataUsingEncoding:NSUTF8StringEncoding];
- [firstSimulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeHTML withData:firstHTMLData];
+ [firstSimulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeHTML withData:firstHTMLData];
auto secondSimulatedHTMLItemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *secondHTMLData = [@"<html><body>hello world</body></html>" dataUsingEncoding:NSUTF8StringEncoding];
- [secondSimulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeHTML withData:secondHTMLData];
+ [secondSimulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeHTML withData:secondHTMLData];
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
[simulator setShouldAllowMoveOperation:NO];
@@ -803,7 +803,7 @@
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
auto itemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *htmlData = [@"<h1>This is a test</h1>" dataUsingEncoding:NSUTF8StringEncoding];
- [itemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeHTML withData:htmlData];
+ [itemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeHTML withData:htmlData];
[simulator setExternalItemProviders:@[ itemProvider.get() ]];
[simulator runFrom:CGPointMake(300, 400) to:CGPointMake(100, 300)];
@@ -987,11 +987,11 @@
auto simulatedImageItemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *imageData = UIImageJPEGRepresentation(testIconImage(), 0.5);
- [simulatedImageItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeJPEG withData:imageData];
+ [simulatedImageItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeJPEG withData:imageData];
auto simulatedHTMLItemProvider = adoptNS([[UIItemProvider alloc] init]);
NSData *firstHTMLData = [@"<body contenteditable></body>" dataUsingEncoding:NSUTF8StringEncoding];
- [simulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeHTML withData:firstHTMLData];
+ [simulatedHTMLItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeHTML withData:firstHTMLData];
[simulatedHTMLItemProvider setPreferredPresentationStyle:UIPreferredPresentationStyleAttachment];
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
@@ -1000,8 +1000,8 @@
EXPECT_EQ(2UL, session.items.count);
UIDragItem *firstItem = session.items[0];
UIDragItem *secondItem = session.items[1];
- EXPECT_TRUE([firstItem.itemProvider.registeredTypeIdentifiers isEqual:@[ (NSString *)kUTTypeJPEG ]]);
- EXPECT_TRUE([secondItem.itemProvider.registeredTypeIdentifiers isEqual:@[ (NSString *)kUTTypeHTML ]]);
+ EXPECT_TRUE([firstItem.itemProvider.registeredTypeIdentifiers isEqual:@[ (__bridge NSString *)kUTTypeJPEG ]]);
+ EXPECT_TRUE([secondItem.itemProvider.registeredTypeIdentifiers isEqual:@[ (__bridge NSString *)kUTTypeHTML ]]);
return @[ secondItem ];
}];
[simulator setExternalItemProviders:@[ simulatedImageItemProvider.get(), simulatedHTMLItemProvider.get() ]];
@@ -1018,7 +1018,7 @@
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
[webView synchronouslyLoadTestPageNamed:@"DataTransferItem-getAsEntry"];
- auto preferences = (WKPreferencesRef)[[webView configuration] preferences];
+ auto preferences = (__bridge WKPreferencesRef)[[webView configuration] preferences];
WKPreferencesSetDataTransferItemsEnabled(preferences, true);
WKPreferencesSetDirectoryUploadEnabled(preferences, true);
@@ -1049,7 +1049,7 @@
runTestWithTemporaryFolder(^(NSURL *folderURL) {
auto itemProvider = adoptNS([[NSItemProvider alloc] init]);
[itemProvider setSuggestedName:@"somedirectory"];
- [itemProvider registerFileRepresentationForTypeIdentifier:(NSString *)kUTTypeFolder fileOptions:0 visibility:NSItemProviderRepresentationVisibilityAll loadHandler:[capturedFolderURL = retainPtr(folderURL)] (FileLoadCompletionBlock completionHandler) -> NSProgress * {
+ [itemProvider registerFileRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeFolder fileOptions:0 visibility:NSItemProviderRepresentationVisibilityAll loadHandler:[capturedFolderURL = retainPtr(folderURL)] (FileLoadCompletionBlock completionHandler) -> NSProgress * {
completionHandler(capturedFolderURL.get(), NO, nil);
return nil;
}];
@@ -1079,7 +1079,7 @@
runTestWithTemporaryTextFile(^(NSURL *fileURL) {
auto itemProvider = adoptNS([[NSItemProvider alloc] init]);
[itemProvider setSuggestedName:@"foo"];
- [itemProvider registerFileRepresentationForTypeIdentifier:(NSString *)kUTTypeUTF8PlainText fileOptions:0 visibility:NSItemProviderRepresentationVisibilityAll loadHandler:[capturedFileURL = retainPtr(fileURL)](FileLoadCompletionBlock completionHandler) -> NSProgress * {
+ [itemProvider registerFileRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeUTF8PlainText fileOptions:0 visibility:NSItemProviderRepresentationVisibilityAll loadHandler:[capturedFileURL = retainPtr(fileURL)](FileLoadCompletionBlock completionHandler) -> NSProgress * {
completionHandler(capturedFileURL.get(), NO, nil);
return nil;
}];
@@ -1106,7 +1106,7 @@
{
NSMutableArray<UIDragItem *> *allowedItems = [NSMutableArray array];
for (UIDragItem *item in session.items) {
- if ([item.itemProvider.registeredTypeIdentifiers containsObject:(NSString *)kUTTypeURL])
+ if ([item.itemProvider.registeredTypeIdentifiers containsObject:(__bridge NSString *)kUTTypeURL])
[allowedItems addObject:item];
}
EXPECT_EQ(1UL, allowedItems.count);
@@ -1129,7 +1129,7 @@
[webView synchronouslyLoadTestPageNamed:@"simple"];
auto simulatedItemProvider = adoptNS([[UIItemProvider alloc] init]);
- [simulatedItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeHTML withData:[@"<body></body>" dataUsingEncoding:NSUTF8StringEncoding]];
+ [simulatedItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeHTML withData:[@"<body></body>" dataUsingEncoding:NSUTF8StringEncoding]];
__block bool finishedLoadingData = false;
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
@@ -1141,7 +1141,7 @@
}];
[simulator setDropCompletionBlock:^(BOOL handled, NSArray *itemProviders) {
EXPECT_FALSE(handled);
- [itemProviders.firstObject loadDataRepresentationForTypeIdentifier:(NSString *)kUTTypeHTML completionHandler:^(NSData *data, NSError *error) {
+ [itemProviders.firstObject loadDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeHTML completionHandler:^(NSData *data, NSError *error) {
NSString *text = [[[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding] autorelease];
EXPECT_WK_STREQ("<body></body>", text.UTF8String);
EXPECT_FALSE(!!error);
@@ -1162,7 +1162,7 @@
[webView stringByEvaluatingJavaScript:@"getSelection().removeAllRanges()"];
auto simulatedItemProvider = adoptNS([[UIItemProvider alloc] init]);
- [simulatedItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeUTF8PlainText options:nil loadHandler:^NSProgress *(UIItemProviderDataLoadCompletionBlock completionBlock)
+ [simulatedItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeUTF8PlainText options:nil loadHandler:^NSProgress *(UIItemProviderDataLoadCompletionBlock completionBlock)
{
completionBlock([@"Hello world" dataUsingEncoding:NSUTF8StringEncoding], nil);
return [NSProgress discreteProgressWithTotalUnitCount:100];
@@ -1185,7 +1185,7 @@
[webView stringByEvaluatingJavaScript:@"getSelection().removeAllRanges()"];
auto simulatedItemProvider = adoptNS([[UIItemProvider alloc] init]);
- [simulatedItemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeUTF8PlainText options:nil loadHandler:^NSProgress *(UIItemProviderDataLoadCompletionBlock completionBlock)
+ [simulatedItemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeUTF8PlainText options:nil loadHandler:^NSProgress *(UIItemProviderDataLoadCompletionBlock completionBlock)
{
completionBlock([@"Hello world" dataUsingEncoding:NSUTF8StringEncoding], nil);
return [NSProgress discreteProgressWithTotalUnitCount:100];
@@ -1406,7 +1406,7 @@
WebItemProviderPasteboard *pasteboard = [WebItemProviderPasteboard sharedInstance];
auto fastItem = adoptNS([[UIItemProvider alloc] init]);
- [fastItem registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeUTF8PlainText options:nil loadHandler:^NSProgress *(UIItemProviderDataLoadCompletionBlock completionBlock)
+ [fastItem registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeUTF8PlainText options:nil loadHandler:^NSProgress *(UIItemProviderDataLoadCompletionBlock completionBlock)
{
completionBlock([fastString dataUsingEncoding:NSUTF8StringEncoding], nil);
return nil;
@@ -1413,7 +1413,7 @@
}];
auto slowItem = adoptNS([[UIItemProvider alloc] init]);
- [slowItem registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeUTF8PlainText options:nil loadHandler:^NSProgress *(UIItemProviderDataLoadCompletionBlock completionBlock)
+ [slowItem registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeUTF8PlainText options:nil loadHandler:^NSProgress *(UIItemProviderDataLoadCompletionBlock completionBlock)
{
sleep(2_s);
completionBlock([slowString dataUsingEncoding:NSUTF8StringEncoding], nil);
@@ -1523,14 +1523,14 @@
TEST(DragAndDropTests, DataTransferGetDataWhenDroppingImageAndMarkup)
{
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 320, 500)]);
- WKPreferencesSetCustomPasteboardDataEnabled((WKPreferencesRef)[webView configuration].preferences, true);
+ WKPreferencesSetCustomPasteboardDataEnabled((__bridge WKPreferencesRef)[webView configuration].preferences, true);
[webView synchronouslyLoadTestPageNamed:@"DataTransfer"];
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
auto itemProvider = adoptNS([[UIItemProvider alloc] init]);
- [itemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypePNG withData:testIconImageData()];
+ [itemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypePNG withData:testIconImageData()];
NSString *markupString = @"<script>bar()</script><strong _onmousedown_=_javascript_:void(0)>HELLO WORLD</strong>";
- [itemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeHTML withData:[markupString dataUsingEncoding:NSUTF8StringEncoding]];
+ [itemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeHTML withData:[markupString dataUsingEncoding:NSUTF8StringEncoding]];
[itemProvider setSuggestedName:@"icon"];
[simulator setExternalItemProviders:@[ itemProvider.get() ]];
[simulator runFrom:CGPointZero to:CGPointMake(50, 100)];
@@ -1615,7 +1615,7 @@
auto itemProvider = adoptNS([[UIItemProvider alloc] init]);
NSURL *iconURL = [[NSBundle mainBundle] URLForResource:@"icon" withExtension:@"png" subdirectory:@"TestWebKitAPI.resources"];
- [itemProvider registerFileRepresentationForTypeIdentifier:(NSString *)kUTTypePNG fileOptions:0 visibility:NSItemProviderRepresentationVisibilityAll loadHandler:[protectedIconURL = retainPtr(iconURL)] (FileLoadCompletionBlock completionHandler) -> NSProgress * {
+ [itemProvider registerFileRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypePNG fileOptions:0 visibility:NSItemProviderRepresentationVisibilityAll loadHandler:[protectedIconURL = retainPtr(iconURL)] (FileLoadCompletionBlock completionHandler) -> NSProgress * {
completionHandler(protectedIconURL.get(), NO, nil);
return nil;
}];
@@ -1638,7 +1638,7 @@
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
auto itemProvider = adoptNS([[UIItemProvider alloc] init]);
- [itemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeJPEG visibility:NSItemProviderRepresentationVisibilityAll loadHandler:^NSProgress *(DataLoadCompletionBlock completionHandler)
+ [itemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeJPEG visibility:NSItemProviderRepresentationVisibilityAll loadHandler:^NSProgress *(DataLoadCompletionBlock completionHandler)
{
completionHandler(UIImageJPEGRepresentation(testIconImage(), 0.5), nil);
return nil;
@@ -1661,7 +1661,7 @@
runTestWithTemporaryTextFile(^(NSURL *fileURL) {
auto itemProvider = adoptNS([[UIItemProvider alloc] init]);
- [itemProvider registerFileRepresentationForTypeIdentifier:(NSString *)kUTTypeUTF8PlainText fileOptions:0 visibility:NSItemProviderRepresentationVisibilityAll loadHandler:[protectedFileURL = retainPtr(fileURL)] (FileLoadCompletionBlock completionHandler) -> NSProgress * {
+ [itemProvider registerFileRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeUTF8PlainText fileOptions:0 visibility:NSItemProviderRepresentationVisibilityAll loadHandler:[protectedFileURL = retainPtr(fileURL)] (FileLoadCompletionBlock completionHandler) -> NSProgress * {
completionHandler(protectedFileURL.get(), NO, nil);
return nil;
}];
@@ -1759,7 +1759,7 @@
auto simulator = adoptNS([[DragAndDropSimulator alloc] initWithWebView:webView.get()]);
auto itemProvider = adoptNS([[UIItemProvider alloc] init]);
- [itemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeMP3 visibility:NSItemProviderRepresentationVisibilityAll loadHandler:^NSProgress *(DataLoadCompletionBlock completionHandler)
+ [itemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeMP3 visibility:NSItemProviderRepresentationVisibilityAll loadHandler:^NSProgress *(DataLoadCompletionBlock completionHandler)
{
completionHandler([@"this is a test" dataUsingEncoding:NSUTF8StringEncoding], nil);
return nil;
@@ -1793,7 +1793,7 @@
{
EXPECT_EQ(1UL, session.items.count);
auto *item = session.items[0].itemProvider;
- EXPECT_TRUE([item.registeredTypeIdentifiers containsObject:(NSString *)kUTTypeURL]);
+ EXPECT_TRUE([item.registeredTypeIdentifiers containsObject:(__bridge NSString *)kUTTypeURL]);
EXPECT_TRUE([item canLoadObjectOfClass: [NSURL class]]);
[item loadObjectOfClass:[NSURL class] completionHandler:^(id<NSItemProviderReading> url, NSError *error) {
EXPECT_TRUE([url isKindOfClass: [NSURL class]]);
@@ -1830,7 +1830,7 @@
{
EXPECT_EQ(1UL, session.items.count);
auto *item = session.items[0].itemProvider;
- EXPECT_TRUE([item.registeredTypeIdentifiers containsObject:(NSString *)kUTTypeURL]);
+ EXPECT_TRUE([item.registeredTypeIdentifiers containsObject:(__bridge NSString *)kUTTypeURL]);
EXPECT_TRUE([item canLoadObjectOfClass: [NSURL class]]);
[item loadObjectOfClass:[NSURL class] completionHandler:^(id<NSItemProviderReading> url, NSError *error) {
EXPECT_TRUE([url isKindOfClass: [NSURL class]]);
@@ -1864,7 +1864,7 @@
[simulator runFrom:CGPointMake(50, 225) to:CGPointMake(50, 375)];
NSArray *registeredTypes = [simulator.get().sourceItemProviders.firstObject registeredTypeIdentifiers];
- EXPECT_FALSE([registeredTypes containsObject:(NSString *)kUTTypeURL]);
+ EXPECT_FALSE([registeredTypes containsObject:(__bridge NSString *)kUTTypeURL]);
checkJSONWithLogging([webView stringByEvaluatingJavaScript:@"output.value"], @{
@"dragover": @{
@"text/uri-list": @"",
@@ -1891,8 +1891,8 @@
{
EXPECT_EQ(1UL, session.items.count);
auto *item = session.items[0].itemProvider;
- EXPECT_TRUE([item.registeredTypeIdentifiers containsObject:(NSString *)kUTTypeHTML]);
- [item loadDataRepresentationForTypeIdentifier:(NSString *)kUTTypeHTML completionHandler:^(NSData *data, NSError *error) {
+ EXPECT_TRUE([item.registeredTypeIdentifiers containsObject:(__bridge NSString *)kUTTypeHTML]);
+ [item loadDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeHTML completionHandler:^(NSData *data, NSError *error) {
NSString *markup = [[[NSString alloc] initWithData:(NSData *)data encoding:NSUTF8StringEncoding] autorelease];
EXPECT_TRUE([markup containsString:@"hello"]);
EXPECT_TRUE([markup containsString:@", world"]);
Modified: trunk/Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -174,7 +174,7 @@
RetainPtr<NSString> testPlainTextString = @"WebKit";
RetainPtr<NSString> testMarkupString = @"<a href="" WebKit Project</a>";
auto itemProvider = adoptNS([[NSItemProvider alloc] init]);
- [itemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeHTML visibility:NSItemProviderRepresentationVisibilityAll loadHandler:^NSProgress *(DataLoadCompletionBlock completionHandler)
+ [itemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeHTML visibility:NSItemProviderRepresentationVisibilityAll loadHandler:^NSProgress *(DataLoadCompletionBlock completionHandler)
{
completionHandler([testMarkupString dataUsingEncoding:NSUTF8StringEncoding], nil);
return nil;
@@ -199,11 +199,11 @@
auto webView = setUpWebViewForPasteboardTests(@"DataTransfer");
auto copiedText = retainPtr(@"Apple Inc.");
auto itemProvider = adoptNS([[NSItemProvider alloc] init]);
- [itemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypePNG visibility:NSItemProviderRepresentationVisibilityAll loadHandler:[] (DataLoadCompletionBlock completionHandler) -> NSProgress * {
+ [itemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypePNG visibility:NSItemProviderRepresentationVisibilityAll loadHandler:[] (DataLoadCompletionBlock completionHandler) -> NSProgress * {
completionHandler([NSData dataWithContentsOfURL:[[NSBundle mainBundle] URLForResource:@"icon" withExtension:@"png" subdirectory:@"TestWebKitAPI.resources"]], nil);
return nil;
}];
- [itemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeUTF8PlainText visibility:NSItemProviderRepresentationVisibilityAll loadHandler:[copiedText] (DataLoadCompletionBlock completionHandler) -> NSProgress * {
+ [itemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeUTF8PlainText visibility:NSItemProviderRepresentationVisibilityAll loadHandler:[copiedText] (DataLoadCompletionBlock completionHandler) -> NSProgress * {
completionHandler([copiedText dataUsingEncoding:NSUTF8StringEncoding], nil);
return nil;
}];
@@ -238,7 +238,7 @@
});
// Most importantly, the system pasteboard should not contain the PDF UTI.
- NSData *pdfData = [[UIPasteboard generalPasteboard] dataForPasteboardType:(NSString *)kUTTypePDF];
+ NSData *pdfData = [[UIPasteboard generalPasteboard] dataForPasteboardType:(__bridge NSString *)kUTTypePDF];
EXPECT_EQ(0UL, pdfData.length);
// However, the system pasteboard should contain a plain text string.
@@ -249,7 +249,7 @@
{
auto webView = setUpWebViewForPasteboardTests(@"dump-datatransfer-types");
auto itemProvider = adoptNS([[NSItemProvider alloc] init]);
- [itemProvider registerDataRepresentationForTypeIdentifier:(NSString *)kUTTypeMP3 visibility:NSItemProviderRepresentationVisibilityAll loadHandler:^NSProgress *(DataLoadCompletionBlock completionHandler)
+ [itemProvider registerDataRepresentationForTypeIdentifier:(__bridge NSString *)kUTTypeMP3 visibility:NSItemProviderRepresentationVisibilityAll loadHandler:^NSProgress *(DataLoadCompletionBlock completionHandler)
{
completionHandler([@"this is a test" dataUsingEncoding:NSUTF8StringEncoding], nil);
return nil;
Modified: trunk/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -40,25 +40,25 @@
WKStringRef createInjectedBundlePath()
{
NSString *nsString = [[[NSBundle mainBundle] bundlePath] stringByAppendingPathComponent:@"InjectedBundleTestWebKitAPI.bundle"];
- return WKStringCreateWithCFString((CFStringRef)nsString);
+ return WKStringCreateWithCFString((__bridge CFStringRef)nsString);
}
WKURLRef createURLForResource(const char* resource, const char* extension)
{
NSURL *nsURL = [[NSBundle mainBundle] URLForResource:[NSString stringWithUTF8String:resource] withExtension:[NSString stringWithUTF8String:extension] subdirectory:@"TestWebKitAPI.resources"];
- return WKURLCreateWithCFURL((CFURLRef)nsURL);
+ return WKURLCreateWithCFURL((__bridge CFURLRef)nsURL);
}
WKURLRef URLForNonExistentResource()
{
NSURL *nsURL = [NSURL URLWithString:@"file:///does-not-exist.html"];
- return WKURLCreateWithCFURL((CFURLRef)nsURL);
+ return WKURLCreateWithCFURL((__bridge CFURLRef)nsURL);
}
WKRetainPtr<WKStringRef> MIMETypeForWKURLResponse(WKURLResponseRef wkResponse)
{
RetainPtr<NSURLResponse> response = adoptNS(WKURLResponseCopyNSURLResponse(wkResponse));
- return adoptWK(WKStringCreateWithCFString((CFStringRef)[response.get() MIMEType]));
+ return adoptWK(WKStringCreateWithCFString((__bridge CFStringRef)[response.get() MIMEType]));
}
bool isKeyDown(WKNativeEventPtr event)
Modified: trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm (235834 => 235835)
--- trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm 2018-09-09 03:25:05 UTC (rev 235834)
+++ trunk/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm 2018-09-09 04:24:33 UTC (rev 235835)
@@ -118,7 +118,7 @@
void WebKitAgnosticTest::loadURL(WKView *view, NSURL *url)
{
EXPECT_FALSE(didFinishLoad);
- WKPageLoadURL([view pageRef], adoptWK(WKURLCreateWithCFURL((CFURLRef)url)).get());
+ WKPageLoadURL([view pageRef], adoptWK(WKURLCreateWithCFURL((__bridge CFURLRef)url)).get());
}
void WebKitAgnosticTest::goBack(WebView *webView)
