Diff
Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (209445 => 209446)
--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-12-07 04:58:23 UTC (rev 209446)
@@ -130,6 +130,7 @@
515F794F1CFC9F4A00CCED93 /* CrossThreadCopier.h in Headers */ = {isa = PBXBuildFile; fileRef = 515F794C1CFC9F4A00CCED93 /* CrossThreadCopier.h */; };
515F79501CFC9F4A00CCED93 /* CrossThreadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 515F794D1CFC9F4A00CCED93 /* CrossThreadTask.h */; };
515F79561CFD3A6900CCED93 /* CrossThreadQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 515F79551CFD3A6900CCED93 /* CrossThreadQueue.h */; };
+ 52183012C99E476A84EEBEA8 /* SymbolImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F72BBDB107FA424886178B9E /* SymbolImpl.cpp */; };
539EB0631D55284200C82EF7 /* LEBDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 539EB0621D55284200C82EF7 /* LEBDecoder.h */; };
553071CA1C40427200384898 /* TinyLRUCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 553071C91C40427200384898 /* TinyLRUCache.h */; };
5597F82F1D94B9970066BC21 /* SynchronizedFixedQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 5597F82C1D94B9970066BC21 /* SynchronizedFixedQueue.h */; };
@@ -356,7 +357,6 @@
FE8925B01D00DAEC0046907E /* Indenter.h in Headers */ = {isa = PBXBuildFile; fileRef = FE8925AF1D00DAEC0046907E /* Indenter.h */; };
FEDACD3D1630F83F00C69634 /* StackStats.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEDACD3B1630F83F00C69634 /* StackStats.cpp */; };
FEDACD3E1630F83F00C69634 /* StackStats.h in Headers */ = {isa = PBXBuildFile; fileRef = FEDACD3C1630F83F00C69634 /* StackStats.h */; };
- 52183012C99E476A84EEBEA8 /* SymbolImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F72BBDB107FA424886178B9E /* SymbolImpl.cpp */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -721,11 +721,11 @@
E4A0AD381A96245500536DF6 /* WorkQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WorkQueue.h; sourceTree = "<group>"; };
E4A0AD3C1A96253C00536DF6 /* WorkQueueCocoa.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WorkQueueCocoa.cpp; sourceTree = "<group>"; };
EB95E1EF161A72410089A2F5 /* ByteOrder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ByteOrder.h; sourceTree = "<group>"; };
+ F72BBDB107FA424886178B9E /* SymbolImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SymbolImpl.cpp; sourceTree = "<group>"; };
FE8225301B2A1E5B00BA68FD /* NakedPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NakedPtr.h; sourceTree = "<group>"; };
FE8925AF1D00DAEC0046907E /* Indenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Indenter.h; sourceTree = "<group>"; };
FEDACD3B1630F83F00C69634 /* StackStats.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StackStats.cpp; sourceTree = "<group>"; };
FEDACD3C1630F83F00C69634 /* StackStats.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StackStats.h; sourceTree = "<group>"; };
- F72BBDB107FA424886178B9E /* SymbolImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SymbolImpl.cpp; path = SymbolImpl.cpp; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
Modified: trunk/Source/WebCore/CMakeLists.txt (209445 => 209446)
--- trunk/Source/WebCore/CMakeLists.txt 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-12-07 04:58:23 UTC (rev 209446)
@@ -221,9 +221,6 @@
Modules/mediastream/MediaStreamEvent.idl
Modules/mediastream/MediaStreamTrack.idl
Modules/mediastream/MediaStreamTrackEvent.idl
- Modules/mediastream/MediaTrackConstraint.idl
- Modules/mediastream/MediaTrackConstraintSet.idl
- Modules/mediastream/MediaTrackConstraints.idl
Modules/mediastream/MediaTrackSupportedConstraints.idl
Modules/mediastream/NavigatorMediaDevices.idl
Modules/mediastream/NavigatorUserMedia.idl
@@ -912,9 +909,6 @@
Modules/mediastream/MediaStreamRegistry.cpp
Modules/mediastream/MediaStreamTrack.cpp
Modules/mediastream/MediaStreamTrackEvent.cpp
- Modules/mediastream/MediaTrackConstraint.cpp
- Modules/mediastream/MediaTrackConstraintSet.cpp
- Modules/mediastream/MediaTrackConstraints.cpp
Modules/mediastream/NavigatorMediaDevices.cpp
Modules/mediastream/PeerConnectionBackend.cpp
Modules/mediastream/RTCConfiguration.cpp
Modified: trunk/Source/WebCore/ChangeLog (209445 => 209446)
--- trunk/Source/WebCore/ChangeLog 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/ChangeLog 2016-12-07 04:58:23 UTC (rev 209446)
@@ -1,3 +1,61 @@
+2016-12-04 Darin Adler <da...@apple.com>
+
+ Remove various stray uses of WebCore::Dictionary
+ https://bugs.webkit.org/show_bug.cgi?id=165358
+
+ Reviewed by Sam Weinig.
+
+ I discovered three completely unused classes in the MediaStream code:
+ MediaTrackConstraint, MediaTrackConstraintSet, and MediaTrackConstraints.
+ While there is some chance we may implement these at some point, they are
+ likely to be dictionaries or some other kind of data structure rather than
+ clases, and there is no reason to keep the current classes.
+
+ * CMakeLists.txt: Removed MediaTrackConstraint, MediaTrackConstraintSet,
+ and MediaTrackConstraints.
+ * DerivedSources.cpp: Ditto.
+ * DerivedSources.make: Ditto.
+
+ * Modules/indexeddb/IDBDatabase.h: Removed include of Dictionary.h.
+ * Modules/indexeddb/IDBObjectStore.cpp: Added include of HeapInlines.h.
+ * Modules/indexeddb/IDBRequest.cpp: Added include of StrongInlines.h.
+ * Modules/indexeddb/IDBTransaction.cpp: Added include of SerializedScriptValue.h.
+
+ * Modules/mediastream/MediaStreamTrack.cpp:
+ (WebCore::MediaStreamTrack::getConstraints): Deleted.
+ This function is implemented entirely in the bindings layer.
+ * Modules/mediastream/MediaStreamTrack.h: Removed getConstraints.
+
+ * Modules/mediastream/MediaTrackConstraint.cpp: Removed.
+ * Modules/mediastream/MediaTrackConstraint.h: Removed.
+ * Modules/mediastream/MediaTrackConstraint.idl: Removed.
+ * Modules/mediastream/MediaTrackConstraintSet.cpp: Removed.
+ * Modules/mediastream/MediaTrackConstraintSet.h: Removed.
+ * Modules/mediastream/MediaTrackConstraintSet.idl: Removed.
+ * Modules/mediastream/MediaTrackConstraints.cpp: Removed.
+ * Modules/mediastream/MediaTrackConstraints.h: Removed.
+ * Modules/mediastream/MediaTrackConstraints.idl: Removed.
+
+ * Modules/mediastream/NavigatorUserMedia.idl: Use the type names from the latest
+ getUserMedia specification for the arguments to webkitGetUserMedia; not sure they
+ are precisely correct for this legacy function, but since this is a JSBuiltin,
+ it's all ignored anyway. Just important not to call anything "Dictionary".
+
+ * WebCore.xcodeproj/project.pbxproj: Removed MediaTrackConstraint, MediaTrackConstraintSet,
+ and MediaTrackConstraints.
+
+ * bindings/js/JSApplePaySessionCustom.cpp:
+ (WebCore::JSApplePaySession::completeShippingMethodSelection): Use uncheckedArgument, since
+ the code explicitly checks the number of arguments.
+ (WebCore::JSApplePaySession::completeShippingContactSelection): Ditto.
+ (WebCore::JSApplePaySession::completePaymentMethodSelection): Ditto.
+
+ * bindings/js/JSFontFaceCustom.cpp: Removed include of Dictionary.h.
+ * dom/Document.cpp: Ditto.
+ * dom/Element.cpp: Ditto.
+
+ * dom/Element.h: Removed forward declaration of Dictionary.
+
2016-12-06 Wenson Hsieh <wenson_hs...@apple.com>
After preventing a beforeinput event, an input event is fired when formatting rich text
Modified: trunk/Source/WebCore/DerivedSources.cpp (209445 => 209446)
--- trunk/Source/WebCore/DerivedSources.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/DerivedSources.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -348,9 +348,6 @@
#include "JSMediaStreamAudioSourceNode.cpp"
#include "JSMediaStreamEvent.cpp"
#include "JSMediaStreamTrack.cpp"
-#include "JSMediaTrackConstraint.cpp"
-#include "JSMediaTrackConstraintSet.cpp"
-#include "JSMediaTrackConstraints.cpp"
#include "JSMediaTrackSupportedConstraints.cpp"
#include "JSMessageChannel.cpp"
#include "JSMessageEvent.cpp"
Modified: trunk/Source/WebCore/DerivedSources.make (209445 => 209446)
--- trunk/Source/WebCore/DerivedSources.make 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/DerivedSources.make 2016-12-07 04:58:23 UTC (rev 209446)
@@ -151,9 +151,6 @@
$(WebCore)/Modules/mediastream/MediaStreamEvent.idl \
$(WebCore)/Modules/mediastream/MediaStreamTrack.idl \
$(WebCore)/Modules/mediastream/MediaStreamTrackEvent.idl \
- $(WebCore)/Modules/mediastream/MediaTrackConstraint.idl \
- $(WebCore)/Modules/mediastream/MediaTrackConstraintSet.idl \
- $(WebCore)/Modules/mediastream/MediaTrackConstraints.idl \
$(WebCore)/Modules/mediastream/MediaTrackSupportedConstraints.idl \
$(WebCore)/Modules/mediastream/NavigatorMediaDevices.idl \
$(WebCore)/Modules/mediastream/NavigatorUserMedia.idl \
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp (209445 => 209446)
--- trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCursor.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -40,6 +40,7 @@
#include "IDBTransaction.h"
#include "Logging.h"
#include "ScriptExecutionContext.h"
+#include <heap/HeapInlines.h>
#include <heap/StrongInlines.h>
#include <runtime/JSCJSValueInlines.h>
#include <wtf/NeverDestroyed.h>
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp (209445 => 209446)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -43,6 +43,7 @@
#include "IDBVersionChangeEvent.h"
#include "Logging.h"
#include "ScriptExecutionContext.h"
+#include <heap/HeapInlines.h>
namespace WebCore {
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h (209445 => 209446)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabase.h 2016-12-07 04:58:23 UTC (rev 209446)
@@ -27,7 +27,6 @@
#if ENABLE(INDEXED_DATABASE)
-#include "Dictionary.h"
#include "EventTarget.h"
#include "IDBActiveDOMObject.h"
#include "IDBConnectionProxy.h"
@@ -44,6 +43,7 @@
class IDBResultData;
class IDBTransaction;
class IDBTransactionInfo;
+
struct EventNames;
class IDBDatabase : public ThreadSafeRefCounted<IDBDatabase>, public EventTargetWithInlineData, public IDBActiveDOMObject {
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBIndex.cpp (209445 => 209446)
--- trunk/Source/WebCore/Modules/indexeddb/IDBIndex.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBIndex.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -38,6 +38,7 @@
#include "IDBRequest.h"
#include "IDBTransaction.h"
#include "Logging.h"
+#include <heap/HeapInlines.h>
using namespace JSC;
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp (209445 => 209446)
--- trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBObjectStore.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -48,6 +48,7 @@
#include "ScriptExecutionContext.h"
#include "ScriptState.h"
#include "SerializedScriptValue.h"
+#include <heap/HeapInlines.h>
#include <wtf/Locker.h>
using namespace JSC;
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp (209445 => 209446)
--- trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBRequest.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -47,6 +47,7 @@
#include "ScopeGuard.h"
#include "ScriptExecutionContext.h"
#include "ThreadSafeDataBuffer.h"
+#include <heap/StrongInlines.h>
#include <wtf/NeverDestroyed.h>
using namespace JSC;
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (209445 => 209446)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -53,6 +53,7 @@
#include "Logging.h"
#include "ScriptExecutionContext.h"
#include "ScriptState.h"
+#include "SerializedScriptValue.h"
#include "TransactionOperation.h"
#include <wtf/NeverDestroyed.h>
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (209445 => 209446)
--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -30,7 +30,6 @@
#if ENABLE(MEDIA_STREAM)
-#include "Dictionary.h"
#include "Event.h"
#include "EventNames.h"
#include "JSOverconstrainedError.h"
@@ -38,7 +37,6 @@
#include "MediaSourceSettings.h"
#include "MediaStream.h"
#include "MediaStreamPrivate.h"
-#include "MediaTrackConstraints.h"
#include "NotImplemented.h"
#include "OverconstrainedError.h"
#include "ScriptExecutionContext.h"
@@ -150,13 +148,6 @@
m_private->endTrack();
}
-RefPtr<MediaTrackConstraints> MediaStreamTrack::getConstraints() const
-{
- // FIXME: https://bugs.webkit.org/show_bug.cgi?id=122428
- notImplemented();
- return 0;
-}
-
RefPtr<MediaSourceSettings> MediaStreamTrack::getSettings() const
{
return MediaSourceSettings::create(m_private->settings());
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (209445 => 209446)
--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h 2016-12-07 04:58:23 UTC (rev 209446)
@@ -46,7 +46,6 @@
class AudioSourceProvider;
class MediaConstraints;
class MediaSourceSettings;
-class MediaTrackConstraints;
class MediaStreamTrack final : public RefCounted<MediaStreamTrack>, public ActiveDOMObject, public EventTargetWithInlineData, private MediaStreamTrackPrivate::Observer {
public:
@@ -78,7 +77,6 @@
Ref<MediaStreamTrack> clone();
void stopProducingData();
- RefPtr<MediaTrackConstraints> getConstraints() const;
RefPtr<MediaSourceSettings> getSettings() const;
RefPtr<RealtimeMediaSourceCapabilities> getCapabilities() const;
Deleted: trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraint.cpp (209445 => 209446)
--- trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraint.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraint.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE, INC. ``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 INC. OR
- * 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.
- *
- */
-
-#include "config.h"
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "MediaTrackConstraint.h"
-
-using namespace JSC;
-
-namespace WebCore {
-
-Ref<MediaTrackConstraint> MediaTrackConstraint::create(const Dictionary& constraint)
-{
- return adoptRef(*new MediaTrackConstraint(constraint));
-}
-
-MediaTrackConstraint::MediaTrackConstraint(const Dictionary& constraint)
- : m_constraint(constraint)
-{
-}
-
-MediaTrackConstraint::~MediaTrackConstraint()
-{
-}
-
-} // namespace WebCore
-
-#endif
Deleted: trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraint.h (209445 => 209446)
--- trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraint.h 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraint.h 2016-12-07 04:58:23 UTC (rev 209446)
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE, INC. ``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 INC. OR
- * 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 "Dictionary.h"
-#include "ScriptWrappable.h"
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class MediaTrackConstraint : public RefCounted<MediaTrackConstraint>, public ScriptWrappable {
-public:
- static Ref<MediaTrackConstraint> create(const Dictionary&);
-
- virtual ~MediaTrackConstraint();
-
- const Dictionary& constraint() const { return m_constraint; }
-
-private:
- explicit MediaTrackConstraint(const Dictionary&);
-
- const Dictionary& m_constraint;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
Deleted: trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraint.idl (209445 => 209446)
--- trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraint.idl 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraint.idl 2016-12-07 04:58:23 UTC (rev 209446)
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 INC. OR
- * 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.
- */
-
-[
- Conditional=MEDIA_STREAM,
- NoInterfaceObject,
-] interface MediaTrackConstraint {
-};
-
Deleted: trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraintSet.cpp (209445 => 209446)
--- trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraintSet.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraintSet.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE, INC. ``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 INC. OR
- * 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.
- *
- */
-
-#include "config.h"
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "MediaTrackConstraintSet.h"
-
-using namespace JSC;
-
-namespace WebCore {
-
-Ref<MediaTrackConstraintSet> MediaTrackConstraintSet::create(const Dictionary& constraints)
-{
- return adoptRef(*new MediaTrackConstraintSet(constraints));
-}
-
-MediaTrackConstraintSet::MediaTrackConstraintSet(const Dictionary& constraints)
- : m_constraints(constraints)
-{
-}
-
-MediaTrackConstraintSet::~MediaTrackConstraintSet()
-{
-}
-
-} // namespace WebCore
-
-#endif
Deleted: trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraintSet.h (209445 => 209446)
--- trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraintSet.h 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraintSet.h 2016-12-07 04:58:23 UTC (rev 209446)
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE, INC. ``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 INC. OR
- * 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 "Dictionary.h"
-#include "ScriptWrappable.h"
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class MediaTrackConstraintSet : public RefCounted<MediaTrackConstraintSet>, public ScriptWrappable {
-public:
- static Ref<MediaTrackConstraintSet> create(const Dictionary&);
-
- virtual ~MediaTrackConstraintSet();
-
- const Dictionary& constraints() const { return m_constraints; }
-
-private:
- explicit MediaTrackConstraintSet(const Dictionary&);
-
- const Dictionary& m_constraints;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
Deleted: trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraintSet.idl (209445 => 209446)
--- trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraintSet.idl 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraintSet.idl 2016-12-07 04:58:23 UTC (rev 209446)
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- *
- * THIS SOFTWARE IS PROVIDED BY GOOGLE INC. ``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 GOOGLE INC. OR
- * 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.
- */
-
-[
- Conditional=MEDIA_STREAM,
- NoInterfaceObject,
-] interface MediaTrackConstraintSet {
- // FIXME: Not implemented.
- // https://bugs.webkit.org/show_bug.cgi?id=121954
-};
-
Deleted: trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp (209445 => 209446)
--- trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE, INC. ``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 INC. OR
- * 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.
- *
- */
-
-#include "config.h"
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "MediaTrackConstraints.h"
-
-#include "MediaTrackConstraint.h"
-#include "MediaTrackConstraintSet.h"
-#include "NotImplemented.h"
-
-using namespace JSC;
-
-namespace WebCore {
-
-Ref<MediaTrackConstraints> MediaTrackConstraints::create(MediaConstraintsImpl& constraints)
-{
- return adoptRef(*new MediaTrackConstraints(constraints));
-}
-
-MediaTrackConstraints::MediaTrackConstraints(MediaConstraintsImpl& constraints)
- : m_constraints(constraints)
-{
-}
-
-Vector<RefPtr<MediaTrackConstraint>> MediaTrackConstraints::optional() const
-{
- // https://bugs.webkit.org/show_bug.cgi?id=121954
- notImplemented();
- return { };
-}
-
-MediaTrackConstraintSet* MediaTrackConstraints::mandatory() const
-{
- // https://bugs.webkit.org/show_bug.cgi?id=121954
- notImplemented();
- return nullptr;
-}
-
-} // namespace WebCore
-
-#endif
Deleted: trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.h (209445 => 209446)
--- trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.h 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.h 2016-12-07 04:58:23 UTC (rev 209446)
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE, INC. ``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 INC. OR
- * 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 "MediaConstraintsImpl.h"
-#include "ScriptWrappable.h"
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class MediaTrackConstraint;
-class MediaTrackConstraintSet;
-
-class MediaTrackConstraints : public RefCounted<MediaTrackConstraints>, public ScriptWrappable {
-public:
- virtual ~MediaTrackConstraints() { }
-
- static Ref<MediaTrackConstraints> create(MediaConstraintsImpl&);
-
- Vector<RefPtr<MediaTrackConstraint>> optional() const;
- MediaTrackConstraintSet* mandatory() const;
-
-private:
- explicit MediaTrackConstraints(MediaConstraintsImpl&);
-
- Ref<MediaConstraintsImpl> m_constraints;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
Deleted: trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl (209445 => 209446)
--- trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/mediastream/MediaTrackConstraints.idl 2016-12-07 04:58:23 UTC (rev 209446)
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2013 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.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``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 INC. OR
- * 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.
- */
-
-[
- Conditional=MEDIA_STREAM,
- NoInterfaceObject,
-] interface MediaTrackConstraints {
- readonly attribute MediaTrackConstraintSet? mandatory;
- readonly attribute sequence<MediaTrackConstraint>? optional;
-};
-
Modified: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.idl (209445 => 209446)
--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.idl 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.idl 2016-12-07 04:58:23 UTC (rev 209446)
@@ -20,6 +20,5 @@
[
Conditional=MEDIA_STREAM,
] partial interface Navigator {
- [JSBuiltin] void webkitGetUserMedia(Dictionary object, any successCallback, any errorCallback);
+ [JSBuiltin] void webkitGetUserMedia(MediaStreamConstraints constraints, NavigatorUserMediaSuccessCallback successCallback, NavigatorUserMediaErrorCallback errorCallback);
};
-
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (209445 => 209446)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-12-07 04:58:23 UTC (rev 209446)
@@ -84,18 +84,6 @@
0704A40C1D6DFC690086DCDB /* JSOverconstrainedError.h in Headers */ = {isa = PBXBuildFile; fileRef = 0704A40A1D6DFC690086DCDB /* JSOverconstrainedError.h */; };
0704A4151D6F39FB0086DCDB /* JSOverconstrainedErrorEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0704A4131D6F39FB0086DCDB /* JSOverconstrainedErrorEvent.cpp */; };
0704A4161D6F39FB0086DCDB /* JSOverconstrainedErrorEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 0704A4141D6F39FB0086DCDB /* JSOverconstrainedErrorEvent.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 */; };
- 0705852917FDE02C005F2BCB /* MediaTrackConstraintSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0705852617FDE02B005F2BCB /* MediaTrackConstraintSet.h */; };
- 0705853117FDE6D9005F2BCB /* JSMediaTrackConstraint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0705852B17FDE6D9005F2BCB /* JSMediaTrackConstraint.cpp */; };
- 0705853217FDE6D9005F2BCB /* JSMediaTrackConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 0705852C17FDE6D9005F2BCB /* JSMediaTrackConstraint.h */; };
- 0705853317FDE6D9005F2BCB /* JSMediaTrackConstraints.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0705852D17FDE6D9005F2BCB /* JSMediaTrackConstraints.cpp */; };
- 0705853417FDE6D9005F2BCB /* JSMediaTrackConstraints.h in Headers */ = {isa = PBXBuildFile; fileRef = 0705852E17FDE6D9005F2BCB /* JSMediaTrackConstraints.h */; };
- 0705853517FDE6D9005F2BCB /* JSMediaTrackConstraintSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0705852F17FDE6D9005F2BCB /* JSMediaTrackConstraintSet.cpp */; };
- 0705853617FDE6D9005F2BCB /* JSMediaTrackConstraintSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 0705853017FDE6D9005F2BCB /* JSMediaTrackConstraintSet.h */; };
- 0705853817FE044F005F2BCB /* MediaTrackConstraintSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0705853717FE044F005F2BCB /* MediaTrackConstraintSet.cpp */; };
- 0705853A17FE0770005F2BCB /* MediaTrackConstraint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0705853917FE0770005F2BCB /* MediaTrackConstraint.cpp */; };
0707568B142262D600414161 /* HTMLTrackElement.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07075688142262D600414161 /* HTMLTrackElement.cpp */; };
0707568C142262D600414161 /* HTMLTrackElement.h in Headers */ = {isa = PBXBuildFile; fileRef = 07075689142262D600414161 /* HTMLTrackElement.h */; };
070756941422668D00414161 /* JSTextTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0707568E1422668C00414161 /* JSTextTrack.cpp */; };
@@ -7026,21 +7014,6 @@
0704A40A1D6DFC690086DCDB /* JSOverconstrainedError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOverconstrainedError.h; sourceTree = "<group>"; };
0704A4131D6F39FB0086DCDB /* JSOverconstrainedErrorEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOverconstrainedErrorEvent.cpp; sourceTree = "<group>"; };
0704A4141D6F39FB0086DCDB /* JSOverconstrainedErrorEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSOverconstrainedErrorEvent.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>"; };
- 0705851F17FDC140005F2BCB /* MediaTrackConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaTrackConstraints.cpp; sourceTree = "<group>"; };
- 0705852017FDC140005F2BCB /* MediaTrackConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaTrackConstraints.h; sourceTree = "<group>"; };
- 0705852617FDE02B005F2BCB /* MediaTrackConstraintSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaTrackConstraintSet.h; sourceTree = "<group>"; };
- 0705852717FDE02B005F2BCB /* MediaTrackConstraintSet.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaTrackConstraintSet.idl; sourceTree = "<group>"; };
- 0705852B17FDE6D9005F2BCB /* JSMediaTrackConstraint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaTrackConstraint.cpp; sourceTree = "<group>"; };
- 0705852C17FDE6D9005F2BCB /* JSMediaTrackConstraint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaTrackConstraint.h; sourceTree = "<group>"; };
- 0705852D17FDE6D9005F2BCB /* JSMediaTrackConstraints.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaTrackConstraints.cpp; sourceTree = "<group>"; };
- 0705852E17FDE6D9005F2BCB /* JSMediaTrackConstraints.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaTrackConstraints.h; sourceTree = "<group>"; };
- 0705852F17FDE6D9005F2BCB /* JSMediaTrackConstraintSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaTrackConstraintSet.cpp; sourceTree = "<group>"; };
- 0705853017FDE6D9005F2BCB /* JSMediaTrackConstraintSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSMediaTrackConstraintSet.h; sourceTree = "<group>"; };
- 0705853717FE044F005F2BCB /* MediaTrackConstraintSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaTrackConstraintSet.cpp; sourceTree = "<group>"; };
- 0705853917FE0770005F2BCB /* MediaTrackConstraint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaTrackConstraint.cpp; sourceTree = "<group>"; };
07075688142262D600414161 /* HTMLTrackElement.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLTrackElement.cpp; sourceTree = "<group>"; };
07075689142262D600414161 /* HTMLTrackElement.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLTrackElement.h; sourceTree = "<group>"; };
0707568A142262D600414161 /* HTMLTrackElement.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = HTMLTrackElement.idl; sourceTree = "<group>"; };
@@ -15086,15 +15059,6 @@
07221B5717CEC32700848E51 /* MediaStreamTrackEvent.cpp */,
07221B5817CEC32700848E51 /* MediaStreamTrackEvent.h */,
07221B5917CEC32700848E51 /* MediaStreamTrackEvent.idl */,
- 0705853917FE0770005F2BCB /* MediaTrackConstraint.cpp */,
- 0705851D17FDC140005F2BCB /* MediaTrackConstraint.h */,
- 0705851E17FDC140005F2BCB /* MediaTrackConstraint.idl */,
- 0705851F17FDC140005F2BCB /* MediaTrackConstraints.cpp */,
- 0705852017FDC140005F2BCB /* MediaTrackConstraints.h */,
- 0705851C17FDB23C005F2BCB /* MediaTrackConstraints.idl */,
- 0705853717FE044F005F2BCB /* MediaTrackConstraintSet.cpp */,
- 0705852617FDE02B005F2BCB /* MediaTrackConstraintSet.h */,
- 0705852717FDE02B005F2BCB /* MediaTrackConstraintSet.idl */,
07C1C0E01BFB600100BD2256 /* MediaTrackSupportedConstraints.h */,
07C1C0E11BFB600100BD2256 /* MediaTrackSupportedConstraints.idl */,
5EA725CA1ACABCB500EAD17B /* NavigatorMediaDevices.cpp */,
@@ -15312,12 +15276,6 @@
07277E4717D018CC0015534D /* JSMediaStreamTrack.h */,
07277E4817D018CC0015534D /* JSMediaStreamTrackEvent.cpp */,
07277E4917D018CC0015534D /* JSMediaStreamTrackEvent.h */,
- 0705852B17FDE6D9005F2BCB /* JSMediaTrackConstraint.cpp */,
- 0705852C17FDE6D9005F2BCB /* JSMediaTrackConstraint.h */,
- 0705852D17FDE6D9005F2BCB /* JSMediaTrackConstraints.cpp */,
- 0705852E17FDE6D9005F2BCB /* JSMediaTrackConstraints.h */,
- 0705852F17FDE6D9005F2BCB /* JSMediaTrackConstraintSet.cpp */,
- 0705853017FDE6D9005F2BCB /* JSMediaTrackConstraintSet.h */,
0787C4671BFBDF6F006DCD7F /* JSMediaTrackSupportedConstraints.cpp */,
0787C4681BFBDF6F006DCD7F /* JSMediaTrackSupportedConstraints.h */,
073BE33E17D17E01002BD431 /* JSNavigatorUserMedia.cpp */,
@@ -26320,9 +26278,6 @@
07277E5117D018CC0015534D /* JSMediaStreamEvent.h in Headers */,
07277E5317D018CC0015534D /* JSMediaStreamTrack.h in Headers */,
07277E5517D018CC0015534D /* JSMediaStreamTrackEvent.h in Headers */,
- 0705853217FDE6D9005F2BCB /* JSMediaTrackConstraint.h in Headers */,
- 0705853417FDE6D9005F2BCB /* JSMediaTrackConstraints.h in Headers */,
- 0705853617FDE6D9005F2BCB /* JSMediaTrackConstraintSet.h in Headers */,
0787C46A1BFBDF6F006DCD7F /* JSMediaTrackSupportedConstraints.h in Headers */,
E107400E0E77BDC00033AF24 /* JSMessageChannel.h in Headers */,
75793EC90D0CE72D007FC0AC /* JSMessageEvent.h in Headers */,
@@ -26850,9 +26805,6 @@
07FFDE69181AED420072D409 /* MediaStreamTrackPrivate.h in Headers */,
CD641EC01819B36000EE4C41 /* MediaTimeAVFoundation.h in Headers */,
CD60C0C7193E87C7003C656B /* MediaTimeQTKit.h in Headers */,
- 0705852117FDC140005F2BCB /* MediaTrackConstraint.h in Headers */,
- 0705852417FDC140005F2BCB /* MediaTrackConstraints.h in Headers */,
- 0705852917FDE02C005F2BCB /* MediaTrackConstraintSet.h in Headers */,
07C1C0E21BFB600100BD2256 /* MediaTrackSupportedConstraints.h in Headers */,
99C7CCB318C663E40032E413 /* MemoizedDOMResult.h in Headers */,
51E1BAC31BD8064E0055D81F /* MemoryBackingStoreTransaction.h in Headers */,
@@ -30103,9 +30055,6 @@
07277E5217D018CC0015534D /* JSMediaStreamTrack.cpp in Sources */,
07C59B6E17F794F6000FBCBB /* JSMediaStreamTrackCustom.cpp in Sources */,
07277E5417D018CC0015534D /* JSMediaStreamTrackEvent.cpp in Sources */,
- 0705853117FDE6D9005F2BCB /* JSMediaTrackConstraint.cpp in Sources */,
- 0705853317FDE6D9005F2BCB /* JSMediaTrackConstraints.cpp in Sources */,
- 0705853517FDE6D9005F2BCB /* JSMediaTrackConstraintSet.cpp in Sources */,
0787C4691BFBDF6F006DCD7F /* JSMediaTrackSupportedConstraints.cpp in Sources */,
072560FB1BFC2482004F9359 /* JSMediaTrackSupportedConstraintsCustom.cpp in Sources */,
E107400D0E77BDC00033AF24 /* JSMessageChannel.cpp in Sources */,
@@ -30662,9 +30611,6 @@
07FFDE68181AED420072D409 /* MediaStreamTrackPrivate.cpp in Sources */,
CD641EBF1819B36000EE4C41 /* MediaTimeAVFoundation.cpp in Sources */,
CD60C0C6193E87C7003C656B /* MediaTimeQTKit.mm in Sources */,
- 0705853A17FE0770005F2BCB /* MediaTrackConstraint.cpp in Sources */,
- 0705852317FDC140005F2BCB /* MediaTrackConstraints.cpp in Sources */,
- 0705853817FE044F005F2BCB /* MediaTrackConstraintSet.cpp in Sources */,
99C7CCB518C6B8990032E413 /* MemoizedDOMResult.cpp in Sources */,
51E1BAC21BD8064E0055D81F /* MemoryBackingStoreTransaction.cpp in Sources */,
BCB16C170979C3BD00467741 /* MemoryCache.cpp in Sources */,
Modified: trunk/Source/WebCore/bindings/generic/IDLTypes.h (209445 => 209446)
--- trunk/Source/WebCore/bindings/generic/IDLTypes.h 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/bindings/generic/IDLTypes.h 2016-12-07 04:58:23 UTC (rev 209446)
@@ -35,7 +35,7 @@
class ArrayBufferView;
class JSValue;
class JSObject;
-template<typename T> class Strong;
+template<typename> class Strong;
}
namespace WebCore {
Modified: trunk/Source/WebCore/bindings/js/JSApplePaySessionCustom.cpp (209445 => 209446)
--- trunk/Source/WebCore/bindings/js/JSApplePaySessionCustom.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/bindings/js/JSApplePaySessionCustom.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -53,13 +53,13 @@
if (UNLIKELY(state.argumentCount() < 3))
return JSValue::decode(throwVMError(&state, scope, createNotEnoughArgumentsError(&state)));
- uint16_t status = convert<IDLUnsignedShort>(state, state.argument(0), IntegerConversionConfiguration::Normal);
+ uint16_t status = convert<IDLUnsignedShort>(state, state.uncheckedArgument(0), IntegerConversionConfiguration::Normal);
RETURN_IF_EXCEPTION(scope, JSValue());
- Dictionary newTotal = { &state, state.argument(1) };
+ Dictionary newTotal = { &state, state.uncheckedArgument(1) };
RETURN_IF_EXCEPTION(scope, JSValue());
- ArrayValue newLineItems { &state, state.argument(2) };
+ ArrayValue newLineItems { &state, state.uncheckedArgument(2) };
RETURN_IF_EXCEPTION(scope, JSValue());
propagateException(state, scope, impl.completeShippingMethodSelection(status, newTotal, newLineItems));
@@ -81,16 +81,16 @@
if (UNLIKELY(state.argumentCount() < 4))
return JSValue::decode(throwVMError(&state, scope, createNotEnoughArgumentsError(&state)));
- uint16_t status = convert<IDLUnsignedShort>(state, state.argument(0), IntegerConversionConfiguration::Normal);
+ uint16_t status = convert<IDLUnsignedShort>(state, state.uncheckedArgument(0), IntegerConversionConfiguration::Normal);
RETURN_IF_EXCEPTION(scope, JSValue());
- ArrayValue newShippingMethods { &state, state.argument(1) };
+ ArrayValue newShippingMethods { &state, state.uncheckedArgument(1) };
RETURN_IF_EXCEPTION(scope, JSValue());
- Dictionary newTotal = { &state, state.argument(2) };
+ Dictionary newTotal = { &state, state.uncheckedArgument(2) };
RETURN_IF_EXCEPTION(scope, JSValue());
- ArrayValue newLineItems { &state, state.argument(3) };
+ ArrayValue newLineItems { &state, state.uncheckedArgument(3) };
RETURN_IF_EXCEPTION(scope, JSValue());
propagateException(state, scope, impl.completeShippingContactSelection(status, newShippingMethods, newTotal, newLineItems));
@@ -113,10 +113,10 @@
if (UNLIKELY(state.argumentCount() < 2))
return JSValue::decode(throwVMError(&state, scope, createNotEnoughArgumentsError(&state)));
- Dictionary newTotal = { &state, state.argument(0) };
+ Dictionary newTotal = { &state, state.uncheckedArgument(0) };
RETURN_IF_EXCEPTION(scope, JSValue());
- ArrayValue newLineItems { &state, state.argument(1) };
+ ArrayValue newLineItems { &state, state.uncheckedArgument(1) };
RETURN_IF_EXCEPTION(scope, JSValue());
propagateException(state, scope, impl.completePaymentMethodSelection(newTotal, newLineItems));
Modified: trunk/Source/WebCore/bindings/js/JSFontFaceCustom.cpp (209445 => 209446)
--- trunk/Source/WebCore/bindings/js/JSFontFaceCustom.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/bindings/js/JSFontFaceCustom.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -29,7 +29,6 @@
#include "CSSFontSelector.h"
#include "CSSValue.h"
#include "CSSValueList.h"
-#include "Dictionary.h"
#include "ExceptionCode.h"
#include "JSDOMConstructor.h"
Modified: trunk/Source/WebCore/dom/Document.cpp (209445 => 209446)
--- trunk/Source/WebCore/dom/Document.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -51,7 +51,6 @@
#include "DOMWindow.h"
#include "DateComponents.h"
#include "DebugPageOverlays.h"
-#include "Dictionary.h"
#include "DocumentLoader.h"
#include "DocumentMarkerController.h"
#include "DocumentSharedObjectPool.h"
Modified: trunk/Source/WebCore/dom/Element.cpp (209445 => 209446)
--- trunk/Source/WebCore/dom/Element.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/dom/Element.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -40,7 +40,6 @@
#include "CustomElementReactionQueue.h"
#include "CustomElementRegistry.h"
#include "DOMTokenList.h"
-#include "Dictionary.h"
#include "DocumentAnimation.h"
#include "DocumentSharedObjectPool.h"
#include "ElementIterator.h"
Modified: trunk/Source/WebCore/dom/Element.h (209445 => 209446)
--- trunk/Source/WebCore/dom/Element.h 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/dom/Element.h 2016-12-07 04:58:23 UTC (rev 209446)
@@ -41,7 +41,6 @@
class ClientRectList;
class CustomElementReactionQueue;
class DatasetDOMStringMap;
-class Dictionary;
class DOMTokenList;
class ElementRareData;
class HTMLDocument;
Modified: trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp (209445 => 209446)
--- trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2016-12-07 04:36:55 UTC (rev 209445)
+++ trunk/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp 2016-12-07 04:58:23 UTC (rev 209446)
@@ -60,6 +60,7 @@
#include "InstrumentingAgents.h"
#include "ScriptState.h"
#include "SecurityOrigin.h"
+#include <heap/HeapInlines.h>
#include <inspector/InjectedScript.h>
#include <inspector/InjectedScriptManager.h>
#include <inspector/InspectorFrontendDispatchers.h>