OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2000 Harri Porten (porten@kde.org) | 2 * Copyright (C) 2000 Harri Porten (porten@kde.org) |
3 * Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org) | 3 * Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org) |
4 * Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org) | 4 * Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org) |
5 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. | 5 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. |
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Lesser General Public | 9 * modify it under the terms of the GNU Lesser General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 16 matching lines...) Expand all Loading... |
27 #include "bindings/core/v8/ExceptionState.h" | 27 #include "bindings/core/v8/ExceptionState.h" |
28 #include "core/dom/Document.h" | 28 #include "core/dom/Document.h" |
29 #include "core/dom/ExceptionCode.h" | 29 #include "core/dom/ExceptionCode.h" |
30 #include "core/frame/LocalFrame.h" | 30 #include "core/frame/LocalFrame.h" |
31 #include "core/frame/Navigator.h" | 31 #include "core/frame/Navigator.h" |
32 #include "core/frame/OriginsUsingFeatures.h" | 32 #include "core/frame/OriginsUsingFeatures.h" |
33 #include "core/frame/Settings.h" | 33 #include "core/frame/Settings.h" |
34 #include "core/frame/UseCounter.h" | 34 #include "core/frame/UseCounter.h" |
35 #include "core/page/Page.h" | 35 #include "core/page/Page.h" |
36 #include "modules/mediastream/MediaDevicesRequest.h" | 36 #include "modules/mediastream/MediaDevicesRequest.h" |
| 37 #include "modules/mediastream/MediaStreamConstraints.h" |
37 #include "modules/mediastream/NavigatorUserMediaErrorCallback.h" | 38 #include "modules/mediastream/NavigatorUserMediaErrorCallback.h" |
38 #include "modules/mediastream/NavigatorUserMediaSuccessCallback.h" | 39 #include "modules/mediastream/NavigatorUserMediaSuccessCallback.h" |
39 #include "modules/mediastream/UserMediaController.h" | 40 #include "modules/mediastream/UserMediaController.h" |
40 #include "modules/mediastream/UserMediaRequest.h" | 41 #include "modules/mediastream/UserMediaRequest.h" |
41 #include "platform/weborigin/SecurityOrigin.h" | 42 #include "platform/weborigin/SecurityOrigin.h" |
42 | 43 |
43 namespace blink { | 44 namespace blink { |
44 | 45 |
45 NavigatorMediaStream::NavigatorMediaStream() | 46 NavigatorMediaStream::NavigatorMediaStream() |
46 { | 47 { |
47 } | 48 } |
48 | 49 |
49 NavigatorMediaStream::~NavigatorMediaStream() | 50 NavigatorMediaStream::~NavigatorMediaStream() |
50 { | 51 { |
51 } | 52 } |
52 | 53 |
53 void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const Dictio
nary& options, NavigatorUserMediaSuccessCallback* successCallback, NavigatorUser
MediaErrorCallback* errorCallback, ExceptionState& exceptionState) | 54 void NavigatorMediaStream::webkitGetUserMedia(Navigator& navigator, const MediaS
treamConstraints& options, NavigatorUserMediaSuccessCallback* successCallback, N
avigatorUserMediaErrorCallback* errorCallback, ExceptionState& exceptionState) |
54 { | 55 { |
55 if (!successCallback) | 56 if (!successCallback) |
56 return; | 57 return; |
57 | 58 |
58 UserMediaController* userMedia = UserMediaController::from(navigator.frame()
); | 59 UserMediaController* userMedia = UserMediaController::from(navigator.frame()
); |
59 if (!userMedia) { | 60 if (!userMedia) { |
60 exceptionState.throwDOMException(NotSupportedError, "No user media contr
oller available; is this a detached window?"); | 61 exceptionState.throwDOMException(NotSupportedError, "No user media contr
oller available; is this a detached window?"); |
61 return; | 62 return; |
62 } | 63 } |
63 | 64 |
(...skipping 12 matching lines...) Expand all Loading... |
76 UserMediaRequest* request = UserMediaRequest::create(navigator.frame()->docu
ment(), userMedia, options, successCallback, errorCallback, exceptionState); | 77 UserMediaRequest* request = UserMediaRequest::create(navigator.frame()->docu
ment(), userMedia, options, successCallback, errorCallback, exceptionState); |
77 if (!request) { | 78 if (!request) { |
78 ASSERT(exceptionState.hadException()); | 79 ASSERT(exceptionState.hadException()); |
79 return; | 80 return; |
80 } | 81 } |
81 | 82 |
82 request->start(); | 83 request->start(); |
83 } | 84 } |
84 | 85 |
85 } // namespace blink | 86 } // namespace blink |
OLD | NEW |