Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(661)

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaDevicesRequest.cpp

Issue 2629593004: Disambiguate LifecycleObserver::contextDestroyed (Closed)
Patch Set: temp Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 return m_resolver->promise(); 62 return m_resolver->promise();
63 } 63 }
64 64
65 void MediaDevicesRequest::succeed(const MediaDeviceInfoVector& mediaDevices) { 65 void MediaDevicesRequest::succeed(const MediaDeviceInfoVector& mediaDevices) {
66 if (!getExecutionContext() || !m_resolver) 66 if (!getExecutionContext() || !m_resolver)
67 return; 67 return;
68 68
69 m_resolver->resolve(mediaDevices); 69 m_resolver->resolve(mediaDevices);
70 } 70 }
71 71
72 void MediaDevicesRequest::contextDestroyed() { 72 void MediaDevicesRequest::contextDestroyed(ExecutionContext*) {
73 m_controller.clear(); 73 m_controller.clear();
74 m_resolver.clear(); 74 m_resolver.clear();
75 } 75 }
76 76
77 DEFINE_TRACE(MediaDevicesRequest) { 77 DEFINE_TRACE(MediaDevicesRequest) {
78 visitor->trace(m_controller); 78 visitor->trace(m_controller);
79 visitor->trace(m_resolver); 79 visitor->trace(m_resolver);
80 ContextLifecycleObserver::trace(visitor); 80 ContextLifecycleObserver::trace(visitor);
81 } 81 }
82 82
83 } // namespace blink 83 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698