225734 2021-05-12 22:11:18 -0700 [iOS] REGRESSION(r271216) pointerevents/ios/pointer-events-no-mousedown-when-prevent-default-called-on-pointerdown.html is consistently failing 2021-05-13 16:20:15 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 220072 1 hi hi graouts hi thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1759546 0 hi 2021-05-12 22:11:18 -0700 ``` --- ios-simulator-wk2-tests/build/OpenSource/layout-test-results/pointerevents/ios/pointer-events-no-mousedown-when-prevent-default-called-on-pointerdown-expected.txt +++ ios-simulator-wk2-tests/build/OpenSource/layout-test-results/pointerevents/ios/pointer-events-no-mousedown-when-prevent-default-called-on-pointerdown-actual.txt @@ -1,3 +1,7 @@ +CONSOLE MESSAGE: Error: assert_unreached: The mousedown event should not be dispatched after calling preventDefault() during pointerdown. Reached unreachable code +CONSOLE MESSAGE: Error: assert_unreached: The mouseup event should not be dispatched after calling preventDefault() during pointerdown. Reached unreachable code + +Harness Error (FAIL), message = Error: assert_unreached: The mouseup event should not be dispatched after calling preventDefault() during pointerdown. Reached unreachable code PASS Testing that calling preventDefault() during a "pointerdown" event prevents compatibility events from being dispatched. ``` 1759547 1 hi 2021-05-12 22:11:35 -0700 <rdar://problem/77070765> 1759548 2 428459 hi 2021-05-12 22:12:27 -0700 Created attachment 428459 Patch 1759558 3 428459 wenson_hsieh 2021-05-12 23:08:50 -0700 Comment on attachment 428459 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428459&action=review > Source/WebCore/ChangeLog:14 > + Instead of fully removing the `CapturingData` entirely, change it's state such that it's Nit - the first "it's" should be "its" > Source/WebCore/page/PointerCaptureController.cpp:329 > - if (capturingData.pointerType == touchPointerEventType() && capturingData.pointerIsPressed && !capturingData.cancelled) > + if (capturingData.pointerType == touchPointerEventType() && capturingData.state == CapturingData::State::Ready) Was removing the check for `capturingData.pointerIsPressed` intentional? 1759563 4 428459 hi 2021-05-12 23:47:52 -0700 Comment on attachment 428459 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428459&action=review >> Source/WebCore/page/PointerCaptureController.cpp:329 >> + if (capturingData.pointerType == touchPointerEventType() && capturingData.state == CapturingData::State::Ready) > > Was removing the check for `capturingData.pointerIsPressed` intentional? Yes. This was my attempt at "only include things that are active" in r271216, but as I mentioned in the ChangeLog because mouse events are dispatched after, it'd no longer be `pointerIsPressed` by that point anyways. 1759847 5 428565 hi 2021-05-13 14:58:46 -0700 Created attachment 428565 Patch 1759880 6 ews-feeder 2021-05-13 16:20:14 -0700 Committed r277463 (237706@main): <https://commits.webkit.org/237706@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428565. 428459 2021-05-12 22:12:27 -0700 2021-05-13 14:58:46 -0700 Patch bug-225734-20210512231226.patch text/plain 5021 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjOTFkODA2ZDAzNDdjOWQwZGVlMjZhMzc5YzVhNmJmOGU3NDNkNmFiLi5i ODYyMmM1MWI5NzJhYjllNzM0Njk5NDYyM2I1ZmMyZmRlOGQ2YWNmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjYgQEAKKzIwMjEtMDUtMTIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFtpT1NdIFJFR1JFU1NJT04ocjI3MTIxNikgcG9pbnRlcmV2ZW50cy9pb3Mv cG9pbnRlci1ldmVudHMtbm8tbW91c2Vkb3duLXdoZW4tcHJldmVudC1kZWZhdWx0LWNhbGxlZC1v bi1wb2ludGVyZG93bi5odG1sIGlzIGNvbnNpc3RlbnRseSBmYWlsaW5nCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU3MzQKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzc3MDcwNzY1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIHIyNzEyMTYgbWFkZSBpdCBzbyB0aGF0IGB0b3VjaFdpdGhJZGVudGlmaWVy V2FzUmVtb3ZlZGAgaXMgZWFnZXJseSBjYWxsZWQgd2hlbiBkaXNwYXRjaGluZworICAgICAgICBg InBvaW50ZXJ1cCJgIGZvciBhIHRvdWNoIGV2ZW50LiBUaGlzIGlzIHByb2JsZW1hdGljIGJlY2F1 c2UgKGNvbXBhdGliaWxpdHkpIG1vdXNlIGV2ZW50cworICAgICAgICBhcmUgZGlzcGF0Y2hlZCBh ZnRlciBib3RoIHBvaW50ZXIgYW5kIHRvdWNoIGV2ZW50cywgbWVhbmluZyB0aGF0IGlmIHRoZSBg Q2FwdHVyaW5nRGF0YWAgZm9yCisgICAgICAgIHRoZSB0b3VjaCBldmVudCBpcyByZW1vdmVkLCB0 aGVyZSdzIG5vIHdheSBvZiBrbm93aW5nIGlmIHRoZSBwb2ludGVyIGV2ZW50IGBwcmV2ZW50RGVm YXVsdGAuCisKKyAgICAgICAgSW5zdGVhZCBvZiBmdWxseSByZW1vdmluZyB0aGUgYENhcHR1cmlu Z0RhdGFgIGVudGlyZWx5LCBjaGFuZ2UgaXQncyBzdGF0ZSBzdWNoIHRoYXQgaXQncworICAgICAg ICBtYXJrZWQgYXMgYENhcHR1cmluZ0RhdGE6OlN0YXRlOjpGaW5pc2hlZGAgYW5kIGNoZWNrIGZv ciB0aGF0IGluc3RlYWQuCisKKyAgICAgICAgKiBwYWdlL1BvaW50ZXJDYXB0dXJlQ29udHJvbGxl ci5oOgorICAgICAgICAqIHBhZ2UvUG9pbnRlckNhcHR1cmVDb250cm9sbGVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlBvaW50ZXJDYXB0dXJlQ29udHJvbGxlcjo6aGFzQ2FuY2VsbGVkUG9pbnRl ckV2ZW50Rm9ySWRlbnRpZmllciBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpQb2ludGVyQ2Fw dHVyZUNvbnRyb2xsZXI6OmRpc3BhdGNoRXZlbnRGb3JUb3VjaEF0SW5kZXgpOgorICAgICAgICAo V2ViQ29yZTo6UG9pbnRlckNhcHR1cmVDb250cm9sbGVyOjpwb2ludGVyRXZlbnRGb3JNb3VzZUV2 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBvaW50ZXJDYXB0dXJlQ29udHJvbGxlcjo6Y2FuY2Vs UG9pbnRlcik6CisKIDIwMjEtMDUtMTIgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4K IAogICAgICAgICBBU1NFUlRJT04gRkFJTEVEOiBhY3R1YWxWVGFibGVQb2ludGVyID09IGV4cGVj dGVkVlRhYmxlUG9pbnRlciBpbiB0b0pTTmV3bHlDcmVhdGVkKEpTQzo6SlNHbG9iYWxPYmplY3Qg KiwgV2ViQ29yZTo6SlNET01HbG9iYWxPYmplY3QgKiwgUmVmPFdlYkNvcmU6OkF1ZGlvTm9kZT4g JiYpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BvaW50ZXJDYXB0dXJlQ29udHJv bGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BvaW50ZXJDYXB0dXJlQ29udHJvbGxlci5j cHAKaW5kZXggZjI5ZjUzNjhmMDRiMDE0MGMzMzhlNzFlMTRjZWVhZTM1OTY4MTVkNC4uMjkwM2U5 MzRlYmY1Y2YwZTc1NWQ4MTdkNzc4NzE3ZmUwMWFlMDY2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGFnZS9Qb2ludGVyQ2FwdHVyZUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvUG9pbnRlckNhcHR1cmVDb250cm9sbGVyLmNwcApAQCAtMTkzLDcgKzE5Myw3IEBA IHZvaWQgUG9pbnRlckNhcHR1cmVDb250cm9sbGVyOjp0b3VjaFdpdGhJZGVudGlmaWVyV2FzUmVt b3ZlZChQb2ludGVySUQgcG9pbnRlcklkCiBib29sIFBvaW50ZXJDYXB0dXJlQ29udHJvbGxlcjo6 aGFzQ2FuY2VsbGVkUG9pbnRlckV2ZW50Rm9ySWRlbnRpZmllcihQb2ludGVySUQgcG9pbnRlcklk KSBjb25zdAogewogICAgIGF1dG8gaXRlcmF0b3IgPSBtX2FjdGl2ZVBvaW50ZXJJZHNUb0NhcHR1 cmluZ0RhdGEuZmluZChwb2ludGVySWQpOwotICAgIHJldHVybiBpdGVyYXRvciAhPSBtX2FjdGl2 ZVBvaW50ZXJJZHNUb0NhcHR1cmluZ0RhdGEuZW5kKCkgJiYgaXRlcmF0b3ItPnZhbHVlLmNhbmNl bGxlZDsKKyAgICByZXR1cm4gaXRlcmF0b3IgIT0gbV9hY3RpdmVQb2ludGVySWRzVG9DYXB0dXJp bmdEYXRhLmVuZCgpICYmIGl0ZXJhdG9yLT52YWx1ZS5zdGF0ZSA9PSBDYXB0dXJpbmdEYXRhOjpT dGF0ZTo6Q2FuY2VsbGVkOwogfQogCiBib29sIFBvaW50ZXJDYXB0dXJlQ29udHJvbGxlcjo6cHJl dmVudHNDb21wYXRpYmlsaXR5TW91c2VFdmVudHNGb3JJZGVudGlmaWVyKFBvaW50ZXJJRCBwb2lu dGVySWQpIGNvbnN0CkBAIC0zMTYsOCArMzE2LDcgQEAgdm9pZCBQb2ludGVyQ2FwdHVyZUNvbnRy b2xsZXI6OmRpc3BhdGNoRXZlbnRGb3JUb3VjaEF0SW5kZXgoRXZlbnRUYXJnZXQmIHRhcmdldCwK ICAgICAgICAgZGlzcGF0Y2hPdmVyT3JPdXRFdmVudChldmVudE5hbWVzKCkucG9pbnRlcm91dEV2 ZW50LCBjdXJyZW50VGFyZ2V0LmdldCgpKTsKICAgICAgICAgZGlzcGF0Y2hFbnRlck9yTGVhdmVF dmVudChldmVudE5hbWVzKCkucG9pbnRlcmxlYXZlRXZlbnQpOwogICAgICAgICBjYXB0dXJpbmdE YXRhLnByZXZpb3VzVGFyZ2V0ID0gbnVsbHB0cjsKLQotICAgICAgICB0b3VjaFdpdGhJZGVudGlm aWVyV2FzUmVtb3ZlZChwb2ludGVyRXZlbnQtPnBvaW50ZXJJZCgpKTsKKyAgICAgICAgY2FwdHVy aW5nRGF0YS5zdGF0ZSA9IENhcHR1cmluZ0RhdGE6OlN0YXRlOjpGaW5pc2hlZDsKICAgICB9CiB9 CiAjZW5kaWYKQEAgLTMyNyw3ICszMjYsNyBAQCBSZWZQdHI8UG9pbnRlckV2ZW50PiBQb2ludGVy Q2FwdHVyZUNvbnRyb2xsZXI6OnBvaW50ZXJFdmVudEZvck1vdXNlRXZlbnQoY29uc3QgTQogICAg IC8vIElmIHdlIGFscmVhZHkgaGF2ZSBrbm93biB0b3VjaGVzIHRoZW4gd2UgY2Fubm90IGRpc3Bh dGNoIGEgbW91c2UgZXZlbnQsCiAgICAgLy8gZm9yIGluc3RhbmNlIGluIHRoZSBjYXNlIG9mIGEg bG9uZyBwcmVzcyB0byBpbml0aWF0ZSBhIHN5c3RlbSBkcmFnLgogICAgIGZvciAoYXV0byYgY2Fw dHVyaW5nRGF0YSA6IG1fYWN0aXZlUG9pbnRlcklkc1RvQ2FwdHVyaW5nRGF0YS52YWx1ZXMoKSkg ewotICAgICAgICBpZiAoY2FwdHVyaW5nRGF0YS5wb2ludGVyVHlwZSA9PSB0b3VjaFBvaW50ZXJF dmVudFR5cGUoKSAmJiBjYXB0dXJpbmdEYXRhLnBvaW50ZXJJc1ByZXNzZWQgJiYgIWNhcHR1cmlu Z0RhdGEuY2FuY2VsbGVkKQorICAgICAgICBpZiAoY2FwdHVyaW5nRGF0YS5wb2ludGVyVHlwZSA9 PSB0b3VjaFBvaW50ZXJFdmVudFR5cGUoKSAmJiBjYXB0dXJpbmdEYXRhLnN0YXRlID09IENhcHR1 cmluZ0RhdGE6OlN0YXRlOjpSZWFkeSkKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwogICAg IH0KIApAQCAtNDg0LDExICs0ODMsMTEgQEAgdm9pZCBQb2ludGVyQ2FwdHVyZUNvbnRyb2xsZXI6 OmNhbmNlbFBvaW50ZXIoUG9pbnRlcklEIHBvaW50ZXJJZCwgY29uc3QgSW50UG9pbnQKICAgICAg ICAgcmV0dXJuOwogCiAgICAgYXV0byYgY2FwdHVyaW5nRGF0YSA9IGl0ZXJhdG9yLT52YWx1ZTsK LSAgICBpZiAoY2FwdHVyaW5nRGF0YS5jYW5jZWxsZWQpCisgICAgaWYgKGNhcHR1cmluZ0RhdGEu c3RhdGUgPT0gQ2FwdHVyaW5nRGF0YTo6U3RhdGU6OkNhbmNlbGxlZCkKICAgICAgICAgcmV0dXJu OwogCiAgICAgY2FwdHVyaW5nRGF0YS5wZW5kaW5nVGFyZ2V0T3ZlcnJpZGUgPSBudWxscHRyOwot ICAgIGNhcHR1cmluZ0RhdGEuY2FuY2VsbGVkID0gdHJ1ZTsKKyAgICBjYXB0dXJpbmdEYXRhLnN0 YXRlID0gQ2FwdHVyaW5nRGF0YTo6U3RhdGU6OkNhbmNlbGxlZDsKIAogI2lmIEVOQUJMRShUT1VD SF9FVkVOVFMpICYmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgY2FwdHVyaW5nRGF0YS5wcmV2 aW91c1RhcmdldCA9IG51bGxwdHI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1Bv aW50ZXJDYXB0dXJlQ29udHJvbGxlci5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Qb2ludGVyQ2Fw dHVyZUNvbnRyb2xsZXIuaAppbmRleCA1NmMxYTIzNmRiMjUyMmMzM2FkODg4MjI2MDJmNWU3NjQ2 NmM2OTdlLi4yN2VlNzk0Nzc5MTUyZjExM2I0OTM5MWU0ZTU5NjE0Y2I1Nzk0NzY0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BvaW50ZXJDYXB0dXJlQ29udHJvbGxlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUG9pbnRlckNhcHR1cmVDb250cm9sbGVyLmgKQEAgLTgzLDcg KzgzLDEyIEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgOwogICAgICAgICB9CiAgICAgICAg IFN0cmluZyBwb2ludGVyVHlwZTsKLSAgICAgICAgYm9vbCBjYW5jZWxsZWQgeyBmYWxzZSB9Owor ICAgICAgICBlbnVtIGNsYXNzIFN0YXRlIDogdWludDhfdCB7CisgICAgICAgICAgICBSZWFkeSwK KyAgICAgICAgICAgIEZpbmlzaGVkLAorICAgICAgICAgICAgQ2FuY2VsbGVkLAorICAgICAgICB9 OworICAgICAgICBTdGF0ZSBzdGF0ZSB7IFN0YXRlOjpSZWFkeSB9OwogICAgICAgICBib29sIGlz UHJpbWFyeSB7IGZhbHNlIH07CiAgICAgICAgIGJvb2wgcHJldmVudHNDb21wYXRpYmlsaXR5TW91 c2VFdmVudHMgeyBmYWxzZSB9OwogICAgICAgICBib29sIHBvaW50ZXJJc1ByZXNzZWQgeyBmYWxz ZSB9Owo= 428565 2021-05-13 14:58:46 -0700 2021-05-13 16:20:15 -0700 Patch 225734.diff text/plain 5020 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjOTFkODA2ZDAzNDdjOWQwZGVlMjZhMzc5YzVhNmJmOGU3NDNkNmFiLi5i ODYyMmM1MWI5NzJhYjllNzM0Njk5NDYyM2I1ZmMyZmRlOGQ2YWNmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjYgQEAKKzIwMjEtMDUtMTMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFtpT1NdIFJFR1JFU1NJT04ocjI3MTIxNikgcG9pbnRlcmV2ZW50cy9pb3Mv cG9pbnRlci1ldmVudHMtbm8tbW91c2Vkb3duLXdoZW4tcHJldmVudC1kZWZhdWx0LWNhbGxlZC1v bi1wb2ludGVyZG93bi5odG1sIGlzIGNvbnNpc3RlbnRseSBmYWlsaW5nCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU3MzQKKyAgICAgICAgPHJkYXI6 Ly9wcm9ibGVtLzc3MDcwNzY1PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIHIyNzEyMTYgbWFkZSBpdCBzbyB0aGF0IGB0b3VjaFdpdGhJZGVudGlmaWVy V2FzUmVtb3ZlZGAgaXMgZWFnZXJseSBjYWxsZWQgd2hlbiBkaXNwYXRjaGluZworICAgICAgICBg InBvaW50ZXJ1cCJgIGZvciBhIHRvdWNoIGV2ZW50LiBUaGlzIGlzIHByb2JsZW1hdGljIGJlY2F1 c2UgKGNvbXBhdGliaWxpdHkpIG1vdXNlIGV2ZW50cworICAgICAgICBhcmUgZGlzcGF0Y2hlZCBh ZnRlciBib3RoIHBvaW50ZXIgYW5kIHRvdWNoIGV2ZW50cywgbWVhbmluZyB0aGF0IGlmIHRoZSBg Q2FwdHVyaW5nRGF0YWAgZm9yCisgICAgICAgIHRoZSB0b3VjaCBldmVudCBpcyByZW1vdmVkLCB0 aGVyZSdzIG5vIHdheSBvZiBrbm93aW5nIGlmIHRoZSBwb2ludGVyIGV2ZW50IGBwcmV2ZW50RGVm YXVsdGAuCisKKyAgICAgICAgSW5zdGVhZCBvZiBmdWxseSByZW1vdmluZyB0aGUgYENhcHR1cmlu Z0RhdGFgIGVudGlyZWx5LCBjaGFuZ2UgaXRzIHN0YXRlIHN1Y2ggdGhhdCBpdCdzCisgICAgICAg IG1hcmtlZCBhcyBgQ2FwdHVyaW5nRGF0YTo6U3RhdGU6OkZpbmlzaGVkYCBhbmQgY2hlY2sgZm9y IHRoYXQgaW5zdGVhZC4KKworICAgICAgICAqIHBhZ2UvUG9pbnRlckNhcHR1cmVDb250cm9sbGVy Lmg6CisgICAgICAgICogcGFnZS9Qb2ludGVyQ2FwdHVyZUNvbnRyb2xsZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UG9pbnRlckNhcHR1cmVDb250cm9sbGVyOjpoYXNDYW5jZWxsZWRQb2ludGVy RXZlbnRGb3JJZGVudGlmaWVyIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OlBvaW50ZXJDYXB0 dXJlQ29udHJvbGxlcjo6ZGlzcGF0Y2hFdmVudEZvclRvdWNoQXRJbmRleCk6CisgICAgICAgIChX ZWJDb3JlOjpQb2ludGVyQ2FwdHVyZUNvbnRyb2xsZXI6OnBvaW50ZXJFdmVudEZvck1vdXNlRXZl bnQpOgorICAgICAgICAoV2ViQ29yZTo6UG9pbnRlckNhcHR1cmVDb250cm9sbGVyOjpjYW5jZWxQ b2ludGVyKToKKwogMjAyMS0wNS0xMiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgog CiAgICAgICAgIEFTU0VSVElPTiBGQUlMRUQ6IGFjdHVhbFZUYWJsZVBvaW50ZXIgPT0gZXhwZWN0 ZWRWVGFibGVQb2ludGVyIGluIHRvSlNOZXdseUNyZWF0ZWQoSlNDOjpKU0dsb2JhbE9iamVjdCAq LCBXZWJDb3JlOjpKU0RPTUdsb2JhbE9iamVjdCAqLCBSZWY8V2ViQ29yZTo6QXVkaW9Ob2RlPiAm JikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUG9pbnRlckNhcHR1cmVDb250cm9s bGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUG9pbnRlckNhcHR1cmVDb250cm9sbGVyLmNw cAppbmRleCBmMjlmNTM2OGYwNGIwMTQwYzMzOGU3MWUxNGNlZWFlMzU5NjgxNWQ0Li4yOTAzZTkz NGViZjVjZjBlNzU1ZDgxN2Q3Nzg3MTdmZTAxYWUwNjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1BvaW50ZXJDYXB0dXJlQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9Qb2ludGVyQ2FwdHVyZUNvbnRyb2xsZXIuY3BwCkBAIC0xOTMsNyArMTkzLDcgQEAg dm9pZCBQb2ludGVyQ2FwdHVyZUNvbnRyb2xsZXI6OnRvdWNoV2l0aElkZW50aWZpZXJXYXNSZW1v dmVkKFBvaW50ZXJJRCBwb2ludGVySWQKIGJvb2wgUG9pbnRlckNhcHR1cmVDb250cm9sbGVyOjpo YXNDYW5jZWxsZWRQb2ludGVyRXZlbnRGb3JJZGVudGlmaWVyKFBvaW50ZXJJRCBwb2ludGVySWQp IGNvbnN0CiB7CiAgICAgYXV0byBpdGVyYXRvciA9IG1fYWN0aXZlUG9pbnRlcklkc1RvQ2FwdHVy aW5nRGF0YS5maW5kKHBvaW50ZXJJZCk7Ci0gICAgcmV0dXJuIGl0ZXJhdG9yICE9IG1fYWN0aXZl UG9pbnRlcklkc1RvQ2FwdHVyaW5nRGF0YS5lbmQoKSAmJiBpdGVyYXRvci0+dmFsdWUuY2FuY2Vs bGVkOworICAgIHJldHVybiBpdGVyYXRvciAhPSBtX2FjdGl2ZVBvaW50ZXJJZHNUb0NhcHR1cmlu Z0RhdGEuZW5kKCkgJiYgaXRlcmF0b3ItPnZhbHVlLnN0YXRlID09IENhcHR1cmluZ0RhdGE6OlN0 YXRlOjpDYW5jZWxsZWQ7CiB9CiAKIGJvb2wgUG9pbnRlckNhcHR1cmVDb250cm9sbGVyOjpwcmV2 ZW50c0NvbXBhdGliaWxpdHlNb3VzZUV2ZW50c0ZvcklkZW50aWZpZXIoUG9pbnRlcklEIHBvaW50 ZXJJZCkgY29uc3QKQEAgLTMxNiw4ICszMTYsNyBAQCB2b2lkIFBvaW50ZXJDYXB0dXJlQ29udHJv bGxlcjo6ZGlzcGF0Y2hFdmVudEZvclRvdWNoQXRJbmRleChFdmVudFRhcmdldCYgdGFyZ2V0LAog ICAgICAgICBkaXNwYXRjaE92ZXJPck91dEV2ZW50KGV2ZW50TmFtZXMoKS5wb2ludGVyb3V0RXZl bnQsIGN1cnJlbnRUYXJnZXQuZ2V0KCkpOwogICAgICAgICBkaXNwYXRjaEVudGVyT3JMZWF2ZUV2 ZW50KGV2ZW50TmFtZXMoKS5wb2ludGVybGVhdmVFdmVudCk7CiAgICAgICAgIGNhcHR1cmluZ0Rh dGEucHJldmlvdXNUYXJnZXQgPSBudWxscHRyOwotCi0gICAgICAgIHRvdWNoV2l0aElkZW50aWZp ZXJXYXNSZW1vdmVkKHBvaW50ZXJFdmVudC0+cG9pbnRlcklkKCkpOworICAgICAgICBjYXB0dXJp bmdEYXRhLnN0YXRlID0gQ2FwdHVyaW5nRGF0YTo6U3RhdGU6OkZpbmlzaGVkOwogICAgIH0KIH0K ICNlbmRpZgpAQCAtMzI3LDcgKzMyNiw3IEBAIFJlZlB0cjxQb2ludGVyRXZlbnQ+IFBvaW50ZXJD YXB0dXJlQ29udHJvbGxlcjo6cG9pbnRlckV2ZW50Rm9yTW91c2VFdmVudChjb25zdCBNCiAgICAg Ly8gSWYgd2UgYWxyZWFkeSBoYXZlIGtub3duIHRvdWNoZXMgdGhlbiB3ZSBjYW5ub3QgZGlzcGF0 Y2ggYSBtb3VzZSBldmVudCwKICAgICAvLyBmb3IgaW5zdGFuY2UgaW4gdGhlIGNhc2Ugb2YgYSBs b25nIHByZXNzIHRvIGluaXRpYXRlIGEgc3lzdGVtIGRyYWcuCiAgICAgZm9yIChhdXRvJiBjYXB0 dXJpbmdEYXRhIDogbV9hY3RpdmVQb2ludGVySWRzVG9DYXB0dXJpbmdEYXRhLnZhbHVlcygpKSB7 Ci0gICAgICAgIGlmIChjYXB0dXJpbmdEYXRhLnBvaW50ZXJUeXBlID09IHRvdWNoUG9pbnRlckV2 ZW50VHlwZSgpICYmIGNhcHR1cmluZ0RhdGEucG9pbnRlcklzUHJlc3NlZCAmJiAhY2FwdHVyaW5n RGF0YS5jYW5jZWxsZWQpCisgICAgICAgIGlmIChjYXB0dXJpbmdEYXRhLnBvaW50ZXJUeXBlID09 IHRvdWNoUG9pbnRlckV2ZW50VHlwZSgpICYmIGNhcHR1cmluZ0RhdGEuc3RhdGUgPT0gQ2FwdHVy aW5nRGF0YTo6U3RhdGU6OlJlYWR5KQogICAgICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAg fQogCkBAIC00ODQsMTEgKzQ4MywxMSBAQCB2b2lkIFBvaW50ZXJDYXB0dXJlQ29udHJvbGxlcjo6 Y2FuY2VsUG9pbnRlcihQb2ludGVySUQgcG9pbnRlcklkLCBjb25zdCBJbnRQb2ludAogICAgICAg ICByZXR1cm47CiAKICAgICBhdXRvJiBjYXB0dXJpbmdEYXRhID0gaXRlcmF0b3ItPnZhbHVlOwot ICAgIGlmIChjYXB0dXJpbmdEYXRhLmNhbmNlbGxlZCkKKyAgICBpZiAoY2FwdHVyaW5nRGF0YS5z dGF0ZSA9PSBDYXB0dXJpbmdEYXRhOjpTdGF0ZTo6Q2FuY2VsbGVkKQogICAgICAgICByZXR1cm47 CiAKICAgICBjYXB0dXJpbmdEYXRhLnBlbmRpbmdUYXJnZXRPdmVycmlkZSA9IG51bGxwdHI7Ci0g ICAgY2FwdHVyaW5nRGF0YS5jYW5jZWxsZWQgPSB0cnVlOworICAgIGNhcHR1cmluZ0RhdGEuc3Rh dGUgPSBDYXB0dXJpbmdEYXRhOjpTdGF0ZTo6Q2FuY2VsbGVkOwogCiAjaWYgRU5BQkxFKFRPVUNI X0VWRU5UUykgJiYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKICAgICBjYXB0dXJpbmdEYXRhLnByZXZp b3VzVGFyZ2V0ID0gbnVsbHB0cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUG9p bnRlckNhcHR1cmVDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BvaW50ZXJDYXB0 dXJlQ29udHJvbGxlci5oCmluZGV4IDU2YzFhMjM2ZGIyNTIyYzMzYWQ4ODgyMjYwMmY1ZTc2NDY2 YzY5N2UuLjI3ZWU3OTQ3NzkxNTJmMTEzYjQ5MzkxZTRlNTk2MTRjYjU3OTQ3NjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUG9pbnRlckNhcHR1cmVDb250cm9sbGVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9Qb2ludGVyQ2FwdHVyZUNvbnRyb2xsZXIuaApAQCAtODMsNyAr ODMsMTIgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICA7CiAgICAgICAgIH0KICAgICAgICAg U3RyaW5nIHBvaW50ZXJUeXBlOwotICAgICAgICBib29sIGNhbmNlbGxlZCB7IGZhbHNlIH07Cisg ICAgICAgIGVudW0gY2xhc3MgU3RhdGUgOiB1aW50OF90IHsKKyAgICAgICAgICAgIFJlYWR5LAor ICAgICAgICAgICAgRmluaXNoZWQsCisgICAgICAgICAgICBDYW5jZWxsZWQsCisgICAgICAgIH07 CisgICAgICAgIFN0YXRlIHN0YXRlIHsgU3RhdGU6OlJlYWR5IH07CiAgICAgICAgIGJvb2wgaXNQ cmltYXJ5IHsgZmFsc2UgfTsKICAgICAgICAgYm9vbCBwcmV2ZW50c0NvbXBhdGliaWxpdHlNb3Vz ZUV2ZW50cyB7IGZhbHNlIH07CiAgICAgICAgIGJvb2wgcG9pbnRlcklzUHJlc3NlZCB7IGZhbHNl IH07Cg==