Modified: trunk/Source/WebCore/ChangeLog (164654 => 164655)
--- trunk/Source/WebCore/ChangeLog 2014-02-25 17:57:31 UTC (rev 164654)
+++ trunk/Source/WebCore/ChangeLog 2014-02-25 18:18:28 UTC (rev 164655)
@@ -1,3 +1,15 @@
+2014-02-25 Thiago de Barros Lacerda <[email protected]>
+
+ [MediaStream] Adding mock implementation of UserMediaClient
+ https://bugs.webkit.org/show_bug.cgi?id=129274
+
+ Reviewed by Eric Carlson.
+
+ * platform/mock/UserMediaClientMock.h: Added.
+ (WebCore::UserMediaClientRequestNotifier::UserMediaClientRequestNotifier):
+ * testing/Internals.cpp:
+ (WebCore::Internals::Internals):
+
2014-02-25 Ryosuke Niwa <[email protected]>
Tighten bitfields in live NodeLists and HTMLCollections
Added: trunk/Source/WebCore/platform/mock/UserMediaClientMock.h (0 => 164655)
--- trunk/Source/WebCore/platform/mock/UserMediaClientMock.h (rev 0)
+++ trunk/Source/WebCore/platform/mock/UserMediaClientMock.h 2014-02-25 18:18:28 UTC (rev 164655)
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER 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.
+ */
+
+#ifndef UserMediaClientMock_h
+#define UserMediaClientMock_h
+
+#if ENABLE(MEDIA_STREAM)
+
+#include "TimerEventBasedMock.h"
+#include "UserMediaClient.h"
+#include "UserMediaRequest.h"
+
+namespace WebCore {
+
+class UserMediaClientRequestNotifier : public MockNotifier {
+public:
+ UserMediaClientRequestNotifier(PassRefPtr<UserMediaRequest> request, bool requestSuccess)
+ : m_request(request)
+ , m_requestSuccess(requestSuccess)
+ {
+ }
+
+ void fire() override
+ {
+ if (m_requestSuccess)
+ m_request->userMediaAccessGranted();
+ else
+ m_request->userMediaAccessDenied();
+ }
+
+private:
+ RefPtr<UserMediaRequest> m_request;
+ bool m_requestSuccess;
+};
+
+class UserMediaClientMock final : public UserMediaClient, public TimerEventBasedMock {
+public:
+ public:
+ virtual void pageDestroyed() override { }
+
+ virtual void requestPermission(PassRefPtr<UserMediaRequest> request) override
+ {
+ RefPtr<UserMediaClientRequestNotifier> notifier = adoptRef(new UserMediaClientRequestNotifier(request, true));
+ m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
+ }
+
+ virtual void cancelRequest(UserMediaRequest* request) override
+ {
+ RefPtr<UserMediaClientRequestNotifier> notifier = adoptRef(new UserMediaClientRequestNotifier(request, false));
+ m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
+ }
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(MEDIA_STREAM)
+
+#endif // UserMediaClientMock_h
Modified: trunk/Source/WebCore/testing/Internals.cpp (164654 => 164655)
--- trunk/Source/WebCore/testing/Internals.cpp 2014-02-25 17:57:31 UTC (rev 164654)
+++ trunk/Source/WebCore/testing/Internals.cpp 2014-02-25 18:18:28 UTC (rev 164655)
@@ -153,6 +153,7 @@
#include "MockMediaStreamCenter.h"
#include "RTCPeerConnection.h"
#include "RTCPeerConnectionHandlerMock.h"
+#include "UserMediaClientMock.h"
#endif
#if ENABLE(MEDIA_SOURCE)
@@ -307,6 +308,7 @@
#if ENABLE(MEDIA_STREAM)
MockMediaStreamCenter::registerMockMediaStreamCenter();
enableMockRTCPeerConnectionHandler();
+ WebCore::provideUserMediaTo(document->page(), new UserMediaClientMock());
#endif
}
