Title: [197893] trunk/Source/WebCore
- Revision
- 197893
- Author
- [email protected]
- Date
- 2016-03-09 15:36:22 -0800 (Wed, 09 Mar 2016)
Log Message
Add a getter for WebVideoFullscreenInterfaceObjC and update its rate property
https://bugs.webkit.org/show_bug.cgi?id=155239
Reviewed by Eric Carlson.
* platform/mac/WebVideoFullscreenInterfaceMac.h:
Move the stub implementation of setVideoDimensions() to the mm file.
Declare a getter to WebVideoFullscreenInterfaceMacObjC.
* platform/mac/WebVideoFullscreenInterfaceMac.mm:
(WebCore::WebVideoFullscreenInterfaceMac::setRate):
Also update the rate property of WebVideoFullscreenInterfaceMacObjC.
(WebCore::WebVideoFullscreenInterfaceMac::setVideoDimensions):
Stub implementation of setVideoDimensions() has been moved to here.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (197892 => 197893)
--- trunk/Source/WebCore/ChangeLog 2016-03-09 23:33:55 UTC (rev 197892)
+++ trunk/Source/WebCore/ChangeLog 2016-03-09 23:36:22 UTC (rev 197893)
@@ -1,3 +1,19 @@
+2016-03-09 Ada Chan <[email protected]>
+
+ Add a getter for WebVideoFullscreenInterfaceObjC and update its rate property
+ https://bugs.webkit.org/show_bug.cgi?id=155239
+
+ Reviewed by Eric Carlson.
+
+ * platform/mac/WebVideoFullscreenInterfaceMac.h:
+ Move the stub implementation of setVideoDimensions() to the mm file.
+ Declare a getter to WebVideoFullscreenInterfaceMacObjC.
+ * platform/mac/WebVideoFullscreenInterfaceMac.mm:
+ (WebCore::WebVideoFullscreenInterfaceMac::setRate):
+ Also update the rate property of WebVideoFullscreenInterfaceMacObjC.
+ (WebCore::WebVideoFullscreenInterfaceMac::setVideoDimensions):
+ Stub implementation of setVideoDimensions() has been moved to here.
+
2016-03-09 Alex Christensen <[email protected]>
Fix Mac build without video enabled after r197633.
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h (197892 => 197893)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h 2016-03-09 23:33:55 UTC (rev 197892)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.h 2016-03-09 23:36:22 UTC (rev 197893)
@@ -66,7 +66,7 @@
WEBCORE_EXPORT void setCurrentTime(double /*currentTime*/, double /*anchorTime*/) override;
WEBCORE_EXPORT void setBufferedTime(double) override { }
WEBCORE_EXPORT void setRate(bool /*isPlaying*/, float /*playbackRate*/) override;
- WEBCORE_EXPORT void setVideoDimensions(bool /*hasVideo*/, float /*width*/, float /*height*/) override { }
+ WEBCORE_EXPORT void setVideoDimensions(bool hasVideo, float width, float height) final;
WEBCORE_EXPORT void setSeekableRanges(const TimeRanges&) override;
WEBCORE_EXPORT void setCanPlayFastReverse(bool) override { }
WEBCORE_EXPORT void setAudioMediaSelectionOptions(const Vector<WTF::String>& /*options*/, uint64_t /*selectedIndex*/) override { }
@@ -94,6 +94,9 @@
void applicationDidBecomeActive() { }
WEBCORE_EXPORT WebPlaybackControlsManager *playBackControlsManager();
+#if USE(APPLE_INTERNAL_SDK)
+ WEBCORE_EXPORT WebVideoFullscreenInterfaceMacObjC *videoFullscreenInterfaceObjC();
+#endif
private:
WebVideoFullscreenModel* m_videoFullscreenModel { nullptr };
Modified: trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm (197892 => 197893)
--- trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm 2016-03-09 23:33:55 UTC (rev 197892)
+++ trunk/Source/WebCore/platform/mac/WebVideoFullscreenInterfaceMac.mm 2016-03-09 23:36:22 UTC (rev 197893)
@@ -215,6 +215,10 @@
WebPlaybackControlsManager* controlsManager = playBackControlsManager();
[controlsManager setRate:isPlaying ? playbackRate : 0.];
+
+#if USE(APPLE_INTERNAL_SDK)
+ [videoFullscreenInterfaceObjC() setRate:isPlaying ? playbackRate : 0.];
+#endif
}
void WebVideoFullscreenInterfaceMac::setSeekableRanges(const TimeRanges& timeRanges)
@@ -281,6 +285,10 @@
{
}
+void WebVideoFullscreenInterfaceMac::setVideoDimensions(bool, float, float)
+{
+}
+
bool supportsPictureInPicture()
{
return false;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
