226745 2021-06-07 15:08:16 -0700 [GTK] Too easy to trigger navigation swipe on touchscreen 2021-07-08 11:14:33 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alicem webkit-unassigned bugs-noreply mcatanzaro oldest_to_newest 1767572 0 alicem 2021-06-07 15:08:16 -0700 Probably another fallout from https://bugs.webkit.org/show_bug.cgi?id=212324 1767575 1 alicem 2021-06-07 15:09:21 -0700 Forgot to describe: scrolling the page vertically tends to trigger the navigation gesture upon slightest horizontal movement, happens about 90% of the time I'm trying to scroll here. 1774891 2 432912 alicem 2021-07-06 00:20:27 -0700 Created attachment 432912 Patch Will probably fail to apply without https://bugs.webkit.org/show_bug.cgi?id=226173 1775729 3 ews-feeder 2021-07-08 11:14:30 -0700 Committed r279736 (239518@main): <https://commits.webkit.org/239518@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 432912. 432912 2021-07-06 00:20:27 -0700 2021-07-08 11:14:32 -0700 Patch 0001-Patch.patch text/plain 10641 alicem RnJvbSAzNDAyYjEyNjc1YzA3ZWRlMzEyOWYxYjNkZWYwZWJiOWMzMjAyODJiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgTWlraGF5bGVua28gPGFsZXhtQGdub21lLm9y Zz4KRGF0ZTogVHVlLCA2IEp1bCAyMDIxIDEyOjE4OjIxICswNTAwClN1YmplY3Q6IFtQQVRDSF0g UGF0Y2gKCi0tLQogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg IHwgMjUgKysrKysrKysrKysrKysrKysrKwogLi4uL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGll bnRJbXBsLmNwcCAgICAgIHwgIDQgKy0tCiAuLi4vVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Vmlld0Jhc2UuY3BwICAgfCAxNiArKysrKysrLS0tLS0KIC4uLi9XZWJLaXQvVUlQcm9jZXNzL1Zp ZXdHZXN0dXJlQ29udHJvbGxlci5oICB8ICAzICsrLQogLi4uL2d0ay9WaWV3R2VzdHVyZUNvbnRy b2xsZXJHdGsuY3BwICAgICAgICAgIHwgMTIgKysrKy0tLS0tCiA1IGZpbGVzIGNoYW5nZWQsIDQ1 IGluc2VydGlvbnMoKyksIDE1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggNmIyYTJhY2VjMmUy Li5mYTE4ZGY5NGYwYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMjEtMDctMDYgIEFs ZXhhbmRlciBNaWtoYXlsZW5rbyAgPGFsZXhtQGdub21lLm9yZz4KKworICAgICAgICBbR1RLXSBU b28gZWFzeSB0byB0cmlnZ2VyIG5hdmlnYXRpb24gc3dpcGUgb24gdG91Y2hzY3JlZW4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjc0NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFZpZXdHZXN0dXJlQ29u dHJvbGxlciB1c2VzIGJvdGggeCBhbmQgeSBkZWx0YXMgdG8gZmlndXJlIG91dCB3aGV0aGVyIHRv IHByb2NlZWQKKyAgICAgICAgd2l0aCBhIHN3aXBlLCBpbiB0aGUgY3Jvc3MtcGxhdGZvcm0gcGFy dCBvZiB0aGUgY29kZS4gSG93ZXZlciwgdGhhdCB3YXMgb3B0aW1pemVkCisgICAgICAgIG91dCBk dXJpbmcgdGhlIHRvdWNoIGhhbmRsaW5nIHJld3JpdGUsIGJyaW5nIGl0IGJhY2suCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChXZWJL aXQ6OlBhZ2VDbGllbnRJbXBsOjp3aGVlbEV2ZW50V2FzTm90SGFuZGxlZEJ5V2ViQ29yZSk6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwOgorICAgICAg ICAod2Via2l0V2ViVmlld0Jhc2VIYW5kbGVXaGVlbEV2ZW50KToKKyAgICAgICAgKHdlYmtpdFdl YlZpZXdCYXNlU2Nyb2xsKToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlVG91Y2hEcmFnVXBk YXRlKToKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlVG91Y2hEcmFnRW5kKToKKyAgICAgICAg KiBVSVByb2Nlc3MvVmlld0dlc3R1cmVDb250cm9sbGVyLmg6CisgICAgICAgICogVUlQcm9jZXNz L2d0ay9WaWV3R2VzdHVyZUNvbnRyb2xsZXJHdGsuY3BwOgorICAgICAgICAoV2ViS2l0OjpWaWV3 R2VzdHVyZUNvbnRyb2xsZXI6OlBlbmRpbmdTd2lwZVRyYWNrZXI6OnNjcm9sbEV2ZW50R2V0U2Ny b2xsaW5nRGVsdGFzKToKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpT d2lwZVByb2dyZXNzVHJhY2tlcjo6aGFuZGxlRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpWaWV3 R2VzdHVyZUNvbnRyb2xsZXI6OmJlZ2luU2ltdWxhdGVkU3dpcGVJbkRpcmVjdGlvbkZvclRlc3Rp bmcpOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmNvbXBsZXRlU2lt dWxhdGVkU3dpcGVJbkRpcmVjdGlvbkZvclRlc3RpbmcpOgorCiAyMDIxLTA3LTA1ICBBbGV4YW5k ZXIgTWlraGF5bGVua28gIDxhbGV4bUBnbm9tZS5vcmc+CiAKICAgICAgICAgW0dUSzRdIE5hdmln YXRpb24gc3dpcGUgZG9lc24ndCB3b3JrIHdoZW4gdGhlIHBhZ2Ugc2Nyb2xscyBob3Jpem9udGFs bHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVu dEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1w bC5jcHAKaW5kZXggMjYzNDBjOTkxMDk3Li5hZmNkNmQwZDQ4ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCkBAIC00MjQsOSAr NDI0LDkgQEAgdm9pZCBQYWdlQ2xpZW50SW1wbDo6d2hlZWxFdmVudFdhc05vdEhhbmRsZWRCeVdl YkNvcmUoY29uc3QgTmF0aXZlV2ViV2hlZWxFdmVudCYKIAogICAgIFZpZXdHZXN0dXJlQ29udHJv bGxlciogY29udHJvbGxlciA9IHdlYmtpdFdlYlZpZXdCYXNlVmlld0dlc3R1cmVDb250cm9sbGVy KFdFQktJVF9XRUJfVklFV19CQVNFKG1fdmlld1dpZGdldCkpOwogICAgIGlmIChjb250cm9sbGVy ICYmIGNvbnRyb2xsZXItPmlzU3dpcGVHZXN0dXJlRW5hYmxlZCgpKSB7Ci0gICAgICAgIC8vIFdo aWxlIHdlIGRvbid0IHVzZSBkZWx0YVksIG5vbmUgb2YgdGhlIHBhcmFtcyBjYW4gYmUgbnVsbCBp biBHVEs0IHNvIHdlIGhhdmUgdG8gcGFzcyBzb21ldGhpbmcuCiAgICAgICAgIGRvdWJsZSBkZWx0 YVgsIGRlbHRhWTsKICAgICAgICAgZ2RrX2V2ZW50X2dldF9zY3JvbGxfZGVsdGFzKGV2ZW50Lm5h dGl2ZUV2ZW50KCksICZkZWx0YVgsICZkZWx0YVkpOworICAgICAgICBGbG9hdFNpemUgZGVsdGEo ZGVsdGFYLCBkZWx0YVkpOwogCiAgICAgICAgIGludDMyX3QgZXZlbnRUaW1lID0gc3RhdGljX2Nh c3Q8aW50MzJfdD4oZ2RrX2V2ZW50X2dldF90aW1lKGV2ZW50Lm5hdGl2ZUV2ZW50KCkpKTsKIApA QCAtNDM1LDcgKzQzNSw3IEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OndoZWVsRXZlbnRXYXNOb3RI YW5kbGVkQnlXZWJDb3JlKGNvbnN0IE5hdGl2ZVdlYldoZWVsRXZlbnQmCiAKICAgICAgICAgYm9v bCBpc0VuZCA9IGdka19ldmVudF9pc19zY3JvbGxfc3RvcF9ldmVudChldmVudC5uYXRpdmVFdmVu dCgpKSA/IHRydWUgOiBmYWxzZTsKIAotICAgICAgICBQbGF0Zm9ybUd0a1Njcm9sbERhdGEgc2Ny b2xsRGF0YSA9IHsgLmRlbHRhID0gZGVsdGFYLCAuZXZlbnRUaW1lID0gZXZlbnRUaW1lLCAuc291 cmNlID0gc291cmNlLCAuaXNFbmQgPSBpc0VuZCB9OworICAgICAgICBQbGF0Zm9ybUd0a1Njcm9s bERhdGEgc2Nyb2xsRGF0YSA9IHsgLmRlbHRhID0gZGVsdGEsIC5ldmVudFRpbWUgPSBldmVudFRp bWUsIC5zb3VyY2UgPSBzb3VyY2UsIC5pc0VuZCA9IGlzRW5kIH07CiAgICAgICAgIGNvbnRyb2xs ZXItPndoZWVsRXZlbnRXYXNOb3RIYW5kbGVkQnlXZWJDb3JlKCZzY3JvbGxEYXRhKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViVmlld0Jhc2UuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAKaW5kZXggNWIwNzdkOTQ0MDc4Li42ZDAwNzQyZTM2 NDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Vmlld0Jhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlld0Jhc2UuY3BwCkBAIC0xMjY0LDggKzEyNjQsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRX ZWJWaWV3QmFzZUhhbmRsZVdoZWVsRXZlbnQoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNl LCBHZAogewogICAgIFZpZXdHZXN0dXJlQ29udHJvbGxlciogY29udHJvbGxlciA9IHdlYmtpdFdl YlZpZXdCYXNlVmlld0dlc3R1cmVDb250cm9sbGVyKHdlYlZpZXdCYXNlKTsKICAgICBpZiAoY29u dHJvbGxlciAmJiBjb250cm9sbGVyLT5pc1N3aXBlR2VzdHVyZUVuYWJsZWQoKSkgewotICAgICAg ICBkb3VibGUgZGVsdGFYOwotICAgICAgICBnZGtfZXZlbnRfZ2V0X3Njcm9sbF9kZWx0YXMoZXZl bnQsICZkZWx0YVgsIG51bGxwdHIpOworICAgICAgICBkb3VibGUgZGVsdGFYLCBkZWx0YVk7Cisg ICAgICAgIGdka19ldmVudF9nZXRfc2Nyb2xsX2RlbHRhcyhldmVudCwgJmRlbHRhWCwgJmRlbHRh WSk7CisgICAgICAgIEZsb2F0U2l6ZSBkZWx0YShkZWx0YVgsIGRlbHRhWSk7CiAKICAgICAgICAg aW50MzJfdCBldmVudFRpbWUgPSBzdGF0aWNfY2FzdDxpbnQzMl90PihnZGtfZXZlbnRfZ2V0X3Rp bWUoZXZlbnQpKTsKIApAQCAtMTI3NCw3ICsxMjc1LDcgQEAgc3RhdGljIHZvaWQgd2Via2l0V2Vi Vmlld0Jhc2VIYW5kbGVXaGVlbEV2ZW50KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwg R2QKIAogICAgICAgICBib29sIGlzRW5kID0gZ2RrX2V2ZW50X2lzX3Njcm9sbF9zdG9wX2V2ZW50 KGV2ZW50KSA/IHRydWUgOiBmYWxzZTsKIAotICAgICAgICBQbGF0Zm9ybUd0a1Njcm9sbERhdGEg c2Nyb2xsRGF0YSA9IHsgLmRlbHRhID0gZGVsdGFYLCAuZXZlbnRUaW1lID0gZXZlbnRUaW1lLCAu c291cmNlID0gc291cmNlLCAuaXNFbmQgPSBpc0VuZCB9OworICAgICAgICBQbGF0Zm9ybUd0a1Nj cm9sbERhdGEgc2Nyb2xsRGF0YSA9IHsgLmRlbHRhID0gZGVsdGEsIC5ldmVudFRpbWUgPSBldmVu dFRpbWUsIC5zb3VyY2UgPSBzb3VyY2UsIC5pc0VuZCA9IGlzRW5kIH07CiAgICAgICAgIGlmIChj b250cm9sbGVyLT5oYW5kbGVTY3JvbGxXaGVlbEV2ZW50KCZzY3JvbGxEYXRhKSkKICAgICAgICAg ICAgIHJldHVybjsKICAgICB9CkBAIC0xMzM1LDYgKzEzMzYsOCBAQCBzdGF0aWMgZ2Jvb2xlYW4g d2Via2l0V2ViVmlld0Jhc2VTY3JvbGwoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdCYXNlLCBk b3VibGUgZAogCiAgICAgVmlld0dlc3R1cmVDb250cm9sbGVyKiBjb250cm9sbGVyID0gd2Via2l0 V2ViVmlld0Jhc2VWaWV3R2VzdHVyZUNvbnRyb2xsZXIod2ViVmlld0Jhc2UpOwogICAgIGlmIChj b250cm9sbGVyICYmIGNvbnRyb2xsZXItPmlzU3dpcGVHZXN0dXJlRW5hYmxlZCgpKSB7CisgICAg ICAgIEZsb2F0U2l6ZSBkZWx0YShkZWx0YVgsIGRlbHRhWSk7CisKICAgICAgICAgaW50MzJfdCBl dmVudFRpbWUgPSBzdGF0aWNfY2FzdDxpbnQzMl90PihndGtfZXZlbnRfY29udHJvbGxlcl9nZXRf Y3VycmVudF9ldmVudF90aW1lKGV2ZW50Q29udHJvbGxlcikpOwogCiAgICAgICAgIEdka0Rldmlj ZSogZGV2aWNlID0gZ2RrX2V2ZW50X2dldF9kZXZpY2UoZXZlbnQpOwpAQCAtMTM0Miw3ICsxMzQ1 LDcgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdFdlYlZpZXdCYXNlU2Nyb2xsKFdlYktpdFdlYlZp ZXdCYXNlKiB3ZWJWaWV3QmFzZSwgZG91YmxlIGQKIAogICAgICAgICBib29sIGlzRW5kID0gZ2Rr X3Njcm9sbF9ldmVudF9pc19zdG9wKGV2ZW50KSA/IHRydWUgOiBmYWxzZTsKIAotICAgICAgICBQ bGF0Zm9ybUd0a1Njcm9sbERhdGEgc2Nyb2xsRGF0YSA9IHsgLmRlbHRhID0gZGVsdGFYLCAuZXZl bnRUaW1lID0gZXZlbnRUaW1lLCAuc291cmNlID0gc291cmNlLCAuaXNFbmQgPSBpc0VuZCB9Owor ICAgICAgICBQbGF0Zm9ybUd0a1Njcm9sbERhdGEgc2Nyb2xsRGF0YSA9IHsgLmRlbHRhID0gZGVs dGEsIC5ldmVudFRpbWUgPSBldmVudFRpbWUsIC5zb3VyY2UgPSBzb3VyY2UsIC5pc0VuZCA9IGlz RW5kIH07CiAgICAgICAgIGlmIChjb250cm9sbGVyLT5oYW5kbGVTY3JvbGxXaGVlbEV2ZW50KCZz Y3JvbGxEYXRhKSkKICAgICAgICAgICAgIHJldHVybiBHREtfRVZFTlRfU1RPUDsKICAgICB9CkBA IC0xOTgxLDggKzE5ODQsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVRvdWNoRHJh Z1VwZGF0ZShXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UsIGRvdQogCiAgICAgICAgIFZp ZXdHZXN0dXJlQ29udHJvbGxlciogY29udHJvbGxlciA9IHdlYmtpdFdlYlZpZXdCYXNlVmlld0dl c3R1cmVDb250cm9sbGVyKHdlYlZpZXdCYXNlKTsKICAgICAgICAgaWYgKGNvbnRyb2xsZXIgJiYg Y29udHJvbGxlci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkpIHsKKyAgICAgICAgICAgIEZsb2F0 U2l6ZSBkZWx0YShkZWx0YVgsIGRlbHRhWSk7CiAgICAgICAgICAgICBpbnQzMl90IGV2ZW50VGlt ZSA9IHN0YXRpY19jYXN0PGludDMyX3Q+KGd0a19ldmVudF9jb250cm9sbGVyX2dldF9jdXJyZW50 X2V2ZW50X3RpbWUoR1RLX0VWRU5UX0NPTlRST0xMRVIoZ2VzdHVyZSkpKTsKLSAgICAgICAgICAg IFBsYXRmb3JtR3RrU2Nyb2xsRGF0YSBzY3JvbGxEYXRhID0geyAuZGVsdGEgPSBkZWx0YVgsIC5l dmVudFRpbWUgPSBldmVudFRpbWUsIC5zb3VyY2UgPSBHREtfU09VUkNFX1RPVUNIU0NSRUVOLCAu aXNFbmQgPSBmYWxzZSB9OworICAgICAgICAgICAgUGxhdGZvcm1HdGtTY3JvbGxEYXRhIHNjcm9s bERhdGEgPSB7IC5kZWx0YSA9IGRlbHRhLCAuZXZlbnRUaW1lID0gZXZlbnRUaW1lLCAuc291cmNl ID0gR0RLX1NPVVJDRV9UT1VDSFNDUkVFTiwgLmlzRW5kID0gZmFsc2UgfTsKICAgICAgICAgICAg IGlmIChjb250cm9sbGVyLT5oYW5kbGVTY3JvbGxXaGVlbEV2ZW50KCZzY3JvbGxEYXRhKSkKICAg ICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTIwMDYsNyArMjAxMCw3IEBAIHN0 YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlVG91Y2hEcmFnRW5kKFdlYktpdFdlYlZpZXdCYXNl KiB3ZWJWaWV3QmFzZSwgZ2RvdWJsCiAgICAgICAgIFZpZXdHZXN0dXJlQ29udHJvbGxlciogY29u dHJvbGxlciA9IHdlYmtpdFdlYlZpZXdCYXNlVmlld0dlc3R1cmVDb250cm9sbGVyKHdlYlZpZXdC YXNlKTsKICAgICAgICAgaWYgKGNvbnRyb2xsZXIgJiYgY29udHJvbGxlci0+aXNTd2lwZUdlc3R1 cmVFbmFibGVkKCkpIHsKICAgICAgICAgICAgIGludDMyX3QgZXZlbnRUaW1lID0gc3RhdGljX2Nh c3Q8aW50MzJfdD4oZ3RrX2V2ZW50X2NvbnRyb2xsZXJfZ2V0X2N1cnJlbnRfZXZlbnRfdGltZShH VEtfRVZFTlRfQ09OVFJPTExFUihnZXN0dXJlKSkpOwotICAgICAgICAgICAgUGxhdGZvcm1HdGtT Y3JvbGxEYXRhIHNjcm9sbERhdGEgPSB7IC5kZWx0YSA9IDAsIC5ldmVudFRpbWUgPSBldmVudFRp bWUsIC5zb3VyY2UgPSBHREtfU09VUkNFX1RPVUNIU0NSRUVOLCAuaXNFbmQgPSB0cnVlIH07Cisg ICAgICAgICAgICBQbGF0Zm9ybUd0a1Njcm9sbERhdGEgc2Nyb2xsRGF0YSA9IHsgLmRlbHRhID0g RmxvYXRTaXplKCksIC5ldmVudFRpbWUgPSBldmVudFRpbWUsIC5zb3VyY2UgPSBHREtfU09VUkNF X1RPVUNIU0NSRUVOLCAuaXNFbmQgPSB0cnVlIH07CiAgICAgICAgICAgICBjb250cm9sbGVyLT5o YW5kbGVTY3JvbGxXaGVlbEV2ZW50KCZzY3JvbGxEYXRhKTsKICAgICAgICAgfQogICAgIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld0dlc3R1cmVDb250cm9sbGVyLmgKaW5kZXgg MGU5NzJhOTZkNTU2Li4yMGMzMGI4MzQ4ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oCkBAIC0zMCw2ICszMCw3IEBACiAjaW5jbHVkZSAi V2ViUGFnZVByb3h5SWRlbnRpZmllci5oIgogI2luY2x1ZGUgPFdlYkNvcmUvQ29sb3IuaD4KICNp bmNsdWRlIDxXZWJDb3JlL0Zsb2F0UmVjdC5oPgorI2luY2x1ZGUgPFdlYkNvcmUvRmxvYXRTaXpl Lmg+CiAjaW5jbHVkZSA8d3RmL01vbm90b25pY1RpbWUuaD4KICNpbmNsdWRlIDx3dGYvUmV0YWlu UHRyLmg+CiAjaW5jbHVkZSA8d3RmL1J1bkxvb3AuaD4KQEAgLTgwLDcgKzgxLDcgQEAgY2xhc3Mg TmF2aWdhdGlvbjsKIHR5cGVkZWYgTlNFdmVudCogUGxhdGZvcm1TY3JvbGxFdmVudDsKICNlbGlm IFBMQVRGT1JNKEdUSykKIHR5cGVkZWYgc3RydWN0IHsKLSAgICBkb3VibGUgZGVsdGE7CisgICAg V2ViQ29yZTo6RmxvYXRTaXplIGRlbHRhOwogICAgIGludDMyX3QgZXZlbnRUaW1lOwogICAgIEdk a0lucHV0U291cmNlIHNvdXJjZTsKICAgICBib29sIGlzRW5kOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvZ3RrL1ZpZXdHZXN0dXJlQ29udHJvbGxlckd0ay5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvVmlld0dlc3R1cmVDb250cm9sbGVyR3RrLmNwcAppbmRl eCAxZDE3ODBmODk5MjAuLjM1ZWExMDM4YzkyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvZ3RrL1ZpZXdHZXN0dXJlQ29udHJvbGxlckd0ay5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvZ3RrL1ZpZXdHZXN0dXJlQ29udHJvbGxlckd0ay5jcHAKQEAgLTk3LDcg Kzk3LDcgQEAgRmxvYXRTaXplIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6UGVuZGluZ1N3aXBlVHJh Y2tlcjo6c2Nyb2xsRXZlbnRHZXRTY3JvbGxpbmdEZWwKIHsKICAgICBkb3VibGUgbXVsdGlwbGll ciA9IGlzVG91Y2hFdmVudChldmVudCkgPyBTY3JvbGxiYXI6OnBpeGVsc1BlckxpbmVTdGVwKCkg OiBndGtTY3JvbGxEZWx0YU11bHRpcGxpZXI7CiAgICAgLy8gR1RLIGRlbHRhcyBhcmUgaW52ZXJ0 ZWQgY29tcGFyZWQgdG8gTlNFdmVudCwgc28gaW52ZXJ0IHRoZW0gYWdhaW4KLSAgICByZXR1cm4g LUZsb2F0U2l6ZShldmVudC0+ZGVsdGEsIDApICogbXVsdGlwbGllcjsKKyAgICByZXR1cm4gLWV2 ZW50LT5kZWx0YSAqIG11bHRpcGxpZXI7CiB9CiAKIGJvb2wgVmlld0dlc3R1cmVDb250cm9sbGVy OjpoYW5kbGVTY3JvbGxXaGVlbEV2ZW50KFBsYXRmb3JtR3RrU2Nyb2xsRGF0YSogZXZlbnQpCkBA IC0xODAsOSArMTgwLDggQEAgYm9vbCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlN3aXBlUHJvZ3Jl c3NUcmFja2VyOjpoYW5kbGVFdmVudChQbGF0Zm9ybUd0a1Njcm9sbEQKICAgICB9CiAKICAgICB1 aW50MzJfdCBldmVudFRpbWUgPSBldmVudC0+ZXZlbnRUaW1lOwotICAgIGRvdWJsZSBldmVudERl bHRhWCA9IGV2ZW50LT5kZWx0YTsKIAotICAgIGRvdWJsZSBkZWx0YVggPSAtZXZlbnREZWx0YVg7 CisgICAgZG91YmxlIGRlbHRhWCA9IC1ldmVudC0+ZGVsdGEud2lkdGgoKTsKICAgICBpZiAoaXNU b3VjaEV2ZW50KGV2ZW50KSkgewogICAgICAgICBtX2Rpc3RhbmNlID0gbV93ZWJQYWdlUHJveHku dmlld1NpemUoKS53aWR0aCgpOwogICAgICAgICBkZWx0YVggKj0gc3RhdGljX2Nhc3Q8ZG91Ymxl PihTY3JvbGxiYXI6OnBpeGVsc1BlckxpbmVTdGVwKCkpIC8gbV9kaXN0YW5jZTsKQEAgLTYzOCwx MSArNjM3LDEyIEBAIGJvb2wgVmlld0dlc3R1cmVDb250cm9sbGVyOjpiZWdpblNpbXVsYXRlZFN3 aXBlSW5EaXJlY3Rpb25Gb3JUZXN0aW5nKFN3aXBlRGlyZWN0CiAgICAgaWYgKCFjYW5Td2lwZUlu RGlyZWN0aW9uKGRpcmVjdGlvbikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIGRvdWJs ZSBkZWx0YSA9IHN3aXBlVG91Y2hwYWRCYXNlV2lkdGggLyBndGtTY3JvbGxEZWx0YU11bHRpcGxp ZXIgKiAwLjc1OworICAgIGRvdWJsZSBkZWx0YVggPSBzd2lwZVRvdWNocGFkQmFzZVdpZHRoIC8g Z3RrU2Nyb2xsRGVsdGFNdWx0aXBsaWVyICogMC43NTsKIAogICAgIGlmIChpc1BoeXNpY2FsbHlT d2lwaW5nTGVmdChkaXJlY3Rpb24pKQotICAgICAgICBkZWx0YSA9IC1kZWx0YTsKKyAgICAgICAg ZGVsdGFYID0gLWRlbHRhWDsKIAorICAgIEZsb2F0U2l6ZSBkZWx0YShkZWx0YVgsIDApOwogICAg IFBsYXRmb3JtR3RrU2Nyb2xsRGF0YSBzY3JvbGxEYXRhID0geyAuZGVsdGEgPSBkZWx0YSwgLmV2 ZW50VGltZSA9IEdES19DVVJSRU5UX1RJTUUsIC5zb3VyY2UgPSBHREtfU09VUkNFX1RPVUNIUEFE LCAuaXNFbmQgPSBmYWxzZSB9OwogICAgIGhhbmRsZVNjcm9sbFdoZWVsRXZlbnQoJnNjcm9sbERh dGEpOwogCkBAIC02NTEsNyArNjUxLDcgQEAgYm9vbCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmJl Z2luU2ltdWxhdGVkU3dpcGVJbkRpcmVjdGlvbkZvclRlc3RpbmcoU3dpcGVEaXJlY3QKIAogYm9v bCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmNvbXBsZXRlU2ltdWxhdGVkU3dpcGVJbkRpcmVjdGlv bkZvclRlc3RpbmcoU3dpcGVEaXJlY3Rpb24pCiB7Ci0gICAgUGxhdGZvcm1HdGtTY3JvbGxEYXRh IHNjcm9sbERhdGEgPSB7IC5kZWx0YSA9IDAsIC5ldmVudFRpbWUgPSBHREtfQ1VSUkVOVF9USU1F LCAuc291cmNlID0gR0RLX1NPVVJDRV9UT1VDSFBBRCwgLmlzRW5kID0gdHJ1ZSB9OworICAgIFBs YXRmb3JtR3RrU2Nyb2xsRGF0YSBzY3JvbGxEYXRhID0geyAuZGVsdGEgPSBGbG9hdFNpemUoKSwg LmV2ZW50VGltZSA9IEdES19DVVJSRU5UX1RJTUUsIC5zb3VyY2UgPSBHREtfU09VUkNFX1RPVUNI UEFELCAuaXNFbmQgPSB0cnVlIH07CiAgICAgaGFuZGxlU2Nyb2xsV2hlZWxFdmVudCgmc2Nyb2xs RGF0YSk7CiAKICAgICByZXR1cm4gdHJ1ZTsKLS0gCjIuMzEuMQoK