Fix incorrect ASSERT added in r239840
authoreric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Jan 2019 00:08:52 +0000 (00:08 +0000)
committereric.carlson@apple.com <eric.carlson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Jan 2019 00:08:52 +0000 (00:08 +0000)
https://bugs.webkit.org/show_bug.cgi?id=193466
<rdar://problem/47095142>

Reviewed by Youenn Fablet.

* WebProcess/cocoa/UserMediaCaptureManager.cpp:
(WebKit::UserMediaCaptureManager::Source::Source):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240017 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp

index ef8d41e..0601b73 100644 (file)
@@ -1,3 +1,14 @@
+2019-01-15  Eric Carlson  <eric.carlson@apple.com>
+
+        Fix incorrect ASSERT added in r239840
+        https://bugs.webkit.org/show_bug.cgi?id=193466
+        <rdar://problem/47095142>
+
+        Reviewed by Youenn Fablet.
+
+        * WebProcess/cocoa/UserMediaCaptureManager.cpp:
+        (WebKit::UserMediaCaptureManager::Source::Source):
+
 2019-01-15  Tim Horton  <timothy_horton@apple.com>
 
         Frequent null-deref under TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded()
index e2b519c..45b901e 100644 (file)
@@ -62,7 +62,7 @@ public:
         , m_manager(manager)
         , m_deviceType(deviceType)
     {
-        ASSERT(deviceType == CaptureDevice::DeviceType::Camera || deviceType == CaptureDevice::DeviceType::Screen || deviceType == CaptureDevice::DeviceType::Window);
+        ASSERT(deviceType != CaptureDevice::DeviceType::Unknown);
         if (type == Type::Audio)
             m_ringBuffer = std::make_unique<CARingBuffer>(makeUniqueRef<SharedRingBufferStorage>(nullptr));
     }