Changeset 160433 in webkit

Timestamp:

Dec 11, 2013, 8:16:16 AM (11 years ago)

Author:

mitz@apple.com

Message:

[Mac] Observe the activeURL property to keep the MiniBrowser URL field up to date
​https://bugs.webkit.org/show_bug.cgi?id=125579

Reviewed by Anders Carlsson.

• MiniBrowser/mac/WK2BrowserWindowController.m:

(-[WK2BrowserWindowController dealloc]): Stop observing the activeURL property.
(-[WK2BrowserWindowController observeValueForKeyPath:ofObject:change:context:]): When the
activeURL property changes, update the URL field with its value.
(-[WK2BrowserWindowController awakeFromNib]): Start observing the activeURL property.
(-[WK2BrowserWindowController browsingContextControllerDidStartProvisionalLoad:]): Just log.
(-[WK2BrowserWindowController browsingContextControllerDidReceiveServerRedirectForProvisionalLoad:]):
Ditto.
(-[WK2BrowserWindowController browsingContextController:didFailProvisionalLoadWithError:]):
Ditto.
(-[WK2BrowserWindowController browsingContextControllerDidCommitLoad:]): Ditto.
(-[WK2BrowserWindowController browsingContextController:didFailLoadWithError:]): Ditto.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2013-12-11  Dan Bernstein  <mitz@apple.com>
+
+        [Mac] Observe the activeURL property to keep the MiniBrowser URL field up to date
+        https://bugs.webkit.org/show_bug.cgi?id=125579
+
+        Reviewed by Anders Carlsson.
+
+        * MiniBrowser/mac/WK2BrowserWindowController.m:
+        (-[WK2BrowserWindowController dealloc]): Stop observing the activeURL property.
+        (-[WK2BrowserWindowController observeValueForKeyPath:ofObject:change:context:]): When the
+        activeURL property changes, update the URL field with its value.
+        (-[WK2BrowserWindowController awakeFromNib]): Start observing the activeURL property.
+        (-[WK2BrowserWindowController browsingContextControllerDidStartProvisionalLoad:]): Just log.
+        (-[WK2BrowserWindowController browsingContextControllerDidReceiveServerRedirectForProvisionalLoad:]):
+        Ditto.
+        (-[WK2BrowserWindowController browsingContextController:didFailProvisionalLoadWithError:]):
+        Ditto.
+        (-[WK2BrowserWindowController browsingContextControllerDidCommitLoad:]): Ditto.
+        (-[WK2BrowserWindowController browsingContextController:didFailLoadWithError:]): Ditto.
+
 2013-12-11  Dániel Bátyai  <Batyai.Daniel@stud.u-szeged.hu>
 

trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m

@@ -38 +38 @@
 #import <WebKit2/WKViewPrivate.h>
 
+static void* keyValueObservingContext = &keyValueObservingContext;
+
 @interface WK2BrowserWindowController () <WKBrowsingContextLoadDelegatePrivate, WKBrowsingContextPolicyDelegate, WKBrowsingContextHistoryDelegate>
 @end
@@ -64 +66 @@
     [progressIndicator unbind:NSValueBinding];
 
-    [_webView.browsingContextController removeObserver:self forKeyPath:@"title" context:[WK2BrowserWindowController self]];
+    [_webView.browsingContextController removeObserver:self forKeyPath:@"title" context:keyValueObservingContext];
+    [_webView.browsingContextController removeObserver:self forKeyPath:@"activeURL" context:keyValueObservingContext];
     _webView.browsingContextController.loadDelegate = nil;
     _webView.browsingContextController.policyDelegate = nil;
@@ -300 +303 @@
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
 {
-    if (context != [WK2BrowserWindowController self] || object != _webView.browsingContextController)
+    if (context != keyValueObservingContext || object != _webView.browsingContextController)
         return;
 
     if ([keyPath isEqualToString:@"title"])
         self.window.title = [_webView.browsingContextController.title stringByAppendingString:@" [WK2]"];
+    else if ([keyPath isEqualToString:@"activeURL"])
+        [self updateTextFieldFromURL:_webView.browsingContextController.activeURL];
 }
 
@@ -505 +510 @@
     [progressIndicator bind:NSValueBinding toObject:_webView.browsingContextController withKeyPath:@"estimatedProgress" options:nil];
 
-    [_webView.browsingContextController addObserver:self forKeyPath:@"title" options:0 context:[WK2BrowserWindowController self]];
+    [_webView.browsingContextController addObserver:self forKeyPath:@"title" options:0 context:keyValueObservingContext];
+    [_webView.browsingContextController addObserver:self forKeyPath:@"activeURL" options:0 context:keyValueObservingContext];
 
     _webView.browsingContextController.loadDelegate = self;
@@ -574 +580 @@
 }
 
-- (void)updateProvisionalURL
-{
-    NSURL *url = _webView.browsingContextController.provisionalURL;
-    if (!url)
-        return;
-    [self updateTextFieldFromURL:url];
-}
-
-- (void)updateCommittedURL
-{
-    NSURL *url = _webView.browsingContextController.committedURL;
-    if (!url)
-        return;
-    [self updateTextFieldFromURL:url];
-}
-
 - (void)loadURLString:(NSString *)urlString
 {
@@ -613 +603 @@
 - (void)browsingContextControllerDidStartProvisionalLoad:(WKBrowsingContextController *)sender
 {
-    [self updateProvisionalURL];
+    LOG(@"didStartProvisionalLoad");
 }
 
 - (void)browsingContextControllerDidReceiveServerRedirectForProvisionalLoad:(WKBrowsingContextController *)sender
 {
-    [self updateProvisionalURL];
+    LOG(@"didReceiveServerRedirectForProvisionalLoad");
 }
 
 - (void)browsingContextController:(WKBrowsingContextController *)sender didFailProvisionalLoadWithError:(NSError *)error
 {
-    [self updateProvisionalURL];
+    LOG(@"didFailProvisionalLoadWithError: %@", error);
 }
 
 - (void)browsingContextControllerDidCommitLoad:(WKBrowsingContextController *)sender
 {
-    [self updateCommittedURL];
+    LOG(@"didCommitLoad");
 }
 
@@ -638 +628 @@
 - (void)browsingContextController:(WKBrowsingContextController *)sender didFailLoadWithError:(NSError *)error
 {
-    [self updateProvisionalURL];
+    LOG(@"didFailLoadWithError: %@", error);
 }