diff options
| author | rsesek <rsesek@chromium.org> | 2015-07-22 09:06:20 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-22 16:07:00 +0000 |
| commit | 787e2b2d0110448a5added6c9aae8fc7f9134144 (patch) | |
| tree | 3fcf06af87cdc26c0bedce9600d532bb5246f7a1 /media/capture | |
| parent | 0b866e1ba9b26a8d39247e552ab5f4d62a8e238c (diff) | |
| download | chromium_src-787e2b2d0110448a5added6c9aae8fc7f9134144.zip chromium_src-787e2b2d0110448a5added6c9aae8fc7f9134144.tar.gz chromium_src-787e2b2d0110448a5added6c9aae8fc7f9134144.tar.bz2 | |
Remove base/mac/scoped_nsexception_enabler.h.
Exception fatalisation is now handled via base::mac::CallWithEHFrame, so
this file is unnecessary.
The base::mac::ScopedNSExceptionEnabler is removed, since instantiating an
NSException is no longer fatal (only an uncaught one is).
base::mac::RunBlockIgnoringExceptions has been removed where possible or converted
to a @try/@catch to swallow any exceptions.
BUG=503128
R=shess@chromium.org
Review URL: https://codereview.chromium.org/1233983004
Cr-Commit-Position: refs/heads/master@{#339884}
Diffstat (limited to 'media/capture')
| -rw-r--r-- | media/capture/video/mac/video_capture_device_qtkit_mac.mm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/media/capture/video/mac/video_capture_device_qtkit_mac.mm b/media/capture/video/mac/video_capture_device_qtkit_mac.mm index 3415e03..2fc0b32 100644 --- a/media/capture/video/mac/video_capture_device_qtkit_mac.mm +++ b/media/capture/video/mac/video_capture_device_qtkit_mac.mm @@ -8,7 +8,6 @@ #include "base/debug/crash_logging.h" #include "base/logging.h" -#include "base/mac/scoped_nsexception_enabler.h" #include "media/base/video_capture_types.h" #include "media/capture/video/mac/video_capture_device_mac.h" #include "media/capture/video/video_capture_device.h" @@ -19,13 +18,14 @@ #pragma mark Class methods + (void)getDeviceNames:(NSMutableDictionary*)deviceNames { - // Third-party drivers often throw exceptions, which are fatal in - // Chromium (see comments in scoped_nsexception_enabler.h). The - // following catches any exceptions and continues in an orderly - // fashion with no devices detected. - NSArray* captureDevices = base::mac::RunBlockIgnoringExceptions(^{ - return [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo]; - }); + // Third-party drivers often throw exceptions. The following catches any + // exceptions and continues in an orderly fashion with no devices detected. + NSArray* captureDevices = nil; + @try { + captureDevices = + [QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeVideo]; + } @catch (id exception) { + } for (QTCaptureDevice* device in captureDevices) { if ([[device attributeForKey:QTCaptureDeviceSuspendedAttribute] boolValue]) |