Diff
Modified: trunk/LayoutTests/ChangeLog (204934 => 204935)
--- trunk/LayoutTests/ChangeLog 2016-08-24 21:39:44 UTC (rev 204934)
+++ trunk/LayoutTests/ChangeLog 2016-08-24 21:55:27 UTC (rev 204935)
@@ -1,3 +1,18 @@
+2016-08-24 Eric Carlson <[email protected]>
+
+ [MediaStream] Add support for OverConstrained Error
+ https://bugs.webkit.org/show_bug.cgi?id=160790
+ <rdar://problem/27815715>
+
+ Reviewed by Jer Noble.
+
+ * fast/dom/Window/get-set-properties-expected.txt:
+ * fast/dom/Window/get-set-properties.html:
+ * fast/dom/Window/resources/window-properties.js:
+ * fast/dom/Window/window-property-shadowing-expected.txt:
+ * fast/dom/Window/window-property-shadowing.html:
+ * platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt:
+
2016-08-24 Jiewen Tan <[email protected]>
Unreviewed, rebase iOS simulator WK1 css3 tests
Modified: trunk/LayoutTests/fast/dom/Window/get-set-properties-expected.txt (204934 => 204935)
--- trunk/LayoutTests/fast/dom/Window/get-set-properties-expected.txt 2016-08-24 21:39:44 UTC (rev 204934)
+++ trunk/LayoutTests/fast/dom/Window/get-set-properties-expected.txt 2016-08-24 21:55:27 UTC (rev 204935)
@@ -155,6 +155,8 @@
PASS: canSet('NodeFilter') should be 'true' and is.
PASS: canGet('Option') should be 'true' and is.
PASS: canSet('Option') should be 'true' and is.
+PASS: canGet('OverconstrainedError') should be 'true' and is.
+PASS: canSet('OverconstrainedError') should be 'true' and is.
PASS: canGet('ProcessingInstruction') should be 'true' and is.
PASS: canSet('ProcessingInstruction') should be 'true' and is.
PASS: canGet('Range') should be 'true' and is.
Modified: trunk/LayoutTests/fast/dom/Window/get-set-properties.html (204934 => 204935)
--- trunk/LayoutTests/fast/dom/Window/get-set-properties.html 2016-08-24 21:39:44 UTC (rev 204934)
+++ trunk/LayoutTests/fast/dom/Window/get-set-properties.html 2016-08-24 21:55:27 UTC (rev 204935)
@@ -145,6 +145,7 @@
"Node",
"NodeFilter",
"Option",
+ "OverconstrainedError",
"ProcessingInstruction",
"Range",
"RangeError",
Modified: trunk/LayoutTests/fast/dom/Window/resources/window-properties.js (204934 => 204935)
--- trunk/LayoutTests/fast/dom/Window/resources/window-properties.js 2016-08-24 21:39:44 UTC (rev 204934)
+++ trunk/LayoutTests/fast/dom/Window/resources/window-properties.js 2016-08-24 21:55:27 UTC (rev 204935)
@@ -121,6 +121,7 @@
["Node", "object"],
["NodeFilter", "object"],
["NodeList", "object"],
+ ["OverconstrainedError", "object"],
["OverflowEvent", "object"],
["ProcessingInstruction", "object"],
["ProgressEvent", "object"],
Modified: trunk/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt (204934 => 204935)
--- trunk/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt 2016-08-24 21:39:44 UTC (rev 204934)
+++ trunk/LayoutTests/fast/dom/Window/window-property-shadowing-expected.txt 2016-08-24 21:55:27 UTC (rev 204935)
@@ -158,6 +158,7 @@
PASS: Event successfully shadowed
PASS: MutationEvent successfully shadowed
PASS: NodeFilter successfully shadowed
+PASS: OverconstrainedError successfully shadowed
PASS: Range successfully shadowed
PASS: RangeException successfully shadowed
PASS: XMLDocument successfully shadowed
Modified: trunk/LayoutTests/fast/dom/Window/window-property-shadowing.html (204934 => 204935)
--- trunk/LayoutTests/fast/dom/Window/window-property-shadowing.html 2016-08-24 21:39:44 UTC (rev 204934)
+++ trunk/LayoutTests/fast/dom/Window/window-property-shadowing.html 2016-08-24 21:55:27 UTC (rev 204935)
@@ -339,6 +339,8 @@
log(MutationEvent == 1 ? "PASS: MutationEvent successfully shadowed" : "FAIL: MutationEvent was not shadowed");
var NodeFilter = 1;
log(NodeFilter == 1 ? "PASS: NodeFilter successfully shadowed" : "FAIL: NodeFilter was not shadowed");
+ var OverconstrainedError = 1;
+ log(OverconstrainedError == 1 ? "PASS: OverconstrainedError successfully shadowed" : "FAIL: OverconstrainedError was not shadowed");
var Range = 1;
log(Range == 1 ? "PASS: Range successfully shadowed" : "FAIL: Range was not shadowed");
var RangeException = 1;
Modified: trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt (204934 => 204935)
--- trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt 2016-08-24 21:39:44 UTC (rev 204934)
+++ trunk/LayoutTests/js/dom/global-constructors-attributes-expected.txt 2016-08-24 21:55:27 UTC (rev 204935)
@@ -923,6 +923,11 @@
PASS Object.getOwnPropertyDescriptor(global, 'OscillatorNode').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'OscillatorNode').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'OscillatorNode').configurable is true
+PASS Object.getOwnPropertyDescriptor(global, 'OverconstrainedError').value is OverconstrainedError
+PASS Object.getOwnPropertyDescriptor(global, 'OverconstrainedError').hasOwnProperty('get') is false
+PASS Object.getOwnPropertyDescriptor(global, 'OverconstrainedError').hasOwnProperty('set') is false
+PASS Object.getOwnPropertyDescriptor(global, 'OverconstrainedError').enumerable is false
+PASS Object.getOwnPropertyDescriptor(global, 'OverconstrainedError').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'OverflowEvent').value is OverflowEvent
PASS Object.getOwnPropertyDescriptor(global, 'OverflowEvent').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'OverflowEvent').hasOwnProperty('set') is false
Modified: trunk/LayoutTests/platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt (204934 => 204935)
--- trunk/LayoutTests/platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt 2016-08-24 21:39:44 UTC (rev 204934)
+++ trunk/LayoutTests/platform/mac/fast/dom/Window/window-lookup-precedence-expected.txt 2016-08-24 21:55:27 UTC (rev 204935)
@@ -244,6 +244,8 @@
PASS '[object Function]' is '[object Function]'
PASS 'function NodeList() { [native code]}' is 'function NodeList() { [native code]}'
PASS 'function NodeList() { [native code]}' is 'function NodeList() { [native code]}'
+PASS 'function OverconstrainedError() { [native code]}' is 'function OverconstrainedError() { [native code]}'
+PASS 'function OverconstrainedError() { [native code]}' is 'function OverconstrainedError() { [native code]}'
PASS 'function OverflowEvent() { [native code]}' is 'function OverflowEvent() { [native code]}'
PASS 'function OverflowEvent() { [native code]}' is 'function OverflowEvent() { [native code]}'
PASS 'function ProcessingInstruction() { [native code]}' is 'function ProcessingInstruction() { [native code]}'
Modified: trunk/Source/WebCore/ChangeLog (204934 => 204935)
--- trunk/Source/WebCore/ChangeLog 2016-08-24 21:39:44 UTC (rev 204934)
+++ trunk/Source/WebCore/ChangeLog 2016-08-24 21:55:27 UTC (rev 204935)
@@ -1,3 +1,22 @@
+2016-08-24 Eric Carlson <[email protected]>
+
+ [MediaStream] Add support for OverConstrained Error
+ https://bugs.webkit.org/show_bug.cgi?id=160790
+ <rdar://problem/27815715>
+
+ Reviewed by Jer Noble.
+
+ Existing tests updated.
+
+ * DerivedSources.make:
+ * Modules/mediastream/OverconstrainedError.h: Added.
+ (WebCore::OverconstrainedError::create):
+ (WebCore::OverconstrainedError::constraint):
+ (WebCore::OverconstrainedError::message):
+ (WebCore::OverconstrainedError::OverconstrainedError):
+ * Modules/mediastream/OverconstrainedError.idl: Added.
+ * WebCore.xcodeproj/project.pbxproj:
+
2016-08-24 Anders Carlsson <[email protected]>
Build the platform name dynamically for the phony WebKitLegacy framework
Modified: trunk/Source/WebCore/DerivedSources.make (204934 => 204935)
--- trunk/Source/WebCore/DerivedSources.make 2016-08-24 21:39:44 UTC (rev 204934)
+++ trunk/Source/WebCore/DerivedSources.make 2016-08-24 21:55:27 UTC (rev 204935)
@@ -146,6 +146,7 @@
$(WebCore)/Modules/mediastream/MediaTrackSupportedConstraints.idl \
$(WebCore)/Modules/mediastream/NavigatorMediaDevices.idl \
$(WebCore)/Modules/mediastream/NavigatorUserMedia.idl \
+ $(WebCore)/Modules/mediastream/OverconstrainedError.idl \
$(WebCore)/Modules/mediastream/RTCConfiguration.idl \
$(WebCore)/Modules/mediastream/RTCDTMFSender.idl \
$(WebCore)/Modules/mediastream/RTCDTMFToneChangeEvent.idl \
Added: trunk/Source/WebCore/Modules/mediastream/OverconstrainedError.h (0 => 204935)
--- trunk/Source/WebCore/Modules/mediastream/OverconstrainedError.h (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/OverconstrainedError.h 2016-08-24 21:55:27 UTC (rev 204935)
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#if ENABLE(MEDIA_STREAM)
+
+#include <wtf/RefCounted.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class OverconstrainedError : public RefCounted<OverconstrainedError> {
+public:
+ static Ref<OverconstrainedError> create(const String& constraint, const String& message)
+ {
+ return adoptRef(*new OverconstrainedError(constraint, message));
+ }
+
+ String constraint() const { return m_constraint; }
+ String message() const { return m_message; }
+
+protected:
+ explicit OverconstrainedError(const String& constraint, const String& message)
+ : m_constraint(constraint)
+ , m_message(message)
+ {
+ }
+
+private:
+ String m_constraint;
+ String m_message;
+};
+
+} // namespace WebCore
+
+#endif
Added: trunk/Source/WebCore/Modules/mediastream/OverconstrainedError.idl (0 => 204935)
--- trunk/Source/WebCore/Modules/mediastream/OverconstrainedError.idl (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/OverconstrainedError.idl 2016-08-24 21:55:27 UTC (rev 204935)
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+[
+ Constructor(optional DOMString constraint = "", optional DOMString message = ""),
+ ImplementationLacksVTable,
+ Conditional=MEDIA_STREAM,
+] exception OverconstrainedError {
+ readonly attribute DOMString message;
+ readonly attribute DOMString constraint;
+};
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (204934 => 204935)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-24 21:39:44 UTC (rev 204934)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-08-24 21:55:27 UTC (rev 204935)
@@ -79,6 +79,9 @@
070363E5181A1CDC00C074A5 /* AVMediaCaptureSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 070363DD181A1CDC00C074A5 /* AVMediaCaptureSource.mm */; };
070363E6181A1CDC00C074A5 /* AVVideoCaptureSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 070363DE181A1CDC00C074A5 /* AVVideoCaptureSource.h */; };
070363E7181A1CDC00C074A5 /* AVVideoCaptureSource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 070363DF181A1CDC00C074A5 /* AVVideoCaptureSource.mm */; };
+ 0704A4081D6DE9F10086DCDB /* OverconstrainedError.h in Headers */ = {isa = PBXBuildFile; fileRef = 0704A4051D6DE9F10086DCDB /* OverconstrainedError.h */; };
+ 0704A40B1D6DFC690086DCDB /* JSOverconstrainedError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0704A4091D6DFC690086DCDB /* JSOverconstrainedError.cpp */; };
+ 0704A40C1D6DFC690086DCDB /* JSOverconstrainedError.h in Headers */ = {isa = PBXBuildFile; fileRef = 0704A40A1D6DFC690086DCDB /* JSOverconstrainedError.h */; };
0705852117FDC140005F2BCB /* MediaTrackConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 0705851D17FDC140005F2BCB /* MediaTrackConstraint.h */; };
0705852317FDC140005F2BCB /* MediaTrackConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0705851F17FDC140005F2BCB /* MediaTrackConstraints.cpp */; };
0705852417FDC140005F2BCB /* MediaTrackConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 0705852017FDC140005F2BCB /* MediaTrackConstraints.h */; };
@@ -6782,6 +6785,10 @@
070363DD181A1CDC00C074A5 /* AVMediaCaptureSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AVMediaCaptureSource.mm; sourceTree = "<group>"; };
070363DE181A1CDC00C074A5 /* AVVideoCaptureSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVVideoCaptureSource.h; sourceTree = "<group>"; };
070363DF181A1CDC00C074A5 /* AVVideoCaptureSource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AVVideoCaptureSource.mm; sourceTree = "<group>"; };
+ 0704A4031D6DE9F10086DCDB /* OverconstrainedError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OverconstrainedError.idl; sourceTree = "<group>"; };
+ 0704A4051D6DE9F10086DCDB /* OverconstrainedError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverconstrainedError.h; sourceTree = "<group>"; };
+ 0704A4091D6DFC690086DCDB /* JSOverconstrainedError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOverconstrainedError.cpp; sourceTree = "<group>"; };
+ 0704A40A1D6DFC690086DCDB /* JSOverconstrainedError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOverconstrainedError.h; sourceTree = "<group>"; };
0705851C17FDB23C005F2BCB /* MediaTrackConstraints.idl */ = {isa = PBXFileReference; lastKnownFileType = text; path = MediaTrackConstraints.idl; sourceTree = "<group>"; };
0705851D17FDC140005F2BCB /* MediaTrackConstraint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaTrackConstraint.h; sourceTree = "<group>"; };
0705851E17FDC140005F2BCB /* MediaTrackConstraint.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaTrackConstraint.idl; sourceTree = "<group>"; };
@@ -14406,6 +14413,8 @@
5EA725CC1ACABCB500EAD17B /* NavigatorMediaDevices.idl */,
07221B5C17CEC32700848E51 /* NavigatorUserMedia.idl */,
419BE75A1BCBD3ED00E1C85B /* NavigatorUserMedia.js */,
+ 0704A4031D6DE9F10086DCDB /* OverconstrainedError.idl */,
+ 0704A4051D6DE9F10086DCDB /* OverconstrainedError.h */,
5E2C434D1BCEE2E50001E2BC /* PeerConnectionBackend.h */,
5E2C434E1BCEE2E50001E2BC /* PeerConnectionStates.h */,
5E2C434F1BCEE2E50001E2BC /* RTCConfiguration.cpp */,
@@ -14626,6 +14635,8 @@
0787C4681BFBDF6F006DCD7F /* JSMediaTrackSupportedConstraints.h */,
073BE33E17D17E01002BD431 /* JSNavigatorUserMedia.cpp */,
073BE33F17D17E01002BD431 /* JSNavigatorUserMedia.h */,
+ 0704A4091D6DFC690086DCDB /* JSOverconstrainedError.cpp */,
+ 0704A40A1D6DFC690086DCDB /* JSOverconstrainedError.h */,
073794E319EE2FF200E5A045 /* JSRTCConfiguration.cpp */,
073794E419EE2FF200E5A045 /* JSRTCConfiguration.h */,
07969D9117D14151007FF842 /* JSRTCDataChannel.cpp */,
@@ -23680,6 +23691,7 @@
7EE6846012D26E3800E79415 /* AuthenticationCF.h in Headers */,
7EE6846112D26E3800E79415 /* AuthenticationChallenge.h in Headers */,
934F713A0D5A6F1000018D69 /* AuthenticationChallengeBase.h in Headers */,
+ 0704A4081D6DE9F10086DCDB /* OverconstrainedError.h in Headers */,
E124748410AA161D00B79493 /* AuthenticationClient.h in Headers */,
514C764C0CE9234E007EF3CD /* AuthenticationMac.h in Headers */,
E461D65F1BB0C80D00CB5645 /* AuthorStyleSheets.h in Headers */,
@@ -24064,6 +24076,7 @@
81AC5999131636E60009A7E0 /* DataTransferItem.h in Headers */,
81AC599A131636E60009A7E0 /* DataTransferItemList.h in Headers */,
E4A007831B820EC8002C5A6E /* DataURLDecoder.h in Headers */,
+ 0704A40C1D6DFC690086DCDB /* JSOverconstrainedError.h in Headers */,
E4A007831B820EC8002C5A6E /* DataURLDecoder.h in Headers */,
A5732B0B136A161D005C8D7C /* DateComponents.h in Headers */,
F55B3DB61251F12D003EF269 /* DateInputType.h in Headers */,
@@ -29645,6 +29658,7 @@
0F605AEC15F94848004DF0C0 /* ScrollingConstraints.cpp in Sources */,
1AF62EE714DA22A70041556C /* ScrollingCoordinator.cpp in Sources */,
0FC4E40E187F82E10045882C /* ScrollingCoordinatorIOS.mm in Sources */,
+ 0704A40B1D6DFC690086DCDB /* JSOverconstrainedError.cpp in Sources */,
1AF62EE614DA22A70041556C /* ScrollingCoordinatorMac.mm in Sources */,
93C38BFE164473C700091EB2 /* ScrollingStateFixedNode.cpp in Sources */,
0FEA3E7C191B2FC5000F1B55 /* ScrollingStateFrameScrollingNode.cpp in Sources */,
