Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (187736 => 187737)
--- trunk/Source/WebCore/CMakeLists.txt 2015-08-03 12:48:52 UTC (rev 187736)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-03 15:38:32 UTC (rev 187737)
@@ -912,7 +912,6 @@
Modules/mediastream/MediaTrackConstraintSet.cpp
Modules/mediastream/MediaTrackConstraints.cpp
Modules/mediastream/NavigatorMediaDevices.cpp
- Modules/mediastream/NavigatorUserMedia.cpp
Modules/mediastream/NavigatorUserMediaError.cpp
Modules/mediastream/RTCDTMFSender.cpp
Modules/mediastream/RTCDTMFToneChangeEvent.cpp
Modified: trunk/Source/WebCore/ChangeLog (187736 => 187737)
--- trunk/Source/WebCore/ChangeLog 2015-08-03 12:48:52 UTC (rev 187736)
+++ trunk/Source/WebCore/ChangeLog 2015-08-03 15:38:32 UTC (rev 187737)
@@ -1,5 +1,25 @@
2015-08-03 Youenn Fablet <youenn.fab...@crf.canon.fr>
+ [EFL] http/tests/media/media-stream/disconnected-frame-already.html is crashing after r185903
+ https://bugs.webkit.org/show_bug.cgi?id=146834
+
+ Reviewed by Eric Carlson.
+
+ r185903 went to far in removing some tests, in particular whether the current process is related to a frame.
+ Readded that check.
+ Refactored the code to remove the need for NavigatorUserMedia class.
+
+ Covered by existing tests.
+
+ * CMakeLists.txt: Removed NavigatorUserMedia.cpp.
+ * Modules/mediastream/NavigatorUserMedia.cpp: Removed.
+ * Modules/mediastream/NavigatorUserMedia.h: Removed.
+ * WebCore.xcodeproj/project.pbxproj: Ditto.
+ * bindings/js/JSNavigatorCustom.cpp:
+ (WebCore::JSNavigator::webkitGetUserMedia): Inlined NavigatorUserMeia::webkitGetUserMedia.
+
+2015-08-03 Youenn Fablet <youenn.fab...@crf.canon.fr>
+
JSXMLHttpRequest::visitAdditionalChildren does not need to explicitly mark m_response
https://bugs.webkit.org/show_bug.cgi?id=147488
Deleted: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.cpp (187736 => 187737)
--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.cpp 2015-08-03 12:48:52 UTC (rev 187736)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.cpp 2015-08-03 15:38:32 UTC (rev 187737)
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2000 Harri Porten (por...@kde.org)
- * Copyright (c) 2000 Daniel Molkentin (molken...@kde.org)
- * Copyright (c) 2000 Stefan Schimanski (schi...@kde.org)
- * 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 "MediaStream.h"
-#include "Navigator.h"
-#include "NavigatorUserMediaError.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)
-{
- // FIXME: Remove this test once IDL is updated to make errroCallback parameter mandatory.
- if (!successCallback || !errorCallback) {
- ec = TYPE_MISMATCH_ERR;
- return;
- }
-
- // We do not need to protect the context (i.e. document) here as UserMediaRequest is observing context destruction and will check validity before resolving/rejecting promise.
- Document* document = navigator->frame()->document();
-
- ASSERT(errorCallback);
- ASSERT(successCallback);
- auto resolveCallback = [successCallback, document](const RefPtr<MediaStream>& stream) mutable {
- RefPtr<MediaStream> protectedStream = stream;
- document->postTask([successCallback, protectedStream](ScriptExecutionContext&) {
- successCallback->handleEvent(protectedStream.get());
- });
- };
- auto rejectCallback = [errorCallback, document](const RefPtr<NavigatorUserMediaError>& error) mutable {
- RefPtr<NavigatorUserMediaError> protectedError = error;
- document->postTask([errorCallback, protectedError](ScriptExecutionContext&) {
- errorCallback->handleEvent(protectedError.get());
- });
- };
-
- UserMediaRequest::start(navigator->frame()->document(), options, MediaDevices::Promise(WTF::move(resolveCallback), WTF::move(rejectCallback)), ec);
-}
-
-} // namespace WebCore
-
-#endif // ENABLE(MEDIA_STREAM)
Deleted: trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.h (187736 => 187737)
--- trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.h 2015-08-03 12:48:52 UTC (rev 187736)
+++ trunk/Source/WebCore/Modules/mediastream/NavigatorUserMedia.h 2015-08-03 15:38:32 UTC (rev 187737)
@@ -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 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
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (187736 => 187737)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-03 12:48:52 UTC (rev 187736)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-08-03 15:38:32 UTC (rev 187737)
@@ -215,7 +215,6 @@
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 /* 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 */; };
@@ -237,7 +236,6 @@
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 */; };
078E091917D14D1C00420AA1 /* MediaStreamTrackEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B5817CEC32700848E51 /* MediaStreamTrackEvent.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, ); }; };
@@ -7219,8 +7217,6 @@
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 /* 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>"; };
@@ -14782,8 +14778,6 @@
5EA725CA1ACABCB500EAD17B /* NavigatorMediaDevices.cpp */,
5EA725CB1ACABCB500EAD17B /* NavigatorMediaDevices.h */,
5EA725CC1ACABCB500EAD17B /* NavigatorMediaDevices.idl */,
- 07221B5A17CEC32700848E51 /* NavigatorUserMedia.cpp */,
- 07221B5B17CEC32700848E51 /* NavigatorUserMedia.h */,
07221B5C17CEC32700848E51 /* NavigatorUserMedia.idl */,
070327F717EA4AAF00CE1318 /* NavigatorUserMediaError.cpp */,
07221B5D17CEC32700848E51 /* NavigatorUserMediaError.h */,
@@ -26100,7 +26094,6 @@
E12719C70EEEC16800F61213 /* NavigatorBase.h in Headers */,
9711460414EF009A00674FD9 /* NavigatorGeolocation.h in Headers */,
5EA725D61ACABD5700EAD17B /* NavigatorMediaDevices.h in Headers */,
- 078E091A17D14D1C00420AA1 /* NavigatorUserMedia.h in Headers */,
078E091B17D14D1C00420AA1 /* NavigatorUserMediaError.h in Headers */,
078E091C17D14D1C00420AA1 /* NavigatorUserMediaErrorCallback.h in Headers */,
078E091D17D14D1C00420AA1 /* NavigatorUserMediaSuccessCallback.h in Headers */,
@@ -29700,7 +29693,6 @@
51A4BB101954D62700FA5C2E /* NavigatorGamepad.cpp in Sources */,
9711460314EF009A00674FD9 /* NavigatorGeolocation.cpp in Sources */,
5EA725D51ACABD5700EAD17B /* NavigatorMediaDevices.cpp in Sources */,
- 078E090417D14CEE00420AA1 /* NavigatorUserMedia.cpp in Sources */,
070327F817EA4AAF00CE1318 /* NavigatorUserMediaError.cpp in Sources */,
5D874F130D161D3200796C3B /* NetscapePlugInStreamLoader.cpp in Sources */,
A19D934A1AA11B1E00B46C24 /* NetworkExtensionContentFilter.mm in Sources */,
Modified: trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp (187736 => 187737)
--- trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp 2015-08-03 12:48:52 UTC (rev 187736)
+++ trunk/Source/WebCore/bindings/js/JSNavigatorCustom.cpp 2015-08-03 15:38:32 UTC (rev 187737)
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright (C) 2015 Canon INC.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -29,10 +30,13 @@
#include "JSNavigator.h"
#include "Dictionary.h"
+#include "Document.h"
#include "ExceptionCode.h"
+#include "Frame.h"
#include "JSNavigatorUserMediaErrorCallback.h"
#include "JSNavigatorUserMediaSuccessCallback.h"
-#include "NavigatorUserMedia.h"
+#include "MediaStream.h"
+#include "UserMediaRequest.h"
using namespace JSC;
@@ -64,11 +68,32 @@
return jsUndefined();
}
+ if (!impl().frame()) {
+ setDOMException(exec, NOT_SUPPORTED_ERR);
+ return jsUndefined();
+ }
+
+ // We do not need to protect the context (i.e. document) here as UserMediaRequest is observing context destruction and will check validity before resolving/rejecting promise.
+ Document* document = impl().frame()->document();
+
RefPtr<NavigatorUserMediaSuccessCallback> successCallback = JSNavigatorUserMediaSuccessCallback::create(asObject(exec->uncheckedArgument(1)), globalObject());
+ auto resolveCallback = [successCallback, document](const RefPtr<MediaStream>& stream) mutable {
+ RefPtr<MediaStream> protectedStream = stream;
+ document->postTask([successCallback, protectedStream](ScriptExecutionContext&) {
+ successCallback->handleEvent(protectedStream.get());
+ });
+ };
+
RefPtr<NavigatorUserMediaErrorCallback> errorCallback = JSNavigatorUserMediaErrorCallback::create(asObject(exec->uncheckedArgument(2)), globalObject());
+ auto rejectCallback = [errorCallback, document](const RefPtr<NavigatorUserMediaError>& error) mutable {
+ RefPtr<NavigatorUserMediaError> protectedError = error;
+ document->postTask([errorCallback, protectedError](ScriptExecutionContext&) {
+ errorCallback->handleEvent(protectedError.get());
+ });
+ };
ExceptionCode ec = 0;
- NavigatorUserMedia::webkitGetUserMedia(&impl(), options, successCallback, errorCallback, ec);
+ UserMediaRequest::start(document, options, MediaDevices::Promise(WTF::move(resolveCallback), WTF::move(rejectCallback)), ec);
setDOMException(exec, ec);
return jsUndefined();
}
