202645 2019-10-07 11:15:53 -0700 [GTK] Navigation gesture improvements 2019-10-08 03:03:47 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alicem webkit-unassigned bugs-noreply cgarcia commit-queue oldest_to_newest 1577399 0 alicem 2019-10-07 11:15:53 -0700 See the patch. (Yes, name's the same as in bug 194943) 1577401 1 380340 alicem 2019-10-07 11:23:43 -0700 Created attachment 380340 Patch 1577693 2 380340 cgarcia 2019-10-08 00:46:29 -0700 Comment on attachment 380340 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=380340&action=review > Source/WebKit/UIProcess/gtk/ViewGestureControllerGtk.cpp:184 > + deltaX *= (double) Scrollbar::pixelsPerLineStep() / m_distance; I know this is na existing issue, but please use C++ style cast. 1577707 3 380416 alicem 2019-10-08 02:18:22 -0700 Created attachment 380416 Patch Sure, fixed 1577715 4 380416 commit-queue 2019-10-08 03:03:45 -0700 Comment on attachment 380416 Patch Clearing flags on attachment: 380416 Committed r250820: <https://trac.webkit.org/changeset/250820> 1577716 5 commit-queue 2019-10-08 03:03:47 -0700 All reviewed patches have been landed. Closing bug. 380340 2019-10-07 11:23:43 -0700 2019-10-08 02:18:39 -0700 Patch 0001-gesture.patch text/plain 5480 alicem RnJvbSAwMjRkNWNkM2U5ODMzNjI3MjFmMmU2NThjZGYwY2EwNzQ4YzUxNDVmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgTWlraGF5bGVua28gPGFsZXhtQGdub21lLm9y Zz4KRGF0ZTogTW9uLCA3IE9jdCAyMDE5IDIzOjIzOjEwICswNTAwClN1YmplY3Q6IFtQQVRDSCB4 c2VydmVyXSBnZXN0dXJlCgotLS0KIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nICAgICAgICAgICAg ICAgICAgICAgICB8IDI2ICsrKysrKysrKysrKysrKysrKwogLi4uL1dlYktpdC9VSVByb2Nlc3Mv Vmlld0dlc3R1cmVDb250cm9sbGVyLmggIHwgIDEgKwogLi4uL2d0ay9WaWV3R2VzdHVyZUNvbnRy b2xsZXJHdGsuY3BwICAgICAgICAgIHwgMjcgKysrKysrKysrKy0tLS0tLS0tLQogMyBmaWxlcyBj aGFuZ2VkLCA0MiBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU3 NDNkNGI1Yjk3Li5jMTI2MTJlOWJlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxOS0x MC0wNyAgQWxleGFuZGVyIE1pa2hheWxlbmtvICA8YWxleG1AZ25vbWUub3JnPgorCisgICAgICAg IFtHVEtdIE5hdmlnYXRpb24gZ2VzdHVyZSBpbXByb3ZlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjY0NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1lYXN1cmUgdmVsb2NpdHkgdGhyZXNob2xk IGluIHBpeGVscyBwZXIgc2Vjb25kIHJhdGhlciB0aGFuIGRpc3RhbmNlIChyYW5nZSBbMC0xXSkK KyAgICAgICAgcGVyIHNlY29uZC4gVGhlIHZhbHVlIGlzIHRoZSBzYW1lIGFzIGl0IHdhcyBvbiB0 b3VjaHBhZHMsIHNpbmNlIGEgZml4ZWQgZGlzdGFuY2UgaXMKKyAgICAgICAgdXNlZCwgYnV0IGlz IG5vdyBjb25zaXN0ZW50IG9uIHRvdWNoc2NyZWVucywgcmVnYXJkbGVzcyBvZiB0aGUgd2Vidmll dyB3aWR0aC4KKworICAgICAgICBBZGQgYSB0aHJlc2hvbGQgZm9yIGNhbmNlbGxpbmcgZ2VzdHVy ZSB3aGVuIHRoZSBwYWdlIGlzIG1vcmUgdGhhbiBoYWxmd2F5CisgICAgICAgIHRocm91Z2gsIHNv IHRoYXQgaXQncyBzeW1tZXRyaWMgd2l0aCB0aGUgZmlyc3QgaGFsZi4KKworICAgICAgICBBbGln biB0aGUgbW92aW5nIHBhZ2UgdG8gcGl4ZWwgZ3JpZCBvbiBoaWRwaSBkZXZpY2VzIGNvcnJlY3Rs eS4gSnVzdAorICAgICAgICByb3VuZGluZyB0aGUgcG9zaXRpb24gZG9lc24ndCB3b3JrIGNvcnJl Y3RseSwgc2luY2UgdGhlIGNhaXJvIGNvbnRleHQgaXMKKyAgICAgICAgcHJlLXNjYWxlZC4gTXVs dGlwbHlpbmcgYnkgc2NhbGUgZmFjdG9yLCByb3VuZGluZyBhbmQgdGhlbiBkaXZpZGluZyBieQor ICAgICAgICBzY2FsZSBmYWN0b3IgZml4ZXMgdGhpcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9W aWV3R2VzdHVyZUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1ZpZXdHZXN0 dXJlQ29udHJvbGxlckd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJv bGxlcjo6U3dpcGVQcm9ncmVzc1RyYWNrZXI6OnJlc2V0KToKKyAgICAgICAgKFdlYktpdDo6Vmll d0dlc3R1cmVDb250cm9sbGVyOjpTd2lwZVByb2dyZXNzVHJhY2tlcjo6aGFuZGxlRXZlbnQpOgor ICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlN3aXBlUHJvZ3Jlc3NUcmFj a2VyOjpzaG91bGRDYW5jZWwpOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xs ZXI6OmRyYXcpOgorCiAyMDE5LTEwLTA0ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4K IAogICAgICAgICBVc2UgYSBiZXR0ZXIgbmFtZSB0aGFuIGFsbG93RmFzdENsaWNrc0V2ZXJ5d2hl cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdHZXN0dXJlQ29udHJv bGxlci5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld0dlc3R1cmVDb250cm9sbGVyLmgK aW5kZXggMWJiMDEyZjUzOTIuLjBjODQ5M2E3YjBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuaApAQCAtMzk5LDYgKzM5OSw3IEBAIHByaXZh dGU6CiAKICAgICAgICAgU2Vjb25kcyBtX3ByZXZUaW1lOwogICAgICAgICBkb3VibGUgbV92ZWxv Y2l0eSB7IDAgfTsKKyAgICAgICAgZG91YmxlIG1fZGlzdGFuY2UgeyAwIH07CiAKICAgICAgICAg U2Vjb25kcyBtX3N0YXJ0VGltZTsKICAgICAgICAgU2Vjb25kcyBtX2VuZFRpbWU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvVmlld0dlc3R1cmVDb250cm9sbGVyR3Rr LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9WaWV3R2VzdHVyZUNvbnRyb2xsZXJH dGsuY3BwCmluZGV4IDc5YjYzZjg4MjQ0Li42OTgwZjU5MDM3NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvZ3RrL1ZpZXdHZXN0dXJlQ29udHJvbGxlckd0ay5jcHAKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1ZpZXdHZXN0dXJlQ29udHJvbGxlckd0ay5jcHAK QEAgLTQ1LDcgKzQ1LDcgQEAgc3RhdGljIGNvbnN0IGRvdWJsZSBzd2lwZVRvdWNocGFkQmFzZVdp ZHRoID0gNDAwOwogc3RhdGljIGNvbnN0IGRvdWJsZSBzd2lwZUFuaW1hdGlvbkR1cmF0aW9uTXVs dGlwbGllciA9IDM7CiAKIHN0YXRpYyBjb25zdCBkb3VibGUgc3dpcGVDYW5jZWxBcmVhID0gMC41 Owotc3RhdGljIGNvbnN0IGRvdWJsZSBzd2lwZUNhbmNlbFZlbG9jaXR5VGhyZXNob2xkID0gMC4w MDE7CitzdGF0aWMgY29uc3QgZG91YmxlIHN3aXBlQ2FuY2VsVmVsb2NpdHlUaHJlc2hvbGQgPSAw LjQ7CiAKIHN0YXRpYyBib29sIGlzRXZlbnRTdG9wKEdka0V2ZW50U2Nyb2xsKiBldmVudCkKIHsK QEAgLTE0MSw2ICsxNDEsNyBAQCB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6U3dpcGVQcm9n cmVzc1RyYWNrZXI6OnJlc2V0KCkKICAgICBtX2VuZFRpbWUgPSAwX21zOwogICAgIG1fcHJldlRp bWUgPSAwX21zOwogICAgIG1fdmVsb2NpdHkgPSAwOworICAgIG1fZGlzdGFuY2UgPSAwOwogICAg IG1fY2FuY2VsbGVkID0gZmFsc2U7CiB9CiAKQEAgLTE3OCwxMCArMTc5LDEzIEBAIGJvb2wgVmll d0dlc3R1cmVDb250cm9sbGVyOjpTd2lwZVByb2dyZXNzVHJhY2tlcjo6aGFuZGxlRXZlbnQoR2Rr RXZlbnRTY3JvbGwqIGV2CiAgICAgZ2RrX2V2ZW50X2dldF9zY3JvbGxfZGVsdGFzKHJlaW50ZXJw cmV0X2Nhc3Q8R2RrRXZlbnQqPihldmVudCksICZldmVudERlbHRhWCwgbnVsbHB0cik7CiAKICAg ICBkb3VibGUgZGVsdGFYID0gLWV2ZW50RGVsdGFYOwotICAgIGlmIChpc1RvdWNoRXZlbnQoZXZl bnQpKQotICAgICAgICBkZWx0YVggKj0gKGRvdWJsZSkgU2Nyb2xsYmFyOjpwaXhlbHNQZXJMaW5l U3RlcCgpIC8gbV93ZWJQYWdlUHJveHkudmlld1NpemUoKS53aWR0aCgpOwotICAgIGVsc2UKLSAg ICAgICAgZGVsdGFYICo9IGd0a1Njcm9sbERlbHRhTXVsdGlwbGllciAvIHN3aXBlVG91Y2hwYWRC YXNlV2lkdGg7CisgICAgaWYgKGlzVG91Y2hFdmVudChldmVudCkpIHsKKyAgICAgICAgbV9kaXN0 YW5jZSA9IG1fd2ViUGFnZVByb3h5LnZpZXdTaXplKCkud2lkdGgoKTsKKyAgICAgICAgZGVsdGFY ICo9IChkb3VibGUpIFNjcm9sbGJhcjo6cGl4ZWxzUGVyTGluZVN0ZXAoKSAvIG1fZGlzdGFuY2U7 CisgICAgfSBlbHNlIHsKKyAgICAgICAgbV9kaXN0YW5jZSA9IHN3aXBlVG91Y2hwYWRCYXNlV2lk dGg7CisgICAgICAgIGRlbHRhWCAqPSBndGtTY3JvbGxEZWx0YU11bHRpcGxpZXIgLyBtX2Rpc3Rh bmNlOworICAgIH0KIAogICAgIFNlY29uZHMgdGltZSA9IFNlY29uZHM6OmZyb21NaWxsaXNlY29u ZHMoZXZlbnRUaW1lKTsKICAgICBpZiAodGltZSAhPSBtX3ByZXZUaW1lKQpAQCAtMjAzLDE0ICsy MDcsMTIgQEAgYm9vbCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlN3aXBlUHJvZ3Jlc3NUcmFja2Vy OjpoYW5kbGVFdmVudChHZGtFdmVudFNjcm9sbCogZXYKIGJvb2wgVmlld0dlc3R1cmVDb250cm9s bGVyOjpTd2lwZVByb2dyZXNzVHJhY2tlcjo6c2hvdWxkQ2FuY2VsKCkKIHsKICAgICBib29sIHN3 aXBpbmdMZWZ0ID0gbV92aWV3R2VzdHVyZUNvbnRyb2xsZXIuaXNQaHlzaWNhbGx5U3dpcGluZ0xl ZnQobV9kaXJlY3Rpb24pOworICAgIGRvdWJsZSByZWxhdGl2ZVZlbG9jaXR5ID0gbV92ZWxvY2l0 eSAqIChzd2lwaW5nTGVmdCA/IDEgOiAtMSk7CiAKLSAgICBpZiAoc3dpcGluZ0xlZnQgJiYgbV92 ZWxvY2l0eSA8IDApCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgaWYgKCFzd2lwaW5nTGVm dCAmJiBtX3ZlbG9jaXR5ID4gMCkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKGFicyht X3Byb2dyZXNzKSA+IHN3aXBlQ2FuY2VsQXJlYSkKKyAgICAgICAgcmV0dXJuIChyZWxhdGl2ZVZl bG9jaXR5ICogbV9kaXN0YW5jZSA8IC1zd2lwZUNhbmNlbFZlbG9jaXR5VGhyZXNob2xkKTsKIAot ICAgIHJldHVybiAoYWJzKG1fcHJvZ3Jlc3MpIDwgc3dpcGVDYW5jZWxBcmVhICYmIGFicyhtX3Zl bG9jaXR5KSA8IHN3aXBlQ2FuY2VsVmVsb2NpdHlUaHJlc2hvbGQpOworICAgIHJldHVybiAocmVs YXRpdmVWZWxvY2l0eSAqIG1fZGlzdGFuY2UgPCBzd2lwZUNhbmNlbFZlbG9jaXR5VGhyZXNob2xk KTsKIH0KIAogdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlN3aXBlUHJvZ3Jlc3NUcmFja2Vy OjpzdGFydEFuaW1hdGlvbigpCkBAIC00MDQsOCArNDA2LDkgQEAgdm9pZCBWaWV3R2VzdHVyZUNv bnRyb2xsZXI6OmRyYXcoY2Fpcm9fdCogY3IsIGNhaXJvX3BhdHRlcm5fdCogcGFnZUdyb3VwKQog ICAgIGF1dG8gc2l6ZSA9IG1fd2ViUGFnZVByb3h5LmRyYXdpbmdBcmVhKCktPnNpemUoKTsKICAg ICBpbnQgd2lkdGggPSBzaXplLndpZHRoKCk7CiAgICAgaW50IGhlaWdodCA9IHNpemUuaGVpZ2h0 KCk7CisgICAgZG91YmxlIHNjYWxlID0gbV93ZWJQYWdlUHJveHkuZGV2aWNlU2NhbGVGYWN0b3Io KTsKIAotICAgIGRvdWJsZSBzd2lwaW5nTGF5ZXJPZmZzZXQgPSAoc3dpcGluZ0xlZnQgPyAwIDog d2lkdGgpICsgZmxvb3Iod2lkdGggKiBwcm9ncmVzcyk7CisgICAgZG91YmxlIHN3aXBpbmdMYXll ck9mZnNldCA9IChzd2lwaW5nTGVmdCA/IDAgOiB3aWR0aCkgKyBmbG9vcih3aWR0aCAqIHByb2dy ZXNzICogc2NhbGUpIC8gc2NhbGU7CiAKICAgICBkb3VibGUgZGltbWluZ1Byb2dyZXNzID0gc3dp cGluZ0xlZnQgPyAxIC0gcHJvZ3Jlc3MgOiAtcHJvZ3Jlc3M7CiAgICAgaWYgKGlzUlRMKQotLSAK Mi4yMy4wCgo= 380416 2019-10-08 02:18:22 -0700 2019-10-08 03:03:45 -0700 Patch 0001-gesture.patch text/plain 5492 alicem RnJvbSA3ZjkzYzM5ODhlYmVlMDhlNDgzOGRkMzYyNzg5MmM4MzU4NDJjOWY2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgTWlraGF5bGVua28gPGFsZXhtQGdub21lLm9y Zz4KRGF0ZTogTW9uLCA3IE9jdCAyMDE5IDIzOjIzOjEwICswNTAwClN1YmplY3Q6IFtQQVRDSCB4 c2VydmVyXSBnZXN0dXJlCgotLS0KIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nICAgICAgICAgICAg ICAgICAgICAgICB8IDI2ICsrKysrKysrKysrKysrKysrKwogLi4uL1dlYktpdC9VSVByb2Nlc3Mv Vmlld0dlc3R1cmVDb250cm9sbGVyLmggIHwgIDEgKwogLi4uL2d0ay9WaWV3R2VzdHVyZUNvbnRy b2xsZXJHdGsuY3BwICAgICAgICAgIHwgMjcgKysrKysrKysrKy0tLS0tLS0tLQogMyBmaWxlcyBj aGFuZ2VkLCA0MiBpbnNlcnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDU3 NDNkNGI1Yjk3Li5jMTI2MTJlOWJlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxOS0x MC0wNyAgQWxleGFuZGVyIE1pa2hheWxlbmtvICA8YWxleG1AZ25vbWUub3JnPgorCisgICAgICAg IFtHVEtdIE5hdmlnYXRpb24gZ2VzdHVyZSBpbXByb3ZlbWVudHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjY0NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1lYXN1cmUgdmVsb2NpdHkgdGhyZXNob2xk IGluIHBpeGVscyBwZXIgc2Vjb25kIHJhdGhlciB0aGFuIGRpc3RhbmNlIChyYW5nZSBbMC0xXSkK KyAgICAgICAgcGVyIHNlY29uZC4gVGhlIHZhbHVlIGlzIHRoZSBzYW1lIGFzIGl0IHdhcyBvbiB0 b3VjaHBhZHMsIHNpbmNlIGEgZml4ZWQgZGlzdGFuY2UgaXMKKyAgICAgICAgdXNlZCwgYnV0IGlz IG5vdyBjb25zaXN0ZW50IG9uIHRvdWNoc2NyZWVucywgcmVnYXJkbGVzcyBvZiB0aGUgd2Vidmll dyB3aWR0aC4KKworICAgICAgICBBZGQgYSB0aHJlc2hvbGQgZm9yIGNhbmNlbGxpbmcgZ2VzdHVy ZSB3aGVuIHRoZSBwYWdlIGlzIG1vcmUgdGhhbiBoYWxmd2F5CisgICAgICAgIHRocm91Z2gsIHNv IHRoYXQgaXQncyBzeW1tZXRyaWMgd2l0aCB0aGUgZmlyc3QgaGFsZi4KKworICAgICAgICBBbGln biB0aGUgbW92aW5nIHBhZ2UgdG8gcGl4ZWwgZ3JpZCBvbiBoaWRwaSBkZXZpY2VzIGNvcnJlY3Rs eS4gSnVzdAorICAgICAgICByb3VuZGluZyB0aGUgcG9zaXRpb24gZG9lc24ndCB3b3JrIGNvcnJl Y3RseSwgc2luY2UgdGhlIGNhaXJvIGNvbnRleHQgaXMKKyAgICAgICAgcHJlLXNjYWxlZC4gTXVs dGlwbHlpbmcgYnkgc2NhbGUgZmFjdG9yLCByb3VuZGluZyBhbmQgdGhlbiBkaXZpZGluZyBieQor ICAgICAgICBzY2FsZSBmYWN0b3IgZml4ZXMgdGhpcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9W aWV3R2VzdHVyZUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1ZpZXdHZXN0 dXJlQ29udHJvbGxlckd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJv bGxlcjo6U3dpcGVQcm9ncmVzc1RyYWNrZXI6OnJlc2V0KToKKyAgICAgICAgKFdlYktpdDo6Vmll d0dlc3R1cmVDb250cm9sbGVyOjpTd2lwZVByb2dyZXNzVHJhY2tlcjo6aGFuZGxlRXZlbnQpOgor ICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlN3aXBlUHJvZ3Jlc3NUcmFj a2VyOjpzaG91bGRDYW5jZWwpOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xs ZXI6OmRyYXcpOgorCiAyMDE5LTEwLTA0ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4K IAogICAgICAgICBVc2UgYSBiZXR0ZXIgbmFtZSB0aGFuIGFsbG93RmFzdENsaWNrc0V2ZXJ5d2hl cmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1ZpZXdHZXN0dXJlQ29udHJv bGxlci5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld0dlc3R1cmVDb250cm9sbGVyLmgK aW5kZXggMWJiMDEyZjUzOTIuLjBjODQ5M2E3YjBiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuaApAQCAtMzk5LDYgKzM5OSw3IEBAIHByaXZh dGU6CiAKICAgICAgICAgU2Vjb25kcyBtX3ByZXZUaW1lOwogICAgICAgICBkb3VibGUgbV92ZWxv Y2l0eSB7IDAgfTsKKyAgICAgICAgZG91YmxlIG1fZGlzdGFuY2UgeyAwIH07CiAKICAgICAgICAg U2Vjb25kcyBtX3N0YXJ0VGltZTsKICAgICAgICAgU2Vjb25kcyBtX2VuZFRpbWU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvVmlld0dlc3R1cmVDb250cm9sbGVyR3Rr LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9WaWV3R2VzdHVyZUNvbnRyb2xsZXJH dGsuY3BwCmluZGV4IDc5YjYzZjg4MjQ0Li40YTRkMWZlM2QwZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvZ3RrL1ZpZXdHZXN0dXJlQ29udHJvbGxlckd0ay5jcHAKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1ZpZXdHZXN0dXJlQ29udHJvbGxlckd0ay5jcHAK QEAgLTQ1LDcgKzQ1LDcgQEAgc3RhdGljIGNvbnN0IGRvdWJsZSBzd2lwZVRvdWNocGFkQmFzZVdp ZHRoID0gNDAwOwogc3RhdGljIGNvbnN0IGRvdWJsZSBzd2lwZUFuaW1hdGlvbkR1cmF0aW9uTXVs dGlwbGllciA9IDM7CiAKIHN0YXRpYyBjb25zdCBkb3VibGUgc3dpcGVDYW5jZWxBcmVhID0gMC41 Owotc3RhdGljIGNvbnN0IGRvdWJsZSBzd2lwZUNhbmNlbFZlbG9jaXR5VGhyZXNob2xkID0gMC4w MDE7CitzdGF0aWMgY29uc3QgZG91YmxlIHN3aXBlQ2FuY2VsVmVsb2NpdHlUaHJlc2hvbGQgPSAw LjQ7CiAKIHN0YXRpYyBib29sIGlzRXZlbnRTdG9wKEdka0V2ZW50U2Nyb2xsKiBldmVudCkKIHsK QEAgLTE0MSw2ICsxNDEsNyBAQCB2b2lkIFZpZXdHZXN0dXJlQ29udHJvbGxlcjo6U3dpcGVQcm9n cmVzc1RyYWNrZXI6OnJlc2V0KCkKICAgICBtX2VuZFRpbWUgPSAwX21zOwogICAgIG1fcHJldlRp bWUgPSAwX21zOwogICAgIG1fdmVsb2NpdHkgPSAwOworICAgIG1fZGlzdGFuY2UgPSAwOwogICAg IG1fY2FuY2VsbGVkID0gZmFsc2U7CiB9CiAKQEAgLTE3OCwxMCArMTc5LDEzIEBAIGJvb2wgVmll d0dlc3R1cmVDb250cm9sbGVyOjpTd2lwZVByb2dyZXNzVHJhY2tlcjo6aGFuZGxlRXZlbnQoR2Rr RXZlbnRTY3JvbGwqIGV2CiAgICAgZ2RrX2V2ZW50X2dldF9zY3JvbGxfZGVsdGFzKHJlaW50ZXJw cmV0X2Nhc3Q8R2RrRXZlbnQqPihldmVudCksICZldmVudERlbHRhWCwgbnVsbHB0cik7CiAKICAg ICBkb3VibGUgZGVsdGFYID0gLWV2ZW50RGVsdGFYOwotICAgIGlmIChpc1RvdWNoRXZlbnQoZXZl bnQpKQotICAgICAgICBkZWx0YVggKj0gKGRvdWJsZSkgU2Nyb2xsYmFyOjpwaXhlbHNQZXJMaW5l U3RlcCgpIC8gbV93ZWJQYWdlUHJveHkudmlld1NpemUoKS53aWR0aCgpOwotICAgIGVsc2UKLSAg ICAgICAgZGVsdGFYICo9IGd0a1Njcm9sbERlbHRhTXVsdGlwbGllciAvIHN3aXBlVG91Y2hwYWRC YXNlV2lkdGg7CisgICAgaWYgKGlzVG91Y2hFdmVudChldmVudCkpIHsKKyAgICAgICAgbV9kaXN0 YW5jZSA9IG1fd2ViUGFnZVByb3h5LnZpZXdTaXplKCkud2lkdGgoKTsKKyAgICAgICAgZGVsdGFY ICo9IHN0YXRpY19jYXN0PGRvdWJsZT4oU2Nyb2xsYmFyOjpwaXhlbHNQZXJMaW5lU3RlcCgpKSAv IG1fZGlzdGFuY2U7CisgICAgfSBlbHNlIHsKKyAgICAgICAgbV9kaXN0YW5jZSA9IHN3aXBlVG91 Y2hwYWRCYXNlV2lkdGg7CisgICAgICAgIGRlbHRhWCAqPSBndGtTY3JvbGxEZWx0YU11bHRpcGxp ZXIgLyBtX2Rpc3RhbmNlOworICAgIH0KIAogICAgIFNlY29uZHMgdGltZSA9IFNlY29uZHM6OmZy b21NaWxsaXNlY29uZHMoZXZlbnRUaW1lKTsKICAgICBpZiAodGltZSAhPSBtX3ByZXZUaW1lKQpA QCAtMjAzLDE0ICsyMDcsMTIgQEAgYm9vbCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlN3aXBlUHJv Z3Jlc3NUcmFja2VyOjpoYW5kbGVFdmVudChHZGtFdmVudFNjcm9sbCogZXYKIGJvb2wgVmlld0dl c3R1cmVDb250cm9sbGVyOjpTd2lwZVByb2dyZXNzVHJhY2tlcjo6c2hvdWxkQ2FuY2VsKCkKIHsK ICAgICBib29sIHN3aXBpbmdMZWZ0ID0gbV92aWV3R2VzdHVyZUNvbnRyb2xsZXIuaXNQaHlzaWNh bGx5U3dpcGluZ0xlZnQobV9kaXJlY3Rpb24pOworICAgIGRvdWJsZSByZWxhdGl2ZVZlbG9jaXR5 ID0gbV92ZWxvY2l0eSAqIChzd2lwaW5nTGVmdCA/IDEgOiAtMSk7CiAKLSAgICBpZiAoc3dpcGlu Z0xlZnQgJiYgbV92ZWxvY2l0eSA8IDApCi0gICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgaWYg KCFzd2lwaW5nTGVmdCAmJiBtX3ZlbG9jaXR5ID4gMCkKLSAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgaWYgKGFicyhtX3Byb2dyZXNzKSA+IHN3aXBlQ2FuY2VsQXJlYSkKKyAgICAgICAgcmV0dXJu IChyZWxhdGl2ZVZlbG9jaXR5ICogbV9kaXN0YW5jZSA8IC1zd2lwZUNhbmNlbFZlbG9jaXR5VGhy ZXNob2xkKTsKIAotICAgIHJldHVybiAoYWJzKG1fcHJvZ3Jlc3MpIDwgc3dpcGVDYW5jZWxBcmVh ICYmIGFicyhtX3ZlbG9jaXR5KSA8IHN3aXBlQ2FuY2VsVmVsb2NpdHlUaHJlc2hvbGQpOworICAg IHJldHVybiAocmVsYXRpdmVWZWxvY2l0eSAqIG1fZGlzdGFuY2UgPCBzd2lwZUNhbmNlbFZlbG9j aXR5VGhyZXNob2xkKTsKIH0KIAogdm9pZCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlN3aXBlUHJv Z3Jlc3NUcmFja2VyOjpzdGFydEFuaW1hdGlvbigpCkBAIC00MDQsOCArNDA2LDkgQEAgdm9pZCBW aWV3R2VzdHVyZUNvbnRyb2xsZXI6OmRyYXcoY2Fpcm9fdCogY3IsIGNhaXJvX3BhdHRlcm5fdCog cGFnZUdyb3VwKQogICAgIGF1dG8gc2l6ZSA9IG1fd2ViUGFnZVByb3h5LmRyYXdpbmdBcmVhKCkt PnNpemUoKTsKICAgICBpbnQgd2lkdGggPSBzaXplLndpZHRoKCk7CiAgICAgaW50IGhlaWdodCA9 IHNpemUuaGVpZ2h0KCk7CisgICAgZG91YmxlIHNjYWxlID0gbV93ZWJQYWdlUHJveHkuZGV2aWNl U2NhbGVGYWN0b3IoKTsKIAotICAgIGRvdWJsZSBzd2lwaW5nTGF5ZXJPZmZzZXQgPSAoc3dpcGlu Z0xlZnQgPyAwIDogd2lkdGgpICsgZmxvb3Iod2lkdGggKiBwcm9ncmVzcyk7CisgICAgZG91Ymxl IHN3aXBpbmdMYXllck9mZnNldCA9IChzd2lwaW5nTGVmdCA/IDAgOiB3aWR0aCkgKyBmbG9vcih3 aWR0aCAqIHByb2dyZXNzICogc2NhbGUpIC8gc2NhbGU7CiAKICAgICBkb3VibGUgZGltbWluZ1By b2dyZXNzID0gc3dpcGluZ0xlZnQgPyAxIC0gcHJvZ3Jlc3MgOiAtcHJvZ3Jlc3M7CiAgICAgaWYg KGlzUlRMKQotLSAKMi4yMy4wCgo=