Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (168575 => 168576)
--- trunk/Source/WebCore/CMakeLists.txt 2014-05-10 07:23:01 UTC (rev 168575)
+++ trunk/Source/WebCore/CMakeLists.txt 2014-05-10 07:30:12 UTC (rev 168576)
@@ -213,7 +213,7 @@
Modules/mediastream/MediaTrackConstraint.idl
Modules/mediastream/MediaTrackConstraintSet.idl
Modules/mediastream/MediaTrackConstraints.idl
- Modules/mediastream/NavigatorMediaStream.idl
+ Modules/mediastream/NavigatorUserMedia.idl
Modules/mediastream/NavigatorUserMediaError.idl
Modules/mediastream/NavigatorUserMediaErrorCallback.idl
Modules/mediastream/NavigatorUserMediaSuccessCallback.idl
@@ -846,7 +846,7 @@
Modules/mediastream/MediaTrackConstraint.cpp
Modules/mediastream/MediaTrackConstraintSet.cpp
Modules/mediastream/MediaTrackConstraints.cpp
- Modules/mediastream/NavigatorMediaStream.cpp
+ Modules/mediastream/NavigatorUserMedia.cpp
Modules/mediastream/NavigatorUserMediaError.cpp
Modules/mediastream/RTCDTMFSender.cpp
Modules/mediastream/RTCDTMFToneChangeEvent.cpp
Modified: trunk/Source/WebCore/ChangeLog (168575 => 168576)
--- trunk/Source/WebCore/ChangeLog 2014-05-10 07:23:01 UTC (rev 168575)
+++ trunk/Source/WebCore/ChangeLog 2014-05-10 07:30:12 UTC (rev 168576)
@@ -1,3 +1,32 @@
+2014-05-10 Praveen R Jadhav <[email protected]>
+
+ [MediaStream] Rename NavigatorMediaStream as NavigatorUserMedia.
+ https://bugs.webkit.org/show_bug.cgi?id=132734
+
+ Reviewed by Eric Carlson.
+
+ Spec: http://www.w3.org/TR/mediacapture-streams/#navigatorusermedia
+
+ This patch replaces 'NavigatorMediaStream' with 'NavigatorUserMedia'
+ throughout the code to be consistent with W3C specifications.
+ Test cases remain the same as 'Navigator' implies 'NavigatorUserMedia'.
+
+ * CMakeLists.txt: Compiles NavigatorUserMedia.cpp
+ * DerivedSources.make: Compiles NavigatorUserMedia.idl
+ * Modules/mediastream/NavigatorMediaStream.cpp: Removed.
+ * Modules/mediastream/NavigatorMediaStream.h: Removed.
+ * Modules/mediastream/NavigatorMediaStream.idl: Removed.
+ * Modules/mediastream/NavigatorUserMedia.cpp: Added.
+ (WebCore::NavigatorUserMedia::NavigatorUserMedia):
+ (WebCore::NavigatorUserMedia::~NavigatorUserMedia):
+ (WebCore::NavigatorUserMedia::webkitGetUserMedia):
+ * Modules/mediastream/NavigatorUserMedia.h: Added.
+ * Modules/mediastream/NavigatorUserMedia.idl: Added.
+ * WebCore.xcodeproj/project.pbxproj:
+ * bindings/js/JSNavigatorCustom.cpp:
+ (WebCore::JSNavigator::webkitGetUserMedia): NavigatorUserMedia
+ class is used instead of NavigatorMediaStream.
+
2014-05-10 Zalan Bujtas <[email protected]>
Subpixel rendering: Empty rects should remain empty after integrally enclosing them.
Modified: trunk/Source/WebCore/DerivedSources.make (168575 => 168576)
--- trunk/Source/WebCore/DerivedSources.make 2014-05-10 07:23:01 UTC (rev 168575)
+++ trunk/Source/WebCore/DerivedSources.make 2014-05-10 07:30:12 UTC (rev 168576)
@@ -121,7 +121,7 @@
$(WebCore)/Modules/mediastream/MediaTrackConstraint.idl \
$(WebCore)/Modules/mediastream/MediaTrackConstraints.idl \
$(WebCore)/Modules/mediastream/MediaTrackConstraintSet.idl \
- $(WebCore)/Modules/mediastream/NavigatorMediaStream.idl \
+ $(WebCore)/Modules/mediastream/NavigatorUserMedia.idl \
$(WebCore)/Modules/mediastream/NavigatorUserMediaError.idl \
$(WebCore)/Modules/mediastream/NavigatorUserMediaErrorCallback.idl \
$(WebCore)/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl \
Deleted: trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.cpp (168575 => 168576)
--- trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.cpp 2014-05-10 07:23:01 UTC (rev 168575)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.cpp 2014-05-10 07:30:12 UTC (rev 168576)
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2000 Harri Porten ([email protected])
- * Copyright (c) 2000 Daniel Molkentin ([email protected])
- * Copyright (c) 2000 Stefan Schimanski ([email protected])
- * Copyright (C) 2003, 2004, 2005, 2006 Apple Inc.
- * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include "config.h"
-#include "NavigatorMediaStream.h"
-
-#if ENABLE(MEDIA_STREAM)
-
-#include "Dictionary.h"
-#include "Document.h"
-#include "ExceptionCode.h"
-#include "Frame.h"
-#include "Navigator.h"
-#include "NavigatorUserMediaErrorCallback.h"
-#include "NavigatorUserMediaSuccessCallback.h"
-#include "Page.h"
-#include "UserMediaController.h"
-#include "UserMediaRequest.h"
-
-namespace WebCore {
-
-NavigatorMediaStream::NavigatorMediaStream()
-{
-}
-
-NavigatorMediaStream::~NavigatorMediaStream()
-{
-}
-
-void NavigatorMediaStream::webkitGetUserMedia(Navigator* navigator, const Dictionary& options, PassRefPtr<NavigatorUserMediaSuccessCallback> successCallback, PassRefPtr<NavigatorUserMediaErrorCallback> errorCallback, ExceptionCode& ec)
-{
- if (!successCallback)
- return;
-
- UserMediaController* userMedia = UserMediaController::from(navigator->frame() ? navigator->frame()->page() : 0);
- if (!userMedia) {
- ec = NOT_SUPPORTED_ERR;
- return;
- }
-
- RefPtr<UserMediaRequest> request = UserMediaRequest::create(navigator->frame()->document(), userMedia, options, successCallback, errorCallback, ec);
- if (!request) {
- ec = NOT_SUPPORTED_ERR;
- return;
- }
-
- request->start();
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
Deleted: trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.h (168575 => 168576)
--- trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.h 2014-05-10 07:23:01 UTC (rev 168575)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.h 2014-05-10 07:30:12 UTC (rev 168576)
@@ -1,50 +0,0 @@
-/*
- Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB. If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
-*/
-
-#ifndef NavigatorMediaStream_h
-#define NavigatorMediaStream_h
-
-#if ENABLE(MEDIA_STREAM)
-
-#include <wtf/PassRefPtr.h>
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class Dictionary;
-class Navigator;
-class NavigatorUserMediaErrorCallback;
-class NavigatorUserMediaSuccessCallback;
-
-typedef int ExceptionCode;
-
-class NavigatorMediaStream {
-public:
- static void webkitGetUserMedia(Navigator*, const Dictionary&, PassRefPtr<NavigatorUserMediaSuccessCallback>, PassRefPtr<NavigatorUserMediaErrorCallback>, ExceptionCode&);
-
-private:
- NavigatorMediaStream();
- ~NavigatorMediaStream();
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
-
-#endif // NavigatorMediaStream_h
Deleted: trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.idl (168575 => 168576)
--- trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.idl 2014-05-10 07:23:01 UTC (rev 168575)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.idl 2014-05-10 07:30:12 UTC (rev 168576)
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2012 Google Inc. All rights reserved.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-[
- Conditional=MEDIA_STREAM,
-] partial interface Navigator {
- [Custom, RaisesException] void webkitGetUserMedia(Dictionary options,
- NavigatorUserMediaSuccessCallback successCallback,
- optional NavigatorUserMediaErrorCallback errorCallback);
-};
-
Copied: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.cpp (from rev 168575, trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.cpp) (0 => 168576)
--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.cpp (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.cpp 2014-05-10 07:30:12 UTC (rev 168576)
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2000 Harri Porten ([email protected])
+ * Copyright (c) 2000 Daniel Molkentin ([email protected])
+ * Copyright (c) 2000 Stefan Schimanski ([email protected])
+ * Copyright (C) 2003, 2004, 2005, 2006 Apple Inc.
+ * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "config.h"
+#include "NavigatorUserMedia.h"
+
+#if ENABLE(MEDIA_STREAM)
+
+#include "Dictionary.h"
+#include "Document.h"
+#include "ExceptionCode.h"
+#include "Frame.h"
+#include "Navigator.h"
+#include "NavigatorUserMediaErrorCallback.h"
+#include "NavigatorUserMediaSuccessCallback.h"
+#include "Page.h"
+#include "UserMediaController.h"
+#include "UserMediaRequest.h"
+
+namespace WebCore {
+
+NavigatorUserMedia::NavigatorUserMedia()
+{
+}
+
+NavigatorUserMedia::~NavigatorUserMedia()
+{
+}
+
+void NavigatorUserMedia::webkitGetUserMedia(Navigator* navigator, const Dictionary& options, PassRefPtr<NavigatorUserMediaSuccessCallback> successCallback, PassRefPtr<NavigatorUserMediaErrorCallback> errorCallback, ExceptionCode& ec)
+{
+ if (!successCallback)
+ return;
+
+ UserMediaController* userMedia = UserMediaController::from(navigator->frame() ? navigator->frame()->page() : 0);
+ if (!userMedia) {
+ ec = NOT_SUPPORTED_ERR;
+ return;
+ }
+
+ RefPtr<UserMediaRequest> request = UserMediaRequest::create(navigator->frame()->document(), userMedia, options, successCallback, errorCallback, ec);
+ if (!request) {
+ ec = NOT_SUPPORTED_ERR;
+ return;
+ }
+
+ request->start();
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
Copied: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.h (from rev 168575, trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.h) (0 => 168576)
--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.h (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.h 2014-05-10 07:30:12 UTC (rev 168576)
@@ -0,0 +1,50 @@
+/*
+ Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB. If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+*/
+
+#ifndef NavigatorUserMedia_h
+#define NavigatorUserMedia_h
+
+#if ENABLE(MEDIA_STREAM)
+
+#include <wtf/PassRefPtr.h>
+#include <wtf/text/WTFString.h>
+
+namespace WebCore {
+
+class Dictionary;
+class Navigator;
+class NavigatorUserMediaErrorCallback;
+class NavigatorUserMediaSuccessCallback;
+
+typedef int ExceptionCode;
+
+class NavigatorUserMedia {
+public:
+ static void webkitGetUserMedia(Navigator*, const Dictionary&, PassRefPtr<NavigatorUserMediaSuccessCallback>, PassRefPtr<NavigatorUserMediaErrorCallback>, ExceptionCode&);
+
+private:
+ NavigatorUserMedia();
+ ~NavigatorUserMedia();
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
+
+#endif // NavigatorUserMedia_h
Copied: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.idl (from rev 168575, trunk/Source/WebCore/Modules/mediastream/NavigatorMediaStream.idl) (0 => 168576)
--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.idl (rev 0)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.idl 2014-05-10 07:30:12 UTC (rev 168576)
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+[
+ Conditional=MEDIA_STREAM,
+] partial interface Navigator {
+ [Custom, RaisesException] void webkitGetUserMedia(Dictionary options,
+ NavigatorUserMediaSuccessCallback successCallback,
+ optional NavigatorUserMediaErrorCallback errorCallback);
+};
+
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (168575 => 168576)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-05-10 07:23:01 UTC (rev 168575)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-05-10 07:30:12 UTC (rev 168576)
@@ -159,8 +159,8 @@
073AB4B317F8BACA006E0D6F /* AllVideoCapabilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 073AB4B017F8BACA006E0D6F /* AllVideoCapabilities.h */; };
073AB4B717F92ECF006E0D6F /* JSCapabilityRange.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073AB4B517F92ECF006E0D6F /* JSCapabilityRange.cpp */; };
073AB4B817F92ECF006E0D6F /* JSCapabilityRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 073AB4B617F92ECF006E0D6F /* JSCapabilityRange.h */; };
- 073BE34017D17E01002BD431 /* JSNavigatorMediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073BE33E17D17E01002BD431 /* JSNavigatorMediaStream.cpp */; };
- 073BE34117D17E01002BD431 /* JSNavigatorMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 073BE33F17D17E01002BD431 /* JSNavigatorMediaStream.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 073BE34017D17E01002BD431 /* JSNavigatorUserMedia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073BE33E17D17E01002BD431 /* JSNavigatorUserMedia.cpp */; };
+ 073BE34117D17E01002BD431 /* JSNavigatorUserMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 073BE33F17D17E01002BD431 /* JSNavigatorUserMedia.h */; settings = {ATTRIBUTES = (Private, ); }; };
073BE34817D17E7A002BD431 /* JSNavigatorUserMediaError.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073BE34217D17E7A002BD431 /* JSNavigatorUserMediaError.cpp */; };
073BE34917D17E7A002BD431 /* JSNavigatorUserMediaError.h in Headers */ = {isa = PBXBuildFile; fileRef = 073BE34317D17E7A002BD431 /* JSNavigatorUserMediaError.h */; settings = {ATTRIBUTES = (Private, ); }; };
073BE34A17D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 073BE34417D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.cpp */; };
@@ -207,7 +207,7 @@
078E090117D14CEE00420AA1 /* MediaStreamRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B5217CEC32700848E51 /* MediaStreamRegistry.cpp */; };
078E090217D14CEE00420AA1 /* MediaStreamTrack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B5417CEC32700848E51 /* MediaStreamTrack.cpp */; };
078E090317D14CEE00420AA1 /* MediaStreamTrackEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B5717CEC32700848E51 /* MediaStreamTrackEvent.cpp */; };
- 078E090417D14CEE00420AA1 /* NavigatorMediaStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B5A17CEC32700848E51 /* NavigatorMediaStream.cpp */; };
+ 078E090417D14CEE00420AA1 /* NavigatorUserMedia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B5A17CEC32700848E51 /* NavigatorUserMedia.cpp */; };
078E090517D14CEE00420AA1 /* RTCDataChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B6317CEC32700848E51 /* RTCDataChannel.cpp */; };
078E090617D14CEE00420AA1 /* RTCDataChannelEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B6617CEC32700848E51 /* RTCDataChannelEvent.cpp */; };
078E090717D14CEE00420AA1 /* RTCDTMFSender.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07221B6917CEC32700848E51 /* RTCDTMFSender.cpp */; };
@@ -229,7 +229,7 @@
078E091717D14D1C00420AA1 /* MediaStreamRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B5317CEC32700848E51 /* MediaStreamRegistry.h */; settings = {ATTRIBUTES = (Private, ); }; };
078E091817D14D1C00420AA1 /* MediaStreamTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B5517CEC32700848E51 /* MediaStreamTrack.h */; settings = {ATTRIBUTES = (Private, ); }; };
078E091917D14D1C00420AA1 /* MediaStreamTrackEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B5817CEC32700848E51 /* MediaStreamTrackEvent.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 078E091A17D14D1C00420AA1 /* NavigatorMediaStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B5B17CEC32700848E51 /* NavigatorMediaStream.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 078E091A17D14D1C00420AA1 /* NavigatorUserMedia.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B5B17CEC32700848E51 /* NavigatorUserMedia.h */; settings = {ATTRIBUTES = (Private, ); }; };
078E091B17D14D1C00420AA1 /* NavigatorUserMediaError.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B5D17CEC32700848E51 /* NavigatorUserMediaError.h */; settings = {ATTRIBUTES = (Private, ); }; };
078E091C17D14D1C00420AA1 /* NavigatorUserMediaErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B5F17CEC32700848E51 /* NavigatorUserMediaErrorCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
078E091D17D14D1C00420AA1 /* NavigatorUserMediaSuccessCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B6117CEC32700848E51 /* NavigatorUserMediaSuccessCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -6953,9 +6953,9 @@
07221B5717CEC32700848E51 /* MediaStreamTrackEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MediaStreamTrackEvent.cpp; sourceTree = "<group>"; };
07221B5817CEC32700848E51 /* MediaStreamTrackEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaStreamTrackEvent.h; sourceTree = "<group>"; };
07221B5917CEC32700848E51 /* MediaStreamTrackEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = MediaStreamTrackEvent.idl; sourceTree = "<group>"; };
- 07221B5A17CEC32700848E51 /* NavigatorMediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigatorMediaStream.cpp; sourceTree = "<group>"; };
- 07221B5B17CEC32700848E51 /* NavigatorMediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorMediaStream.h; sourceTree = "<group>"; };
- 07221B5C17CEC32700848E51 /* NavigatorMediaStream.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NavigatorMediaStream.idl; sourceTree = "<group>"; };
+ 07221B5A17CEC32700848E51 /* NavigatorUserMedia.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NavigatorUserMedia.cpp; sourceTree = "<group>"; };
+ 07221B5B17CEC32700848E51 /* NavigatorUserMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorUserMedia.h; sourceTree = "<group>"; };
+ 07221B5C17CEC32700848E51 /* NavigatorUserMedia.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NavigatorUserMedia.idl; sourceTree = "<group>"; };
07221B5D17CEC32700848E51 /* NavigatorUserMediaError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorUserMediaError.h; sourceTree = "<group>"; };
07221B5E17CEC32700848E51 /* NavigatorUserMediaError.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = NavigatorUserMediaError.idl; sourceTree = "<group>"; };
07221B5F17CEC32700848E51 /* NavigatorUserMediaErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigatorUserMediaErrorCallback.h; sourceTree = "<group>"; };
@@ -7058,8 +7058,8 @@
073AB4B017F8BACA006E0D6F /* AllVideoCapabilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllVideoCapabilities.h; sourceTree = "<group>"; };
073AB4B517F92ECF006E0D6F /* JSCapabilityRange.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCapabilityRange.cpp; sourceTree = "<group>"; };
073AB4B617F92ECF006E0D6F /* JSCapabilityRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCapabilityRange.h; sourceTree = "<group>"; };
- 073BE33E17D17E01002BD431 /* JSNavigatorMediaStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNavigatorMediaStream.cpp; sourceTree = "<group>"; };
- 073BE33F17D17E01002BD431 /* JSNavigatorMediaStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNavigatorMediaStream.h; sourceTree = "<group>"; };
+ 073BE33E17D17E01002BD431 /* JSNavigatorUserMedia.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNavigatorUserMedia.cpp; sourceTree = "<group>"; };
+ 073BE33F17D17E01002BD431 /* JSNavigatorUserMedia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNavigatorUserMedia.h; sourceTree = "<group>"; };
073BE34217D17E7A002BD431 /* JSNavigatorUserMediaError.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNavigatorUserMediaError.cpp; sourceTree = "<group>"; };
073BE34317D17E7A002BD431 /* JSNavigatorUserMediaError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSNavigatorUserMediaError.h; sourceTree = "<group>"; };
073BE34417D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSNavigatorUserMediaErrorCallback.cpp; sourceTree = "<group>"; };
@@ -14194,9 +14194,9 @@
0705853717FE044F005F2BCB /* MediaTrackConstraintSet.cpp */,
0705852617FDE02B005F2BCB /* MediaTrackConstraintSet.h */,
0705852717FDE02B005F2BCB /* MediaTrackConstraintSet.idl */,
- 07221B5A17CEC32700848E51 /* NavigatorMediaStream.cpp */,
- 07221B5B17CEC32700848E51 /* NavigatorMediaStream.h */,
- 07221B5C17CEC32700848E51 /* NavigatorMediaStream.idl */,
+ 07221B5A17CEC32700848E51 /* NavigatorUserMedia.cpp */,
+ 07221B5B17CEC32700848E51 /* NavigatorUserMedia.h */,
+ 07221B5C17CEC32700848E51 /* NavigatorUserMedia.idl */,
070327F717EA4AAF00CE1318 /* NavigatorUserMediaError.cpp */,
07221B5D17CEC32700848E51 /* NavigatorUserMediaError.h */,
07221B5E17CEC32700848E51 /* NavigatorUserMediaError.idl */,
@@ -14380,8 +14380,8 @@
0705852E17FDE6D9005F2BCB /* JSMediaTrackConstraints.h */,
0705852F17FDE6D9005F2BCB /* JSMediaTrackConstraintSet.cpp */,
0705853017FDE6D9005F2BCB /* JSMediaTrackConstraintSet.h */,
- 073BE33E17D17E01002BD431 /* JSNavigatorMediaStream.cpp */,
- 073BE33F17D17E01002BD431 /* JSNavigatorMediaStream.h */,
+ 073BE33E17D17E01002BD431 /* JSNavigatorUserMedia.cpp */,
+ 073BE33F17D17E01002BD431 /* JSNavigatorUserMedia.h */,
073BE34217D17E7A002BD431 /* JSNavigatorUserMediaError.cpp */,
073BE34317D17E7A002BD431 /* JSNavigatorUserMediaError.h */,
073BE34417D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.cpp */,
@@ -24574,7 +24574,7 @@
C6F08FCA1431000D00685849 /* JSMutationRecord.h in Headers */,
BCD9C2C10C17B69E005C90A2 /* JSNamedNodeMap.h in Headers */,
A9D247F80D757E3400FDF959 /* JSNavigator.h in Headers */,
- 073BE34117D17E01002BD431 /* JSNavigatorMediaStream.h in Headers */,
+ 073BE34117D17E01002BD431 /* JSNavigatorUserMedia.h in Headers */,
073BE34917D17E7A002BD431 /* JSNavigatorUserMediaError.h in Headers */,
073BE34B17D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.h in Headers */,
073BE34D17D17E7A002BD431 /* JSNavigatorUserMediaSuccessCallback.h in Headers */,
@@ -28047,7 +28047,7 @@
BCD9C2C00C17B69E005C90A2 /* JSNamedNodeMap.cpp in Sources */,
BCD9C2630C17AA67005C90A2 /* JSNamedNodeMapCustom.cpp in Sources */,
A9D247F70D757E3400FDF959 /* JSNavigator.cpp in Sources */,
- 073BE34017D17E01002BD431 /* JSNavigatorMediaStream.cpp in Sources */,
+ 073BE34017D17E01002BD431 /* JSNavigatorUserMedia.cpp in Sources */,
073BE34817D17E7A002BD431 /* JSNavigatorUserMediaError.cpp in Sources */,
073BE34A17D17E7A002BD431 /* JSNavigatorUserMediaErrorCallback.cpp in Sources */,
073BE34C17D17E7A002BD431 /* JSNavigatorUserMediaSuccessCallback.cpp in Sources */,
@@ -28555,7 +28555,7 @@
A9C6E5A50D746458006442E9 /* Navigator.cpp in Sources */,
E12719CA0EEEC21300F61213 /* NavigatorBase.cpp in Sources */,
9711460314EF009A00674FD9 /* NavigatorGeolocation.cpp in Sources */,
- 078E090417D14CEE00420AA1 /* NavigatorMediaStream.cpp in Sources */,
+ 078E090417D14CEE00420AA1 /* NavigatorUserMedia.cpp in Sources */,
070327F817EA4AAF00CE1318 /* NavigatorUserMediaError.cpp in Sources */,
5D874F130D161D3200796C3B /* NetscapePlugInStreamLoader.cpp in Sources */,
59C27F05138D28C10079B7E2 /* NetworkResourcesData.cpp in Sources */,
Modified: trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp (168575 => 168576)
--- trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp 2014-05-10 07:23:01 UTC (rev 168575)
+++ trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp 2014-05-10 07:30:12 UTC (rev 168576)
@@ -32,7 +32,7 @@
#include "ExceptionCode.h"
#include "JSNavigatorUserMediaErrorCallback.h"
#include "JSNavigatorUserMediaSuccessCallback.h"
-#include "NavigatorMediaStream.h"
+#include "NavigatorUserMedia.h"
using namespace JSC;
@@ -72,7 +72,7 @@
RefPtr<NavigatorUserMediaSuccessCallback> successCallback = JSNavigatorUserMediaSuccessCallback::create(asObject(exec->uncheckedArgument(1)), castedThis->globalObject());
Navigator& impl = castedThis->impl();
ExceptionCode ec = 0;
- NavigatorMediaStream::webkitGetUserMedia(&impl, options, successCallback, errorCallback, ec);
+ NavigatorUserMedia::webkitGetUserMedia(&impl, options, successCallback, errorCallback, ec);
setDOMException(exec, ec);
return jsUndefined();
}
