181026 2017-12-20 03:24:43 -0800 REGRESSION(r226160) Build broken when MEDIA_STREAM is disabled with MediaStreamRequest namespace confusion 2017-12-20 08:42:37 -0800 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 Ms2ger Ms2ger commit-queue eric.carlson webkit-bug-importer youennf oldest_to_newest 1383584 0 Ms2ger 2017-12-20 03:24:43 -0800 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; ^ 1383587 1 329910 Ms2ger 2017-12-20 04:31:53 -0800 Created attachment 329910 Patch 1383619 2 329910 commit-queue 2017-12-20 06:32:02 -0800 Comment on attachment 329910 Patch Clearing flags on attachment: 329910 Committed r226178: <https://trac.webkit.org/changeset/226178> 1383620 3 commit-queue 2017-12-20 06:32:03 -0800 All reviewed patches have been landed. Closing bug. 1383621 4 webkit-bug-importer 2017-12-20 06:33:26 -0800 <rdar://problem/36154920> 1383654 5 eric.carlson 2017-12-20 08:42:37 -0800 (In reply to Ms2ger from comment #1) > Created attachment 329910 [details] > Patch Sorry about that, and thanks for the fix! 329910 2017-12-20 04:31:53 -0800 2017-12-20 06:32:02 -0800 Patch bug-181026-20171220133152.patch text/plain 3093 Ms2ger U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2MTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWMyOGZmYTFhMDI3ZmY3 N2RmNjhlMjI5Yjg2NzBjN2FmMzIyYTMwYi4uMzk5N2Q3MWM2NDhhODNjOTA0MGYyZGFlMzE3NDBl N2YwYjVmODJiYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE3LTEyLTIwICBNczJn ZXIgIDxNczJnZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OKHIyMjYxNjApIEJ1 aWxkIGJyb2tlbiB3aGVuIE1FRElBX1NUUkVBTSBpcyBkaXNhYmxlZCB3aXRoIE1lZGlhU3RyZWFt UmVxdWVzdCBuYW1lc3BhY2UgY29uZnVzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODEwMjYKKworICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZp eC4KKworICAgICAgICAqIHBsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVxdWVzdC5o OiBGaXggbmFtZXNwYWNlLCB1bmNvbmRpdGlvbmFsbHkgaW5jbHVkZSBoZWFkZXIuCisKIDIwMTct MTItMTkgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZWZhY3RvciB1c2VyLWluc3RhbGxlZCBmb250IHNldHRpbmcgZm9yIGNsYXJpdHkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cK aW5kZXggOTdmM2VmNDZiOGM2ZjU1MmJiODQ3MzFhOTE0ODU3YTUwMWU0NDQzZi4uZGQzMTk1MGJk MDM4ZDNkNzM3MWQ2MjM5YjU5YjNkZGRmZmJjMTE0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBA QAorMjAxNy0xMi0yMCAgTXMyZ2VyICA8TXMyZ2VyQGlnYWxpYS5jb20+CisKKyAgICAgICAgUkVH UkVTU0lPTihyMjI2MTYwKSBCdWlsZCBicm9rZW4gd2hlbiBNRURJQV9TVFJFQU0gaXMgZGlzYWJs ZWQgd2l0aCBNZWRpYVN0cmVhbVJlcXVlc3QgbmFtZXNwYWNlIGNvbmZ1c2lvbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgxMDI2CisKKyAgICAgICAg VW5yZXZpZXdlZCBidWlsZCBmaXguCisKKyAgICAgICAgKiBVSVByb2Nlc3MvVXNlck1lZGlhUGVy bWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpVc2VyTWVk aWFQZXJtaXNzaW9uUmVxdWVzdE1hbmFnZXJQcm94eTo6cmVxdWVzdFVzZXJNZWRpYVBlcm1pc3Np b25Gb3JGcmFtZSk6CisgICAgICAgICAgUmVtb3ZlIFVOVVNFRF9QQVJBTSBtYWNyb3MgdGhhdCBj aGVjayBmb3IgKHVuZGVmaW5lZCkgbWVtYmVycyByYXRoZXIgdGhhbiBwYXJhbXMuCisKIDIwMTct MTItMTkgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZWZhY3RvciB1c2VyLWluc3RhbGxlZCBmb250IHNldHRpbmcgZm9yIGNsYXJpdHkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21lZGlhc3RyZWFtL01lZGlhU3RyZWFtUmVx dWVzdC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1S ZXF1ZXN0LmgKaW5kZXggNDYxNGYzMWY5ZTEwMWUyZmI0OTE5NDg1NWJjMDg3YWVkODQ3NTdiMS4u YzU3MDJjMGQ3MjU3ZjI1MDBiMjhhZmY3YzE1OTVjYzNlYTRkZWQ3NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1SZXF1ZXN0LmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWVkaWFzdHJlYW0vTWVkaWFTdHJlYW1SZXF1ZXN0 LmgKQEAgLTI1LDEwICsyNSwxMSBAQAogCiAjcHJhZ21hIG9uY2UKIAorI2luY2x1ZGUgPHd0Zi9F bnVtVHJhaXRzLmg+CisKICNpZiBFTkFCTEUoTUVESUFfU1RSRUFNKQogCiAjaW5jbHVkZSAiTWVk aWFDb25zdHJhaW50cy5oIgotI2luY2x1ZGUgPHd0Zi9FbnVtVHJhaXRzLmg+CiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIApAQCAtNjAsMTEgKzYxLDE1IEBAIHN0cnVjdCBNZWRpYVN0cmVhbVJlcXVl c3QgewogCiAjZWxzZQogCituYW1lc3BhY2UgV2ViQ29yZSB7CisKIHN0cnVjdCBNZWRpYVN0cmVh bVJlcXVlc3QgewogICAgIGVudW0gY2xhc3MgVHlwZSB7IFVzZXJNZWRpYSB9OwogICAgIFR5cGUg dHlwZTsKIH07CiAKK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUKKwogI2VuZGlmIC8vIEVOQUJMRShN RURJQV9TVFJFQU0pCiAKIG5hbWVzcGFjZSBXVEYgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2VyUHJveHkuY3BwIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvVXNlck1lZGlhUGVybWlzc2lvblJlcXVlc3RNYW5hZ2Vy UHJveHkuY3BwCmluZGV4IGNkYTgwNzk1NWRiNmE4MjNiMGUyM2I1NDQyMGE4N2Y0ZDQ4YmNmNDAu LjM3NTFkNTlmYjAyMjVmNmMwYzVhNzNjYjg0MmNhNGJkZDAyZWRlZmIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1VzZXJNZWRpYVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclBy b3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Vc2VyTWVkaWFQZXJtaXNzaW9u UmVxdWVzdE1hbmFnZXJQcm94eS5jcHAKQEAgLTMzMSw4ICszMzEsNiBAQCB2b2lkIFVzZXJNZWRp YVBlcm1pc3Npb25SZXF1ZXN0TWFuYWdlclByb3h5OjpyZXF1ZXN0VXNlck1lZGlhUGVybWlzc2lv bkZvckZyYW1lKAogICAgIFVOVVNFRF9QQVJBTShmcmFtZUlEKTsKICAgICBVTlVTRURfUEFSQU0o dXNlck1lZGlhRG9jdW1lbnRPcmlnaW4pOwogICAgIFVOVVNFRF9QQVJBTSh0b3BMZXZlbERvY3Vt ZW50T3JpZ2luKTsKLSAgICBVTlVTRURfUEFSQU0oYXVkaW9Db25zdHJhaW50cyk7Ci0gICAgVU5V U0VEX1BBUkFNKHZpZGVvQ29uc3RyYWludHMpOwogICAgIFVOVVNFRF9QQVJBTSh1c2VyUmVxdWVz dCk7CiAjZW5kaWYKIH0K