Changeset 265089 in webkit
- Timestamp:
- Jul 30, 2020 10:30:44 AM (4 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r265087 r265089 1 2020-07-30 Peng Liu <peng.liu6@apple.com> 2 3 ASSERTION FAILED: !isInRoutingArbitrationForArbitrator(proxy) in WebKit::SharedArbitrator::beginRoutingArbitrationForArbitrator 4 https://bugs.webkit.org/show_bug.cgi?id=214904 5 6 Reviewed by Jer Noble. 7 8 Only add an AudioSessionRoutingArbitratorProxy to the WeakHashSet (m_arbitrators) 9 if the routing arbitration is completed successfully. 10 11 * UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm: 12 (WebKit::SharedArbitrator::beginRoutingArbitrationForArbitrator): 13 1 14 2020-07-30 Per Arne Vollan <pvollan@apple.com> 2 15 -
trunk/Source/WebKit/UIProcess/Media/cocoa/AudioSessionRoutingArbitratorProxyCocoa.mm
r263328 r265089 75 75 { 76 76 ASSERT(!isInRoutingArbitrationForArbitrator(proxy)); 77 m_arbitrators.add(proxy);78 77 79 78 if (m_setupArbitrationOngoing) { 80 m_enqueuedCallbacks.append(WTFMove(callback)); 79 m_enqueuedCallbacks.append([this, weakProxy = makeWeakPtr(proxy), callback = WTFMove(callback)] (RoutingArbitrationError error, DefaultRouteChanged routeChanged) mutable { 80 if (error == RoutingArbitrationError::None && weakProxy) 81 m_arbitrators.add(*weakProxy); 82 83 callback(error, routeChanged); 84 }); 85 81 86 return; 82 87 } … … 86 91 if (m_currentCategory) { 87 92 if (*m_currentCategory >= requestedCategory) { 93 m_arbitrators.add(proxy); 88 94 callback(RoutingArbitrationError::None, DefaultRouteChanged::No); 89 95 return; … … 111 117 112 118 m_setupArbitrationOngoing = true; 113 m_enqueuedCallbacks.append(WTFMove(callback)); 119 m_enqueuedCallbacks.append([this, weakProxy = makeWeakPtr(proxy), callback = WTFMove(callback)] (RoutingArbitrationError error, DefaultRouteChanged routeChanged) mutable { 120 if (error == RoutingArbitrationError::None && weakProxy) 121 m_arbitrators.add(*weakProxy); 122 123 callback(error, routeChanged); 124 }); 114 125 115 126 [[PAL::getAVAudioRoutingArbiterClass() sharedRoutingArbiter] beginArbitrationWithCategory:arbitrationCategory completionHandler:[this](BOOL defaultDeviceChanged, NSError * _Nullable error) {
Note: See TracChangeset
for help on using the changeset viewer.