Changeset 180416 in webkit


Ignore:
Timestamp:
Feb 20, 2015, 9:05:48 AM (11 years ago)
Author:
eric.carlson@apple.com
Message:

[iOS] cleanup AirPlay code
​https://bugs.webkit.org/show_bug.cgi?id=141811

Reviewed by Jer Noble.

  • Configurations/FeatureDefines.xcconfig: IOS_AIRPLAY -> WIRELESS_PLAYBACK_TARGET.

Source/WebCore:

  • Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp: Ditto.
  • Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h:
  • Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl:
  • Modules/mediacontrols/MediaControlsHost.cpp:

(WebCore::MediaControlsHost::externalDeviceDisplayName): Ditto.
(WebCore::MediaControlsHost::externalDeviceType):

  • dom/EventNames.h: Ditto.
  • dom/EventNames.in:
  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::HTMLMediaElement): Ditto.
(WebCore::HTMLMediaElement::~HTMLMediaElement): Ditto.
(WebCore::HTMLMediaElement::parseAttribute):

  • html/HTMLMediaElement.h:
  • html/HTMLMediaElement.idl:
  • html/HTMLMediaSession.cpp:

(WebCore::restrictionName): Ditto.
(WebCore::HTMLMediaSession::applyMediaPlayerRestrictions): Ditto.

  • html/HTMLMediaSession.h:
  • html/HTMLVideoElement.cpp:

(WebCore::HTMLVideoElement::parseAttribute): Ditto.

  • html/HTMLVideoElement.h:
  • html/HTMLVideoElement.idl:
  • page/Settings.in: Ditto.
  • platform/audio/MediaSessionManager.h:
  • platform/audio/ios/MediaSessionManagerIOS.h:
  • platform/audio/ios/MediaSessionManagerIOS.mm: Ditto.
  • platform/graphics/MediaPlayer.cpp:

(WebCore::MediaPlayer::showPlaybackTargetPicker): Deleted.
(WebCore::MediaPlayer::hasWirelessPlaybackTargets): Deleted.

  • platform/graphics/MediaPlayer.h:
  • platform/graphics/MediaPlayerPrivate.h:

(WebCore::MediaPlayerPrivateInterface::showPlaybackTargetPicker): Deleted.
(WebCore::MediaPlayerPrivateInterface::hasWirelessPlaybackTargets): Deleted.

  • platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:

(WebCore::MediaPlayerPrivateAVFoundation::rateChanged):
(WebCore::MediaPlayerPrivateAVFoundation::dispatchNotification):

  • platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
  • platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
  • platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC): IOS_AIRPLAY -> WIRELESS_PLAYBACK_TARGET.
(WebCore::MediaPlayerPrivateAVFoundationObjC::cancelLoad): Ditto.
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer): Ditto.
(WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer): Ditto.
(-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]): Ditto.

Source/WebKit2:

  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::updatePreferences): Ditto.

