Changeset 221714 in webkit

Timestamp:

Sep 6, 2017 8:42:39 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Add WKUIDelegatePrivate equivalent of WKPageUIClient's pageDidScroll
​https://bugs.webkit.org/show_bug.cgi?id=176482
<rdar://problem/29270035>

Reviewed by Tim Horton.
Source/WebKit:

Covered by a new API test!

• UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
• UIProcess/Cocoa/UIDelegate.h:
• UIProcess/Cocoa/UIDelegate.mm:

(WebKit::UIDelegate::setDelegate):
(WebKit::UIDelegate::UIClient::pageDidScroll):

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:

(-[DidScrollDelegate _webViewDidScroll:]):
(TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (modified) (1 diff)
• Source/WebKit/UIProcess/Cocoa/UIDelegate.h (modified) (2 diffs)
• Source/WebKit/UIProcess/Cocoa/UIDelegate.mm (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-09-06  Alex Christensen  <achristensen@webkit.org>
+
+        Add WKUIDelegatePrivate equivalent of WKPageUIClient's pageDidScroll
+        https://bugs.webkit.org/show_bug.cgi?id=176482
+        <rdar://problem/29270035>
+
+        Reviewed by Tim Horton.
+        
+        Covered by a new API test!
+
+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+        * UIProcess/Cocoa/UIDelegate.h:
+        * UIProcess/Cocoa/UIDelegate.mm:
+        (WebKit::UIDelegate::setDelegate):
+        (WebKit::UIDelegate::UIClient::pageDidScroll):
+
 2017-09-06  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h

@@ -153 +153 @@
 - (void)_focusWebView:(WKWebView *)webView WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 - (void)_unfocusWebView:(WKWebView *)webView WK_API_AVAILABLE(macosx(WK_MAC_TBA));
+- (void)_webViewDidScroll:(WKWebView *)webView WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 - (void)_webView:(WKWebView *)webView takeFocus:(_WKFocusDirection)direction WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 - (void)_webView:(WKWebView *)webView didNotHandleWheelEvent:(NSEvent *)event WK_API_AVAILABLE(macosx(WK_MAC_TBA));

trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.h

@@ -101 +101 @@
         void focus(WebPageProxy*) final;
         void unfocus(WebPageProxy*) final;
+        void pageDidScroll(WebPageProxy*) final;
         void didNotHandleWheelEvent(WebPageProxy*, const NativeWebWheelEvent&) final;
         void handleAutoplayEvent(WebPageProxy&, WebCore::AutoplayEvent, OptionSet<WebCore::AutoplayEventFlags>) final;
@@ -153 +154 @@
         bool unfocusWebView : 1;
         bool webViewTakeFocus : 1;
+        bool webViewDidScroll : 1;
         bool webViewDidNotHandleWheelEvent : 1;
         bool webViewHandleAutoplayEventWithFlags : 1;

trunk/Source/WebKit/UIProcess/Cocoa/UIDelegate.mm

@@ -110 +110 @@
     m_delegateMethods.unfocusWebView = [delegate respondsToSelector:@selector(_unfocusWebView:)];
     m_delegateMethods.webViewTakeFocus = [delegate respondsToSelector:@selector(_webView:takeFocus:)];
+    m_delegateMethods.webViewDidScroll = [delegate respondsToSelector:@selector(_webViewDidScroll:)];
     m_delegateMethods.webViewGetToolbarsAreVisibleWithCompletionHandler = [delegate respondsToSelector:@selector(_webView:getToolbarsAreVisibleWithCompletionHandler:)];
     m_delegateMethods.webViewDidNotHandleWheelEvent = [delegate respondsToSelector:@selector(_webView:didNotHandleWheelEvent:)];
@@ -410 +411 @@
     
     [(id <WKUIDelegatePrivate>)delegate _webView:m_uiDelegate.m_webView takeFocus:toWKFocusDirection(direction)];
+}
+
+void UIDelegate::UIClient::pageDidScroll(WebPageProxy*)
+{
+    if (!m_uiDelegate.m_delegateMethods.webViewDidScroll)
+        return;
+    
+    auto delegate = m_uiDelegate.m_delegate.get();
+    if (!delegate)
+        return;
+    
+    [(id <WKUIDelegatePrivate>)delegate _webViewDidScroll:m_uiDelegate.m_webView];
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2017-09-06  Alex Christensen  <achristensen@webkit.org>
+
+        Add WKUIDelegatePrivate equivalent of WKPageUIClient's pageDidScroll
+        https://bugs.webkit.org/show_bug.cgi?id=176482
+        <rdar://problem/29270035>
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:
+        (-[DidScrollDelegate _webViewDidScroll:]):
+        (TEST):
+
 2017-09-06  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm

@@ -250 +250 @@
 }
 
-@interface PinnedStateObserver : NSObject <WKUIDelegatePrivate>
+@interface PinnedStateObserver : NSObject
 @end
 
@@ -272 +272 @@
     auto observer = adoptNS([[PinnedStateObserver alloc] init]);
     [webView addObserver:observer.get() forKeyPath:@"_pinnedState" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:nil];
+    [webView loadHTMLString:@"<body onload='scroll(100, 100)' style='height:10000vh;'/>" baseURL:[NSURL URLWithString:@"http://example.com/"]];
+    TestWebKitAPI::Util::run(&done);
+}
+
+@interface DidScrollDelegate : NSObject <WKUIDelegatePrivate>
+@end
+
+@implementation DidScrollDelegate
+
+- (void)_webViewDidScroll:(WKWebView *)webView
+{
+    done = true;
+}
+
+@end
+
+TEST(WebKit, DidScroll)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600)]);
+    auto delegate = adoptNS([[DidScrollDelegate alloc] init]);
+    [webView setUIDelegate:delegate.get()];
     [webView loadHTMLString:@"<body onload='scroll(100, 100)' style='height:10000vh;'/>" baseURL:[NSURL URLWithString:@"http://example.com/"]];
     TestWebKitAPI::Util::run(&done);