| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. | 2 * Copyright (C) 2011 Ericsson AB. All rights reserved. |
| 3 * Copyright (C) 2012 Google Inc. All rights reserved. | 3 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * | 8 * |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 ASSERT(!name.isEmpty()); | 172 ASSERT(!name.isEmpty()); |
| 173 if (!executionContext()) | 173 if (!executionContext()) |
| 174 return; | 174 return; |
| 175 m_errorCallback->handleEvent(NavigatorUserMediaError::create(name, message,
constraintName)); | 175 m_errorCallback->handleEvent(NavigatorUserMediaError::create(name, message,
constraintName)); |
| 176 } | 176 } |
| 177 | 177 |
| 178 void UserMediaRequest::contextDestroyed() | 178 void UserMediaRequest::contextDestroyed() |
| 179 { | 179 { |
| 180 if (m_controller) { | 180 if (m_controller) { |
| 181 m_controller->cancelUserMediaRequest(this); | 181 m_controller->cancelUserMediaRequest(this); |
| 182 m_controller = 0; | 182 m_controller = nullptr; |
| 183 } | 183 } |
| 184 | 184 |
| 185 ContextLifecycleObserver::contextDestroyed(); | 185 ContextLifecycleObserver::contextDestroyed(); |
| 186 } | 186 } |
| 187 | 187 |
| 188 void UserMediaRequest::trace(Visitor* visitor) | 188 void UserMediaRequest::trace(Visitor* visitor) |
| 189 { | 189 { |
| 190 visitor->trace(m_controller); |
| 190 visitor->trace(m_successCallback); | 191 visitor->trace(m_successCallback); |
| 191 visitor->trace(m_errorCallback); | 192 visitor->trace(m_errorCallback); |
| 192 } | 193 } |
| 193 | 194 |
| 194 } // namespace blink | 195 } // namespace blink |
| OLD | NEW |