| 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 23 matching lines...) Expand all Loading... |
| 34 namespace blink { | 34 namespace blink { |
| 35 | 35 |
| 36 MediaDevicesRequest* MediaDevicesRequest::Create( | 36 MediaDevicesRequest* MediaDevicesRequest::Create( |
| 37 ScriptState* state, | 37 ScriptState* state, |
| 38 UserMediaController* controller) { | 38 UserMediaController* controller) { |
| 39 return new MediaDevicesRequest(state, controller); | 39 return new MediaDevicesRequest(state, controller); |
| 40 } | 40 } |
| 41 | 41 |
| 42 MediaDevicesRequest::MediaDevicesRequest(ScriptState* state, | 42 MediaDevicesRequest::MediaDevicesRequest(ScriptState* state, |
| 43 UserMediaController* controller) | 43 UserMediaController* controller) |
| 44 : ContextLifecycleObserver(state->GetExecutionContext()), | 44 : ContextLifecycleObserver(ExecutionContext::From(state)), |
| 45 controller_(controller), | 45 controller_(controller), |
| 46 resolver_(ScriptPromiseResolver::Create(state)) {} | 46 resolver_(ScriptPromiseResolver::Create(state)) {} |
| 47 | 47 |
| 48 MediaDevicesRequest::~MediaDevicesRequest() {} | 48 MediaDevicesRequest::~MediaDevicesRequest() {} |
| 49 | 49 |
| 50 Document* MediaDevicesRequest::OwnerDocument() { | 50 Document* MediaDevicesRequest::OwnerDocument() { |
| 51 if (ExecutionContext* context = GetExecutionContext()) { | 51 if (ExecutionContext* context = GetExecutionContext()) { |
| 52 return ToDocument(context); | 52 return ToDocument(context); |
| 53 } | 53 } |
| 54 | 54 |
| (...skipping 19 matching lines...) Expand all Loading... |
| 74 resolver_.Clear(); | 74 resolver_.Clear(); |
| 75 } | 75 } |
| 76 | 76 |
| 77 DEFINE_TRACE(MediaDevicesRequest) { | 77 DEFINE_TRACE(MediaDevicesRequest) { |
| 78 visitor->Trace(controller_); | 78 visitor->Trace(controller_); |
| 79 visitor->Trace(resolver_); | 79 visitor->Trace(resolver_); |
| 80 ContextLifecycleObserver::Trace(visitor); | 80 ContextLifecycleObserver::Trace(visitor); |
| 81 } | 81 } |
| 82 | 82 |
| 83 } // namespace blink | 83 } // namespace blink |
| OLD | NEW |