223422 2021-03-18 00:52:27 -0700 CSP headers can block default <video> controls 2023-08-27 23:36:47 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=225865 InRadar P2 Normal --- 223487 1 hi hi aakash_jain cdumez cmarcelo code commit-queue eric.carlson esprehn+autocc ews-watchlist fnowak glenn graouts hi jer.noble joepeck kangil.han philipj ryanhaddad sergio webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1741068 0 hi 2021-03-18 00:52:27 -0700 . 1741069 1 hi 2021-03-18 00:52:39 -0700 <rdar://problem/41192193> 1741075 2 423569 hi 2021-03-18 01:00:37 -0700 Created attachment 423569 Patch 1741122 3 ews-feeder 2021-03-18 03:08:02 -0700 Found 30 new test failures: compositing/video/video-object-fit.html, fast/canvas/webgl/texImage2D-video-flipY-true.html, http/tests/contentextensions/text-track-blocked.html, http/tests/inspector/network/resource-mime-type.html, http/tests/security/contentSecurityPolicy/report-only-connect-src-xmlhttprequest-redirect-to-blocked.php, media/modern-media-controls/css/cursor.html, media/modern-media-controls/css/pointer-events-none.html, media/modern-media-controls/css/transformed-media.html, media/modern-media-controls/css/webkit-cursor-visibility-auto-hide.html, media/modern-media-controls/macos-fullscreen-media-controls/macos-fullscreen-media-controls-drag-is-prevented-over-button.html ... 1741273 4 423620 hi 2021-03-18 11:15:07 -0700 Created attachment 423620 Patch I'm pretty sure the test failures were due to not having r274625 yet 🤔 1741376 5 ews-feeder 2021-03-18 13:26:40 -0700 Committed r274669: <https://commits.webkit.org/r274669> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423620. 1741472 6 aakash_jain 2021-03-18 15:55:10 -0700 (In reply to Devin Rousso from comment #4) > I'm pretty sure the test failures were due to not having r274625 yet 🤔 https://ews-build.webkit.org/#/builders/56/builds/3789 used 235479@main (displayed in step 6) which is r274654. https://ews-build.webkit.org/#/builders/60/builds/131 used 235476@main which is r274651 r274654 and r274651 are after r274625. Please check. Also These tests are now crashing on post-commit bots too, e.g.: https://results.webkit.org/?suite=layout-tests&suite=layout-tests&test=http%2Ftests%2Finspector%2Fnetwork%2Fresource-initiatorNode.html&test=http%2Ftests%2Finspector%2Fdom%2FdidFireEvent.html 1741498 7 commit-queue 2021-03-18 16:37:54 -0700 Re-opened since this is blocked by bug 223487 1741565 8 423685 hi 2021-03-18 20:09:47 -0700 Created attachment 423685 Patch 1741695 9 ews-feeder 2021-03-19 07:35:06 -0700 Committed r274717: <https://commits.webkit.org/r274717> All reviewed patches have been landed. Closing bug and clearing flags on attachment 423685. 1841528 10 gsnedders 2022-02-14 19:06:11 -0800 *** Bug 191782 has been marked as a duplicate of this bug. *** 1973864 11 annevk 2023-08-27 23:36:47 -0700 *** Bug 225865 has been marked as a duplicate of this bug. *** 423569 2021-03-18 01:00:37 -0700 2021-03-18 11:15:07 -0700 Patch 423569.diff text/plain 2827 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NWIwMmEzYjBlMDkuLjc0NDA0NDVmYzk1ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIxIEBACisyMDIxLTAzLTE4ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KKworICAgICAgICBDU1AgaGVhZGVycyBjYW4gYmxvY2sgZGVmYXVsdCA8dmlkZW8+IGNvbnRy b2xzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM0 MjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQxMTkyMTkzPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMu CisKKyAgICAgICAgKiBNb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9pY29u LXNlcnZpY2UuanM6CisgICAgICAgIChJY29uU2VydmljZS5wcm90b3R5cGUuaW1hZ2VGb3JJY29u QW5kTGF5b3V0VHJhaXRzKToKKyAgICAgICAgSW4gb3JkZXIgZm9yIGFuIGA8aW1nPmAgdG8gc2tp cCBDU1AgY2hlY2tzIGl0IG11c3QgYmUgYGlzSW5Vc2VyQWdlbnRTaGFkb3dUcmVlYCBiZWZvcmUg c2V0dGluZyBgc3JjYC4KKworICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xz L21haW4uanM6CisgICAgICAgIChjcmVhdGVDb250cm9scyk6CisgICAgICAgIFByb3ZpZGUgdGhl IFVBIGBzaGFkb3dSb290YCB0byB0aGUgYGljb25TZXJ2aWNlYCBzbyBpdCBjYW4gdGVtcG9yYXJp bHkgYXR0YWNoIHRoZSBgPGltZz5gLgorCiAyMDIxLTAzLTE3ICBEZXZpbiBSb3Vzc28gIDxkcm91 c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBkb24ndCBjb3B5IGBpbWFnZU92ZXJsYXkuY3NzYCBv ciBgbWV0ZXJFbGVtZW50U2hhZG93LmNzc2AKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2ljb24tc2VydmljZS5qcyBiL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2ljb24t c2VydmljZS5qcwppbmRleCA3ZmE2ZjdjZWFjNzEuLjdhZWIwZDI3ZWFlZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvaWNv bi1zZXJ2aWNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNv bnRyb2xzL2NvbnRyb2xzL2ljb24tc2VydmljZS5qcwpAQCAtODIsMTEgKzgyLDIwIEBAIGNvbnN0 IGljb25TZXJ2aWNlID0gbmV3IGNsYXNzIEljb25TZXJ2aWNlIHsKIAogICAgICAgICBpbWFnZSA9 IHRoaXMuaW1hZ2VzW3BhdGhdID0gbmV3IEltYWdlOwogCisgICAgICAgIC8vIFByZXZlbnQgdGhp cyBpbWFnZSBmcm9tIGJlaW5nIHNob3duIGlmIGl0J3MgZXZlciBhdHRhY2hlZCB0byB0aGUgRE9N LgorICAgICAgICBpbWFnZS5zdHlsZS5kaXNwbGF5ID0gIm5vbmUiOworCisgICAgICAgIC8vIE11 c3QgYXR0YWNoIHRoZSBgPGltZz5gIHRvIHRoZSBVQSBzaGFkb3cgcm9vdCBiZWZvcmUgc2V0dGlu ZyBgc3JjYCBzbyB0aGF0IGBpc0luVXNlckFnZW50U2hhZG93VHJlZWAgaXMgY29ycmVjdC4KKyAg ICAgICAgdGhpcy5zaGFkb3dSb290Py5hcHBlbmRDaGlsZChpbWFnZSk7CisKICAgICAgICAgaWYg KHRoaXMubWVkaWFDb250cm9sc0hvc3QpCiAgICAgICAgICAgICBpbWFnZS5zcmMgPSBgZGF0YTok e01pbWVUeXBlc1tpY29uLnR5cGVdfTtiYXNlNjQsJHt0aGlzLm1lZGlhQ29udHJvbHNIb3N0LmJh c2U2NFN0cmluZ0Zvckljb25OYW1lQW5kVHlwZShmaWxlTmFtZSwgaWNvbi50eXBlKX1gOwogICAg ICAgICBlbHNlCiAgICAgICAgICAgICBpbWFnZS5zcmMgPSBgJHt0aGlzLmRpcmVjdG9yeVBhdGh9 LyR7cGF0aH1gOwogCisgICAgICAgIC8vIFJlbW92ZSB0aGUgYDxpbWc+YCBmcm9tIHRoZSBzaGFk b3cgcm9vdCBvbmNlIHRoZSBgc3JjYCBoYXMgYmVlbiBzZXQgYXMgYGlzSW5Vc2VyQWdlbnRTaGFk b3dUcmVlYCBoYXMgYWxyZWFkeSBiZWVuIGNoZWNrZWQgYnkgdGhpcyBwb2ludC4KKyAgICAgICAg aW1hZ2UucmVtb3ZlKCk7CisKICAgICAgICAgcmV0dXJuIGltYWdlOwogICAgIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWFpbi5q cyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21haW4uanMK aW5kZXggMDlhY2M5NDU2NWZhLi41NDZlNmE2MTJiOTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21haW4uanMKKysrIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWFpbi5qcwpAQCAtMzQsNyArMzQs MTAgQEAgZnVuY3Rpb24gY3JlYXRlQ29udHJvbHMoc2hhZG93Um9vdCwgbWVkaWEsIGhvc3QpCiB7 CiAgICAgaWYgKGhvc3QpIHsKICAgICAgICAgbWVkaWFDb250cm9sc0hvc3QgPSBob3N0OworCisg ICAgICAgIGljb25TZXJ2aWNlLnNoYWRvd1Jvb3QgPSBzaGFkb3dSb290OwogICAgICAgICBpY29u U2VydmljZS5tZWRpYUNvbnRyb2xzSG9zdCA9IGhvc3Q7CisKICAgICAgICAgc2hhZG93Um9vdC5h cHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzdHlsZSIpKS50ZXh0Q29udGVudCA9 IGhvc3Quc2hhZG93Um9vdENTU1RleHQ7CiAgICAgfQogCg== 423620 2021-03-18 11:15:07 -0700 2021-03-18 20:09:47 -0700 Patch 423569.diff text/plain 2826 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NWIwMmEzYjBlMDkuLjc0NDA0NDVmYzk1ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDIxIEBACisyMDIxLTAzLTE4ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KKworICAgICAgICBDU1AgaGVhZGVycyBjYW4gYmxvY2sgZGVmYXVsdCA8dmlkZW8+IGNvbnRy b2xzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM0 MjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQxMTkyMTkzPgorCisgICAgICAgIFJldmlld2Vk IGJ5IEFudG9pbmUgUXVpbnQuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4K KworICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2ljb24t c2VydmljZS5qczoKKyAgICAgICAgKEljb25TZXJ2aWNlLnByb3RvdHlwZS5pbWFnZUZvckljb25B bmRMYXlvdXRUcmFpdHMpOgorICAgICAgICBJbiBvcmRlciBmb3IgYW4gYDxpbWc+YCB0byBza2lw IENTUCBjaGVja3MgaXQgbXVzdCBiZSBgaXNJblVzZXJBZ2VudFNoYWRvd1RyZWVgIGJlZm9yZSBz ZXR0aW5nIGBzcmNgLgorCisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv bWFpbi5qczoKKyAgICAgICAgKGNyZWF0ZUNvbnRyb2xzKToKKyAgICAgICAgUHJvdmlkZSB0aGUg VUEgYHNoYWRvd1Jvb3RgIHRvIHRoZSBgaWNvblNlcnZpY2VgIHNvIGl0IGNhbiB0ZW1wb3Jhcmls eSBhdHRhY2ggdGhlIGA8aW1nPmAuCisKIDIwMjEtMDMtMTcgIERldmluIFJvdXNzbyAgPGRyb3Vz c29AYXBwbGUuY29tPgogCiAgICAgICAgIGRvbid0IGNvcHkgYGltYWdlT3ZlcmxheS5jc3NgIG9y IGBtZXRlckVsZW1lbnRTaGFkb3cuY3NzYApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9k dWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvaWNvbi1zZXJ2aWNlLmpzIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMvaWNvbi1z ZXJ2aWNlLmpzCmluZGV4IDdmYTZmN2NlYWM3MS4uN2FlYjBkMjdlYWVlIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9pY29u LXNlcnZpY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvY29udHJvbHMvaWNvbi1zZXJ2aWNlLmpzCkBAIC04MiwxMSArODIsMjAgQEAgY29uc3Qg aWNvblNlcnZpY2UgPSBuZXcgY2xhc3MgSWNvblNlcnZpY2UgewogCiAgICAgICAgIGltYWdlID0g dGhpcy5pbWFnZXNbcGF0aF0gPSBuZXcgSW1hZ2U7CiAKKyAgICAgICAgLy8gUHJldmVudCB0aGlz IGltYWdlIGZyb20gYmVpbmcgc2hvd24gaWYgaXQncyBldmVyIGF0dGFjaGVkIHRvIHRoZSBET00u CisgICAgICAgIGltYWdlLnN0eWxlLmRpc3BsYXkgPSAibm9uZSI7CisKKyAgICAgICAgLy8gTXVz dCBhdHRhY2ggdGhlIGA8aW1nPmAgdG8gdGhlIFVBIHNoYWRvdyByb290IGJlZm9yZSBzZXR0aW5n IGBzcmNgIHNvIHRoYXQgYGlzSW5Vc2VyQWdlbnRTaGFkb3dUcmVlYCBpcyBjb3JyZWN0LgorICAg ICAgICB0aGlzLnNoYWRvd1Jvb3Q/LmFwcGVuZENoaWxkKGltYWdlKTsKKwogICAgICAgICBpZiAo dGhpcy5tZWRpYUNvbnRyb2xzSG9zdCkKICAgICAgICAgICAgIGltYWdlLnNyYyA9IGBkYXRhOiR7 TWltZVR5cGVzW2ljb24udHlwZV19O2Jhc2U2NCwke3RoaXMubWVkaWFDb250cm9sc0hvc3QuYmFz ZTY0U3RyaW5nRm9ySWNvbk5hbWVBbmRUeXBlKGZpbGVOYW1lLCBpY29uLnR5cGUpfWA7CiAgICAg ICAgIGVsc2UKICAgICAgICAgICAgIGltYWdlLnNyYyA9IGAke3RoaXMuZGlyZWN0b3J5UGF0aH0v JHtwYXRofWA7CiAKKyAgICAgICAgLy8gUmVtb3ZlIHRoZSBgPGltZz5gIGZyb20gdGhlIHNoYWRv dyByb290IG9uY2UgdGhlIGBzcmNgIGhhcyBiZWVuIHNldCBhcyBgaXNJblVzZXJBZ2VudFNoYWRv d1RyZWVgIGhhcyBhbHJlYWR5IGJlZW4gY2hlY2tlZCBieSB0aGlzIHBvaW50LgorICAgICAgICBp bWFnZS5yZW1vdmUoKTsKKwogICAgICAgICByZXR1cm4gaW1hZ2U7CiAgICAgfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tYWluLmpz IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWFpbi5qcwpp bmRleCAwOWFjYzk0NTY1ZmEuLjU0NmU2YTYxMmI5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvbWFpbi5qcworKysgYi9Tb3VyY2UvV2Vi Q29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tYWluLmpzCkBAIC0zNCw3ICszNCwx MCBAQCBmdW5jdGlvbiBjcmVhdGVDb250cm9scyhzaGFkb3dSb290LCBtZWRpYSwgaG9zdCkKIHsK ICAgICBpZiAoaG9zdCkgewogICAgICAgICBtZWRpYUNvbnRyb2xzSG9zdCA9IGhvc3Q7CisKKyAg ICAgICAgaWNvblNlcnZpY2Uuc2hhZG93Um9vdCA9IHNoYWRvd1Jvb3Q7CiAgICAgICAgIGljb25T ZXJ2aWNlLm1lZGlhQ29udHJvbHNIb3N0ID0gaG9zdDsKKwogICAgICAgICBzaGFkb3dSb290LmFw cGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInN0eWxlIikpLnRleHRDb250ZW50ID0g aG9zdC5zaGFkb3dSb290Q1NTVGV4dDsKICAgICB9CiAK 423685 2021-03-18 20:09:47 -0700 2021-03-19 07:35:08 -0700 Patch 423569.diff text/plain 3681 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3NWIwMmEzYjBlMDkuLjc0NDA0NDVmYzk1ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI1IEBACisyMDIxLTAzLTE4ICBEZXZpbiBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNv bT4KKworICAgICAgICBDU1AgaGVhZGVycyBjYW4gYmxvY2sgZGVmYXVsdCA8dmlkZW8+IGNvbnRy b2xzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjM0 MjIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQxMTkyMTkzPgorCisgICAgICAgIFJldmlld2Vk IGJ5IEFudG9pbmUgUXVpbnQuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4K KworICAgICAgICAqIE1vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2ljb24t c2VydmljZS5qczoKKyAgICAgICAgKEljb25TZXJ2aWNlLnByb3RvdHlwZS5pbWFnZUZvckljb25B bmRMYXlvdXRUcmFpdHMpOgorICAgICAgICBJbiBvcmRlciBmb3IgYW4gYDxpbWc+YCB0byBza2lw IENTUCBjaGVja3MgaXQgbXVzdCBiZSBgaXNJblVzZXJBZ2VudFNoYWRvd1RyZWVgIGJlZm9yZSBz ZXR0aW5nIGBzcmNgLgorCisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMv bWFpbi5qczoKKyAgICAgICAgKGNyZWF0ZUNvbnRyb2xzKToKKyAgICAgICAgUHJvdmlkZSB0aGUg VUEgYHNoYWRvd1Jvb3RgIHRvIHRoZSBgaWNvblNlcnZpY2VgIHNvIGl0IGNhbiB0ZW1wb3Jhcmls eSBhdHRhY2ggdGhlIGA8aW1nPmAuCisKKyAgICAgICAgKiBkb20vRWxlbWVudC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpFbGVtZW50OjphZGRTaGFkb3dSb290KToKKyAgICAgICAgV2ViIEluc3Bl Y3RvciBzaG91bGQgYmUgbm90aWZpZWQgYWJvdXQgbmV3IFVBIHNoYWRvdyByb290cyBiZWZvcmUg dGhleSdyZSBtb2RpZmllZC4KKwogMjAyMS0wMy0xNyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0Bh cHBsZS5jb20+CiAKICAgICAgICAgZG9uJ3QgY29weSBgaW1hZ2VPdmVybGF5LmNzc2Agb3IgYG1l dGVyRWxlbWVudFNoYWRvdy5jc3NgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9pY29uLXNlcnZpY2UuanMgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scy9pY29uLXNlcnZp Y2UuanMKaW5kZXggN2ZhNmY3Y2VhYzcxLi43YWViMGQyN2VhZWUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzL2ljb24tc2Vy dmljZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9s cy9jb250cm9scy9pY29uLXNlcnZpY2UuanMKQEAgLTgyLDExICs4MiwyMCBAQCBjb25zdCBpY29u U2VydmljZSA9IG5ldyBjbGFzcyBJY29uU2VydmljZSB7CiAKICAgICAgICAgaW1hZ2UgPSB0aGlz LmltYWdlc1twYXRoXSA9IG5ldyBJbWFnZTsKIAorICAgICAgICAvLyBQcmV2ZW50IHRoaXMgaW1h Z2UgZnJvbSBiZWluZyBzaG93biBpZiBpdCdzIGV2ZXIgYXR0YWNoZWQgdG8gdGhlIERPTS4KKyAg ICAgICAgaW1hZ2Uuc3R5bGUuZGlzcGxheSA9ICJub25lIjsKKworICAgICAgICAvLyBNdXN0IGF0 dGFjaCB0aGUgYDxpbWc+YCB0byB0aGUgVUEgc2hhZG93IHJvb3QgYmVmb3JlIHNldHRpbmcgYHNy Y2Agc28gdGhhdCBgaXNJblVzZXJBZ2VudFNoYWRvd1RyZWVgIGlzIGNvcnJlY3QuCisgICAgICAg IHRoaXMuc2hhZG93Um9vdD8uYXBwZW5kQ2hpbGQoaW1hZ2UpOworCiAgICAgICAgIGlmICh0aGlz Lm1lZGlhQ29udHJvbHNIb3N0KQogICAgICAgICAgICAgaW1hZ2Uuc3JjID0gYGRhdGE6JHtNaW1l VHlwZXNbaWNvbi50eXBlXX07YmFzZTY0LCR7dGhpcy5tZWRpYUNvbnRyb2xzSG9zdC5iYXNlNjRT dHJpbmdGb3JJY29uTmFtZUFuZFR5cGUoZmlsZU5hbWUsIGljb24udHlwZSl9YDsKICAgICAgICAg ZWxzZQogICAgICAgICAgICAgaW1hZ2Uuc3JjID0gYCR7dGhpcy5kaXJlY3RvcnlQYXRofS8ke3Bh dGh9YDsKIAorICAgICAgICAvLyBSZW1vdmUgdGhlIGA8aW1nPmAgZnJvbSB0aGUgc2hhZG93IHJv b3Qgb25jZSB0aGUgYHNyY2AgaGFzIGJlZW4gc2V0IGFzIGBpc0luVXNlckFnZW50U2hhZG93VHJl ZWAgaGFzIGFscmVhZHkgYmVlbiBjaGVja2VkIGJ5IHRoaXMgcG9pbnQuCisgICAgICAgIGltYWdl LnJlbW92ZSgpOworCiAgICAgICAgIHJldHVybiBpbWFnZTsKICAgICB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21haW4uanMgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tYWluLmpzCmluZGV4 IDA5YWNjOTQ1NjVmYS4uNTQ2ZTZhNjEyYjk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9tYWluLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21haW4uanMKQEAgLTM0LDcgKzM0LDEwIEBA IGZ1bmN0aW9uIGNyZWF0ZUNvbnRyb2xzKHNoYWRvd1Jvb3QsIG1lZGlhLCBob3N0KQogewogICAg IGlmIChob3N0KSB7CiAgICAgICAgIG1lZGlhQ29udHJvbHNIb3N0ID0gaG9zdDsKKworICAgICAg ICBpY29uU2VydmljZS5zaGFkb3dSb290ID0gc2hhZG93Um9vdDsKICAgICAgICAgaWNvblNlcnZp Y2UubWVkaWFDb250cm9sc0hvc3QgPSBob3N0OworCiAgICAgICAgIHNoYWRvd1Jvb3QuYXBwZW5k Q2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3R5bGUiKSkudGV4dENvbnRlbnQgPSBob3N0 LnNoYWRvd1Jvb3RDU1NUZXh0OwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmluZGV4IDdi YmE3Njk3NTg1Ni4uYmVhOTIwNDJhMWYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC0yMzU0 LDEzICsyMzU0LDEzIEBAIHZvaWQgRWxlbWVudDo6YWRkU2hhZG93Um9vdChSZWY8U2hhZG93Um9v dD4mJiBuZXdTaGFkb3dSb290KQogICAgICAgICBub3RpZnlDaGlsZE5vZGVJbnNlcnRlZCgqdGhp cywgc2hhZG93Um9vdCk7CiAjZW5kaWYKIAorICAgICAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OmRpZFB1c2hTaGFkb3dSb290KCp0aGlzLCBzaGFkb3dSb290KTsKKwogICAgICAgICBpbnZh bGlkYXRlU3R5bGVBbmRSZW5kZXJlcnNGb3JTdWJ0cmVlKCk7CiAgICAgfQogCiAgICAgaWYgKHNo YWRvd1Jvb3QubW9kZSgpID09IFNoYWRvd1Jvb3RNb2RlOjpVc2VyQWdlbnQpCiAgICAgICAgIGRp ZEFkZFVzZXJBZ2VudFNoYWRvd1Jvb3Qoc2hhZG93Um9vdCk7Ci0KLSAgICBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246OmRpZFB1c2hTaGFkb3dSb290KCp0aGlzLCBzaGFkb3dSb290KTsKIH0KIAog dm9pZCBFbGVtZW50OjpyZW1vdmVTaGFkb3dSb290KCkK