Bug 142940 – [Mac] Enable WIRELESS_PLAYBACK_TARGET for WK1

• Status: RESOLVED
• Resolution: FIXED
• Component: Media

[Eric Carlson]

Make it work for WebKit 1 clients.

[Eric Carlson]

<rdar://problem/20157973>

[Eric Carlson]

Created attachment 249178 [details]
Proposed patch.

[Eric Carlson]

Created attachment 249187 [details]
Updated patch.

[Sam Weinig]

Comment on attachment 249187 [details]
Updated patch.

View in context: https://bugs.webkit.org/attachment.cgi?id=249187&action=review

> Source/WebKit/mac/WebView/WebViewData.h:152
> +#if ENABLE(WIRELESS_PLAYBACK_TARGET) && !PLATFORM(IOS)
> +class WebMediaPlaybackTargetPicker : public WebCore::MediaPlaybackTargetPicker::Client {
> +public:
> +    static std::unique_ptr<WebMediaPlaybackTargetPicker> create(WebCore::Page&);
> +
> +    explicit WebMediaPlaybackTargetPicker(WebCore::Page&);
> +    virtual ~WebMediaPlaybackTargetPicker() { }
> +
> +    void showPlaybackTargetPicker(const WebCore::FloatRect&, bool /* hasVideo */);
> +    void startingMonitoringPlaybackTargets();
> +    void stopMonitoringPlaybackTargets();
> +
> +    // WebCore::MediaPlaybackTargetPicker::Client
> +    virtual void didChoosePlaybackTarget(const WebCore::MediaPlaybackTarget&) override;
> +    virtual void externalOutputDeviceAvailableDidChange(bool) override;
> +
> +    void invalidate();
> +
> +private:
> +    WebCore::MediaPlaybackTargetPicker& targetPicker();
> +
> +    WebCore::Page* m_page;
> +    std::unique_ptr<WebCore::MediaPlaybackTargetPicker> m_targetPicker;
> +};
> +#endif

I would put this in its own file.

> Source/WebKit/mac/WebView/WebViewData.mm:86
> +std::unique_ptr<WebMediaPlaybackTargetPicker> WebMediaPlaybackTargetPicker::create(WebCore::Page& page)
> +{
> +    return std::make_unique<WebMediaPlaybackTargetPicker>(page);
> +}
> +

This (and the rest of the class, should go in its own file.

[Eric Carlson]

(In reply to comment #4)
> Comment on attachment 249187 [details]
> Updated patch.
> 
> This (and the rest of the class, should go in its own file.

Done, thanks!

[Eric Carlson]

Committed r181838 - https://trac.webkit.org/r181838

[Alexey Proskuryakov]

Build fix in http://trac.webkit.org/r181846