Attachment 349275 Details for Bug 189457 – Patch

[patch] Patch

bug-189457-20180908202617.patch (text/plain), 61.32 KB, created by Wenson Hsieh on 2018-09-08 20:26:18 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Wenson Hsieh

Created: 2018-09-08 20:26:18 PDT

Size: 61.32 KB

patch

obsolete

>Subversion Revision: 235775
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 051a402d080716e6b9de3aadddf5cc4f83d12426..d71eace193f17bd4fc65061f4a63756ad8d40984 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,63 @@
>+2018-09-08  Wenson Hsieh  <wenson_hsieh@apple.com>
>+
>+        [Cocoa] Use more bridging casts in TestWebKitAPI
>+        https://bugs.webkit.org/show_bug.cgi?id=189457
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-06  Zalan Bujtas  <zalan@apple.com>
> 
>         [LFC] Add support for min/max-height percentage values.
>diff --git a/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm b/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm
>index 399b95cb34398abfc2c011c4c0dfe96721b41d7d..18c06720551f1e35c4199c329f8795fb000a215a 100644
>--- a/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SharedBuffer.mm
>@@ -56,11 +56,11 @@ TEST_F(SharedBufferTest, createNSDataArray)
>         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());
>     }
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm
>index 631fbea2370411ea64545cf13eed3953501323be..556e3c80eb18741abab38630d8769bd4313e7f88 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyHTML.mm
>@@ -51,7 +51,7 @@ NSString *readHTMLFromPasteboard()
> #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 @@ NSString *readHTMLFromPasteboard()
> 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;
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyURL.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyURL.mm
>index 6acdee3c437664171d6464732dbb6e77f92498fb..618f099d0f3229d4eab66279e2b82cd7ecc582e4 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyURL.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/CopyURL.mm
>@@ -65,7 +65,7 @@ static RetainPtr<TestWKWebView> createWebViewWithCustomPasteboardDataEnabled()
> #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;
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/DragAndDropTests.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/DragAndDropTests.mm
>index 206709efb0443e5115db1549ebc72d3b9908f040..550026302f2eefbd50ecab10cc69a1c80cb8a142 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/DragAndDropTests.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/DragAndDropTests.mm
>@@ -48,7 +48,7 @@ TEST(DragAndDropTests, ExposeMultipleURLsInDataTransfer)
> {
>     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";
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteHTML.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteHTML.mm
>index 7f80fab05bf7e15a0783b496e99cd2f993e1ec23..f4f58f0facedc998eff930d388f99aa1d88cdf52 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteHTML.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteHTML.mm
>@@ -53,14 +53,14 @@ void writeHTMLToPasteboard(NSString *html)
> #else
> void writeHTMLToPasteboard(NSString *html)
> {
>-    [[UIPasteboard generalPasteboard] setItems:@[@{ (NSString *)kUTTypeHTML : html}]];
>+    [[UIPasteboard generalPasteboard] setItems:@[@{ (__bridge NSString *)kUTTypeHTML : html}]];
> }
> #endif
> 
> 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;
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteImage.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteImage.mm
>index d89ec94b46834d7638535cf3bc5abb2de8b8a23c..e0a5a45c2d00ce597b13f75048cb8793d45dbd2d 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteImage.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteImage.mm
>@@ -77,7 +77,7 @@ TEST(PasteImage, PasteGIFImage)
>     [webView synchronouslyLoadTestPageNamed:@"paste-image"];
> 
>     auto *data = [NSData 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 @@ TEST(PasteImage, PasteJPEGImage)
>     [webView synchronouslyLoadTestPageNamed:@"paste-image"];
> 
>     auto *data = [NSData 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 @@ TEST(PasteImage, PastePNGImage)
>     [webView synchronouslyLoadTestPageNamed:@"paste-image"];
> 
>     auto *data = [NSData 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 @@ TEST(PasteImage, PasteTIFFImage)
>     [webView synchronouslyLoadTestPageNamed:@"paste-image"];
> 
>     auto *data = [NSData 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()"]);
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteMixedContent.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteMixedContent.mm
>index 7132a2ec9c693e6ecce152b459b3d8bf83dc74bb..5aeed4d765b30daec5eddbee822bb6a72632ac58 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteMixedContent.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteMixedContent.mm
>@@ -90,7 +90,7 @@ void writeTypesAndDataToPasteboard(id type, ...)
> 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 @@ TEST(PasteMixedContent, CopyAndPasteWithCustomPasteboardDataOnly)
>     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://"]];
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteRTFD.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteRTFD.mm
>index 0c5418338e7e3f39ed32b8a729286a832c19c403..c819bb936fa584d1f47b70c563722b167cafca3a 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteRTFD.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteRTFD.mm
>@@ -67,19 +67,19 @@ @end
> 
> 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
> 
> 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 @@ TEST(PasteRTFD, ImageElementUsesBlobURL)
>     [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 @@ TEST(PasteRTFD, ImageElementUsesBlobURLInHTML)
>     [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:@{ }];
> 
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteWebArchive.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteWebArchive.mm
>index 15f27e913d137764a3fa150a16490f49bc145450..50458dde91a3b0983813ff4930967ac69bebfb8a 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteWebArchive.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/PasteWebArchive.mm
>@@ -42,7 +42,7 @@ @end
> 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;
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/RestoreSessionStateWithoutNavigation.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/RestoreSessionStateWithoutNavigation.mm
>index ebaddaea01cdec777e5972ffef992a3253580056..fe95616a3bb7d9096a6e5fc128f9ec7953faaf08 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/RestoreSessionStateWithoutNavigation.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/RestoreSessionStateWithoutNavigation.mm
>@@ -98,7 +98,7 @@ TEST(WebKit, RestoreSessionStateWithoutNavigation)
>     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()));
> }
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm
>index 68d19ad669f5488d575c38b8484b3b08ca9b799a..2c362a4e727d7cd63be932013c236847779eaec3 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm
>@@ -153,7 +153,7 @@ static NSString *attachmentEditingTestMarkup = @"<meta name='viewport' content='
> 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];
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/AccessingPastedImage.mm b/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/AccessingPastedImage.mm
>index 503c224bba66b28267c7745bbf1cd7d36e765f8b..cac36abfa46206aa01445ba26a4996c892afe088 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/AccessingPastedImage.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitLegacy/mac/AccessingPastedImage.mm
>@@ -53,7 +53,7 @@ @end
> 
> static void writeRTFDToPasteboard(NSData *data)
> {
>-    [[UIPasteboard generalPasteboard] setItems:@[@{ (NSString *)kUTTypeFlatRTFD : data}]];
>+    [[UIPasteboard generalPasteboard] setItems:@[@{ (__bridge NSString *)kUTTypeFlatRTFD : data}]];
> }
> #endif
> 
>@@ -93,7 +93,7 @@ TEST(WebKitLegacy, AccessingImageInPastedRTFD)
>     [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:@{ }];
> 
>diff --git a/Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm b/Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm
>index dcfc2e122e985d9d0d3146e266acfd5b95ca3492..b9ffa74d610771a005310c8c9a486a548fc19158 100644
>--- a/Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm
>+++ b/Tools/TestWebKitAPI/Tests/ios/ActionSheetTests.mm
>@@ -250,14 +250,14 @@ TEST(ActionSheetTests, CopyImageElementWithHREFAndTitle)
>     [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 @@ TEST(ActionSheetTests, CopyImageElementWithHREF)
>     [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 @@ TEST(ActionSheetTests, CopyImageElementWithoutHREF)
>     [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);
>diff --git a/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm b/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm
>index 00c13f0dcb6f675962f8f1f6f34b51a732d49732..386d93bda53322f4924e4507596fa6ba7739d58e 100644
>--- a/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm
>+++ b/Tools/TestWebKitAPI/Tests/ios/DragAndDropTestsIOS.mm
>@@ -122,9 +122,9 @@ static void checkRichTextTypePrecedesPlainTextType(DragAndDropSimulator *simulat
> {
>     // 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 @@ TEST(DragAndDropTests, CanStartDragOnEnormousImage)
>     [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 @@ TEST(DragAndDropTests, ImageInLinkToInput)
>     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 @@ TEST(DragAndDropTests, ImageInLinkWithoutHREFToInput)
> 
>     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 @@ TEST(DragAndDropTests, ImageDoesNotUseElementSizeAsEstimatedSize)
>     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 @@ TEST(DragAndDropTests, SinglePlainTextWordTypeIdentifiers)
>     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 @@ TEST(DragAndDropTests, SinglePlainTextURLTypeIdentifiers)
>     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 @@ TEST(DragAndDropTests, LinkToInput)
>     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 @@ TEST(DragAndDropTests, BackgroundImageLinkToInput)
>     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 @@ TEST(DragAndDropTests, ExternalSourceJSONToFileInput)
> 
>     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 @@ TEST(DragAndDropTests, ExternalSourceImageToFileInput)
> 
>     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 @@ TEST(DragAndDropTests, ExternalSourceHTMLToUploadArea)
> 
>     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 @@ TEST(DragAndDropTests, ExternalSourceMoveOperationNotAllowed)
> 
>     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 @@ TEST(DragAndDropTests, ExternalSourceZIPArchiveAndURLToSingleFileInput)
>     [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 @@ TEST(DragAndDropTests, ExternalSourceZIPArchiveToUploadArea)
>     [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 @@ TEST(DragAndDropTests, ExternalSourceImageAndHTMLToSingleFileInput)
> 
>     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 @@ TEST(DragAndDropTests, ExternalSourceImageAndHTMLToMultipleFileInput)
> 
>     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 @@ TEST(DragAndDropTests, ExternalSourceImageAndHTMLToUploadArea)
> 
>     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 @@ TEST(DragAndDropTests, ExternalSourceHTMLToContentEditable)
>     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 @@ TEST(DragAndDropTests, ExternalSourceOverrideDropFileUpload)
> 
>     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 @@ TEST(DragAndDropTests, ExternalSourceOverrideDropFileUpload)
>         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 @@ static RetainPtr<TestWKWebView> setUpTestWebViewForDataTransferItems()
>     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 @@ TEST(DragAndDropTests, ExternalSourceDataTransferItemGetFolderAsEntry)
>     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 @@ TEST(DragAndDropTests, ExternalSourceDataTransferItemGetPlainTextFileAsEntry)
>     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 @@ TEST(DragAndDropTests, ExternalSourceOverrideDropInsertURL)
>     {
>         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 @@ TEST(DragAndDropTests, OverrideDrop)
>     [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 @@ TEST(DragAndDropTests, OverrideDrop)
>     }];
>     [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 @@ TEST(DragAndDropTests, InjectedBundleOverridePerformTwoStepDrop)
>     [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 @@ TEST(DragAndDropTests, InjectedBundleAllowPerformTwoStepDrop)
>     [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,14 +1406,14 @@ TEST(DragAndDropTests, WebItemProviderPasteboardLoading)
> 
>     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;
>     }];
> 
>     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 @@ static NSData *testIconImageData()
> 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 @@ TEST(DragAndDropTests, DataTransferGetDataWhenDroppingImageWithFileURL)
> 
>     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 @@ TEST(DragAndDropTests, DataTransferGetDataWhenDroppingImageWithHTTPURL)
>     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 @@ TEST(DragAndDropTests, DataTransferGetDataWhenDroppingRespectsPresentationStyle)
> 
>     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 @@ TEST(DragAndDropTests, DataTransferGetDataCannotReadPrivateArbitraryTypes)
>     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 @@ TEST(DragAndDropTests, DataTransferSetDataValidURL)
>     {
>         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 @@ TEST(DragAndDropTests, DataTransferSetDataUnescapedURL)
>     {
>         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 @@ TEST(DragAndDropTests, DataTransferSetDataInvalidURL)
> 
>     [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 @@ TEST(DragAndDropTests, DataTransferSanitizeHTML)
>     {
>         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"]);
>diff --git a/Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm b/Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm
>index 1c19a375b91349bed6f988e8cb98e96b66b67bb2..fcf751885f39fe9c29f2b0cf1802f22b692e94e6 100644
>--- a/Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm
>+++ b/Tools/TestWebKitAPI/Tests/ios/UIPasteboardTests.mm
>@@ -174,7 +174,7 @@ TEST(UIPasteboardTests, DataTransferGetDataWhenPastingPlatformRepresentations)
>     RetainPtr<NSString> testPlainTextString = @"WebKit";
>     RetainPtr<NSString> testMarkupString = @"<a href=\"https://www.webkit.org/\">The 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 @@ TEST(UIPasteboardTests, DataTransferGetDataWhenPastingImageAndText)
>     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 @@ TEST(UIPasteboardTests, DataTransferSetDataCannotWritePlatformTypes)
>     });
> 
>     // 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 @@ TEST(UIPasteboardTests, DataTransferGetDataCannotReadArbitraryPlatformTypes)
> {
>     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;
>diff --git a/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm b/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm
>index a0c42e789b440cd813b67fd236e9a89a6ef29300..79a47ce6549a49502932fd27a002cc926013dfbd 100644
>--- a/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm
>+++ b/Tools/TestWebKitAPI/mac/PlatformUtilitiesMac.mm
>@@ -40,25 +40,25 @@ namespace Util {
> 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)
>diff --git a/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm b/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm
>index 038cef0a8bc62d43a1507ba2ca380fe29b35a3f3..30a1f2cf7fa29968409bab795177c7f82be0a983 100644
>--- a/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm
>+++ b/Tools/TestWebKitAPI/mac/WebKitAgnosticTest.mm
>@@ -118,7 +118,7 @@ void WebKitAgnosticTest::loadURL(WebView *webView, NSURL *url)
> 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)

Actions: View | Formatted Diff | Diff

Attachments on bug 189457: 349275