Changeset 221466 in webkit

Timestamp:

Aug 31, 2017, 6:47:33 PM (8 years ago)

Author:

achristensen@apple.com

Message:

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

Reviewed by Tim Horton.

Source/WebKit:

• UIProcess/API/APIUIClient.h:

(API::UIClient::isPlayingMediaDidChange):
(API::UIClient::isPlayingAudioDidChange): Deleted.

• UIProcess/API/C/WKPage.cpp:

(WKPageSetPageUIClient):

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

(WebKit::UIDelegate::setDelegate):
(WebKit::UIDelegate::UIClient::isPlayingMediaDidChange):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::isPlayingMediaDidChange):

Tools:

• TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:

(-[MediaDelegate _webView:isPlayingMediaDidChange:]):
(-[MediaDelegate webView:didFinishNavigation:]):
(TEST):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/UIProcess/API/APIUIClient.h (modified) (1 diff)
• Source/WebKit/UIProcess/API/C/WKPage.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/API/Cocoa/WKUIDelegatePrivate.h (modified) (1 diff)
• Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp (modified) (1 diff)
• Source/WebKit/UIProcess/Cocoa/UIDelegate.h (modified) (2 diffs)
• Source/WebKit/UIProcess/Cocoa/UIDelegate.mm (modified) (2 diffs)
• Source/WebKit/UIProcess/WebPageProxy.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-08-31  Alex Christensen  <achristensen@webkit.org>
+
+        Add WKUIDelegatePrivate equivalent of WKPageUIClient's isPlayingAudioDidChange
+        https://bugs.webkit.org/show_bug.cgi?id=176203
+        <rdar://problem/29270035>
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/APIUIClient.h:
+        (API::UIClient::isPlayingMediaDidChange):
+        (API::UIClient::isPlayingAudioDidChange): Deleted.
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageSetPageUIClient):
+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+        * UIProcess/Cocoa/UIDelegate.h:
+        * UIProcess/Cocoa/UIDelegate.mm:
+        (WebKit::UIDelegate::setDelegate):
+        (WebKit::UIDelegate::UIClient::isPlayingMediaDidChange):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::isPlayingMediaDidChange):
+
 2017-08-31  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/APIUIClient.h

@@ -147 +147 @@
     virtual void pinnedStateDidChange(WebKit::WebPageProxy&) { }
 
-    virtual void isPlayingAudioDidChange(WebKit::WebPageProxy&) { }
+    virtual void isPlayingMediaDidChange(WebKit::WebPageProxy&, bool) { }
     virtual void mediaCaptureStateDidChange(WebCore::MediaProducer::MediaStateFlags) { }
     virtual void handleAutoplayEvent(WebKit::WebPageProxy&, WebCore::AutoplayEvent, OptionSet<WebCore::AutoplayEventFlags>) { }

trunk/Source/WebKit/UIProcess/API/C/WKPage.cpp

@@ -2060 +2060 @@
         }
 
-        void isPlayingAudioDidChange(WebPageProxy& page) final
+        void isPlayingMediaDidChange(WebPageProxy& page, bool) final
         {
             if (!m_client.isPlayingAudioDidChange)

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

@@ -150 +150 @@
 - (void)_webView:(WKWebView *)webView didNotHandleWheelEvent:(NSEvent *)event WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 - (void)_webView:(WKWebView *)webView handleAutoplayEvent:(_WKAutoplayEvent)event withFlags:(_WKAutoplayEventFlags)flags WK_API_AVAILABLE(macosx(WK_MAC_TBA));
+- (void)_webView:(WKWebView *)webView isPlayingMediaDidChange:(BOOL)playingMedia WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 - (void)_webView:(WKWebView *)webView didClickAutoFillButtonWithUserInfo:(id <NSSecureCoding>)userInfo WK_API_AVAILABLE(macosx(WK_MAC_TBA));
 - (void)_webView:(WKWebView *)webView saveDataToFile:(NSData *)data suggestedFilename:(NSString *)suggestedFilename mimeType:(NSString *)mimeType originatingURL:(NSURL *)url WK_API_AVAILABLE(macosx(WK_MAC_TBA));

trunk/Source/WebKit/UIProcess/API/glib/WebKitUIClient.cpp

@@ -218 +218 @@
     }
 
