Attachment 373126 Details for Bug 199290 – Patch for landing

[patch] Patch for landing

bug-199290-20190628101911.patch (text/plain), 8.23 KB, created by Sihui Liu on 2019-06-28 10:19:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sihui Liu

Created: 2019-06-28 10:19:12 PDT

Size: 8.23 KB

patch

obsolete

>Subversion Revision: 246909
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index e14b12394b510c1278ff483b17d556a5fbff8a48..471d6624088b6e66a2f57466da7b086613188c61 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-06-27  Sihui Liu  <sihui_liu@apple.com>
>+
>+        Add a regression test for change r246901
>+        https://bugs.webkit.org/show_bug.cgi?id=199290
>+
>+        Reviewed by Geoffrey Garen.
>+
>+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
>+        * TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm:
>+        (-[LocalStorageNavigationDelegate webView:createWebViewWithConfiguration:forNavigationAction:windowFeatures:]):
>+        (TEST):
>+        * TestWebKitAPI/Tests/WebKitCocoa/localstorage-open-window-private.html: Added.
>+
> 2019-06-27  Beth Dakin  <bdakin@apple.com>
> 
>         Upstream use of MACCATALYST
>diff --git a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
>index 8d336e452a47e442d06c73c605b0d8954710b271..7802aa3636f83eb51328d1ff4c419544828ae63c 100644
>--- a/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
>+++ b/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
>@@ -662,6 +662,7 @@
> 		93AF4ECE1506F064007FD57E /* NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93AF4ECD1506F064007FD57E /* NewFirstVisuallyNonEmptyLayoutForImages_Bundle.cpp */; };
> 		93AF4ED11506F130007FD57E /* lots-of-images.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93AF4ECF1506F123007FD57E /* lots-of-images.html */; };
> 		93CFA8671CEB9E38000565A8 /* autofocused-text-input.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93CFA8661CEB9DE1000565A8 /* autofocused-text-input.html */; };
>+		93D119FC22C680F7009BE3C7 /* localstorage-open-window-private.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93D119FB22C57112009BE3C7 /* localstorage-open-window-private.html */; };
> 		93E2C5551FD3204100E1DF6A /* LineEnding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93E2C5541FD3204100E1DF6A /* LineEnding.cpp */; };
> 		93E2D2761ED7D53200FA76F6 /* offscreen-iframe-of-media-document.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93E2D2751ED7D51700FA76F6 /* offscreen-iframe-of-media-document.html */; };
> 		93E6193B1F931B3A00AF245E /* TextCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 93A258981F92FF15003E510C /* TextCodec.cpp */; };
>@@ -1049,6 +1050,7 @@
> 			dstPath = TestWebKitAPI.resources;
> 			dstSubfolderSpec = 7;
> 			files = (
>+				93D119FC22C680F7009BE3C7 /* localstorage-open-window-private.html in Copy Resources */,
> 				55A817FF2181021A0004A39A /* 100x100-red.tga in Copy Resources */,
> 				1A9E52C913E65EF4006917F5 /* 18-characters.html in Copy Resources */,
> 				55A81800218102210004A39A /* 400x400-green.png in Copy Resources */,
>@@ -1959,6 +1961,7 @@
> 		93AF4ECF1506F123007FD57E /* lots-of-images.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "lots-of-images.html"; sourceTree = "<group>"; };
> 		93CFA8661CEB9DE1000565A8 /* autofocused-text-input.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "autofocused-text-input.html"; sourceTree = "<group>"; };
> 		93CFA8681CEBCFED000565A8 /* CandidateTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CandidateTests.mm; sourceTree = "<group>"; };
>+		93D119FB22C57112009BE3C7 /* localstorage-open-window-private.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "localstorage-open-window-private.html"; sourceTree = "<group>"; };
> 		93D3D19B17B1A7B000C7C415 /* all-content-in-one-iframe.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "all-content-in-one-iframe.html"; sourceTree = "<group>"; };
> 		93D3D19D17B1A84200C7C415 /* LayoutMilestonesWithAllContentInFrame.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayoutMilestonesWithAllContentInFrame.cpp; sourceTree = "<group>"; };
> 		93E2C5541FD3204100E1DF6A /* LineEnding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LineEnding.cpp; sourceTree = "<group>"; };
>@@ -3123,6 +3126,7 @@
> 				9368A25D229EFB3A00A829CA /* local-storage-process-suspends-1.html */,
> 				9368A25C229EFB3A00A829CA /* local-storage-process-suspends-2.html */,
> 				8C10AF97206467830018FD90 /* localstorage-empty-string-value.html */,
>+				93D119FB22C57112009BE3C7 /* localstorage-open-window-private.html */,
> 				51E6A8951D2F1C7700C004B6 /* LocalStorageClear.html */,
> 				46C519E21D35629600DAA51A /* LocalStorageNullEntries.html */,
> 				46C519E31D35629600DAA51A /* LocalStorageNullEntries.localstorage */,
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm b/Tools/TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm
>index 3db173f882b2a9cd3294b316909176c31bb04cc5..11562bb56934f54d63f977a7bde09d943549ab27 100644
>--- a/Tools/TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/LocalStoragePersistence.mm
>@@ -39,6 +39,7 @@
> static bool readyToContinue;
> static bool receivedScriptMessage;
> static RetainPtr<WKScriptMessage> lastScriptMessage;
>+static RetainPtr<WKWebView> createdWebView;
> 
> @interface LocalStorageMessageHandler : NSObject <WKScriptMessageHandler>
> @end
>@@ -53,6 +54,19 @@ - (void)userContentController:(WKUserContentController *)userContentController d
> 
> @end
> 
>+@interface LocalStorageNavigationDelegate : NSObject <WKNavigationDelegate, WKUIDelegate>
>+@end
>+
>+@implementation LocalStorageNavigationDelegate
>+
>+- (WKWebView *)webView:(WKWebView *)webView createWebViewWithConfiguration:(WKWebViewConfiguration *)configuration forNavigationAction:(WKNavigationAction *)navigationAction windowFeatures:(WKWindowFeatures *)windowFeatures
>+{
>+    createdWebView = adoptNS([[WKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:configuration]);
>+    return createdWebView.get();
>+}
>+
>+@end
>+
> TEST(WKWebView, LocalStorageProcessCrashes)
> {
>     readyToContinue = false;
>@@ -198,3 +212,24 @@ TEST(WKWebView, LocalStorageEmptyString)
>     RetainPtr<NSString> string2 = (NSString *)[lastScriptMessage body];
>     EXPECT_WK_STREQ(@"", string2.get());
> }
>+
>+TEST(WKWebView, LocalStorageOpenWindowPrivate)
>+{
>+    auto handler = adoptNS([[LocalStorageMessageHandler alloc] init]);
>+    auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
>+    [[configuration userContentController] addScriptMessageHandler:handler.get() name:@"testHandler"];
>+    [configuration _setAllowUniversalAccessFromFileURLs:YES];
>+    [configuration setWebsiteDataStore:[WKWebsiteDataStore nonPersistentDataStore]];
>+    auto delegate = adoptNS([[LocalStorageNavigationDelegate alloc] init]);
>+    auto webView = adoptNS([[WKWebView alloc] initWithFrame:NSMakeRect(0, 0, 800, 600) configuration:configuration.get()]);
>+    [webView setNavigationDelegate:delegate.get()];
>+    [webView setUIDelegate:delegate.get()];
>+    [webView configuration].preferences.javaScriptCanOpenWindowsAutomatically = YES;
>+
>+    NSURLRequest *request = [NSURLRequest requestWithURL:[[NSBundle mainBundle] URLForResource:@"localstorage-open-window-private" withExtension:@"html" subdirectory:@"TestWebKitAPI.resources"]];
>+    [webView loadRequest:request];
>+    
>+    receivedScriptMessage = false;
>+    TestWebKitAPI::Util::run(&receivedScriptMessage);
>+    EXPECT_WK_STREQ(@"local:storage", [lastScriptMessage body]);
>+}
>diff --git a/Tools/TestWebKitAPI/Tests/WebKitCocoa/localstorage-open-window-private.html b/Tools/TestWebKitAPI/Tests/WebKitCocoa/localstorage-open-window-private.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..40ce7a8656edd770725ad9bdcc066ab73022546c
>--- /dev/null
>+++ b/Tools/TestWebKitAPI/Tests/WebKitCocoa/localstorage-open-window-private.html
>@@ -0,0 +1,11 @@
>+<!DOCTYPE html>
>+<script>
>+window.localStorage.setItem("local", "storage");
>+
>+var newWindow = window.open("about:blank");
>+if (newWindow)
>+    window.webkit.messageHandlers.testHandler.postMessage("local:" + newWindow.localStorage.getItem("local"));
>+else
>+    window.webkit.messageHandlers.testHandler.postMessage("open window fails");
>+
>+</script>

Actions: View | Formatted Diff | Diff

Attachments on bug 199290: 373054 | 373126