Changeset 232360 in webkit
- Timestamp:
- May 31, 2018 12:13:35 PM (6 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r232356 r232360 1 2018-05-31 Brent Fulgham <bfulgham@apple.com> 2 3 Don't attempt to extend sandbox when running tests with mock media devices 4 https://bugs.webkit.org/show_bug.cgi?id=186150 5 <rdar://problem/40690875> 6 7 Reviewed by Alexey Proskuryakov. 8 9 Avoid attempting to issue a sandbox extension to actual media devices when 10 running with Mock capture devices. 11 12 Also handle the 'denyNextRequest' test state outside of the USE(APPLE_INTERNAL_SDK) 13 guards, since it is needed for Open Source builds as well. 14 15 * UIProcess/UserMediaProcessManager.cpp: 16 (WebKit::UserMediaProcessManager::willCreateMediaStream): 17 1 18 2018-05-31 Antti Koivisto <antti@apple.com> 2 19 -
trunk/Source/WebKit/UIProcess/UserMediaProcessManager.cpp
r232321 r232360 129 129 bool UserMediaProcessManager::willCreateMediaStream(UserMediaPermissionRequestManagerProxy& proxy, bool withAudio, bool withVideo) 130 130 { 131 #if ENABLE(SANDBOX_EXTENSIONS) && USE(APPLE_INTERNAL_SDK)132 auto& processStartingCapture = proxy.page().process();133 134 ASSERT(stateMap().contains(&processStartingCapture));135 136 131 if (m_denyNextRequest) { 137 132 m_denyNextRequest = false; 138 133 return false; 139 134 } 135 136 if (proxy.page().preferences().mockCaptureDevicesEnabled()) 137 return true; 138 139 #if ENABLE(SANDBOX_EXTENSIONS) && USE(APPLE_INTERNAL_SDK) 140 auto& processStartingCapture = proxy.page().process(); 141 142 ASSERT(stateMap().contains(&processStartingCapture)); 140 143 141 144 auto& state = processState(processStartingCapture);
Note: See TracChangeset
for help on using the changeset viewer.