Bug 181026 – REGRESSION(r226160) Build broken when MEDIA_STREAM is disabled with MediaStreamRequest namespace confusion

• Status: RESOLVED
• Resolution: FIXED
• Component: WebRTC

[Ms2ger (he/him; ⌚ UTC+1/+2)]

In file included from DerivedSources/ForwardingHeaders/WebCore/MediaStreamRequest.h:1:0,
                 from ../../Source/WebKit/UIProcess/UserMediaPermissionRequestProxy.h:24,
                 from ../../Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h:23,
                 from ../../Source/WebKit/UIProcess/WebPageProxy.h:47,
                 from ../../Source/WebKit/UIProcess/VisitedLinkStore.h:31,
                 from ../../Source/WebKit/UIProcess/WebProcessPool.h:44,
                 from ../../Source/WebKit/UIProcess/API/glib/WebKitWebContextPrivate.h:32,
                 from ../../Source/WebKit/UIProcess/API/glib/WebKitInjectedBundleClient.cpp:28:
../../Source/WebCore/platform/mediastream/MediaStreamRequest.h:72:30: error: ‘MediaStreamRequest’ is not a member of ‘WebCore’
 template<> struct EnumTraits<WebCore::MediaStreamRequest> {
                              ^
../../Source/WebCore/platform/mediastream/MediaStreamRequest.h:72:30: note: suggested alternative:
../../Source/WebCore/platform/mediastream/MediaStreamRequest.h:63:8: note:   ‘MediaStreamRequest’
 struct MediaStreamRequest {
        ^
../../Source/WebCore/platform/mediastream/MediaStreamRequest.h:72:30: error: ‘MediaStreamRequest’ is not a member of ‘WebCore’
 template<> struct EnumTraits<WebCore::MediaStreamRequest> {
                              ^
../../Source/WebCore/platform/mediastream/MediaStreamRequest.h:72:30: note: suggested alternative:
../../Source/WebCore/platform/mediastream/MediaStreamRequest.h:63:8: note:   ‘MediaStreamRequest’
 struct MediaStreamRequest {
        ^
../../Source/WebCore/platform/mediastream/MediaStreamRequest.h:72:57: error: template argument 1 is invalid
 template<> struct EnumTraits<WebCore::MediaStreamRequest> {
                                                         ^
In file included from ../../Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h:23:0,
                 from ../../Source/WebKit/UIProcess/WebPageProxy.h:47,
                 from ../../Source/WebKit/UIProcess/VisitedLinkStore.h:31,
                 from ../../Source/WebKit/UIProcess/WebProcessPool.h:44,
                 from ../../Source/WebKit/UIProcess/API/glib/WebKitWebContextPrivate.h:32,
                 from ../../Source/WebKit/UIProcess/API/glib/WebKitInjectedBundleClient.cpp:28:
../../Source/WebKit/UIProcess/UserMediaPermissionRequestProxy.h:38:408: error: ‘WebCore::MediaStreamRequest’ has not been declared
     static Ref<UserMediaPermissionRequestProxy> create(UserMediaPermissionRequestManagerProxy& manager, uint64_t userMediaID, uint64_t mainFrameID, uint64_t frameID, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, Vector<WebCore::CaptureDevice>&& audioDevices, Vector<WebCore::CaptureDevice>&& videoDevices, String&& deviceIDHashSalt, WebCore::MediaStreamRequest&& request)
                                                                                                                                                                                                                                                                                                                                                                                                                        ^
../../Source/WebKit/UIProcess/UserMediaPermissionRequestProxy.h:65:14: error: ‘MediaStreamRequest’ in namespace ‘WebCore’ does not name a type
     WebCore::MediaStreamRequest::Type requestType() const { return m_request.type; }
              ^
../../Source/WebKit/UIProcess/UserMediaPermissionRequestProxy.h:68:364: error: ‘WebCore::MediaStreamRequest’ has not been declared
     UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy&, uint64_t userMediaID, uint64_t mainFrameID, uint64_t frameID, Ref<WebCore::SecurityOrigin>&& userMediaDocumentOrigin, Ref<WebCore::SecurityOrigin>&& topLevelDocumentOrigin, Vector<WebCore::CaptureDevice>&& audioDevices, Vector<WebCore::CaptureDevice>&& videoDevices, String&&, WebCore::MediaStreamRequest&&);
                                                                                                                                                                                                                                                                                                                                                                            ^
../../Source/WebKit/UIProcess/UserMediaPermissionRequestProxy.h:79:14: error: ‘MediaStreamRequest’ in namespace ‘WebCore’ does not name a type
     WebCore::MediaStreamRequest m_request;
              ^

[Ms2ger (he/him; ⌚ UTC+1/+2)]

Created attachment 329910 [details]
Patch

[WebKit Commit Bot]

Comment on attachment 329910 [details]
Patch

Clearing flags on attachment: 329910

Committed r226178: <https://trac.webkit.org/changeset/226178>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/36154920>

[Eric Carlson]

(In reply to Ms2ger from comment #1)
> Created attachment 329910 [details]
> Patch

Sorry about that, and thanks for the fix!