Title: [226164] trunk/Tools
- Revision
- 226164
- Author
- wenson_hs...@apple.com
- Date
- 2017-12-19 17:31:21 -0800 (Tue, 19 Dec 2017)
Log Message
Unreviewed, rebaseline an API test result for El Capitan and Sierra.
* TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:
(TestWebKitAPI::TEST):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (226163 => 226164)
--- trunk/Tools/ChangeLog 2017-12-20 01:29:57 UTC (rev 226163)
+++ trunk/Tools/ChangeLog 2017-12-20 01:31:21 UTC (rev 226164)
@@ -1,3 +1,10 @@
+2017-12-19 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Unreviewed, rebaseline an API test result for El Capitan and Sierra.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm:
+ (TestWebKitAPI::TEST):
+
2017-12-19 Ryosuke Niwa <rn...@webkit.org>
Don't convert pasted content to use blob URL in WebKit1
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm (226163 => 226164)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm 2017-12-20 01:29:57 UTC (rev 226163)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKAttachmentTests.mm 2017-12-20 01:31:21 UTC (rev 226164)
@@ -38,6 +38,8 @@
#import <MobileCoreServices/MobileCoreServices.h>
#endif
+#define USES_MODERN_ATTRIBUTED_STRING_CONVERSION ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300))
+
#if WK_API_ENABLED
@interface AttachmentUpdateObserver : NSObject <WKUIDelegatePrivate>
@@ -871,8 +873,14 @@
EXPECT_EQ(3, [webView stringByEvaluatingJavaScript:@"document.querySelectorAll('attachment').length"].integerValue);
EXPECT_WK_STREQ("image/png", [webView stringByEvaluatingJavaScript:@"document.querySelectorAll('attachment')[0].getAttribute('type')"]);
EXPECT_WK_STREQ("application/pdf", [webView stringByEvaluatingJavaScript:@"document.querySelectorAll('attachment')[1].getAttribute('type')"]);
- EXPECT_WK_STREQ("application/zip", [webView stringByEvaluatingJavaScript:@"document.querySelectorAll('attachment')[2].getAttribute('type')"]);
+ NSString *zipAttachmentType = [webView stringByEvaluatingJavaScript:@"document.querySelectorAll('attachment')[2].getAttribute('type')"];
+#if USES_MODERN_ATTRIBUTED_STRING_CONVERSION
+ EXPECT_WK_STREQ("application/zip", zipAttachmentType);
+#else
+ EXPECT_WK_STREQ("application/octet-stream", zipAttachmentType);
+#endif
+
{
ObserveAttachmentUpdatesForScope observer(webView.get());
[webView _synchronouslyExecuteEditCommand:@"SelectAll" argument:nil];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
