Attachment 359213 Details for Bug 193466 – Patch for landing

[patch] Patch for landing

bug-193466-20190115152931.patch (text/plain), 1.53 KB, created by Eric Carlson on 2019-01-15 15:29:32 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Carlson

Created: 2019-01-15 15:29:32 PST

Size: 1.53 KB

patch

obsolete

>Subversion Revision: 239848
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index d768ac97748f4dfc61a0171ffa5566494cc5f97a..31742219570042bbade4cdc4e34c7f792242ce56 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -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-10  Per Arne Vollan  <pvollan@apple.com>
> 
>         [macOS] Add name of IORegistry key in sandbox.
>diff --git a/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp b/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp
>index e2b519ce34a43e0c5ad875468d58cc35e1f5a036..45b901e8ac4d908dcafbda016e53adcff8b7eaea 100644
>--- a/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp
>+++ b/Source/WebKit/WebProcess/cocoa/UserMediaCaptureManager.cpp
>@@ -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));
>     }

Actions: View | Formatted Diff | Diff

Attachments on bug 193466: 359209 | 359213