Title: [131384] trunk/Tools
- Revision
- 131384
- Author
- simon.fra...@apple.com
- Date
- 2012-10-15 17:15:55 -0700 (Mon, 15 Oct 2012)
Log Message
Update the url bar in MiniBrowser when getting the committed URL
https://bugs.webkit.org/show_bug.cgi?id=99388
Reviewed by Sam Weinig.
Fix both WK1 and WK2 window controllers to update the URL in the
text field when transitioning to the committed URL. This fixes
the URL when dragging local files into the window.
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController webView:didCommitLoadForFrame:]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController updateTextFieldFromURL:]):
(-[WK2BrowserWindowController updateProvisionalURLForFrame:]):
(-[WK2BrowserWindowController updateCommittedURLForFrame:]):
(-[WK2BrowserWindowController didCommitLoadForFrame:]):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (131383 => 131384)
--- trunk/Tools/ChangeLog 2012-10-16 00:08:48 UTC (rev 131383)
+++ trunk/Tools/ChangeLog 2012-10-16 00:15:55 UTC (rev 131384)
@@ -1,3 +1,22 @@
+2012-10-15 Simon Fraser <simon.fra...@apple.com>
+
+ Update the url bar in MiniBrowser when getting the committed URL
+ https://bugs.webkit.org/show_bug.cgi?id=99388
+
+ Reviewed by Sam Weinig.
+
+ Fix both WK1 and WK2 window controllers to update the URL in the
+ text field when transitioning to the committed URL. This fixes
+ the URL when dragging local files into the window.
+
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController webView:didCommitLoadForFrame:]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController updateTextFieldFromURL:]):
+ (-[WK2BrowserWindowController updateProvisionalURLForFrame:]):
+ (-[WK2BrowserWindowController updateCommittedURLForFrame:]):
+ (-[WK2BrowserWindowController didCommitLoadForFrame:]):
+
2012-10-15 Ojan Vafai <o...@chromium.org>
Don't show the content shell and android test bots for webkit ToT
Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (131383 => 131384)
--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2012-10-16 00:08:48 UTC (rev 131383)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2012-10-16 00:15:55 UTC (rev 131384)
@@ -233,6 +233,15 @@
{
}
+- (void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame
+{
+ if (frame != [sender mainFrame])
+ return;
+
+ NSURL *committedURL = [[[frame dataSource] request] URL];
+ [urlText setStringValue:[committedURL absoluteString]];
+}
+
- (void)webView:(WebView *)sender didReceiveTitle:(NSString *)title forFrame:(WebFrame *)frame
{
if (frame != [sender mainFrame])
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (131383 => 131384)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2012-10-16 00:08:48 UTC (rev 131383)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2012-10-16 00:15:55 UTC (rev 131384)
@@ -724,29 +724,39 @@
[progressIndicator setDoubleValue:1.0];
}
-- (void)updateProvisionalURLForFrame:(WKFrameRef)frame
+- (void)updateTextFieldFromURL:(WKURLRef)URLRef
{
+ if (!URLRef)
+ return;
+
static WKURLRef emptyURL = 0;
if (!emptyURL)
emptyURL = WKURLCreateWithUTF8CString("");
- WKURLRef url = ""
-
- if (!url)
+ if (WKURLIsEqual(URLRef, emptyURL)) {
+ WKRelease(URLRef);
return;
-
- if (WKURLIsEqual(url, emptyURL)) {
- WKRelease(url);
- return;
}
- CFURLRef cfSourceURL = WKURLCopyCFURL(0, url);
- WKRelease(url);
-
+ CFURLRef cfSourceURL = WKURLCopyCFURL(0, URLRef);
[urlText setStringValue:(NSString*)CFURLGetString(cfSourceURL)];
CFRelease(cfSourceURL);
}
+- (void)updateProvisionalURLForFrame:(WKFrameRef)frame
+{
+ WKURLRef url = ""
+ [self updateTextFieldFromURL:url];
+ WKRelease(url);
+}
+
+- (void)updateCommittedURLForFrame:(WKFrameRef)frame
+{
+ WKURLRef url = ""
+ [self updateTextFieldFromURL:url];
+ WKRelease(url);
+}
+
- (void)didStartProvisionalLoadForFrame:(WKFrameRef)frame
{
if (!WKFrameIsMainFrame(frame))
@@ -785,6 +795,10 @@
- (void)didCommitLoadForFrame:(WKFrameRef)frame
{
+ if (!WKFrameIsMainFrame(frame))
+ return;
+
+ [self updateCommittedURLForFrame:frame];
}
- (void)loadURLString:(NSString *)urlString
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
