Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 | 27 |
| 28 #include "modules/mediastream/MediaDevicesRequest.h" | 28 #include "modules/mediastream/MediaDevicesRequest.h" |
| 29 | 29 |
| 30 #include "bindings/v8/ExceptionState.h" | 30 #include "bindings/v8/ExceptionState.h" |
| 31 #include "core/dom/Document.h" | 31 #include "core/dom/Document.h" |
| 32 #include "modules/mediastream/UserMediaController.h" | 32 #include "modules/mediastream/UserMediaController.h" |
| 33 | 33 |
| 34 namespace WebCore { | 34 namespace WebCore { |
| 35 | 35 |
| 36 PassRefPtr<MediaDevicesRequest> MediaDevicesRequest::create(ExecutionContext* co ntext, UserMediaController* controller, PassOwnPtr<MediaDeviceInfoCallback> call back, ExceptionState& exceptionState) | 36 PassRefPtrWillBeRawPtr<MediaDevicesRequest> MediaDevicesRequest::create(Executio nContext* context, UserMediaController* controller, PassOwnPtr<MediaDeviceInfoCa llback> callback, ExceptionState& exceptionState) |
| 37 { | 37 { |
| 38 RefPtr<MediaDevicesRequest> request = adoptRef(new MediaDevicesRequest(conte xt, controller, callback)); | 38 RefPtrWillBeRawPtr<MediaDevicesRequest> request = adoptRefWillBeRefCountedGa rbageCollected(new MediaDevicesRequest(context, controller, callback)); |
| 39 request->suspendIfNeeded(); | 39 request->suspendIfNeeded(); |
| 40 return request.release(); | 40 return request.release(); |
| 41 } | 41 } |
| 42 | 42 |
| 43 MediaDevicesRequest::MediaDevicesRequest(ExecutionContext* context, UserMediaCon troller* controller, PassOwnPtr<MediaDeviceInfoCallback> callback) | 43 MediaDevicesRequest::MediaDevicesRequest(ExecutionContext* context, UserMediaCon troller* controller, PassOwnPtr<MediaDeviceInfoCallback> callback) |
| 44 : ActiveDOMObject(context) | 44 : ActiveDOMObject(context) |
| 45 , m_controller(controller) | 45 , m_controller(controller) |
| 46 , m_callback(callback) | 46 , m_callback(callback) |
| 47 { | 47 { |
| 48 } | 48 } |
| 49 | 49 |
| 50 MediaDevicesRequest::~MediaDevicesRequest() | 50 MediaDevicesRequest::~MediaDevicesRequest() |
| 51 { | 51 { |
| 52 } | 52 } |
|
haraken
2014/05/08 05:08:39
At first, I thought it would be better to add ASSE
| |
| 53 | 53 |
| 54 Document* MediaDevicesRequest::ownerDocument() | 54 Document* MediaDevicesRequest::ownerDocument() |
| 55 { | 55 { |
| 56 if (ExecutionContext* context = executionContext()) { | 56 if (ExecutionContext* context = executionContext()) { |
| 57 return toDocument(context); | 57 return toDocument(context); |
| 58 } | 58 } |
| 59 | 59 |
| 60 return 0; | 60 return 0; |
| 61 } | 61 } |
| 62 | 62 |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 74 m_callback->handleEvent(mediaDevices); | 74 m_callback->handleEvent(mediaDevices); |
| 75 } | 75 } |
| 76 | 76 |
| 77 void MediaDevicesRequest::stop() | 77 void MediaDevicesRequest::stop() |
| 78 { | 78 { |
| 79 m_callback.clear(); | 79 m_callback.clear(); |
| 80 m_controller = 0; | 80 m_controller = 0; |
| 81 } | 81 } |
| 82 | 82 |
| 83 } // namespace WebCore | 83 } // namespace WebCore |
| OLD | NEW |