| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
Y | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN
Y |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
Y | 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN
Y |
| 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
| 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
| 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
N | 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O
N |
| 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
| 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 23 */ | 23 */ |
| 24 | 24 |
| 25 #include "config.h" | 25 #include "config.h" |
| 26 #include "modules/mediastream/UserMediaController.h" | 26 #include "modules/mediastream/UserMediaController.h" |
| 27 | 27 |
| 28 namespace WebCore { | 28 namespace blink { |
| 29 | 29 |
| 30 const char* UserMediaController::supplementName() | 30 const char* UserMediaController::supplementName() |
| 31 { | 31 { |
| 32 return "UserMediaController"; | 32 return "UserMediaController"; |
| 33 } | 33 } |
| 34 | 34 |
| 35 UserMediaController::UserMediaController(UserMediaClient* client) | 35 UserMediaController::UserMediaController(UserMediaClient* client) |
| 36 : m_client(client) | 36 : m_client(client) |
| 37 { | 37 { |
| 38 } | 38 } |
| 39 | 39 |
| 40 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(UserMediaController) | 40 DEFINE_EMPTY_DESTRUCTOR_WILL_BE_REMOVED(UserMediaController) |
| 41 | 41 |
| 42 PassOwnPtrWillBeRawPtr<UserMediaController> UserMediaController::create(UserMedi
aClient* client) | 42 PassOwnPtrWillBeRawPtr<UserMediaController> UserMediaController::create(UserMedi
aClient* client) |
| 43 { | 43 { |
| 44 return adoptPtrWillBeNoop(new UserMediaController(client)); | 44 return adoptPtrWillBeNoop(new UserMediaController(client)); |
| 45 } | 45 } |
| 46 | 46 |
| 47 void provideUserMediaTo(LocalFrame& frame, UserMediaClient* client) | 47 void provideUserMediaTo(LocalFrame& frame, UserMediaClient* client) |
| 48 { | 48 { |
| 49 UserMediaController::provideTo(frame, UserMediaController::supplementName(),
UserMediaController::create(client)); | 49 UserMediaController::provideTo(frame, UserMediaController::supplementName(),
UserMediaController::create(client)); |
| 50 } | 50 } |
| 51 | 51 |
| 52 } // namespace WebCore | 52 } // namespace blink |
| OLD | NEW |