Title: [186980] trunk/Source/WebCore
- Revision
- 186980
- Author
- [email protected]
- Date
- 2015-07-17 20:16:32 -0700 (Fri, 17 Jul 2015)
Log Message
Attempt to fix the build.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::webkitCurrentPlaybackTargetIsWireless):
* html/HTMLMediaElement.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (186979 => 186980)
--- trunk/Source/WebCore/ChangeLog 2015-07-18 00:30:16 UTC (rev 186979)
+++ trunk/Source/WebCore/ChangeLog 2015-07-18 03:16:32 UTC (rev 186980)
@@ -1,3 +1,11 @@
+2015-07-17 Simon Fraser <[email protected]>
+
+ Attempt to fix the build.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::webkitCurrentPlaybackTargetIsWireless):
+ * html/HTMLMediaElement.h:
+
2015-07-17 Dean Jackson <[email protected]>
Picture in Picture interacts poorly with AirPlay/HDMI
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (186979 => 186980)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-07-18 00:30:16 UTC (rev 186979)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-07-18 03:16:32 UTC (rev 186980)
@@ -5108,8 +5108,15 @@
if (m_player)
m_player->setShouldPlayToPlaybackTarget(shouldPlay);
}
-#endif
+#else // ENABLE(WIRELESS_PLAYBACK_TARGET)
+bool HTMLMediaElement::webkitCurrentPlaybackTargetIsWireless() const
+{
+ return false;
+}
+
+#endif // ENABLE(WIRELESS_PLAYBACK_TARGET)
+
double HTMLMediaElement::minFastReverseRate() const
{
return m_player ? m_player->minFastReverseRate() : 0;
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (186979 => 186980)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-07-18 00:30:16 UTC (rev 186979)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-07-18 03:16:32 UTC (rev 186980)
@@ -344,8 +344,6 @@
#if ENABLE(WIRELESS_PLAYBACK_TARGET)
void webkitShowPlaybackTargetPicker();
- bool webkitCurrentPlaybackTargetIsWireless() const;
-
virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture) override;
virtual bool removeEventListener(const AtomicString& eventType, EventListener*, bool useCapture) override;
@@ -355,6 +353,7 @@
virtual void setWirelessPlaybackTarget(Ref<MediaPlaybackTarget>&&) override;
virtual void setShouldPlayToPlaybackTarget(bool) override;
#endif
+ bool webkitCurrentPlaybackTargetIsWireless() const;
// EventTarget function.
// Both Node (via HTMLElement) and ActiveDOMObject define this method, which
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
