Diff
Modified: trunk/LayoutTests/ChangeLog (186181 => 186182)
--- trunk/LayoutTests/ChangeLog 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/LayoutTests/ChangeLog 2015-07-01 18:44:27 UTC (rev 186182)
@@ -1,3 +1,20 @@
+2015-07-01 Matthew Daiter <[email protected]>
+
+ Enable MEDIA_STREAM flag
+ https://bugs.webkit.org/show_bug.cgi?id=145947
+ <rdar://problem/21365829>
+
+ Reviewed by Eric Carlson.
+
+ *
+ platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt:
+ Added attributes to tests
+ *
+ platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
+ Ditto
+ * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+ Ditto
+
2015-07-01 Antti Koivisto <[email protected]>
PNG mask images are loaded with Accept:image/svg+xml
Modified: trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt (186181 => 186182)
--- trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt 2015-07-01 18:44:27 UTC (rev 186182)
@@ -798,6 +798,31 @@
PASS Object.getOwnPropertyDescriptor(global, 'MediaSource').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'MediaSource').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'MediaSource').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').value is MediaStreamAudioDestinationNode
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').value is MediaStreamAudioSourceNode
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').value is MediaStreamEvent
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').value is MediaStreamTrack
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').value is MediaStreamTrackEvent
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'MessageChannel').value is MessageChannel
PASS Object.getOwnPropertyDescriptor(global, 'MessageChannel').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'MessageChannel').hasOwnProperty('set') is false
@@ -958,6 +983,16 @@
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').value is RTCIceCandidate
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').value is RTCSessionDescription
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'Range').value is Range
PASS Object.getOwnPropertyDescriptor(global, 'Range').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'Range').hasOwnProperty('set') is false
@@ -2073,11 +2108,21 @@
PASS Object.getOwnPropertyDescriptor(global, 'webkitAudioPannerNode').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitAudioPannerNode').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitAudioPannerNode').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').value is webkitMediaStream
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').value is webkitOfflineAudioContext
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').value is webkitRTCPeerConnection
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').value is webkitURL
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').hasOwnProperty('set') is false
Modified: trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt (186181 => 186182)
--- trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt 2015-07-01 18:44:27 UTC (rev 186182)
@@ -793,6 +793,31 @@
PASS Object.getOwnPropertyDescriptor(global, 'MediaList').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'MediaList').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'MediaList').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').value is MediaStreamAudioDestinationNode
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').value is MediaStreamAudioSourceNode
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').value is MediaStreamEvent
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').value is MediaStreamTrack
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').value is MediaStreamTrackEvent
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'MessageChannel').value is MessageChannel
PASS Object.getOwnPropertyDescriptor(global, 'MessageChannel').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'MessageChannel').hasOwnProperty('set') is false
@@ -938,6 +963,16 @@
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').value is RTCIceCandidate
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').value is RTCSessionDescription
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'Range').value is Range
PASS Object.getOwnPropertyDescriptor(global, 'Range').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'Range').hasOwnProperty('set') is false
@@ -2048,11 +2083,21 @@
PASS Object.getOwnPropertyDescriptor(global, 'webkitAudioPannerNode').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitAudioPannerNode').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitAudioPannerNode').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').value is webkitMediaStream
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').value is webkitOfflineAudioContext
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').value is webkitRTCPeerConnection
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').value is webkitURL
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').hasOwnProperty('set') is false
Modified: trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt (186181 => 186182)
--- trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt 2015-07-01 18:44:27 UTC (rev 186182)
@@ -798,6 +798,31 @@
PASS Object.getOwnPropertyDescriptor(global, 'MediaSource').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'MediaSource').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'MediaSource').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').value is MediaStreamAudioDestinationNode
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioDestinationNode').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').value is MediaStreamAudioSourceNode
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamAudioSourceNode').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').value is MediaStreamEvent
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamEvent').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').value is MediaStreamTrack
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrack').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').value is MediaStreamTrackEvent
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'MediaStreamTrackEvent').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'MessageChannel').value is MessageChannel
PASS Object.getOwnPropertyDescriptor(global, 'MessageChannel').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'MessageChannel').hasOwnProperty('set') is false
@@ -958,6 +983,16 @@
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').value is RTCIceCandidate
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').value is RTCSessionDescription
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'Range').value is Range
PASS Object.getOwnPropertyDescriptor(global, 'Range').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'Range').hasOwnProperty('set') is false
@@ -2068,11 +2103,21 @@
PASS Object.getOwnPropertyDescriptor(global, 'webkitAudioPannerNode').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitAudioPannerNode').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitAudioPannerNode').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').value is webkitMediaStream
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitMediaStream').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').value is webkitOfflineAudioContext
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').value is webkitRTCPeerConnection
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').value is webkitURL
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').hasOwnProperty('set') is false
Modified: trunk/Source/_javascript_Core/ChangeLog (186181 => 186182)
--- trunk/Source/_javascript_Core/ChangeLog 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/_javascript_Core/ChangeLog 2015-07-01 18:44:27 UTC (rev 186182)
@@ -1,3 +1,13 @@
+2015-07-01 Matthew Daiter <[email protected]>
+
+ Enable MEDIA_STREAM flag
+ https://bugs.webkit.org/show_bug.cgi?id=145947
+ <rdar://problem/21365829>
+
+ Reviewed by Eric Carlson.
+
+ * Configurations/FeatureDefines.xcconfig: Added MEDIA_STREAM flag
+
2015-06-30 Andy VanWagoner <[email protected]>
Implement ECMAScript Internationalization API
Modified: trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig (186181 => 186182)
--- trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/_javascript_Core/Configurations/FeatureDefines.xcconfig 2015-07-01 18:44:27 UTC (rev 186182)
@@ -143,6 +143,7 @@
ENABLE_MEDIA_SOURCE_macosx_101200 = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
+ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
ENABLE_METER_ELEMENT[sdk=macosx*] = ENABLE_METER_ELEMENT;
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
@@ -226,4 +227,4 @@
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(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_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(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_INTL) $(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_SCR
IPT) $(ENABLE_MEDIA_SESSION) $(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_PICTURE_SIZES) $(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_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(E
NABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(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_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(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_C
ONSTRUCTOR) $(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_INTL) $(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_SCRI
PT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(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_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VI
EW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
Modified: trunk/Source/WebCore/ChangeLog (186181 => 186182)
--- trunk/Source/WebCore/ChangeLog 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebCore/ChangeLog 2015-07-01 18:44:27 UTC (rev 186182)
@@ -1,3 +1,26 @@
+2015-07-01 Matthew Daiter <[email protected]>
+
+ Enable MEDIA_STREAM flag
+ https://bugs.webkit.org/show_bug.cgi?id=145947
+ <rdar://problem/21365829>
+
+ Reviewed by Eric Carlson.
+
+ * Configurations/FeatureDefines.xcconfig: Added MEDIA_STREAM flag
+ * Modules/mediastream/MediaStreamTrack.h:
+ * WebCore.xcodeproj/project.pbxproj: Changed project headers to
+ private headers
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h:
+ * platform/graphics/mac/MediaPlayerPrivateQTKit.h:
+ * platform/mediastream/RealtimeMediaSource.h:
+ * platform/mediastream/mac/AVAudioCaptureSource.mm:
+ * platform/mediastream/mac/AVCaptureDeviceManager.mm:
+ (WebCore::refreshCaptureDeviceList): Deleted.
+ * platform/mediastream/mac/AVMediaCaptureSource.mm:
+ (WebCore::AVMediaCaptureSource::startProducingData):
+ (WebCore::AVMediaCaptureSource::stopProducingData):
+
2015-07-01 Brent Fulgham <[email protected]>
REGRESSION (r185016): Intermittent crash in WebCore::TextTrackList::remove
Modified: trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig (186181 => 186182)
--- trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebCore/Configurations/FeatureDefines.xcconfig 2015-07-01 18:44:27 UTC (rev 186182)
@@ -143,6 +143,7 @@
ENABLE_MEDIA_SOURCE_macosx_101200 = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
+ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
ENABLE_METER_ELEMENT[sdk=macosx*] = ENABLE_METER_ELEMENT;
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
@@ -226,4 +227,4 @@
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(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_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(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_INTL) $(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_SCR
IPT) $(ENABLE_MEDIA_SESSION) $(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_PICTURE_SIZES) $(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_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(E
NABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(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_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(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_C
ONSTRUCTOR) $(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_INTL) $(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_SCRI
PT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(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_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VI
EW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (186181 => 186182)
--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2015-07-01 18:44:27 UTC (rev 186182)
@@ -112,8 +112,8 @@
virtual void derefEventTarget() override final { deref(); }
// MediaStreamTrackPrivateClient
- void trackEnded();
- void trackMutedChanged();
+ void trackEnded() override;
+ void trackMutedChanged() override;
Vector<Observer*> m_observers;
Ref<MediaStreamTrackPrivate> m_private;
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (186181 => 186182)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-07-01 18:44:27 UTC (rev 186182)
@@ -636,6 +636,8 @@
14FFE31D0AE1963300136BF5 /* HTMLFrameElementBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 14FFE31B0AE1963300136BF5 /* HTMLFrameElementBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
14FFE31E0AE1963300136BF5 /* HTMLFrameElementBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14FFE31C0AE1963300136BF5 /* HTMLFrameElementBase.cpp */; };
15145B901B3A1CE000662BF7 /* MediaDeviceInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 15145B8F1B3A1B3E00662BF7 /* MediaDeviceInfo.h */; };
+ 15739BBA1B42012A00D258C1 /* JSMediaDevices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15739BB81B42012200D258C1 /* JSMediaDevices.cpp */; };
+ 15739BBB1B42012D00D258C1 /* JSMediaDevices.h in Headers */ = {isa = PBXBuildFile; fileRef = 15739BB91B42012200D258C1 /* JSMediaDevices.h */; };
159AE82B1B3A402F0037478B /* MediaDeviceInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 159AE82A1B3A402F0037478B /* MediaDeviceInfo.cpp */; };
15C7708D100D3C6B005BA267 /* ValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C7708A100D3C6A005BA267 /* ValidityState.h */; };
15C77093100D3CA8005BA267 /* JSValidityState.h in Headers */ = {isa = PBXBuildFile; fileRef = 15C77091100D3CA8005BA267 /* JSValidityState.h */; };
@@ -1804,10 +1806,10 @@
4A4F48A916B0DFC000EDBB29 /* DocumentRuleSets.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A4F48A716B0DFC000EDBB29 /* DocumentRuleSets.cpp */; };
4A4F48AA16B0DFC000EDBB29 /* DocumentRuleSets.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4F48A816B0DFC000EDBB29 /* DocumentRuleSets.h */; };
4A4F65701AA997F100E38CDD /* RealtimeMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A4F656B1AA997F100E38CDD /* RealtimeMediaSource.cpp */; };
- 4A4F65711AA997F100E38CDD /* RealtimeMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4F656C1AA997F100E38CDD /* RealtimeMediaSource.h */; };
- 4A4F65721AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4F656D1AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h */; };
+ 4A4F65711AA997F100E38CDD /* RealtimeMediaSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4F656C1AA997F100E38CDD /* RealtimeMediaSource.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 4A4F65721AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4F656D1AA997F100E38CDD /* RealtimeMediaSourceCapabilities.h */; settings = {ATTRIBUTES = (Private, ); }; };
4A4F65731AA997F100E38CDD /* RealtimeMediaSourceStates.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A4F656E1AA997F100E38CDD /* RealtimeMediaSourceStates.cpp */; };
- 4A4F65741AA997F100E38CDD /* RealtimeMediaSourceStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4F656F1AA997F100E38CDD /* RealtimeMediaSourceStates.h */; };
+ 4A4F65741AA997F100E38CDD /* RealtimeMediaSourceStates.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A4F656F1AA997F100E38CDD /* RealtimeMediaSourceStates.h */; settings = {ATTRIBUTES = (Private, ); }; };
4A5A2ADB161E7E00005889DD /* WebSocketExtensionParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A5A2AD9161E7E00005889DD /* WebSocketExtensionParser.cpp */; };
4A5A2ADC161E7E00005889DD /* WebSocketExtensionParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A5A2ADA161E7E00005889DD /* WebSocketExtensionParser.h */; };
4A6E9FC313C17D1D0046A7F8 /* CSSFontFeatureValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A6E9FC113C17D1D0046A7F8 /* CSSFontFeatureValue.cpp */; };
@@ -2212,7 +2214,7 @@
5DFE8F570D16477C0076E937 /* ScheduledAction.h in Headers */ = {isa = PBXBuildFile; fileRef = BCA378BB0D15F64200B793D6 /* ScheduledAction.h */; settings = {ATTRIBUTES = (Private, ); }; };
5DFEBAB718592B6D00C75BEB /* WebKitAvailability.h in Headers */ = {isa = PBXBuildFile; fileRef = 5DFEBAB618592B6D00C75BEB /* WebKitAvailability.h */; settings = {ATTRIBUTES = (Private, ); }; };
5EA725D21ACABD4700EAD17B /* MediaDevices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EA725CD1ACABCD900EAD17B /* MediaDevices.cpp */; };
- 5EA725D31ACABD4700EAD17B /* MediaDevices.h in Headers */ = {isa = PBXBuildFile; fileRef = 5EA725CE1ACABCD900EAD17B /* MediaDevices.h */; };
+ 5EA725D31ACABD4700EAD17B /* MediaDevices.h in Headers */ = {isa = PBXBuildFile; fileRef = 5EA725CE1ACABCD900EAD17B /* MediaDevices.h */; settings = {ATTRIBUTES = (Private, ); }; };
5EA725D51ACABD5700EAD17B /* NavigatorMediaDevices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5EA725CA1ACABCB500EAD17B /* NavigatorMediaDevices.cpp */; };
5EA725D61ACABD5700EAD17B /* NavigatorMediaDevices.h in Headers */ = {isa = PBXBuildFile; fileRef = 5EA725CB1ACABCB500EAD17B /* NavigatorMediaDevices.h */; };
5F2DBBE9178E3C8100141486 /* CertificateInfoMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5F2DBBE7178E332D00141486 /* CertificateInfoMac.mm */; };
@@ -6127,7 +6129,7 @@
E172AF6E180F24C600FBADB9 /* CryptoAlgorithm.h in Headers */ = {isa = PBXBuildFile; fileRef = E172AF6C180F24C600FBADB9 /* CryptoAlgorithm.h */; };
E172AF70180F289500FBADB9 /* CryptoKeyUsage.h in Headers */ = {isa = PBXBuildFile; fileRef = E172AF6F180F289500FBADB9 /* CryptoKeyUsage.h */; };
E172AF8F1811BC3700FBADB9 /* JSDOMPromise.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E172AF8D1811BC3700FBADB9 /* JSDOMPromise.cpp */; };
- E172AF901811BC3700FBADB9 /* JSDOMPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = E172AF8E1811BC3700FBADB9 /* JSDOMPromise.h */; };
+ E172AF901811BC3700FBADB9 /* JSDOMPromise.h in Headers */ = {isa = PBXBuildFile; fileRef = E172AF8E1811BC3700FBADB9 /* JSDOMPromise.h */; settings = {ATTRIBUTES = (Private, ); }; };
E17B491516A9B094001C8839 /* TransitionEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E17B491316A9B093001C8839 /* TransitionEvent.cpp */; };
E17B491616A9B094001C8839 /* TransitionEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = E17B491416A9B093001C8839 /* TransitionEvent.h */; };
E17B492116A9B8FF001C8839 /* JSTransitionEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = E17B491F16A9B8FF001C8839 /* JSTransitionEvent.h */; };
@@ -7749,6 +7751,8 @@
14FFE31C0AE1963300136BF5 /* HTMLFrameElementBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLFrameElementBase.cpp; sourceTree = "<group>"; };
15145B8F1B3A1B3E00662BF7 /* MediaDeviceInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaDeviceInfo.h; sourceTree = "<group>"; };
15145B911B3A1D4C00662BF7 /* MediaDeviceInfo.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaDeviceInfo.idl; sourceTree = "<group>"; };
+ 15739BB81B42012200D258C1 /* JSMediaDevices.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaDevices.cpp; sourceTree = "<group>"; };
+ 15739BB91B42012200D258C1 /* JSMediaDevices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaDevices.h; sourceTree = "<group>"; };
159AE82A1B3A402F0037478B /* MediaDeviceInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaDeviceInfo.cpp; sourceTree = "<group>"; };
15C77089100D3C6A005BA267 /* ValidityState.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = ValidityState.idl; sourceTree = "<group>"; };
15C7708A100D3C6A005BA267 /* ValidityState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ValidityState.h; sourceTree = "<group>"; };
@@ -14903,6 +14907,8 @@
07CFD99317D01405001C4FFC /* MediaStream */ = {
isa = PBXGroup;
children = (
+ 15739BB81B42012200D258C1 /* JSMediaDevices.cpp */,
+ 15739BB91B42012200D258C1 /* JSMediaDevices.h */,
07C59B6F17F79C7C000FBCBB /* JSMediaSourceStates.cpp */,
07C59B7017F79C7C000FBCBB /* JSMediaSourceStates.h */,
07277E4017D018CC0015534D /* JSMediaStream.cpp */,
@@ -25685,6 +25691,7 @@
B2FA3DE10AB75A6F000E5AC4 /* JSSVGPatternElement.h in Headers */,
8542A7950AE5C94100DF58DF /* JSSVGPoint.h in Headers */,
B2FA3DE30AB75A6F000E5AC4 /* JSSVGPointList.h in Headers */,
+ 15739BBB1B42012D00D258C1 /* JSMediaDevices.h in Headers */,
B2FA3DE60AB75A6F000E5AC4 /* JSSVGPolygonElement.h in Headers */,
B2FA3DE80AB75A6F000E5AC4 /* JSSVGPolylineElement.h in Headers */,
B2FA3DEA0AB75A6F000E5AC4 /* JSSVGPreserveAspectRatio.h in Headers */,
@@ -28489,6 +28496,7 @@
7C3E510B18DF8F3500C112F7 /* HTMLConverter.mm in Sources */,
F5C041DA0FFCA7CE00839D4A /* HTMLDataListElement.cpp in Sources */,
D359D789129CA2710006E5D2 /* HTMLDetailsElement.cpp in Sources */,
+ 15739BBA1B42012A00D258C1 /* JSMediaDevices.cpp in Sources */,
A8EA79F90A1916DF00A8EF5F /* HTMLDirectoryElement.cpp in Sources */,
A8EA7CB10A192B9C00A8EF5F /* HTMLDivElement.cpp in Sources */,
A8EA79F50A1916DF00A8EF5F /* HTMLDListElement.cpp in Sources */,
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (186181 => 186182)
--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2015-07-01 18:44:27 UTC (rev 186182)
@@ -154,7 +154,7 @@
virtual void load(const String&, MediaSourcePrivateClient*) override;
#endif
#if ENABLE(MEDIA_STREAM)
- virtual void load(MediaStreamPrivate*) { }
+ void load(MediaStreamPrivate*) override { }
#endif
virtual void cancelLoad() override = 0;
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h (186181 => 186182)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.h 2015-07-01 18:44:27 UTC (rev 186182)
@@ -96,7 +96,7 @@
virtual void load(const String& url) override;
virtual void load(const String& url, MediaSourcePrivateClient*) override;
#if ENABLE(MEDIA_STREAM)
- virtual void load(MediaStreamPrivate*) { }
+ void load(MediaStreamPrivate*) override { }
#endif
virtual void cancelLoad() override;
Modified: trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h (186181 => 186182)
--- trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.h 2015-07-01 18:44:27 UTC (rev 186182)
@@ -87,7 +87,7 @@
virtual void load(const String&, MediaSourcePrivateClient*) override;
#endif
#if ENABLE(MEDIA_STREAM)
- virtual void load(MediaStreamPrivate*) { }
+ void load(MediaStreamPrivate*) override { }
#endif
void cancelLoad() override;
void loadInternal(const String& url);
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (186181 => 186182)
--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h 2015-07-01 18:44:27 UTC (rev 186182)
@@ -91,7 +91,7 @@
void addObserver(Observer*);
void removeObserver(Observer*);
-
+
virtual void startProducingData() { }
virtual void stopProducingData() { }
Modified: trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm (186181 => 186182)
--- trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVAudioCaptureSource.mm 2015-07-01 18:44:27 UTC (rev 186182)
@@ -29,6 +29,7 @@
#import "AVAudioCaptureSource.h"
+#import "CoreMediaSoftLink.h"
#import "Logging.h"
#import "MediaConstraints.h"
#import "NotImplemented.h"
Modified: trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm (186181 => 186182)
--- trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVCaptureDeviceManager.mm 2015-07-01 18:44:27 UTC (rev 186182)
@@ -159,12 +159,6 @@
source.m_videoSourceId = createCanonicalUUIDString();
devices.append(source);
- } else if (!source.m_enabled) {
- source.m_enabled = true;
- if (source.m_audioSource)
- source.m_audioSource->setEnabled(true);
- if (source.m_videoSource)
- source.m_videoSource->setEnabled(true);
}
}
}
@@ -403,7 +397,6 @@
ASSERT(device);
devices[i].m_audioSource = AVAudioCaptureSource::create(device, devices[i].m_audioSourceId, constraints);
}
- devices[i].m_audioSource->setReadyState(RealtimeMediaSource::Live);
return devices[i].m_audioSource;
}
@@ -413,7 +406,6 @@
ASSERT(device);
devices[i].m_videoSource = AVVideoCaptureSource::create(device, devices[i].m_videoSourceId, constraints);
}
- devices[i].m_videoSource->setReadyState(RealtimeMediaSource::Live);
return devices[i].m_videoSource;
}
}
@@ -445,10 +437,6 @@
if (devices[i].m_captureDeviceID == deviceID) {
LOG(Media, "AVCaptureDeviceManager::deviceDisconnected(%p), device %d disabled", this, i);
devices[i].m_enabled = false;
- if (devices[i].m_audioSource)
- devices[i].m_audioSource->setEnabled(false);
- if (devices[i].m_videoSource)
- devices[i].m_videoSource->setEnabled(false);
}
}
}
Modified: trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm (186181 => 186182)
--- trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebCore/platform/mediastream/mac/AVMediaCaptureSource.mm 2015-07-01 18:44:27 UTC (rev 186182)
@@ -137,8 +137,6 @@
[[NSNotificationCenter defaultCenter] removeObserver:m_objcObserver.get()];
[m_objcObserver disconnect];
[m_session.get() stopRunning];
-
- setReadyState(Ended);
}
void AVMediaCaptureSource::startProducingData()
@@ -150,7 +148,7 @@
return;
[m_session.get() startRunning];
- setEnabled(true);
+
m_isRunning = true;
}
@@ -160,7 +158,7 @@
return;
[m_session.get() stopRunning];
- setEnabled(false);
+
m_isRunning = true;
}
@@ -180,7 +178,6 @@
[[NSNotificationCenter defaultCenter] addObserver:m_objcObserver.get() selector:@selector(captureSessionStoppedRunning:) name:AVCaptureSessionDidStopRunningNotification object:nil];
setupCaptureSession();
- setReadyState(Live);
}
void AVMediaCaptureSource::captureSessionStoppedRunning()
Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.h (186181 => 186182)
--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.h 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeMediaSourceCenterMac.h 2015-07-01 18:44:27 UTC (rev 186182)
@@ -45,8 +45,8 @@
RealtimeMediaSourceCenterMac();
~RealtimeMediaSourceCenterMac();
- virtual void validateRequestConstraints(PassRefPtr<MediaStreamCreationClient>, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints);
- virtual void createMediaStream(PassRefPtr<MediaStreamCreationClient>, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints);
+ void validateRequestConstraints(PassRefPtr<MediaStreamCreationClient>, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints) override;
+ void createMediaStream(PassRefPtr<MediaStreamCreationClient>, PassRefPtr<MediaConstraints> audioConstraints, PassRefPtr<MediaConstraints> videoConstraints) override;
virtual bool getMediaStreamTrackSources(PassRefPtr<MediaStreamTrackSourcesRequestClient>) override;
};
Modified: trunk/Source/WebKit/mac/ChangeLog (186181 => 186182)
--- trunk/Source/WebKit/mac/ChangeLog 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-07-01 18:44:27 UTC (rev 186182)
@@ -1,3 +1,19 @@
+2015-07-01 Matthew Daiter <[email protected]>
+
+ Enable MEDIA_STREAM flag
+ https://bugs.webkit.org/show_bug.cgi?id=145947
+ <rdar://problem/21365829>
+
+ Reviewed by Eric Carlson.
+
+ * Configurations/FeatureDefines.xcconfig: Added MEDIA_STREAM flag
+ * WebCoreSupport/WebUserMediaClient.h: Changed signatures
+ * WebCoreSupport/WebUserMediaClient.mm: Changed signatures
+ (WebUserMediaClient::requestPermission):
+ (WebUserMediaClient::cancelRequest):
+ (-[WebUserMediaPolicyListener denyOnlyThisRequest]):
+ (-[WebUserMediaPolicyListener shouldClearCache]):
+
2015-07-01 Brady Eidson <[email protected]>
REGRESSION (185319): Reproducible crash in WebHistoryItem launching FluidApp.
Modified: trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig (186181 => 186182)
--- trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig 2015-07-01 18:44:27 UTC (rev 186182)
@@ -143,6 +143,7 @@
ENABLE_MEDIA_SOURCE_macosx_101200 = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
+ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
ENABLE_METER_ELEMENT[sdk=macosx*] = ENABLE_METER_ELEMENT;
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
@@ -226,4 +227,4 @@
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(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_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(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_INTL) $(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_SCR
IPT) $(ENABLE_MEDIA_SESSION) $(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_PICTURE_SIZES) $(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_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(E
NABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(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_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(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_C
ONSTRUCTOR) $(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_INTL) $(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_SCRI
PT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(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_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VI
EW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.h (186181 => 186182)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.h 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.h 2015-07-01 18:44:27 UTC (rev 186182)
@@ -44,8 +44,8 @@
~WebUserMediaClient();
// UserMediaClient
- virtual void requestPermission(PassRefPtr<WebCore::UserMediaRequest>) override;
- virtual void cancelRequest(WebCore::UserMediaRequest*) override;
+ virtual void requestPermission(Ref<WebCore::UserMediaRequest>&&) override;
+ virtual void cancelRequest(WebCore::UserMediaRequest&) override;
virtual void pageDestroyed() override;
private:
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm (186181 => 186182)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm 2015-07-01 18:44:27 UTC (rev 186182)
@@ -89,11 +89,11 @@
delete this;
}
-void WebUserMediaClient::requestPermission(PassRefPtr<UserMediaRequest> prpRequest)
+void WebUserMediaClient::requestPermission(Ref<UserMediaRequest>&& prpRequest)
{
BEGIN_BLOCK_OBJC_EXCEPTIONS;
- UserMediaRequest* request = prpRequest.get();
+ UserMediaRequest* request = &prpRequest.get();
SEL selector = @selector(webView:decidePolicyForUserMediaRequestFromOrigin:listener:);
if (![[m_webView UIDelegate] respondsToSelector:selector]) {
request->userMediaAccessDenied();
@@ -112,9 +112,9 @@
END_BLOCK_OBJC_EXCEPTIONS;
}
-void WebUserMediaClient::cancelRequest(UserMediaRequest* request)
+void WebUserMediaClient::cancelRequest(UserMediaRequest& request)
{
- UserMediaRequestsMap::iterator it = userMediaRequestsMap().find(request);
+ UserMediaRequestsMap::iterator it = userMediaRequestsMap().find(&request);
if (it == userMediaRequestsMap().end())
return;
@@ -169,5 +169,18 @@
#endif
}
+#if PLATFORM(IOS)
+- (void)denyOnlyThisRequest
+{
+ ASSERT_NOT_REACHED();
+}
+- (BOOL)shouldClearCache
+{
+ // FIXME: https://bugs.webkit.org/show_bug.cgi?id=146245
+ ASSERT_NOT_REACHED();
+ return true;
+}
+#endif
+
@end
#endif
Modified: trunk/Source/WebKit2/ChangeLog (186181 => 186182)
--- trunk/Source/WebKit2/ChangeLog 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-01 18:44:27 UTC (rev 186182)
@@ -1,3 +1,18 @@
+2015-07-01 Matthew Daiter <[email protected]>
+
+ Enable MEDIA_STREAM flag
+ https://bugs.webkit.org/show_bug.cgi?id=145947
+ <rdar://problem/21365829>
+
+ Reviewed by Eric Carlson.
+
+ * Configurations/FeatureDefines.xcconfig: Add MEDIA_STREAM flag
+ * WebKit2.xcodeproj/project.pbxproj: Changed some project to private
+ declarations of headers
+ * WebProcess/WebCoreSupport/WebUserMediaClient.cpp:
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::userMediaPermissionRequestManager):
+
2015-07-01 Brady Eidson <[email protected]>
Check shouldOpenExternalURLs instead of isProcessingUserGesture before passing URL to LaunchServices.
Modified: trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig (186181 => 186182)
--- trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebKit2/Configurations/FeatureDefines.xcconfig 2015-07-01 18:44:27 UTC (rev 186182)
@@ -143,6 +143,7 @@
ENABLE_MEDIA_SOURCE_macosx_101200 = ENABLE_MEDIA_SOURCE;
ENABLE_MEDIA_STATISTICS = ;
+ENABLE_MEDIA_STREAM = ENABLE_MEDIA_STREAM;
ENABLE_METER_ELEMENT[sdk=macosx*] = ENABLE_METER_ELEMENT;
ENABLE_MHTML = ;
ENABLE_MOUSE_CURSOR_SCALE[sdk=macosx*] = ENABLE_MOUSE_CURSOR_SCALE;
@@ -226,4 +227,4 @@
ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
-FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(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_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(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_INTL) $(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_SCR
IPT) $(ENABLE_MEDIA_SESSION) $(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_PICTURE_SIZES) $(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_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(E
NABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
+FEATURE_DEFINES = $(ENABLE_3D_TRANSFORMS) $(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_ARROWFUNCTION_SYNTAX) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_ANIMATIONS_LEVEL_2) $(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_C
ONSTRUCTOR) $(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_INTL) $(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_SCRI
PT) $(ENABLE_MEDIA_SESSION) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_MEDIA_STREAM) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_PICTURE_SIZES) $(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_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VI
EW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_JIT) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (186181 => 186182)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-07-01 18:44:27 UTC (rev 186182)
@@ -115,6 +115,9 @@
0FF24A2E1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FF24A2C1879E4BC003ABF0C /* RemoteLayerTreeDrawingAreaProxyMessages.h */; };
0FF2649F1A1FF9C6001FE759 /* RemoteLayerTreeScrollingPerformanceData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 0F707C771A1FEE8300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.mm */; };
0FF264A01A1FF9CC001FE759 /* RemoteLayerTreeScrollingPerformanceData.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F707C791A1FEEA300DA7A45 /* RemoteLayerTreeScrollingPerformanceData.h */; };
+ 15739BBC1B42040300D258C1 /* UserMediaPermissionRequestManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A410F4219AF7B27002EBAB5 /* UserMediaPermissionRequestManager.cpp */; };
+ 15739BBD1B42042D00D258C1 /* WebUserMediaClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F4919AF7B80002EBAB5 /* WebUserMediaClient.h */; };
+ 15739BBE1B42046600D258C1 /* WebUserMediaClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A410F4819AF7B80002EBAB5 /* WebUserMediaClient.cpp */; };
1A002D43196B337000B9AD44 /* _WKSessionStateInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A002D42196B337000B9AD44 /* _WKSessionStateInternal.h */; };
1A002D44196B338900B9AD44 /* _WKSessionState.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A002D3F196B329400B9AD44 /* _WKSessionState.h */; settings = {ATTRIBUTES = (Private, ); }; };
1A002D45196B338E00B9AD44 /* _WKSessionState.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A002D3E196B329400B9AD44 /* _WKSessionState.mm */; };
@@ -834,8 +837,6 @@
4A3CC18D19B0641900D14AEF /* UserMediaPermissionRequestProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3C19AF7B04002EBAB5 /* UserMediaPermissionRequestProxy.h */; };
4A3CC18E19B07B8500D14AEF /* WKUserMediaPermissionRequest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A410F3519AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.cpp */; };
4A3CC18F19B07B8A00D14AEF /* WKUserMediaPermissionRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3619AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 4A410F4419AF7B27002EBAB5 /* UserMediaPermissionRequestManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A410F4219AF7B27002EBAB5 /* UserMediaPermissionRequestManager.cpp */; };
- 4A410F4A19AF7B80002EBAB5 /* WebUserMediaClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A410F4819AF7B80002EBAB5 /* WebUserMediaClient.cpp */; };
4F601432155C5AA2001FBDE0 /* BlockingResponseMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F601430155C5A32001FBDE0 /* BlockingResponseMap.h */; };
51021E9C12B16788005C033C /* WebContextMenuClientMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51021E9B12B16788005C033C /* WebContextMenuClientMac.mm */; };
510274321981AF8E008165ED /* WKOriginDataManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 755422BA18062B9C0046F6A8 /* WKOriginDataManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7608,6 +7609,7 @@
83891B6C1A68C30B0030F386 /* DiagnosticLoggingClient.h in Headers */,
BCE81D99131AE02100241910 /* DictionaryPopupInfo.h in Headers */,
518E8F0816B2093700E91429 /* Download.h in Headers */,
+ 15739BBD1B42042D00D258C1 /* WebUserMediaClient.h in Headers */,
518E8F0A16B2093700E91429 /* DownloadAuthenticationClient.h in Headers */,
A1DF631318E0B7C8003A3E2A /* DownloadClient.h in Headers */,
518E8F0C16B2093700E91429 /* DownloadManager.h in Headers */,
@@ -9237,8 +9239,6 @@
buildActionMask = 2147483647;
files = (
BC5D24A116CC3B9E007D5461 /* ChildProcessMain.mm in Sources */,
- 4A410F4419AF7B27002EBAB5 /* UserMediaPermissionRequestManager.cpp in Sources */,
- 4A410F4A19AF7B80002EBAB5 /* WebUserMediaClient.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -9739,6 +9739,7 @@
BC111AE0112F5BC200337BAB /* WebErrorsMac.mm in Sources */,
C0337DAE127A24FE008FF4F4 /* WebEvent.cpp in Sources */,
BC032DBA10F4380F0058C15A /* WebEventConversion.cpp in Sources */,
+ 15739BBC1B42040300D258C1 /* UserMediaPermissionRequestManager.cpp in Sources */,
BC111B5E112F629800337BAB /* WebEventFactory.mm in Sources */,
1A3DD1FD125E59F3004515E6 /* WebFindClient.cpp in Sources */,
BCE469531214E6CB000B98EB /* WebFormClient.cpp in Sources */,
@@ -9983,6 +9984,7 @@
1A5B1C501898606F004FCF9B /* WKNavigation.mm in Sources */,
1A256E3718A1A788006FB922 /* WKNavigationAction.mm in Sources */,
2D3A65DA1A7C3A1F00CAC637 /* WKNavigationActionRef.cpp in Sources */,
+ 15739BBE1B42046600D258C1 /* WebUserMediaClient.cpp in Sources */,
370F34A21829BE1E009027C8 /* WKNavigationData.mm in Sources */,
BCF69FAA1176D1CB00471A52 /* WKNavigationDataRef.cpp in Sources */,
2D3A65E21A7C3A9300CAC637 /* WKNavigationRef.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebUserMediaClient.cpp (186181 => 186182)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebUserMediaClient.cpp 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebUserMediaClient.cpp 2015-07-01 18:44:27 UTC (rev 186182)
@@ -21,9 +21,8 @@
#if ENABLE(MEDIA_STREAM)
-#include "UserMediaController.h"
-#include "UserMediaRequest.h"
#include "WebPage.h"
+#include <WebCore/UserMediaController.h>
#include <WebCore/UserMediaRequest.h>
using namespace WebCore;
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebUserMediaClient.h (186181 => 186182)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebUserMediaClient.h 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebUserMediaClient.h 2015-07-01 18:44:27 UTC (rev 186182)
@@ -34,8 +34,8 @@
private:
virtual void pageDestroyed() override;
- virtual void requestPermission(Ref<WebCore::UserMediaRequest>&&) override;
- virtual void cancelRequest(WebCore::UserMediaRequest&) override;
+ void requestPermission(Ref<WebCore::UserMediaRequest>&&) override;
+ void cancelRequest(WebCore::UserMediaRequest&) override;
WebPage& m_page;
};
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (186181 => 186182)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-01 18:44:27 UTC (rev 186182)
@@ -465,7 +465,7 @@
#endif
#if ENABLE(MEDIA_STREAM)
- UserMediaPermissionRequestManager& userMediaPermissionRequestManager() { return m_userMediaPermissionRequestManager; }
+ WK_EXPORT UserMediaPermissionRequestManager& userMediaPermissionRequestManager() { return m_userMediaPermissionRequestManager; }
#endif
#if PLATFORM(IOS)
@@ -1082,7 +1082,7 @@
void didReceiveNotificationPermissionDecision(uint64_t notificationID, bool allowed);
#if ENABLE(MEDIA_STREAM)
- void didReceiveUserMediaPermissionDecision(uint64_t userMediaID, bool allowed);
+ WK_EXPORT void didReceiveUserMediaPermissionDecision(uint64_t userMediaID, bool allowed);
#endif
void advanceToNextMisspelling(bool startBeforeSelection);
Modified: trunk/Tools/ChangeLog (186181 => 186182)
--- trunk/Tools/ChangeLog 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Tools/ChangeLog 2015-07-01 18:44:27 UTC (rev 186182)
@@ -1,3 +1,13 @@
+2015-07-01 Matthew Daiter <[email protected]>
+
+ Enabled MEDIA_STREAM flag
+ https://bugs.webkit.org/show_bug.cgi?id=145947
+ <rdar://problem/21365829>
+
+ Reviewed by Eric Carlson.
+
+ * TestWebKitAPI/Tests/WebKit2/UserMedia.cpp:
+
2015-06-30 Martin Robinson <[email protected]>
[GTK] REGRESSION(r183936): Test /webkit2/WebKitWebContext/spell-checker fails since r183936
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp (186181 => 186182)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp 2015-07-01 17:35:56 UTC (rev 186181)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/UserMedia.cpp 2015-07-01 18:44:27 UTC (rev 186182)
@@ -18,6 +18,8 @@
#include "config.h"
+#if WK_HAVE_C_SPI
+
#if ENABLE(MEDIA_STREAM)
#include "PlatformUtilities.h"
#include "PlatformWebView.h"
@@ -59,3 +61,6 @@
} // namespace TestWebKitAPI
#endif // ENABLE(MEDIA_STREAM)
+
+#endif // WK_HAVE_C_SPI
+
