Title: [184351] trunk/Source/WebCore
Revision
184351
Author
[email protected]
Date
2015-05-14 14:19:09 -0700 (Thu, 14 May 2015)

Log Message

Add internals setting to disable wireless playback availability for layout tests
https://bugs.webkit.org/show_bug.cgi?id=145012.
<rdar://problem/20946504>

Reviewed by Eric Carlson.

* testing/InternalSettings.cpp:
(WebCore::InternalSettings::resetToConsistentState):
(WebCore::InternalSettings::setWirelessPlaybackDisabled):
* testing/InternalSettings.idl:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (184350 => 184351)


--- trunk/Source/WebCore/ChangeLog	2015-05-14 20:56:31 UTC (rev 184350)
+++ trunk/Source/WebCore/ChangeLog	2015-05-14 21:19:09 UTC (rev 184351)
@@ -1,3 +1,16 @@
+2015-05-14  Roger Fong  <[email protected]>
+
+        Add internals setting to disable wireless playback availability for layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=145012.
+        <rdar://problem/20946504>
+
+        Reviewed by Eric Carlson.
+
+        * testing/InternalSettings.cpp:
+        (WebCore::InternalSettings::resetToConsistentState):
+        (WebCore::InternalSettings::setWirelessPlaybackDisabled):
+        * testing/InternalSettings.idl:
+
 2015-05-14  Beth Dakin  <[email protected]>
 
         Change range of possible forces for mouseforcechanged DOM event

Modified: trunk/Source/WebCore/testing/InternalSettings.cpp (184350 => 184351)


--- trunk/Source/WebCore/testing/InternalSettings.cpp	2015-05-14 20:56:31 UTC (rev 184350)
+++ trunk/Source/WebCore/testing/InternalSettings.cpp	2015-05-14 21:19:09 UTC (rev 184351)
@@ -210,6 +210,9 @@
 {
     page()->setPageScaleFactor(1, IntPoint(0, 0));
     page()->setCanStartMedia(true);
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+    m_page->settings().setMediaPlaybackAllowsAirPlay(false);
+#endif
 
     m_backup.restoreTo(*settings());
     m_backup = Backup(*settings());
@@ -357,6 +360,15 @@
     m_page->setCanStartMedia(enabled);
 }
 
+void InternalSettings::setWirelessPlaybackDisabled(bool available)
+{
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+    m_page->settings().setMediaPlaybackAllowsAirPlay(available);
+#else
+    UNUSED_PARAM(available);
+#endif
+}
+
 void InternalSettings::setEditingBehavior(const String& editingBehavior, ExceptionCode& ec)
 {
     InternalSettingsGuardForSettings();

Modified: trunk/Source/WebCore/testing/InternalSettings.h (184350 => 184351)


--- trunk/Source/WebCore/testing/InternalSettings.h	2015-05-14 20:56:31 UTC (rev 184350)
+++ trunk/Source/WebCore/testing/InternalSettings.h	2015-05-14 21:19:09 UTC (rev 184351)
@@ -125,6 +125,7 @@
     void setMediaTypeOverride(const String& mediaType, ExceptionCode&);
     void setCSSShapesEnabled(bool, ExceptionCode&);
     void setCanStartMedia(bool, ExceptionCode&);
+    void setWirelessPlaybackDisabled(bool);
     void setEditingBehavior(const String&, ExceptionCode&);
     void setShouldDisplayTrackKind(const String& kind, bool enabled, ExceptionCode&);
     bool shouldDisplayTrackKind(const String& kind, ExceptionCode&);

Modified: trunk/Source/WebCore/testing/InternalSettings.idl (184350 => 184351)


--- trunk/Source/WebCore/testing/InternalSettings.idl	2015-05-14 20:56:31 UTC (rev 184350)
+++ trunk/Source/WebCore/testing/InternalSettings.idl	2015-05-14 21:19:09 UTC (rev 184351)
@@ -53,6 +53,7 @@
     [RaisesException] void setDefaultVideoPosterURL(DOMString poster);
     [RaisesException] void setTimeWithoutMouseMovementBeforeHidingControls(unrestricted double time);
     [RaisesException] void setMediaTypeOverride(DOMString mediaTypeOverride);
+    void setWirelessPlaybackDisabled(boolean available);
 
     void setPluginReplacementEnabled(boolean enabled);
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to