Changeset 207713 in webkit

Timestamp:

Oct 22, 2016 9:30:17 AM (7 years ago)

Author:

mitz@apple.com

Message:

Improve MiniBrowser window titles for URLs without paths and with no title
<​https://webkit.org/b/163843>

Reviewed by Darin Adler.

• MiniBrowser/mac/WK1BrowserWindowController.m:

(-[WK1BrowserWindowController fetch:]): While we’re here, deploy

+[NSURL _webkit_URLWithUserTypedString:] here to match the WK2BrowserWindowController
version of this method.

(-[WK1BrowserWindowController updateTitle:]): If the URL doesn’t have a lastPathComponent,

use the entire URL.

(-[WK1BrowserWindowController webView:didCommitLoadForFrame:]): Also while we’re here,

deploy +[NSURL _web_userVisibleString] here to match the WK2BrowserWindowController
behavior.

• MiniBrowser/mac/WK2BrowserWindowController.m:

(-[WK2BrowserWindowController updateTitle:]): If the URL doesn’t have a lastPathComponent,

use the entire URL.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• MiniBrowser/mac/WK1BrowserWindowController.m (modified) (4 diffs)
• MiniBrowser/mac/WK2BrowserWindowController.m (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-10-22  Dan Bernstein  <mitz@apple.com>
+
+        Improve MiniBrowser window titles for URLs without paths and with no title
+        <https://webkit.org/b/163843>
+
+        Reviewed by Darin Adler.
+
+        * MiniBrowser/mac/WK1BrowserWindowController.m:
+        (-[WK1BrowserWindowController fetch:]): While we’re here, deploy
+          +[NSURL _webkit_URLWithUserTypedString:] here to match the WK2BrowserWindowController
+          version of this method.
+        (-[WK1BrowserWindowController updateTitle:]): If the URL doesn’t have a lastPathComponent,
+          use the entire URL.
+        (-[WK1BrowserWindowController webView:didCommitLoadForFrame:]): Also while we’re here,
+          deploy +[NSURL _web_userVisibleString] here to match the WK2BrowserWindowController
+          behavior.
+
+        * MiniBrowser/mac/WK2BrowserWindowController.m:
+        (-[WK2BrowserWindowController updateTitle:]): If the URL doesn’t have a lastPathComponent,
+          use the entire URL.
+
 2016-10-21  David Kilzer  <ddkilzer@apple.com>
 

trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m

@@ -29 +29 @@
 #import "SettingsController.h"
 #import <WebKit/WebKit.h>
+#import <WebKit/WebNSURLExtras.h>
 #import <WebKit/WebPreferences.h>
 #import <WebKit/WebPreferencesPrivate.h>
@@ -82 +83 @@
 {
     [urlText setStringValue:[self addProtocolIfNecessary:[urlText stringValue]]];
-    NSURL *url = [NSURL URLWithString:[urlText stringValue]];
+    NSURL *url = [NSURL _webkit_URLWithUserTypedString:urlText.stringValue];
     [[_webView mainFrame] loadRequest:[NSURLRequest requestWithURL:url]];
 }
@@ -336 +337 @@
     if (!title) {
         NSURL *url = _webView.mainFrame.dataSource.request.URL;
-        title = url.lastPathComponent;
+        title = url.lastPathComponent ?: url._web_userVisibleString;
     }
     
@@ -356 +357 @@
 
     NSURL *committedURL = [[[frame dataSource] request] URL];
-    [urlText setStringValue:[committedURL absoluteString]];
+    urlText.stringValue = committedURL._web_userVisibleString;
 
     [self updateTitle:nil];

trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

@@ -404 +404 @@
 - (void)updateTitle:(NSString *)title
 {
-    if (!title)
-        title = _webView.URL.lastPathComponent;
-    
+    if (!title) {
+        NSURL *url = _webView.URL;
+        title = url.lastPathComponent ?: url._web_userVisibleString;
+    }
+
     self.window.title = [NSString stringWithFormat:@"%@%@ [WK2 %d]", _isPrivateBrowsingWindow ? @"🙈 " : @"", title, _webView._webProcessIdentifier];
 }