Changeset 157701 in webkit

Timestamp:

Oct 20, 2013, 8:43:48 AM (11 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Loading progress API
​https://bugs.webkit.org/show_bug.cgi?id=123069

Reviewed by Sam Weinig.

• UIProcess/API/mac/WKBrowsingContextController.h: Declared estimatedProgress property.
• UIProcess/API/mac/WKBrowsingContextController.mm:

(-[WKBrowsingContextController estimatedProgress]): Added.
(didStartProgress): Added. Calls new delegate method
-browsingContextControllerDidStartProgress:.
(didChangeProgress): Added. Calls new delegate method
-browsingContextController:estimatedProgressChangedTo:.
(didFinishProgress): Added. Calls new delegate method
-browsingContextControllerDidFinishProgress:.
(setUpPageLoaderClient): Hook up new client functions.

• UIProcess/API/mac/WKBrowsingContextLoadDelegate.h: Declared new delegate methods.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/WKBrowsingContextController.h (modified) (1 diff)
• UIProcess/API/mac/WKBrowsingContextController.mm (modified) (3 diffs)
• UIProcess/API/mac/WKBrowsingContextLoadDelegate.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-10-20  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Loading progress API
+        https://bugs.webkit.org/show_bug.cgi?id=123069
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/API/mac/WKBrowsingContextController.h: Declared estimatedProgress property.
+        * UIProcess/API/mac/WKBrowsingContextController.mm:
+        (-[WKBrowsingContextController estimatedProgress]): Added.
+        (didStartProgress): Added. Calls new delegate method
+        -browsingContextControllerDidStartProgress:.
+        (didChangeProgress): Added. Calls new delegate method
+        -browsingContextController:estimatedProgressChangedTo:.
+        (didFinishProgress): Added. Calls new delegate method
+        -browsingContextControllerDidFinishProgress:.
+        (setUpPageLoaderClient): Hook up new client functions.
+        * UIProcess/API/mac/WKBrowsingContextLoadDelegate.h: Declared new delegate methods.
+
 2013-10-20  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>
 

trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.h

@@ -103 +103 @@
 @property(readonly) NSURL *committedURL;
 
+@property(readonly) double estimatedProgress;
 
 #pragma mark Active Document Introspection

trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextController.mm

@@ -271 +271 @@
 }
 
+- (double)estimatedProgress
+{
+    return toImpl(self._pageRef)->estimatedProgress();
+}
+
 #pragma mark Active Document Introspection
 
@@ -452 +457 @@
 }
 
+static void didStartProgress(WKPageRef page, const void* clientInfo)
+{
+    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextControllerDidStartProgress:)])
+        [browsingContext.loadDelegate browsingContextControllerDidStartProgress:browsingContext];
+}
+
+static void didChangeProgress(WKPageRef page, const void* clientInfo)
+{
+    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextController:estimatedProgressChangedTo:)])
+        [browsingContext.loadDelegate browsingContextController:browsingContext estimatedProgressChangedTo:toImpl(page)->estimatedProgress()];
+}
+
+static void didFinishProgress(WKPageRef page, const void* clientInfo)
+{
+    WKBrowsingContextController *browsingContext = (WKBrowsingContextController *)clientInfo;
+    if ([browsingContext.loadDelegate respondsToSelector:@selector(browsingContextControllerDidFinishProgress:)])
+        [browsingContext.loadDelegate browsingContextControllerDidFinishProgress:browsingContext];
+}
+
 static void setUpPageLoaderClient(WKBrowsingContextController *browsingContext, WKPageRef pageRef)
 {
@@ -466 +492 @@
     loaderClient.didFailLoadWithErrorForFrame = didFailLoadWithErrorForFrame;
 
+    loaderClient.didStartProgress = didStartProgress;
+    loaderClient.didChangeProgress = didChangeProgress;
+    loaderClient.didFinishProgress = didFinishProgress;
+
     WKPageSetPageLoaderClient(pageRef, &loaderClient);
 }

trunk/Source/WebKit2/UIProcess/API/mac/WKBrowsingContextLoadDelegate.h

@@ -49 +49 @@
 - (void)browsingContextControllerDidFailLoad:(WKBrowsingContextController *)sender withError:(NSError *)error;
 
+- (void)browsingContextControllerDidStartProgress:(WKBrowsingContextController *)sender;
+- (void)browsingContextController:(WKBrowsingContextController *)sender estimatedProgressChangedTo:(double)estimatedProgress;
+- (void)browsingContextControllerDidFinishProgress:(WKBrowsingContextController *)sender;
+
 @end