Location:
trunk/Source
Files:
34 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r180370 r180416  
     12015-02-20  Eric Carlson  <eric.carlson@apple.com>
     2
     3        [iOS] cleanup AirPlay code
     4        https://bugs.webkit.org/show_bug.cgi?id=141811
     5
     6        Reviewed by Jer Noble.
     7
     8        * Configurations/FeatureDefines.xcconfig: IOS_AIRPLAY -> WIRELESS_PLAYBACK_TARGET.
     9
    1102015-02-19  Dean Jackson  <dino@apple.com>
    211

  • trunk/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

    r180193 r180416  
    103103ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
    104104
    105 ENABLE_IOS_AIRPLAY[sdk=iphone*] = ENABLE_IOS_AIRPLAY;
     105ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
    106106
    107107ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
    … …  
    209209ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
    210210
    211 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
     211FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);

  • trunk/Source/WebCore/ChangeLog

    r180413 r180416  
     12015-02-20  Eric Carlson  <eric.carlson@apple.com>
     2
     3        [iOS] cleanup AirPlay code
     4        https://bugs.webkit.org/show_bug.cgi?id=141811
     5
     6        Reviewed by Jer Noble.
     7
     8        * Configurations/FeatureDefines.xcconfig: IOS_AIRPLAY -> WIRELESS_PLAYBACK_TARGET.
     9
     10        * Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp: Ditto.
     11        * Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h:
     12        * Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl:
     13
     14        * Modules/mediacontrols/MediaControlsHost.cpp:
     15        (WebCore::MediaControlsHost::externalDeviceDisplayName): Ditto.
     16        (WebCore::MediaControlsHost::externalDeviceType):
     17
     18        * dom/EventNames.h: Ditto.
     19        * dom/EventNames.in:
     20
     21        * html/HTMLMediaElement.cpp:
     22        (WebCore::HTMLMediaElement::HTMLMediaElement): Ditto.
     23        (WebCore::HTMLMediaElement::~HTMLMediaElement): Ditto.
     24        (WebCore::HTMLMediaElement::parseAttribute):
     25        * html/HTMLMediaElement.h:
     26        * html/HTMLMediaElement.idl:
     27
     28        * html/HTMLMediaSession.cpp:
     29        (WebCore::restrictionName): Ditto.
     30        (WebCore::HTMLMediaSession::applyMediaPlayerRestrictions): Ditto.
     31        * html/HTMLMediaSession.h:
     32
     33        * html/HTMLVideoElement.cpp:
     34        (WebCore::HTMLVideoElement::parseAttribute): Ditto.
     35        * html/HTMLVideoElement.h:
     36        * html/HTMLVideoElement.idl:
     37
     38        * page/Settings.in: Ditto.
     39
     40        * platform/audio/MediaSessionManager.h:
     41        * platform/audio/ios/MediaSessionManagerIOS.h:
     42        * platform/audio/ios/MediaSessionManagerIOS.mm: Ditto.
     43
     44        * platform/graphics/MediaPlayer.cpp:
     45        (WebCore::MediaPlayer::showPlaybackTargetPicker): Deleted.
     46        (WebCore::MediaPlayer::hasWirelessPlaybackTargets): Deleted.
     47        * platform/graphics/MediaPlayer.h:
     48        * platform/graphics/MediaPlayerPrivate.h:
     49        (WebCore::MediaPlayerPrivateInterface::showPlaybackTargetPicker): Deleted.
     50        (WebCore::MediaPlayerPrivateInterface::hasWirelessPlaybackTargets): Deleted.
     51        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
     52        (WebCore::MediaPlayerPrivateAVFoundation::rateChanged):
     53        (WebCore::MediaPlayerPrivateAVFoundation::dispatchNotification):
     54
     55        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
     56        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
     57        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     58        (WebCore::MediaPlayerPrivateAVFoundationObjC::MediaPlayerPrivateAVFoundationObjC): IOS_AIRPLAY -> WIRELESS_PLAYBACK_TARGET.
     59        (WebCore::MediaPlayerPrivateAVFoundationObjC::cancelLoad): Ditto.
     60        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer): Ditto.
     61        (WebCore::MediaPlayerPrivateAVFoundationObjC::setVideoFullscreenLayer): Ditto.
     62        (-[WebCoreAVFMovieObserver observeValueForKeyPath:ofObject:change:context:]): Ditto.
     63
    1642015-02-20  Dhi Aurrahman  <diorahman@rockybars.com>
    265

  • trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig

    r180193 r180416  
    103103ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
    104104
    105 ENABLE_IOS_AIRPLAY[sdk=iphone*] = ENABLE_IOS_AIRPLAY;
     105ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
    106106
    107107ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
    … …  
    209209ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
    210210
    211 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
     211FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);

  • trunk/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp

    r165676 r180416  
    2727#include "WebKitPlaybackTargetAvailabilityEvent.h"
    2828
    29 #if ENABLE(IOS_AIRPLAY)
     29#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    3030
    3131namespace WebCore {
    … …  
    5757} // namespace WebCore
    5858
    59 #endif // ENABLE(IOS_AIRPLAY)
     59#endif // ENABLE(WIRELESS_PLAYBACK_TARGET)

  • trunk/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.h

    r177264 r180416  
    2727#define WebKitPlaybackTargetAvailabilityEvent_h
    2828
    29 #if ENABLE(IOS_AIRPLAY)
     29#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    3030
    3131#include "Event.h"
    … …  
    7474} // namespace WebCore
    7575
    76 #endif // ENABLE(IOS_AIRPLAY)
     76#endif // ENABLE(WIRELESS_PLAYBACK_TARGET)
    7777
    7878#endif // WebKitPlaybackTargetAvailabilityEvent_h

  • trunk/Source/WebCore/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl

    r165676 r180416  
    2626
    2727[
    28     Conditional=IOS_AIRPLAY,
     28    Conditional=WIRELESS_PLAYBACK_TARGET,
    2929    ConstructorTemplate=Event
    3030] interface WebKitPlaybackTargetAvailabilityEvent : Event {

  • trunk/Source/WebCore/Modules/mediacontrols/MediaControlsHost.cpp

    r177622 r180416  
    219219String MediaControlsHost::externalDeviceDisplayName() const
    220220{
    221 #if ENABLE(IOS_AIRPLAY)
     221#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    222222    MediaPlayer* player = m_mediaElement->player();
    223223    if (!player) {
    … …  
    240240    String type = none;
    241241   
    242 #if ENABLE(IOS_AIRPLAY)
     242#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    243243    DEPRECATED_DEFINE_STATIC_LOCAL(String, airplay, (ASCIILiteral("airplay")));
    244244    DEPRECATED_DEFINE_STATIC_LOCAL(String, tvout, (ASCIILiteral("tvout")));

  • trunk/Source/WebCore/dom/EventNames.h

    r177622 r180416  
    275275    macro(securitypolicyviolation) \
    276276    \
    277     /* ENABLE(IOS_AIRPLAY) */ \
     277    /* ENABLE(WIRELESS_PLAYBACK_TARGET) */ \
    278278    macro(webkitcurrentplaybacktargetiswirelesschanged) \
    279279    macro(webkitplaybacktargetavailabilitychanged) \
    280     /* End of ENABLE(IOS_AIRPLAY) */ \
     280    /* End of ENABLE(WIRELESS_PLAYBACK_TARGET) */ \
    281281    \
    282282    /* ENABLE(IOS_GESTURE_EVENTS) */ \
    … …  
    298298    /* PLATFORM(IOS) */ \
    299299    macro(webkitpresentationmodechanged) \
    300     /* End of ENABLE(IOS_AIRPLAY) */ \
     300    /* End of ENABLE(WIRELESS_PLAYBACK_TARGET) */ \
    301301
    302302// end of DOM_EVENT_NAMES_FOR_EACH

  • trunk/Source/WebCore/dom/EventNames.in

    r176423 r180416  
    6060UIRequestEvent conditional=INDIE_UI
    6161GestureEvent conditional=IOS_GESTURE_EVENTS
    62 WebKitPlaybackTargetAvailabilityEvent conditional=IOS_AIRPLAY
     62WebKitPlaybackTargetAvailabilityEvent conditional=WIRELESS_PLAYBACK_TARGET
    6363GamepadEvent conditional=GAMEPAD
    6464

  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r180406 r180416  
    108108#endif
    109109
    110 #if ENABLE(IOS_AIRPLAY)
     110#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    111111#include "WebKitPlaybackTargetAvailabilityEvent.h"
    112112#endif
    … …  
    354354        if (document.ownerElement() || !document.isMediaDocument())
    355355            m_mediaSession->addBehaviorRestriction(HTMLMediaSession::RequireUserGestureForRateChange);
    356 #if ENABLE(IOS_AIRPLAY)
     356#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    357357        m_mediaSession->addBehaviorRestriction(HTMLMediaSession::RequireUserGestureToShowPlaybackTargetPicker);
    358358#endif
    … …  
    399399#endif
    400400
    401 #if ENABLE(IOS_AIRPLAY)
     401#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    402402    if (hasEventListeners(eventNames().webkitplaybacktargetavailabilitychangedEvent))
    403403        m_mediaSession->setHasPlaybackTargetAvailabilityListeners(*this, false);
    … …  
    596596    else if (name == onwebkitendfullscreenAttr)
    597597        setAttributeEventListener(eventNames().webkitendfullscreenEvent, name, value);
    598 #if ENABLE(IOS_AIRPLAY)
     598#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    599599    else if (name == onwebkitcurrentplaybacktargetiswirelesschangedAttr)
    600600        setAttributeEventListener(eventNames().webkitcurrentplaybacktargetiswirelesschangedEvent, name, value);
    … …  
    46884688#endif
    46894689
    4690 #if ENABLE(IOS_AIRPLAY)
     4690#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    46914691    if (hasEventListeners(eventNames().webkitplaybacktargetavailabilitychangedEvent))
    46924692        m_mediaSession->setHasPlaybackTargetAvailabilityListeners(*this, false);
    … …  
    48284828#endif // ENABLE(VIDEO_TRACK)
    48294829
    4830 #if ENABLE(IOS_AIRPLAY)
     4830#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    48314831void HTMLMediaElement::webkitShowPlaybackTargetPicker()
    48324832{
    … …  
    54195419#endif
    54205420
    5421 #if ENABLE(IOS_AIRPLAY)
     5421#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    54225422    if (hasEventListeners(eventNames().webkitplaybacktargetavailabilitychangedEvent)) {
    54235423        m_mediaSession->setHasPlaybackTargetAvailabilityListeners(*this, true);
    … …  
    58205820    m_mediaSession->removeBehaviorRestriction(HTMLMediaSession::RequireUserGestureForRateChange);
    58215821    m_mediaSession->removeBehaviorRestriction(HTMLMediaSession::RequireUserGestureForFullscreen);
    5822 #if ENABLE(IOS_AIRPLAY)
     5822#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    58235823    m_mediaSession->removeBehaviorRestriction(HTMLMediaSession::RequireUserGestureToShowPlaybackTargetPicker);
    58245824#endif
    … …  
    61056105bool HTMLMediaElement::overrideBackgroundPlaybackRestriction() const
    61066106{
    6107 #if ENABLE(IOS_AIRPLAY)
     6107#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    61086108    if (m_player && m_player->isCurrentPlaybackTargetWireless())
    61096109        return true;

  • trunk/Source/WebCore/html/HTMLMediaElement.h

    r180406 r180416  
    372372#endif
    373373
    374 #if ENABLE(IOS_AIRPLAY)
     374#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    375375    void webkitShowPlaybackTargetPicker();
    376376    bool webkitCurrentPlaybackTargetIsWireless() const;
    … …  
    571571#endif
    572572
    573 #if ENABLE(IOS_AIRPLAY)
     573#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    574574    virtual void mediaPlayerCurrentPlaybackTargetIsWirelessChanged(MediaPlayer*) override;
    575575    void enqueuePlaybackTargetAvailabilityChangedEvent();

  • trunk/Source/WebCore/html/HTMLMediaElement.idl

    r168302 r180416  
    138138#endif
    139139
    140     [Conditional=IOS_AIRPLAY] void webkitShowPlaybackTargetPicker();
    141     [Conditional=IOS_AIRPLAY] readonly attribute boolean webkitCurrentPlaybackTargetIsWireless;
    142     [Conditional=IOS_AIRPLAY] attribute EventListener onwebkitcurrentplaybacktargetiswirelesschanged;
    143     [Conditional=IOS_AIRPLAY] attribute EventListener onwebkitplaybacktargetavailabilitychanged;
     140    [Conditional=WIRELESS_PLAYBACK_TARGET] void webkitShowPlaybackTargetPicker();
     141    [Conditional=WIRELESS_PLAYBACK_TARGET] readonly attribute boolean webkitCurrentPlaybackTargetIsWireless;
     142    [Conditional=WIRELESS_PLAYBACK_TARGET] attribute EventListener onwebkitcurrentplaybacktargetiswirelesschanged;
     143    [Conditional=WIRELESS_PLAYBACK_TARGET] attribute EventListener onwebkitplaybacktargetavailabilitychanged;
    144144};

  • trunk/Source/WebCore/html/HTMLMediaSession.cpp

    r176199 r180416  
    5959    CASE(RequirePageConsentToLoadMedia);
    6060    CASE(RequirePageConsentToResumeMedia);
    61 #if ENABLE(IOS_AIRPLAY)
     61#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    6262    CASE(RequireUserGestureToShowPlaybackTargetPicker);
    6363    CASE(WirelessVideoPlaybackDisabled);
    … …  
    146146}
    147147
    148 #if ENABLE(IOS_AIRPLAY)
     148#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    149149bool HTMLMediaSession::showingPlaybackTargetPickerPermitted(const HTMLMediaElement& element) const
    150150{
    … …  
    294294    LOG(Media, "HTMLMediaSession::applyMediaPlayerRestrictions");
    295295
    296 #if ENABLE(IOS_AIRPLAY)
     296#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    297297    setWirelessVideoPlaybackDisabled(element, m_restrictions & WirelessVideoPlaybackDisabled);
    298298#else

  • trunk/Source/WebCore/html/HTMLMediaSession.h

    r179886 r180416  
    4949    bool pageAllowsDataLoading(const HTMLMediaElement&) const;
    5050    bool pageAllowsPlaybackAfterResuming(const HTMLMediaElement&) const;
    51 #if ENABLE(IOS_AIRPLAY)
     51#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    5252    bool showingPlaybackTargetPickerPermitted(const HTMLMediaElement&) const;
    5353
    … …  
    7575        RequirePageConsentToLoadMedia = 1 << 3,
    7676        RequirePageConsentToResumeMedia = 1 << 4,
    77 #if ENABLE(IOS_AIRPLAY)
     77#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    7878        RequireUserGestureToShowPlaybackTargetPicker = 1 << 5,
    7979        WirelessVideoPlaybackDisabled =  1 << 6,

  • trunk/Source/WebCore/html/HTMLVideoElement.cpp

    r177996 r180416  
    122122        }
    123123    }
    124 #if ENABLE(IOS_AIRPLAY)
     124#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    125125    else if (name == webkitwirelessvideoplaybackdisabledAttr)
    126126        mediaSession().setWirelessVideoPlaybackDisabled(*this, webkitWirelessVideoPlaybackDisabled());
    … …  
    133133        HTMLMediaElement::parseAttribute(name, value);   
    134134
    135 #if PLATFORM(IOS) && ENABLE(IOS_AIRPLAY)
     135#if PLATFORM(IOS) && ENABLE(WIRELESS_PLAYBACK_TARGET)
    136136        if (name == webkitairplayAttr)
    137137            mediaSession().setWirelessVideoPlaybackDisabled(*this, webkitWirelessVideoPlaybackDisabled());
    … …  
    300300}
    301301
    302 #if ENABLE(IOS_AIRPLAY)
     302#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    303303bool HTMLVideoElement::webkitWirelessVideoPlaybackDisabled() const
    304304{

  • trunk/Source/WebCore/html/HTMLVideoElement.h

    r177996 r180416  
    5454    void webkitExitFullScreen() { webkitExitFullscreen(); }
    5555
    56 #if ENABLE(IOS_AIRPLAY)
     56#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    5757    bool webkitWirelessVideoPlaybackDisabled() const;
    5858    void setWebkitWirelessVideoPlaybackDisabled(bool);

  • trunk/Source/WebCore/html/HTMLVideoElement.idl

    r177622 r180416  
    5252    void webkitExitFullScreen();
    5353
    54     [Conditional=IOS_AIRPLAY] attribute boolean webkitWirelessVideoPlaybackDisabled;
     54    [Conditional=WIRELESS_PLAYBACK_TARGET] attribute boolean webkitWirelessVideoPlaybackDisabled;
    5555
    5656    // The number of frames that have been decoded and made available for

  • trunk/Source/WebCore/page/Settings.in

    r180193 r180416  
    204204allowMultiElementImplicitSubmission initial=false
    205205
    206 mediaPlaybackAllowsAirPlay initial=true, conditional=IOS_AIRPLAY
     206mediaPlaybackAllowsAirPlay initial=true, conditional=WIRELESS_PLAYBACK_TARGET
    207207
    208208shouldConvertPositionStyleOnCopy initial=false

  • trunk/Source/WebCore/platform/audio/MediaSessionManager.h

    r180274 r180416  
    8282    virtual void configureWireLessTargetMonitoring() { }
    8383
    84 #if ENABLE(IOS_AIRPLAY)
     84#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    8585    virtual bool hasWirelessTargetsAvailable() { return false; }
    8686#endif

  • trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.h

    r175777 r180416  
    5656    virtual void resetRestrictions() override;
    5757
    58 #if ENABLE(IOS_AIRPLAY)
     58#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    5959    virtual bool hasWirelessTargetsAvailable() override;
    6060    virtual void configureWireLessTargetMonitoring() override;

  • trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm

    r180274 r180416  
    160160}
    161161
    162 #if ENABLE(IOS_AIRPLAY)
     162#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    163163bool MediaSessionManageriOS::hasWirelessTargetsAvailable()
    164164{

  • trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

    r180406 r180416  
    808808#endif
    809809
    810 #if ENABLE(IOS_AIRPLAY)
     810#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    811811bool MediaPlayer::isCurrentPlaybackTargetWireless() const
    812812{
    … …  
    822822{
    823823    return m_private->wirelessPlaybackTargetType();
    824 }
    825 
    826 void MediaPlayer::showPlaybackTargetPicker()
    827 {
    828     m_private->showPlaybackTargetPicker();
    829 }
    830 
    831 bool MediaPlayer::hasWirelessPlaybackTargets() const
    832 {
    833     return m_private->hasWirelessPlaybackTargets();
    834824}
    835825

  • trunk/Source/WebCore/platform/graphics/MediaPlayer.h

    r180406 r180416  
    217217#endif
    218218   
    219 #if ENABLE(IOS_AIRPLAY)
     219#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    220220    virtual void mediaPlayerCurrentPlaybackTargetIsWirelessChanged(MediaPlayer*) { };
    221221#endif
    … …  
    452452#endif
    453453
    454 #if ENABLE(IOS_AIRPLAY)
     454#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    455455    bool isCurrentPlaybackTargetWireless() const;
    456456
    … …  
    459459
    460460    String wirelessPlaybackTargetName() const;
    461 
    462     void showPlaybackTargetPicker();
    463 
    464     bool hasWirelessPlaybackTargets() const;
    465461
    466462    bool wirelessVideoPlaybackDisabled() const;

  • trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h

    r180406 r180416  
    156156#endif
    157157
    158 #if ENABLE(IOS_AIRPLAY)
     158#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    159159    virtual bool isCurrentPlaybackTargetWireless() const { return false; }
    160160
    161161    virtual String wirelessPlaybackTargetName() const { return emptyString(); }
    162162    virtual MediaPlayer::WirelessPlaybackTargetType wirelessPlaybackTargetType() const { return MediaPlayer::TargetTypeNone; }
    163 
    164     virtual void showPlaybackTargetPicker() { }
    165 
    166     virtual bool hasWirelessPlaybackTargets() const { return false; }
    167163
    168164    virtual bool wirelessVideoPlaybackDisabled() const { return false; }

  • trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp

    r179699 r180416  
    612612void MediaPlayerPrivateAVFoundation::rateChanged()
    613613{
    614 #if ENABLE(IOS_AIRPLAY)
     614#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    615615    if (isCurrentPlaybackTargetWireless())
    616616        m_player->handlePlaybackCommand(rate() ? MediaSession::PlayCommand : MediaSession::PauseCommand);
    … …  
    902902        break;
    903903    case Notification::TargetIsWirelessChanged:
    904 #if ENABLE(IOS_AIRPLAY)
     904#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    905905        playbackTargetIsWirelessChanged();
    906906#endif
    … …  
    986986}
    987987
    988 #if ENABLE(IOS_AIRPLAY)
     988#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    989989void MediaPlayerPrivateAVFoundation::playbackTargetIsWirelessChanged()
    990990{

  • trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h

    r180406 r180416  
    6060    virtual void setCurrentTextTrack(InbandTextTrackPrivateAVF*) { }
    6161    virtual InbandTextTrackPrivateAVF* currentTextTrack() const = 0;
    62 #if ENABLE(IOS_AIRPLAY)
     62#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    6363    void playbackTargetIsWirelessChanged();
    6464#endif

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h

    r180406 r180416  
    122122#endif
    123123
    124 #if ENABLE(IOS_AIRPLAY)
     124#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    125125    void playbackTargetIsWirelessDidChange();
    126126#endif
    … …  
    269269#endif
    270270
    271 #if ENABLE(IOS_AIRPLAY)
     271#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    272272    virtual bool isCurrentPlaybackTargetWireless() const override;
    273273    virtual String wirelessPlaybackTargetName() const override;
    … …  
    364364    bool m_cachedCanPlayFastForward;
    365365    bool m_cachedCanPlayFastReverse;
    366 #if ENABLE(IOS_AIRPLAY)
     366#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    367367    mutable bool m_allowsWirelessVideoPlayback;
    368368#endif

  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r180406 r180416  
    474474    , m_cachedIsReadyForDisplay(false)
    475475    , m_haveBeenAskedToCreateLayer(false)
    476 #if ENABLE(IOS_AIRPLAY)
     476#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    477477    , m_allowsWirelessVideoPlayback(true)
    478478#endif
    … …  
    544544        m_timeObserver = nil;
    545545        [m_avPlayer.get() removeObserver:m_objcObserver.get() forKeyPath:@"rate"];
    546 #if ENABLE(IOS_AIRPLAY)
     546#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    547547        [m_avPlayer.get() removeObserver:m_objcObserver.get() forKeyPath:@"externalPlaybackActive"];
    548548#endif
    … …  
    925925    m_avPlayer = adoptNS([allocAVPlayerInstance() init]);
    926926    [m_avPlayer.get() addObserver:m_objcObserver.get() forKeyPath:@"rate" options:NSKeyValueObservingOptionNew context:(void *)MediaPlayerAVFoundationObservationContextPlayer];
    927 #if ENABLE(IOS_AIRPLAY)
     927#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    928928    [m_avPlayer.get() addObserver:m_objcObserver.get() forKeyPath:@"externalPlaybackActive" options:NSKeyValueObservingOptionNew context:(void *)MediaPlayerAVFoundationObservationContextPlayer];
    929929    updateDisableExternalPlayback();
    … …  
    934934#endif
    935935
    936 #if ENABLE(IOS_AIRPLAY)
     936#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    937937    [m_avPlayer.get() setAllowsExternalPlayback:m_allowsWirelessVideoPlayback];
    938938#endif
    … …  
    11321132        [m_videoFullscreenLayer addSublayer:m_textTrackRepresentationLayer.get()];
    11331133    }
    1134 #if ENABLE(IOS_AIRPLAY)
     1134#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    11351135    updateDisableExternalPlayback();
    11361136#endif
    … …  
    26742674}
    26752675
    2676 #if ENABLE(IOS_AIRPLAY) && PLATFORM(IOS)
     2676#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    26772677bool MediaPlayerPrivateAVFoundationObjC::isCurrentPlaybackTargetWireless() const
    26782678{
    … …  
    29722972}
    29732973   
    2974 #if ENABLE(IOS_AIRPLAY)
     2974#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    29752975void MediaPlayerPrivateAVFoundationObjC::playbackTargetIsWirelessDidChange()
    29762976{
    … …  
    31593159        if ([keyPath isEqualToString:@"rate"])
    31603160            function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::rateDidChange, m_callback, [newValue doubleValue]);
    3161 #if ENABLE(IOS_AIRPLAY)
     3161#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    31623162        else if ([keyPath isEqualToString:@"externalPlaybackActive"])
    31633163            function = WTF::bind(&MediaPlayerPrivateAVFoundationObjC::playbackTargetIsWirelessDidChange, m_callback);

  • trunk/Source/WebKit/mac/ChangeLog

    r180308 r180416  
     12015-02-20  Eric Carlson  <eric.carlson@apple.com>
     2
     3        [iOS] cleanup AirPlay code
     4        https://bugs.webkit.org/show_bug.cgi?id=141811
     5
     6        Reviewed by Jer Noble.
     7
     8        * Configurations/FeatureDefines.xcconfig: IOS_AIRPLAY -> WIRELESS_PLAYBACK_TARGET.
     9
    1102015-02-18  Timothy Horton  <timothy_horton@apple.com>
    211

  • trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig

    r180193 r180416  
    103103ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
    104104
    105 ENABLE_IOS_AIRPLAY[sdk=iphone*] = ENABLE_IOS_AIRPLAY;
     105ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
    106106
    107107ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
    … …  
    209209ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
    210210
    211 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
     211FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);

  • trunk/Source/WebKit2/ChangeLog

    r180411 r180416  
     12015-02-20  Eric Carlson  <eric.carlson@apple.com>
     2
     3        [iOS] cleanup AirPlay code
     4        https://bugs.webkit.org/show_bug.cgi?id=141811
     5
     6        Reviewed by Jer Noble.
     7
     8        * Configurations/FeatureDefines.xcconfig: IOS_AIRPLAY -> WIRELESS_PLAYBACK_TARGET.
     9        * WebProcess/WebPage/WebPage.cpp:
     10        (WebKit::WebPage::updatePreferences): Ditto.
     11
    1122015-02-20  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
    213

  • trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig

    r180193 r180416  
    103103ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
    104104
    105 ENABLE_IOS_AIRPLAY[sdk=iphone*] = ENABLE_IOS_AIRPLAY;
     105ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
    106106
    107107ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
    … …  
    209209ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
    210210
    211 FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_IOS_AIRPLAY) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
     211FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r180076 r180416  
    28172817#endif
    28182818
    2819 #if ENABLE(IOS_AIRPLAY)
     2819#if ENABLE(WIRELESS_PLAYBACK_TARGET)
    28202820    settings.setMediaPlaybackAllowsAirPlay(store.getBoolValueForKey(WebPreferencesKey::mediaPlaybackAllowsAirPlayKey()));
    28212821#endif
Note: See TracChangeset for help on using the changeset viewer.