Changeset 226178 in webkit


Ignore:
Timestamp:
Dec 20, 2017 6:31:58 AM (6 years ago)
Author:
Ms2ger@igalia.com
Message:

REGRESSION(r226160) Build broken when MEDIA_STREAM is disabled with MediaStreamRequest namespace confusion
https://bugs.webkit.org/show_bug.cgi?id=181026

Unreviewed build fix.

Source/WebCore:

  • platform/mediastream/MediaStreamRequest.h: Fix namespace, unconditionally include header.

Source/WebKit:

  • UIProcess/UserMediaPermissionRequestManagerProxy.cpp:

(WebKit::UserMediaPermissionRequestManagerProxy::requestUserMediaPermissionForFrame):

Remove UNUSED_PARAM macros that check for (undefined) members rather than params.

Location:
trunk/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r226177 r226178  
     12017-12-20  Ms2ger  <Ms2ger@igalia.com>
     2
     3        REGRESSION(r226160) Build broken when MEDIA_STREAM is disabled with MediaStreamRequest namespace confusion
     4        https://bugs.webkit.org/show_bug.cgi?id=181026
     5
     6        Unreviewed build fix.
     7
     8        * platform/mediastream/MediaStreamRequest.h: Fix namespace, unconditionally include header.
     9
    1102017-12-20  Frederic Wang  <fwang@igalia.com>
    211
  • trunk/Source/WebCore/platform/mediastream/MediaStreamRequest.h

    r226160 r226178  
    2626#pragma once
    2727
     28#include <wtf/EnumTraits.h>
     29
    2830#if ENABLE(MEDIA_STREAM)
    2931
    3032#include "MediaConstraints.h"
    31 #include <wtf/EnumTraits.h>
    3233
    3334namespace WebCore {
     
    6162#else
    6263
     64namespace WebCore {
     65
    6366struct MediaStreamRequest {
    6467    enum class Type { UserMedia };
    6568    Type type;
    6669};
     70
     71} // namespace WebCore
    6772
    6873#endif // ENABLE(MEDIA_STREAM)
  • trunk/Source/WebKit/ChangeLog

    r226172 r226178  
     12017-12-20  Ms2ger  <Ms2ger@igalia.com>
     2
     3        REGRESSION(r226160) Build broken when MEDIA_STREAM is disabled with MediaStreamRequest namespace confusion
     4        https://bugs.webkit.org/show_bug.cgi?id=181026
     5
     6        Unreviewed build fix.
     7
     8        * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
     9        (WebKit::UserMediaPermissionRequestManagerProxy::requestUserMediaPermissionForFrame):
     10          Remove UNUSED_PARAM macros that check for (undefined) members rather than params.
     11
    1122017-12-19  Myles C. Maxfield  <mmaxfield@apple.com>
    213
  • trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp

    r226160 r226178  
    332332    UNUSED_PARAM(userMediaDocumentOrigin);
    333333    UNUSED_PARAM(topLevelDocumentOrigin);
    334     UNUSED_PARAM(audioConstraints);
    335     UNUSED_PARAM(videoConstraints);
    336334    UNUSED_PARAM(userRequest);
    337335#endif
Note: See TracChangeset for help on using the changeset viewer.