-    void isPlayingAudioDidChange(WebPageProxy&) override
+    void isPlayingMediaDidChange(WebPageProxy&, bool) final
     {
         webkitWebViewIsPlayingAudioChanged(m_webView);

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

@@ -101 +101 @@
         void focus(WebPageProxy*) final;
         void unfocus(WebPageProxy*) final;
+        void isPlayingMediaDidChange(WebKit::WebPageProxy&, bool) final;
         void didNotHandleWheelEvent(WebPageProxy*, const NativeWebWheelEvent&) final;
         void handleAutoplayEvent(WebPageProxy&, WebCore::AutoplayEvent, OptionSet<WebCore::AutoplayEventFlags>) final;
@@ -151 +152 @@
         bool webViewTakeFocus : 1;
         bool webViewDidNotHandleWheelEvent : 1;
+        bool webViewIsPlayingMediaDidChange : 1;
         bool webViewHandleAutoplayEventWithFlags : 1;
         bool webViewDidClickAutoFillButtonWithUserInfo : 1;

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

@@ -108 +108 @@
     m_delegateMethods.webViewTakeFocus = [delegate respondsToSelector:@selector(_webView:takeFocus:)];
     m_delegateMethods.webViewDidNotHandleWheelEvent = [delegate respondsToSelector:@selector(_webView:didNotHandleWheelEvent:)];
+    m_delegateMethods.webViewIsPlayingMediaDidChange = [delegate respondsToSelector:@selector(_webView:isPlayingMediaDidChange:)];
     m_delegateMethods.webViewHandleAutoplayEventWithFlags = [delegate respondsToSelector:@selector(_webView:handleAutoplayEvent:withFlags:)];
     m_delegateMethods.webViewDidClickAutoFillButtonWithUserInfo = [delegate respondsToSelector:@selector(_webView:didClickAutoFillButtonWithUserInfo:)];
@@ -464 +465 @@
     
     [(id <WKUIDelegatePrivate>)delegate _webView:m_uiDelegate.m_webView didNotHandleWheelEvent:event.nativeEvent()];
+}
+
+void UIDelegate::UIClient::isPlayingMediaDidChange(WebKit::WebPageProxy&, bool isPlaying)
+{
+    if (!m_uiDelegate.m_delegateMethods.webViewIsPlayingMediaDidChange)
+        return;
+    
+    auto delegate = m_uiDelegate.m_delegate.get();
+    if (!delegate)
+        return;
+    
+    [(id <WKUIDelegatePrivate>)delegate _webView:m_uiDelegate.m_webView isPlayingMediaDidChange:isPlaying];
 }
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -6581 +6581 @@
     playingMediaMask |= WebCore::MediaProducer::MediaCaptureMask;
     if ((oldState & playingMediaMask) != (m_mediaState & playingMediaMask))
-        m_uiClient->isPlayingAudioDidChange(*this);
+        m_uiClient->isPlayingMediaDidChange(*this, (m_mediaState & playingMediaMask));
 
 #if PLATFORM(MAC)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-08-31  Alex Christensen  <achristensen@webkit.org>
+
+        Add WKUIDelegatePrivate equivalent of WKPageUIClient's isPlayingAudioDidChange
+        https://bugs.webkit.org/show_bug.cgi?id=176203
+        <rdar://problem/29270035>
+
+        Reviewed by Tim Horton.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:
+        (-[MediaDelegate _webView:isPlayingMediaDidChange:]):
+        (-[MediaDelegate webView:didFinishNavigation:]):
+        (TEST):
+
 2017-08-31  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -34 +34 @@
 #import "WKWebViewConfigurationExtras.h"
 #import <Carbon/Carbon.h>
+#import <WebKit/WKPreferencesPrivate.h>
 #import <WebKit/WKUIDelegatePrivate.h>
-#import <WebKit/WKWebView.h>
+#import <WebKit/WKWebViewPrivate.h>
 #import <wtf/RetainPtr.h>
 #import <wtf/mac/AppKitCompatibilityDeclarations.h>
@@ -89 +90 @@
     
     ASSERT_EQ(webViewFromDelegateCallback, createdWebView);
+}
+
+@interface MediaDelegate : NSObject <WKUIDelegatePrivate>
+@end
+
+@implementation MediaDelegate
+
+- (void)_webView:(WKWebView *)webView isPlayingMediaDidChange:(BOOL)playingMedia
+{
+    ASSERT_TRUE(playingMedia);
+    done = true;
+}
+
+@end
+
+TEST(WebKit2, WKWebViewIsPlayingMedia)
+{
+    auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:CGRectMake(0, 0, 800, 600) configuration:[[[WKWebViewConfiguration alloc] init] autorelease]]);
+    auto delegate = adoptNS([[MediaDelegate alloc] init]);
+    [webView setUIDelegate:delegate.get()];
+    [webView synchronouslyLoadTestPageNamed:@"file-with-video"];
+    [webView evaluateJavaScript:@"playVideo()" completionHandler:nil];
+    TestWebKitAPI::Util::run(&done);
 }