Title: [182030] trunk/Tools
Revision
182030
Author
[email protected]
Date
2015-03-26 15:35:30 -0700 (Thu, 26 Mar 2015)

Log Message

Layout test results URL loads in WK1 but not WK2 minibrowser
https://bugs.webkit.org/show_bug.cgi?id=143117

Reviewed by Tim Horton.

* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController fetch:]): Fix this, international domain names, and
everything.
(-[WK2BrowserWindowController updateTextFieldFromURL:]): Ditto.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (182029 => 182030)


--- trunk/Tools/ChangeLog	2015-03-26 22:31:46 UTC (rev 182029)
+++ trunk/Tools/ChangeLog	2015-03-26 22:35:30 UTC (rev 182030)
@@ -1,3 +1,15 @@
+2015-03-26  Alexey Proskuryakov  <[email protected]>
+
+        Layout test results URL loads in WK1 but not WK2 minibrowser
+        https://bugs.webkit.org/show_bug.cgi?id=143117
+
+        Reviewed by Tim Horton.
+
+        * MiniBrowser/mac/WK2BrowserWindowController.m:
+        (-[WK2BrowserWindowController fetch:]): Fix this, international domain names, and
+        everything.
+        (-[WK2BrowserWindowController updateTextFieldFromURL:]): Ditto.
+
 2015-03-26  Jer Noble  <[email protected]>
 
         Add --allowed-host support to run-webkit-tests

Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (182029 => 182030)


--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m	2015-03-26 22:31:46 UTC (rev 182029)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m	2015-03-26 22:35:30 UTC (rev 182030)
@@ -36,6 +36,7 @@
 #import <WebKit/WKWebView.h>
 #import <WebKit/WKWebViewConfigurationPrivate.h>
 #import <WebKit/WKWebViewPrivate.h>
+#import <WebKit/WebNSURLExtras.h>
 #import <WebKit/_WKWebsiteDataStore.h>
 
 static void* keyValueObservingContext = &keyValueObservingContext;
@@ -102,7 +103,7 @@
 {
     [urlText setStringValue:[self addProtocolIfNecessary:[urlText stringValue]]];
 
-    [_webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[[urlText stringValue] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]]];
+    [_webView loadRequest:[NSURLRequest requestWithURL:[NSURL _web_URLWithUserTypedString:[urlText stringValue]]]];
 }
 
 - (IBAction)showHideWebView:(id)sender
@@ -388,7 +389,7 @@
     if (!URL.absoluteString.length)
         return;
 
-    urlText.stringValue = [[URL absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
+    urlText.stringValue = [URL _web_userVisibleString];
 }
 
 - (void)loadURLString:(NSString *)urlString
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to