227678 2021-07-05 01:49:08 -0700 [GTK] Navigation swipe gesture can be triggered with mouse 2021-07-05 22:45:33 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alicem webkit-unassigned berto bugs-noreply cgarcia ews-watchlist gustavo oldest_to_newest 1774768 0 alicem 2021-07-05 01:49:08 -0700 That's another regression from https://bugs.webkit.org/show_bug.cgi?id=212324, I noticed that the previous device type check got removed... 1774776 1 432877 alicem 2021-07-05 02:41:21 -0700 Created attachment 432877 Patch 1774777 2 ews-watchlist 2021-07-05 02:42:10 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1774792 3 alicem 2021-07-05 04:06:29 -0700 Hm yes, there's also a GTK3-only code path in PageClientImpl.cpp. I hoped I can get away without a GTK3 build as well. :) 1774808 4 432885 alicem 2021-07-05 07:49:55 -0700 Created attachment 432885 Patch Updated that codepath as well. 1774889 5 ews-feeder 2021-07-05 22:45:30 -0700 Committed r279574 (239405@main): <https://commits.webkit.org/239405@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 432885. 432877 2021-07-05 02:41:21 -0700 2021-07-05 07:50:29 -0700 Patch 0001-Patch.patch text/plain 9359 alicem RnJvbSA4MGViYjNjNDM0MDliMTg1ZTljZTQ4MzAyZmJmY2E3ZDg3Y2FmZTJhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgTWlraGF5bGVua28gPGFsZXhtQGdub21lLm9y Zz4KRGF0ZTogTW9uLCA1IEp1bCAyMDIxIDE0OjM1OjMyICswNTAwClN1YmplY3Q6IFtQQVRDSF0g UGF0Y2gKCi0tLQogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg IHwgMzUgKysrKysrKysrKysrKysrKysrKwogLi4uL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdl YlZpZXdCYXNlLmNwcCAgIHwgMjMgKysrKysrKystLS0tCiAuLi4vV2ViS2l0L1VJUHJvY2Vzcy9W aWV3R2VzdHVyZUNvbnRyb2xsZXIuaCAgfCAgNiArKy0tCiAuLi4vZ3RrL1ZpZXdHZXN0dXJlQ29u dHJvbGxlckd0ay5jcHAgICAgICAgICAgfCAxMSArKystLS0KIDQgZmlsZXMgY2hhbmdlZCwgNTgg aW5zZXJ0aW9ucygrKSwgMTcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAzMjM5YWQzODljMDAu LjZkNTZjZGFlY2NhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOCBAQAorMjAyMS0wNy0wNSAgQWxl eGFuZGVyIE1pa2hheWxlbmtvICA8YWxleG1AZ25vbWUub3JnPgorCisgICAgICAgIFtHVEtdIE5h dmlnYXRpb24gc3dpcGUgZ2VzdHVyZSBjYW4gYmUgdHJpZ2dlcmVkIHdpdGggbW91c2UKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzY3OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE9yaWdpbmFsbHksIHRo ZSBuYXZpZ2F0aW9uIHN3aXBlIGdlc3R1cmUgaGFkIGEgZmV3IGNoZWNrcyB0byBvbmx5IG1ha2Ug aXQgcG9zc2libGUgdG8KKyAgICAgICAgdHJpZ2dlciBpdCB3aXRoIGEgdG91Y2hwYWQgb3IgdG91 Y2hzY3JlZW4sIHdpdGggYW4gZXhjZXB0aW9uIGZvciBzaW11bGF0ZWQgc3dpcGVzCisgICAgICAg IHdoZXJlIHdlIGNvdWxkbid0IHNldCB0aGUgc291cmNlIGVhc2lseS4KKworICAgICAgICBEdXJp bmcgdGhlIHJld3JpdGUgaW4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMjMyNCwgdGhlIGNoZWNrIGdvdAorICAgICAgICBkcm9wcGVkLCBidXQgaXQgaGFzIGEgZ29v ZCByZWFzb24gdG8gYmUgdGhlcmU6IG5vdCBhbGwgZGV2aWNlcyBhcmUgY2FwYWJsZSBvZgorICAg ICAgICBwZXJmb3JtaW5nIGEgZ2VzdHVyZS4gVG91Y2hwYWRzIGFuZCB0b3VjaHNjcmVlbnMgc2hv dWxkIGJlIGZpbmUsIHRyYWNrcG9pbnRzIGFyZQorICAgICAgICBmaW5pY2t5LCB0aG91Z2ggY2Fu IHN0aWxsIHRlY2huaWNhbGx5IHdvcmssIGJ1dCBtb3VzZSBhcmUgYSBuby1nby4gV2hpbGUgdGhl eSBjYW4KKyAgICAgICAgc3RhcnQgYSBzd2lwZSwgdGhleSB3aWxsIG5ldmVyIGVuZCBpdCBhbmQg dGhlIGdlc3R1cmUgd2lsbCBnZXQgc3R1Y2suCisKKyAgICAgICAgU28sIGFkZCB0aGUgY2hlY2sg YmFjay4gRG9uJ3QgYm90aGVyIHdpdGggdGhlIHNjcm9sbCBkaXJlY3Rpb24gdGhpcyB0aW1lIHRo b3VnaCwgd2hpbGUKKyAgICAgICAgdGhhdCBjaGVjayBtYWRlIHNlbnNlIHdoZW4gaXQgZ290IGFk ZGVkLCBhdCBzb21lIHBvaW50IHNpbmNlIHRoZW4gYWxsIHNjcm9sbCBldmVudHMKKyAgICAgICAg aGFkIEdES19TQ1JPTExfU01PT1RIIGRpcmVjdGlvbiBhbmQganVzdCBzZXQgdGhlaXIgZGVsdGFz IHRvICgxLCAwKSwgKC0xLCAwKSwgKDAsIDEpCisgICAgICAgIG9yICgwLCAtMSksIHNvIHRoYXQg Y2hlY2sgc3RvcHBlZCB3b3JraW5nLCBhbmQgdGhlIHNvdXJjZSB0eXBlIGNoZWNrIHNob3VsZCBm aWx0ZXIKKyAgICAgICAgbW91c2UgZXZlbnRzIGFueXdheS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdC YXNlSGFuZGxlV2hlZWxFdmVudCk6CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVNjcm9sbCk6 CisgICAgICAgICh3ZWJraXRXZWJWaWV3QmFzZVRvdWNoRHJhZ1VwZGF0ZSk6CisgICAgICAgICh3 ZWJraXRXZWJWaWV3QmFzZVRvdWNoRHJhZ0VuZCk6CisgICAgICAgICogVUlQcm9jZXNzL1ZpZXdH ZXN0dXJlQ29udHJvbGxlci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9ndGsvVmlld0dlc3R1cmVD b250cm9sbGVyR3RrLmNwcDoKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVy OjpQZW5kaW5nU3dpcGVUcmFja2VyOjpzY3JvbGxFdmVudENhbkluZmx1ZW5jZVN3aXBlKToKKyAg ICAgICAgKFdlYktpdDo6aXNUb3VjaEV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1 cmVDb250cm9sbGVyOjpiZWdpblNpbXVsYXRlZFN3aXBlSW5EaXJlY3Rpb25Gb3JUZXN0aW5nKToK KyAgICAgICAgKFdlYktpdDo6Vmlld0dlc3R1cmVDb250cm9sbGVyOjpjb21wbGV0ZVNpbXVsYXRl ZFN3aXBlSW5EaXJlY3Rpb25Gb3JUZXN0aW5nKToKKwogMjAyMS0wNy0wMiAgQ2hyaXMgRHVtZXog IDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgYXR0ZW1wdCB0byBmaXgg TWFjIENhdGFseXN0IGJ1aWxkLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAppbmRleCBlOWNmNzEzNTJiYTIuLjE3MmQzZDNm OTgxNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJWaWV3QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJL aXRXZWJWaWV3QmFzZS5jcHAKQEAgLTEyNjYsOSArMTI2NiwxNSBAQCBzdGF0aWMgdm9pZCB3ZWJr aXRXZWJWaWV3QmFzZUhhbmRsZVdoZWVsRXZlbnQoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdC YXNlLCBHZAogICAgIGlmIChjb250cm9sbGVyICYmIGNvbnRyb2xsZXItPmlzU3dpcGVHZXN0dXJl RW5hYmxlZCgpKSB7CiAgICAgICAgIGRvdWJsZSBkZWx0YVg7CiAgICAgICAgIGdka19ldmVudF9n ZXRfc2Nyb2xsX2RlbHRhcyhldmVudCwgJmRlbHRhWCwgbnVsbHB0cik7Ci0gICAgICAgIGJvb2wg aXNFbmQgPSBnZGtfZXZlbnRfaXNfc2Nyb2xsX3N0b3BfZXZlbnQoZXZlbnQpID8gdHJ1ZSA6IGZh bHNlOworCiAgICAgICAgIGludDMyX3QgZXZlbnRUaW1lID0gc3RhdGljX2Nhc3Q8aW50MzJfdD4o Z2RrX2V2ZW50X2dldF90aW1lKGV2ZW50KSk7Ci0gICAgICAgIFBsYXRmb3JtR3RrU2Nyb2xsRGF0 YSBzY3JvbGxEYXRhID0geyAuZGVsdGEgPSBkZWx0YVgsIC5ldmVudFRpbWUgPSBldmVudFRpbWUs IC5pc1RvdWNoID0gZmFsc2UsIC5pc0VuZCA9IGlzRW5kIH07CisKKyAgICAgICAgR2RrRGV2aWNl KiBkZXZpY2UgPSBnZGtfZXZlbnRfZ2V0X3NvdXJjZV9kZXZpY2UoZXZlbnQpOworICAgICAgICBH ZGtJbnB1dFNvdXJjZSBzb3VyY2UgPSBnZGtfZGV2aWNlX2dldF9zb3VyY2UoZGV2aWNlKTsKKwor ICAgICAgICBib29sIGlzRW5kID0gZ2RrX2V2ZW50X2lzX3Njcm9sbF9zdG9wX2V2ZW50KGV2ZW50 KSA/IHRydWUgOiBmYWxzZTsKKworICAgICAgICBQbGF0Zm9ybUd0a1Njcm9sbERhdGEgc2Nyb2xs RGF0YSA9IHsgLmRlbHRhID0gZGVsdGFYLCAuZXZlbnRUaW1lID0gZXZlbnRUaW1lLCAuc291cmNl ID0gc291cmNlLCAuaXNFbmQgPSBpc0VuZCB9OwogICAgICAgICBpZiAoY29udHJvbGxlci0+aGFu ZGxlU2Nyb2xsV2hlZWxFdmVudCgmc2Nyb2xsRGF0YSkpCiAgICAgICAgICAgICByZXR1cm47CiAg ICAgfQpAQCAtMTMyOSw5ICsxMzM1LDE0IEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRXZWJWaWV3 QmFzZVNjcm9sbChXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UsIGRvdWJsZSBkCiAKICAg ICBWaWV3R2VzdHVyZUNvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSB3ZWJraXRXZWJWaWV3QmFzZVZp ZXdHZXN0dXJlQ29udHJvbGxlcih3ZWJWaWV3QmFzZSk7CiAgICAgaWYgKGNvbnRyb2xsZXIgJiYg Y29udHJvbGxlci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkpIHsKLSAgICAgICAgYm9vbCBpc0Vu ZCA9IGdka19zY3JvbGxfZXZlbnRfaXNfc3RvcChldmVudCkgPyB0cnVlIDogZmFsc2U7CiAgICAg ICAgIGludDMyX3QgZXZlbnRUaW1lID0gc3RhdGljX2Nhc3Q8aW50MzJfdD4oZ3RrX2V2ZW50X2Nv bnRyb2xsZXJfZ2V0X2N1cnJlbnRfZXZlbnRfdGltZShldmVudENvbnRyb2xsZXIpKTsKLSAgICAg ICAgUGxhdGZvcm1HdGtTY3JvbGxEYXRhIHNjcm9sbERhdGEgPSB7IC5kZWx0YSA9IGRlbHRhWCwg LmV2ZW50VGltZSA9IGV2ZW50VGltZSwgLmlzVG91Y2ggPSBmYWxzZSwgLmlzRW5kID0gaXNFbmQg fTsKKworICAgICAgICBHZGtEZXZpY2UqIGRldmljZSA9IGdka19ldmVudF9nZXRfZGV2aWNlKGV2 ZW50KTsKKyAgICAgICAgR2RrSW5wdXRTb3VyY2Ugc291cmNlID0gZ2RrX2RldmljZV9nZXRfc291 cmNlKGRldmljZSk7CisKKyAgICAgICAgYm9vbCBpc0VuZCA9IGdka19zY3JvbGxfZXZlbnRfaXNf c3RvcChldmVudCkgPyB0cnVlIDogZmFsc2U7CisKKyAgICAgICAgUGxhdGZvcm1HdGtTY3JvbGxE YXRhIHNjcm9sbERhdGEgPSB7IC5kZWx0YSA9IGRlbHRhWCwgLmV2ZW50VGltZSA9IGV2ZW50VGlt ZSwgLnNvdXJjZSA9IHNvdXJjZSwgLmlzRW5kID0gaXNFbmQgfTsKICAgICAgICAgaWYgKGNvbnRy b2xsZXItPmhhbmRsZVNjcm9sbFdoZWVsRXZlbnQoJnNjcm9sbERhdGEpKQogICAgICAgICAgICAg cmV0dXJuIEdES19FVkVOVF9TVE9QOwogICAgIH0KQEAgLTE5NTYsNyArMTk2Nyw3IEBAIHN0YXRp YyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlVG91Y2hEcmFnVXBkYXRlKFdlYktpdFdlYlZpZXdCYXNl KiB3ZWJWaWV3QmFzZSwgZG91CiAgICAgICAgIFZpZXdHZXN0dXJlQ29udHJvbGxlciogY29udHJv bGxlciA9IHdlYmtpdFdlYlZpZXdCYXNlVmlld0dlc3R1cmVDb250cm9sbGVyKHdlYlZpZXdCYXNl KTsKICAgICAgICAgaWYgKGNvbnRyb2xsZXIgJiYgY29udHJvbGxlci0+aXNTd2lwZUdlc3R1cmVF bmFibGVkKCkpIHsKICAgICAgICAgICAgIGludDMyX3QgZXZlbnRUaW1lID0gc3RhdGljX2Nhc3Q8 aW50MzJfdD4oZ3RrX2V2ZW50X2NvbnRyb2xsZXJfZ2V0X2N1cnJlbnRfZXZlbnRfdGltZShHVEtf RVZFTlRfQ09OVFJPTExFUihnZXN0dXJlKSkpOwotICAgICAgICAgICAgUGxhdGZvcm1HdGtTY3Jv bGxEYXRhIHNjcm9sbERhdGEgPSB7IC5kZWx0YSA9IGRlbHRhWCwgLmV2ZW50VGltZSA9IGV2ZW50 VGltZSwgLmlzVG91Y2ggPSB0cnVlLCAuaXNFbmQgPSBmYWxzZSB9OworICAgICAgICAgICAgUGxh dGZvcm1HdGtTY3JvbGxEYXRhIHNjcm9sbERhdGEgPSB7IC5kZWx0YSA9IGRlbHRhWCwgLmV2ZW50 VGltZSA9IGV2ZW50VGltZSwgLnNvdXJjZSA9IEdES19TT1VSQ0VfVE9VQ0hTQ1JFRU4sIC5pc0Vu ZCA9IGZhbHNlIH07CiAgICAgICAgICAgICBpZiAoY29udHJvbGxlci0+aGFuZGxlU2Nyb2xsV2hl ZWxFdmVudCgmc2Nyb2xsRGF0YSkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9 CkBAIC0xOTgwLDcgKzE5OTEsNyBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVRvdWNo RHJhZ0VuZChXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UsIGdkb3VibAogICAgICAgICBW aWV3R2VzdHVyZUNvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSB3ZWJraXRXZWJWaWV3QmFzZVZpZXdH ZXN0dXJlQ29udHJvbGxlcih3ZWJWaWV3QmFzZSk7CiAgICAgICAgIGlmIChjb250cm9sbGVyICYm IGNvbnRyb2xsZXItPmlzU3dpcGVHZXN0dXJlRW5hYmxlZCgpKSB7CiAgICAgICAgICAgICBpbnQz Ml90IGV2ZW50VGltZSA9IHN0YXRpY19jYXN0PGludDMyX3Q+KGd0a19ldmVudF9jb250cm9sbGVy X2dldF9jdXJyZW50X2V2ZW50X3RpbWUoR1RLX0VWRU5UX0NPTlRST0xMRVIoZ2VzdHVyZSkpKTsK LSAgICAgICAgICAgIFBsYXRmb3JtR3RrU2Nyb2xsRGF0YSBzY3JvbGxEYXRhID0geyAuZGVsdGEg PSAwLCAuZXZlbnRUaW1lID0gZXZlbnRUaW1lLCAuaXNUb3VjaCA9IGZhbHNlLCAuaXNFbmQgPSB0 cnVlIH07CisgICAgICAgICAgICBQbGF0Zm9ybUd0a1Njcm9sbERhdGEgc2Nyb2xsRGF0YSA9IHsg LmRlbHRhID0gMCwgLmV2ZW50VGltZSA9IGV2ZW50VGltZSwgLnNvdXJjZSA9IEdES19TT1VSQ0Vf VE9VQ0hTQ1JFRU4sIC5pc0VuZCA9IHRydWUgfTsKICAgICAgICAgICAgIGNvbnRyb2xsZXItPmhh bmRsZVNjcm9sbFdoZWVsRXZlbnQoJnNjcm9sbERhdGEpOwogICAgICAgICB9CiAgICAgfQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvVmlld0dlc3R1cmVDb250cm9sbGVyLmgg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuaAppbmRleCBl MTYxNjA3YjI4ZWMuLjBlOTcyYTk2ZDU1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvVmlld0dlc3R1cmVDb250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvVmlld0dlc3R1cmVDb250cm9sbGVyLmgKQEAgLTgyLDcgKzgyLDcgQEAgdHlwZWRlZiBOU0V2 ZW50KiBQbGF0Zm9ybVNjcm9sbEV2ZW50OwogdHlwZWRlZiBzdHJ1Y3QgewogICAgIGRvdWJsZSBk ZWx0YTsKICAgICBpbnQzMl90IGV2ZW50VGltZTsKLSAgICBib29sIGlzVG91Y2g7CisgICAgR2Rr SW5wdXRTb3VyY2Ugc291cmNlOwogICAgIGJvb2wgaXNFbmQ7CiB9IFBsYXRmb3JtR3RrU2Nyb2xs RGF0YTsKIHR5cGVkZWYgUGxhdGZvcm1HdGtTY3JvbGxEYXRhKiBQbGF0Zm9ybVNjcm9sbEV2ZW50 OwpAQCAtNDcyLDkgKzQ3Miw3IEBAIHByaXZhdGU6CiAgICAgaW50IG1fc3dpcGVPdXRsaW5lU2l6 ZTsKICAgICBHUmVmUHRyPEd0a0Nzc1Byb3ZpZGVyPiBtX2Nzc1Byb3ZpZGVyOwogI2VuZGlmCi0K LSAgICBib29sIG1faXNTaW11bGF0ZWRTd2lwZSB7IGZhbHNlIH07Ci0jZW5kaWYKKyNlbmRpZiAv LyBQTEFURk9STShHVEspCiAKICAgICBib29sIG1faXNDb25uZWN0ZWRUb1Byb2Nlc3MgeyBmYWxz ZSB9OwogICAgIGJvb2wgbV9kaWRTdGFydFByb3Zpc2lvbmFsTG9hZCB7IGZhbHNlIH07CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvVmlld0dlc3R1cmVDb250cm9sbGVy R3RrLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9WaWV3R2VzdHVyZUNvbnRyb2xs ZXJHdGsuY3BwCmluZGV4IDgwNmJiZmZlZTBjNS4uMWQxNzgwZjg5OTIwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvVmlld0dlc3R1cmVDb250cm9sbGVyR3RrLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9ndGsvVmlld0dlc3R1cmVDb250cm9sbGVyR3Rr LmNwcApAQCAtODUsMTIgKzg1LDEyIEBAIGJvb2wgVmlld0dlc3R1cmVDb250cm9sbGVyOjpQZW5k aW5nU3dpcGVUcmFja2VyOjpzY3JvbGxFdmVudENhbkVuZFN3aXBlKFBsYXRmb3JtCiAKIGJvb2wg Vmlld0dlc3R1cmVDb250cm9sbGVyOjpQZW5kaW5nU3dpcGVUcmFja2VyOjpzY3JvbGxFdmVudENh bkluZmx1ZW5jZVN3aXBlKFBsYXRmb3JtR3RrU2Nyb2xsRGF0YSogZXZlbnQpCiB7Ci0gICAgcmV0 dXJuIHRydWU7CisgICAgcmV0dXJuIGV2ZW50LT5zb3VyY2UgPT0gR0RLX1NPVVJDRV9UT1VDSFBB RCB8fCBldmVudC0+c291cmNlID09IEdES19TT1VSQ0VfVE9VQ0hTQ1JFRU47CiB9CiAKIHN0YXRp YyBib29sIGlzVG91Y2hFdmVudChQbGF0Zm9ybUd0a1Njcm9sbERhdGEqIGV2ZW50KQogewotICAg IHJldHVybiBldmVudC0+aXNUb3VjaDsKKyAgICByZXR1cm4gZXZlbnQtPnNvdXJjZSA9PSBHREtf U09VUkNFX1RPVUNIU0NSRUVOOwogfQogCiBGbG9hdFNpemUgVmlld0dlc3R1cmVDb250cm9sbGVy OjpQZW5kaW5nU3dpcGVUcmFja2VyOjpzY3JvbGxFdmVudEdldFNjcm9sbGluZ0RlbHRhcyhQbGF0 Zm9ybUd0a1Njcm9sbERhdGEqIGV2ZW50KQpAQCAtNjM4LDE0ICs2MzgsMTIgQEAgYm9vbCBWaWV3 R2VzdHVyZUNvbnRyb2xsZXI6OmJlZ2luU2ltdWxhdGVkU3dpcGVJbkRpcmVjdGlvbkZvclRlc3Rp bmcoU3dpcGVEaXJlY3QKICAgICBpZiAoIWNhblN3aXBlSW5EaXJlY3Rpb24oZGlyZWN0aW9uKSkK ICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAgbV9pc1NpbXVsYXRlZFN3aXBlID0gdHJ1ZTsK LQogICAgIGRvdWJsZSBkZWx0YSA9IHN3aXBlVG91Y2hwYWRCYXNlV2lkdGggLyBndGtTY3JvbGxE ZWx0YU11bHRpcGxpZXIgKiAwLjc1OwogCiAgICAgaWYgKGlzUGh5c2ljYWxseVN3aXBpbmdMZWZ0 KGRpcmVjdGlvbikpCiAgICAgICAgIGRlbHRhID0gLWRlbHRhOwogCi0gICAgUGxhdGZvcm1HdGtT Y3JvbGxEYXRhIHNjcm9sbERhdGEgPSB7IC5kZWx0YSA9IGRlbHRhLCAuZXZlbnRUaW1lID0gR0RL X0NVUlJFTlRfVElNRSwgLmlzVG91Y2ggPSBmYWxzZSwgLmlzRW5kID0gZmFsc2UgfTsKKyAgICBQ bGF0Zm9ybUd0a1Njcm9sbERhdGEgc2Nyb2xsRGF0YSA9IHsgLmRlbHRhID0gZGVsdGEsIC5ldmVu dFRpbWUgPSBHREtfQ1VSUkVOVF9USU1FLCAuc291cmNlID0gR0RLX1NPVVJDRV9UT1VDSFBBRCwg LmlzRW5kID0gZmFsc2UgfTsKICAgICBoYW5kbGVTY3JvbGxXaGVlbEV2ZW50KCZzY3JvbGxEYXRh KTsKIAogICAgIHJldHVybiB0cnVlOwpAQCAtNjUzLDkgKzY1MSw4IEBAIGJvb2wgVmlld0dlc3R1 cmVDb250cm9sbGVyOjpiZWdpblNpbXVsYXRlZFN3aXBlSW5EaXJlY3Rpb25Gb3JUZXN0aW5nKFN3 aXBlRGlyZWN0CiAKIGJvb2wgVmlld0dlc3R1cmVDb250cm9sbGVyOjpjb21wbGV0ZVNpbXVsYXRl ZFN3aXBlSW5EaXJlY3Rpb25Gb3JUZXN0aW5nKFN3aXBlRGlyZWN0aW9uKQogewotICAgIFBsYXRm b3JtR3RrU2Nyb2xsRGF0YSBzY3JvbGxEYXRhID0geyAuZGVsdGEgPSAwLCAuZXZlbnRUaW1lID0g R0RLX0NVUlJFTlRfVElNRSwgLmlzVG91Y2ggPSBmYWxzZSwgLmlzRW5kID0gdHJ1ZSB9OworICAg IFBsYXRmb3JtR3RrU2Nyb2xsRGF0YSBzY3JvbGxEYXRhID0geyAuZGVsdGEgPSAwLCAuZXZlbnRU aW1lID0gR0RLX0NVUlJFTlRfVElNRSwgLnNvdXJjZSA9IEdES19TT1VSQ0VfVE9VQ0hQQUQsIC5p c0VuZCA9IHRydWUgfTsKICAgICBoYW5kbGVTY3JvbGxXaGVlbEV2ZW50KCZzY3JvbGxEYXRhKTsK LSAgICBtX2lzU2ltdWxhdGVkU3dpcGUgPSBmYWxzZTsKIAogICAgIHJldHVybiB0cnVlOwogfQot LSAKMi4zMS4xCgo= 432885 2021-07-05 07:49:55 -0700 2021-07-05 22:45:31 -0700 Patch 0001-Patch.patch text/plain 10831 alicem RnJvbSA5OTA0YTRkN2Q0MzE3ZDc1ZjQ5NGFmMWI2YWM1ZTU5OWM3NzUzMWZmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgTWlraGF5bGVua28gPGFsZXhtQGdub21lLm9y Zz4KRGF0ZTogTW9uLCA1IEp1bCAyMDIxIDE5OjQ4OjExICswNTAwClN1YmplY3Q6IFtQQVRDSF0g UGF0Y2gKCi0tLQogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAg IHwgMzcgKysrKysrKysrKysrKysrKysrKwogLi4uL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGll bnRJbXBsLmNwcCAgICAgIHwgMTAgKysrKy0KIC4uLi9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRX ZWJWaWV3QmFzZS5jcHAgICB8IDIzICsrKysrKysrKy0tLQogLi4uL1dlYktpdC9VSVByb2Nlc3Mv Vmlld0dlc3R1cmVDb250cm9sbGVyLmggIHwgIDYgKy0tCiAuLi4vZ3RrL1ZpZXdHZXN0dXJlQ29u dHJvbGxlckd0ay5jcHAgICAgICAgICAgfCAxMSArKy0tLS0KIDUgZmlsZXMgY2hhbmdlZCwgNjgg aW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAzMjM5YWQzODljMDAu LjgxZjYyMGZmYWY0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MCBAQAorMjAyMS0wNy0wNSAgQWxl eGFuZGVyIE1pa2hheWxlbmtvICA8YWxleG1AZ25vbWUub3JnPgorCisgICAgICAgIFtHVEtdIE5h dmlnYXRpb24gc3dpcGUgZ2VzdHVyZSBjYW4gYmUgdHJpZ2dlcmVkIHdpdGggbW91c2UKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzY3OAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE9yaWdpbmFsbHksIHRo ZSBuYXZpZ2F0aW9uIHN3aXBlIGdlc3R1cmUgaGFkIGEgZmV3IGNoZWNrcyB0byBvbmx5IG1ha2Ug aXQgcG9zc2libGUgdG8KKyAgICAgICAgdHJpZ2dlciBpdCB3aXRoIGEgdG91Y2hwYWQgb3IgdG91 Y2hzY3JlZW4sIHdpdGggYW4gZXhjZXB0aW9uIGZvciBzaW11bGF0ZWQgc3dpcGVzCisgICAgICAg IHdoZXJlIHdlIGNvdWxkbid0IHNldCB0aGUgc291cmNlIGVhc2lseS4KKworICAgICAgICBEdXJp bmcgdGhlIHJld3JpdGUgaW4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIxMjMyNCwgdGhlIGNoZWNrIGdvdAorICAgICAgICBkcm9wcGVkLCBidXQgaXQgaGFzIGEgZ29v ZCByZWFzb24gdG8gYmUgdGhlcmU6IG5vdCBhbGwgZGV2aWNlcyBhcmUgY2FwYWJsZSBvZgorICAg ICAgICBwZXJmb3JtaW5nIGEgZ2VzdHVyZS4gVG91Y2hwYWRzIGFuZCB0b3VjaHNjcmVlbnMgc2hv dWxkIGJlIGZpbmUsIHRyYWNrcG9pbnRzIGFyZQorICAgICAgICBmaW5pY2t5LCB0aG91Z2ggY2Fu IHN0aWxsIHRlY2huaWNhbGx5IHdvcmssIGJ1dCBtb3VzZSBhcmUgYSBuby1nby4gV2hpbGUgdGhl eSBjYW4KKyAgICAgICAgc3RhcnQgYSBzd2lwZSwgdGhleSB3aWxsIG5ldmVyIGVuZCBpdCBhbmQg dGhlIGdlc3R1cmUgd2lsbCBnZXQgc3R1Y2suCisKKyAgICAgICAgU28sIGFkZCB0aGUgY2hlY2sg YmFjay4gRG9uJ3QgYm90aGVyIHdpdGggdGhlIHNjcm9sbCBkaXJlY3Rpb24gdGhpcyB0aW1lIHRo b3VnaCwgd2hpbGUKKyAgICAgICAgdGhhdCBjaGVjayBtYWRlIHNlbnNlIHdoZW4gaXQgZ290IGFk ZGVkLCBhdCBzb21lIHBvaW50IHNpbmNlIHRoZW4gYWxsIHNjcm9sbCBldmVudHMKKyAgICAgICAg aGFkIEdES19TQ1JPTExfU01PT1RIIGRpcmVjdGlvbiBhbmQganVzdCBzZXQgdGhlaXIgZGVsdGFz IHRvICgxLCAwKSwgKC0xLCAwKSwgKDAsIDEpCisgICAgICAgIG9yICgwLCAtMSksIHNvIHRoYXQg Y2hlY2sgc3RvcHBlZCB3b3JraW5nLCBhbmQgdGhlIHNvdXJjZSB0eXBlIGNoZWNrIHNob3VsZCBm aWx0ZXIKKyAgICAgICAgbW91c2UgZXZlbnRzIGFueXdheS4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVu dEltcGw6OndoZWVsRXZlbnRXYXNOb3RIYW5kbGVkQnlXZWJDb3JlKToKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZS5jcHA6CisgICAgICAgICh3ZWJraXRXZWJW aWV3QmFzZUhhbmRsZVdoZWVsRXZlbnQpOgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VTY3Jv bGwpOgorICAgICAgICAod2Via2l0V2ViVmlld0Jhc2VUb3VjaERyYWdVcGRhdGUpOgorICAgICAg ICAod2Via2l0V2ViVmlld0Jhc2VUb3VjaERyYWdFbmQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9W aWV3R2VzdHVyZUNvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvZ3RrL1ZpZXdHZXN0 dXJlQ29udHJvbGxlckd0ay5jcHA6CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJv bGxlcjo6UGVuZGluZ1N3aXBlVHJhY2tlcjo6c2Nyb2xsRXZlbnRDYW5JbmZsdWVuY2VTd2lwZSk6 CisgICAgICAgIChXZWJLaXQ6OmlzVG91Y2hFdmVudCk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdH ZXN0dXJlQ29udHJvbGxlcjo6YmVnaW5TaW11bGF0ZWRTd2lwZUluRGlyZWN0aW9uRm9yVGVzdGlu Zyk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdHZXN0dXJlQ29udHJvbGxlcjo6Y29tcGxldGVTaW11 bGF0ZWRTd2lwZUluRGlyZWN0aW9uRm9yVGVzdGluZyk6CisKIDIwMjEtMDctMDIgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGF0dGVtcHQgdG8g Zml4IE1hYyBDYXRhbHlzdCBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAKaW5kZXggMmJmMDNlZWMxN2I5Li4zYjU2MmJkNTMy OGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVu dEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVu dEltcGwuY3BwCkBAIC00MjYsOSArNDI2LDE1IEBAIHZvaWQgUGFnZUNsaWVudEltcGw6OndoZWVs RXZlbnRXYXNOb3RIYW5kbGVkQnlXZWJDb3JlKGNvbnN0IE5hdGl2ZVdlYldoZWVsRXZlbnQmCiAg ICAgaWYgKGNvbnRyb2xsZXIgJiYgY29udHJvbGxlci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkp IHsKICAgICAgICAgZG91YmxlIGRlbHRhWDsKICAgICAgICAgZ2RrX2V2ZW50X2dldF9zY3JvbGxf ZGVsdGFzKGV2ZW50Lm5hdGl2ZUV2ZW50KCksICZkZWx0YVgsIG51bGxwdHIpOwotICAgICAgICBi b29sIGlzRW5kID0gZ2RrX2V2ZW50X2lzX3Njcm9sbF9zdG9wX2V2ZW50KGV2ZW50Lm5hdGl2ZUV2 ZW50KCkpID8gdHJ1ZSA6IGZhbHNlOworCiAgICAgICAgIGludDMyX3QgZXZlbnRUaW1lID0gc3Rh dGljX2Nhc3Q8aW50MzJfdD4oZ2RrX2V2ZW50X2dldF90aW1lKGV2ZW50Lm5hdGl2ZUV2ZW50KCkp KTsKLSAgICAgICAgUGxhdGZvcm1HdGtTY3JvbGxEYXRhIHNjcm9sbERhdGEgPSB7IC5kZWx0YSA9 IGRlbHRhWCwgLmV2ZW50VGltZSA9IGV2ZW50VGltZSwgLmlzVG91Y2ggPSBmYWxzZSwgLmlzRW5k ID0gaXNFbmQgfTsKKworICAgICAgICBHZGtEZXZpY2UqIGRldmljZSA9IGdka19ldmVudF9nZXRf c291cmNlX2RldmljZShldmVudC5uYXRpdmVFdmVudCgpKTsKKyAgICAgICAgR2RrSW5wdXRTb3Vy Y2Ugc291cmNlID0gZ2RrX2RldmljZV9nZXRfc291cmNlKGRldmljZSk7CisKKyAgICAgICAgYm9v bCBpc0VuZCA9IGdka19ldmVudF9pc19zY3JvbGxfc3RvcF9ldmVudChldmVudC5uYXRpdmVFdmVu dCgpKSA/IHRydWUgOiBmYWxzZTsKKworICAgICAgICBQbGF0Zm9ybUd0a1Njcm9sbERhdGEgc2Ny b2xsRGF0YSA9IHsgLmRlbHRhID0gZGVsdGFYLCAuZXZlbnRUaW1lID0gZXZlbnRUaW1lLCAuc291 cmNlID0gc291cmNlLCAuaXNFbmQgPSBpc0VuZCB9OwogICAgICAgICBjb250cm9sbGVyLT53aGVl bEV2ZW50V2FzTm90SGFuZGxlZEJ5V2ViQ29yZSgmc2Nyb2xsRGF0YSk7CiAgICAgICAgIHJldHVy bjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYlZpZXdCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlld0Jhc2UuY3BwCmluZGV4IGU5Y2Y3MTM1MmJhMi4uMTcyZDNkM2Y5ODE0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNl LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdC YXNlLmNwcApAQCAtMTI2Niw5ICsxMjY2LDE1IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdC YXNlSGFuZGxlV2hlZWxFdmVudChXZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UsIEdkCiAg ICAgaWYgKGNvbnRyb2xsZXIgJiYgY29udHJvbGxlci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkp IHsKICAgICAgICAgZG91YmxlIGRlbHRhWDsKICAgICAgICAgZ2RrX2V2ZW50X2dldF9zY3JvbGxf ZGVsdGFzKGV2ZW50LCAmZGVsdGFYLCBudWxscHRyKTsKLSAgICAgICAgYm9vbCBpc0VuZCA9IGdk a19ldmVudF9pc19zY3JvbGxfc3RvcF9ldmVudChldmVudCkgPyB0cnVlIDogZmFsc2U7CisKICAg ICAgICAgaW50MzJfdCBldmVudFRpbWUgPSBzdGF0aWNfY2FzdDxpbnQzMl90PihnZGtfZXZlbnRf Z2V0X3RpbWUoZXZlbnQpKTsKLSAgICAgICAgUGxhdGZvcm1HdGtTY3JvbGxEYXRhIHNjcm9sbERh dGEgPSB7IC5kZWx0YSA9IGRlbHRhWCwgLmV2ZW50VGltZSA9IGV2ZW50VGltZSwgLmlzVG91Y2gg PSBmYWxzZSwgLmlzRW5kID0gaXNFbmQgfTsKKworICAgICAgICBHZGtEZXZpY2UqIGRldmljZSA9 IGdka19ldmVudF9nZXRfc291cmNlX2RldmljZShldmVudCk7CisgICAgICAgIEdka0lucHV0U291 cmNlIHNvdXJjZSA9IGdka19kZXZpY2VfZ2V0X3NvdXJjZShkZXZpY2UpOworCisgICAgICAgIGJv b2wgaXNFbmQgPSBnZGtfZXZlbnRfaXNfc2Nyb2xsX3N0b3BfZXZlbnQoZXZlbnQpID8gdHJ1ZSA6 IGZhbHNlOworCisgICAgICAgIFBsYXRmb3JtR3RrU2Nyb2xsRGF0YSBzY3JvbGxEYXRhID0geyAu ZGVsdGEgPSBkZWx0YVgsIC5ldmVudFRpbWUgPSBldmVudFRpbWUsIC5zb3VyY2UgPSBzb3VyY2Us IC5pc0VuZCA9IGlzRW5kIH07CiAgICAgICAgIGlmIChjb250cm9sbGVyLT5oYW5kbGVTY3JvbGxX aGVlbEV2ZW50KCZzY3JvbGxEYXRhKSkKICAgICAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC0x MzI5LDkgKzEzMzUsMTQgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdFdlYlZpZXdCYXNlU2Nyb2xs KFdlYktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwgZG91YmxlIGQKIAogICAgIFZpZXdHZXN0 dXJlQ29udHJvbGxlciogY29udHJvbGxlciA9IHdlYmtpdFdlYlZpZXdCYXNlVmlld0dlc3R1cmVD b250cm9sbGVyKHdlYlZpZXdCYXNlKTsKICAgICBpZiAoY29udHJvbGxlciAmJiBjb250cm9sbGVy LT5pc1N3aXBlR2VzdHVyZUVuYWJsZWQoKSkgewotICAgICAgICBib29sIGlzRW5kID0gZ2RrX3Nj cm9sbF9ldmVudF9pc19zdG9wKGV2ZW50KSA/IHRydWUgOiBmYWxzZTsKICAgICAgICAgaW50MzJf dCBldmVudFRpbWUgPSBzdGF0aWNfY2FzdDxpbnQzMl90PihndGtfZXZlbnRfY29udHJvbGxlcl9n ZXRfY3VycmVudF9ldmVudF90aW1lKGV2ZW50Q29udHJvbGxlcikpOwotICAgICAgICBQbGF0Zm9y bUd0a1Njcm9sbERhdGEgc2Nyb2xsRGF0YSA9IHsgLmRlbHRhID0gZGVsdGFYLCAuZXZlbnRUaW1l ID0gZXZlbnRUaW1lLCAuaXNUb3VjaCA9IGZhbHNlLCAuaXNFbmQgPSBpc0VuZCB9OworCisgICAg ICAgIEdka0RldmljZSogZGV2aWNlID0gZ2RrX2V2ZW50X2dldF9kZXZpY2UoZXZlbnQpOworICAg ICAgICBHZGtJbnB1dFNvdXJjZSBzb3VyY2UgPSBnZGtfZGV2aWNlX2dldF9zb3VyY2UoZGV2aWNl KTsKKworICAgICAgICBib29sIGlzRW5kID0gZ2RrX3Njcm9sbF9ldmVudF9pc19zdG9wKGV2ZW50 KSA/IHRydWUgOiBmYWxzZTsKKworICAgICAgICBQbGF0Zm9ybUd0a1Njcm9sbERhdGEgc2Nyb2xs RGF0YSA9IHsgLmRlbHRhID0gZGVsdGFYLCAuZXZlbnRUaW1lID0gZXZlbnRUaW1lLCAuc291cmNl ID0gc291cmNlLCAuaXNFbmQgPSBpc0VuZCB9OwogICAgICAgICBpZiAoY29udHJvbGxlci0+aGFu ZGxlU2Nyb2xsV2hlZWxFdmVudCgmc2Nyb2xsRGF0YSkpCiAgICAgICAgICAgICByZXR1cm4gR0RL X0VWRU5UX1NUT1A7CiAgICAgfQpAQCAtMTk1Niw3ICsxOTY3LDcgQEAgc3RhdGljIHZvaWQgd2Vi a2l0V2ViVmlld0Jhc2VUb3VjaERyYWdVcGRhdGUoV2ViS2l0V2ViVmlld0Jhc2UqIHdlYlZpZXdC YXNlLCBkb3UKICAgICAgICAgVmlld0dlc3R1cmVDb250cm9sbGVyKiBjb250cm9sbGVyID0gd2Vi a2l0V2ViVmlld0Jhc2VWaWV3R2VzdHVyZUNvbnRyb2xsZXIod2ViVmlld0Jhc2UpOwogICAgICAg ICBpZiAoY29udHJvbGxlciAmJiBjb250cm9sbGVyLT5pc1N3aXBlR2VzdHVyZUVuYWJsZWQoKSkg ewogICAgICAgICAgICAgaW50MzJfdCBldmVudFRpbWUgPSBzdGF0aWNfY2FzdDxpbnQzMl90Pihn dGtfZXZlbnRfY29udHJvbGxlcl9nZXRfY3VycmVudF9ldmVudF90aW1lKEdUS19FVkVOVF9DT05U Uk9MTEVSKGdlc3R1cmUpKSk7Ci0gICAgICAgICAgICBQbGF0Zm9ybUd0a1Njcm9sbERhdGEgc2Ny b2xsRGF0YSA9IHsgLmRlbHRhID0gZGVsdGFYLCAuZXZlbnRUaW1lID0gZXZlbnRUaW1lLCAuaXNU b3VjaCA9IHRydWUsIC5pc0VuZCA9IGZhbHNlIH07CisgICAgICAgICAgICBQbGF0Zm9ybUd0a1Nj cm9sbERhdGEgc2Nyb2xsRGF0YSA9IHsgLmRlbHRhID0gZGVsdGFYLCAuZXZlbnRUaW1lID0gZXZl bnRUaW1lLCAuc291cmNlID0gR0RLX1NPVVJDRV9UT1VDSFNDUkVFTiwgLmlzRW5kID0gZmFsc2Ug fTsKICAgICAgICAgICAgIGlmIChjb250cm9sbGVyLT5oYW5kbGVTY3JvbGxXaGVlbEV2ZW50KCZz Y3JvbGxEYXRhKSkKICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAgLTE5ODAs NyArMTk5MSw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlVG91Y2hEcmFnRW5kKFdl YktpdFdlYlZpZXdCYXNlKiB3ZWJWaWV3QmFzZSwgZ2RvdWJsCiAgICAgICAgIFZpZXdHZXN0dXJl Q29udHJvbGxlciogY29udHJvbGxlciA9IHdlYmtpdFdlYlZpZXdCYXNlVmlld0dlc3R1cmVDb250 cm9sbGVyKHdlYlZpZXdCYXNlKTsKICAgICAgICAgaWYgKGNvbnRyb2xsZXIgJiYgY29udHJvbGxl ci0+aXNTd2lwZUdlc3R1cmVFbmFibGVkKCkpIHsKICAgICAgICAgICAgIGludDMyX3QgZXZlbnRU aW1lID0gc3RhdGljX2Nhc3Q8aW50MzJfdD4oZ3RrX2V2ZW50X2NvbnRyb2xsZXJfZ2V0X2N1cnJl bnRfZXZlbnRfdGltZShHVEtfRVZFTlRfQ09OVFJPTExFUihnZXN0dXJlKSkpOwotICAgICAgICAg ICAgUGxhdGZvcm1HdGtTY3JvbGxEYXRhIHNjcm9sbERhdGEgPSB7IC5kZWx0YSA9IDAsIC5ldmVu dFRpbWUgPSBldmVudFRpbWUsIC5pc1RvdWNoID0gZmFsc2UsIC5pc0VuZCA9IHRydWUgfTsKKyAg ICAgICAgICAgIFBsYXRmb3JtR3RrU2Nyb2xsRGF0YSBzY3JvbGxEYXRhID0geyAuZGVsdGEgPSAw LCAuZXZlbnRUaW1lID0gZXZlbnRUaW1lLCAuc291cmNlID0gR0RLX1NPVVJDRV9UT1VDSFNDUkVF TiwgLmlzRW5kID0gdHJ1ZSB9OwogICAgICAgICAgICAgY29udHJvbGxlci0+aGFuZGxlU2Nyb2xs V2hlZWxFdmVudCgmc2Nyb2xsRGF0YSk7CiAgICAgICAgIH0KICAgICB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9WaWV3R2VzdHVyZUNvbnRyb2xsZXIuaCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oCmluZGV4IGUxNjE2MDdiMjhl Yy4uMGU5NzJhOTZkNTU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9WaWV3 R2VzdHVyZUNvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9WaWV3R2Vz dHVyZUNvbnRyb2xsZXIuaApAQCAtODIsNyArODIsNyBAQCB0eXBlZGVmIE5TRXZlbnQqIFBsYXRm b3JtU2Nyb2xsRXZlbnQ7CiB0eXBlZGVmIHN0cnVjdCB7CiAgICAgZG91YmxlIGRlbHRhOwogICAg IGludDMyX3QgZXZlbnRUaW1lOwotICAgIGJvb2wgaXNUb3VjaDsKKyAgICBHZGtJbnB1dFNvdXJj ZSBzb3VyY2U7CiAgICAgYm9vbCBpc0VuZDsKIH0gUGxhdGZvcm1HdGtTY3JvbGxEYXRhOwogdHlw ZWRlZiBQbGF0Zm9ybUd0a1Njcm9sbERhdGEqIFBsYXRmb3JtU2Nyb2xsRXZlbnQ7CkBAIC00NzIs OSArNDcyLDcgQEAgcHJpdmF0ZToKICAgICBpbnQgbV9zd2lwZU91dGxpbmVTaXplOwogICAgIEdS ZWZQdHI8R3RrQ3NzUHJvdmlkZXI+IG1fY3NzUHJvdmlkZXI7CiAjZW5kaWYKLQotICAgIGJvb2wg bV9pc1NpbXVsYXRlZFN3aXBlIHsgZmFsc2UgfTsKLSNlbmRpZgorI2VuZGlmIC8vIFBMQVRGT1JN KEdUSykKIAogICAgIGJvb2wgbV9pc0Nvbm5lY3RlZFRvUHJvY2VzcyB7IGZhbHNlIH07CiAgICAg Ym9vbCBtX2RpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkIHsgZmFsc2UgfTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9WaWV3R2VzdHVyZUNvbnRyb2xsZXJHdGsuY3BwIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvZ3RrL1ZpZXdHZXN0dXJlQ29udHJvbGxlckd0ay5jcHAK aW5kZXggODA2YmJmZmVlMGM1Li4xZDE3ODBmODk5MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2d0ay9WaWV3R2VzdHVyZUNvbnRyb2xsZXJHdGsuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2d0ay9WaWV3R2VzdHVyZUNvbnRyb2xsZXJHdGsuY3BwCkBAIC04 NSwxMiArODUsMTIgQEAgYm9vbCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlBlbmRpbmdTd2lwZVRy YWNrZXI6OnNjcm9sbEV2ZW50Q2FuRW5kU3dpcGUoUGxhdGZvcm0KIAogYm9vbCBWaWV3R2VzdHVy ZUNvbnRyb2xsZXI6OlBlbmRpbmdTd2lwZVRyYWNrZXI6OnNjcm9sbEV2ZW50Q2FuSW5mbHVlbmNl U3dpcGUoUGxhdGZvcm1HdGtTY3JvbGxEYXRhKiBldmVudCkKIHsKLSAgICByZXR1cm4gdHJ1ZTsK KyAgICByZXR1cm4gZXZlbnQtPnNvdXJjZSA9PSBHREtfU09VUkNFX1RPVUNIUEFEIHx8IGV2ZW50 LT5zb3VyY2UgPT0gR0RLX1NPVVJDRV9UT1VDSFNDUkVFTjsKIH0KIAogc3RhdGljIGJvb2wgaXNU b3VjaEV2ZW50KFBsYXRmb3JtR3RrU2Nyb2xsRGF0YSogZXZlbnQpCiB7Ci0gICAgcmV0dXJuIGV2 ZW50LT5pc1RvdWNoOworICAgIHJldHVybiBldmVudC0+c291cmNlID09IEdES19TT1VSQ0VfVE9V Q0hTQ1JFRU47CiB9CiAKIEZsb2F0U2l6ZSBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OlBlbmRpbmdT d2lwZVRyYWNrZXI6OnNjcm9sbEV2ZW50R2V0U2Nyb2xsaW5nRGVsdGFzKFBsYXRmb3JtR3RrU2Ny b2xsRGF0YSogZXZlbnQpCkBAIC02MzgsMTQgKzYzOCwxMiBAQCBib29sIFZpZXdHZXN0dXJlQ29u dHJvbGxlcjo6YmVnaW5TaW11bGF0ZWRTd2lwZUluRGlyZWN0aW9uRm9yVGVzdGluZyhTd2lwZURp cmVjdAogICAgIGlmICghY2FuU3dpcGVJbkRpcmVjdGlvbihkaXJlY3Rpb24pKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKLSAgICBtX2lzU2ltdWxhdGVkU3dpcGUgPSB0cnVlOwotCiAgICAgZG91 YmxlIGRlbHRhID0gc3dpcGVUb3VjaHBhZEJhc2VXaWR0aCAvIGd0a1Njcm9sbERlbHRhTXVsdGlw bGllciAqIDAuNzU7CiAKICAgICBpZiAoaXNQaHlzaWNhbGx5U3dpcGluZ0xlZnQoZGlyZWN0aW9u KSkKICAgICAgICAgZGVsdGEgPSAtZGVsdGE7CiAKLSAgICBQbGF0Zm9ybUd0a1Njcm9sbERhdGEg c2Nyb2xsRGF0YSA9IHsgLmRlbHRhID0gZGVsdGEsIC5ldmVudFRpbWUgPSBHREtfQ1VSUkVOVF9U SU1FLCAuaXNUb3VjaCA9IGZhbHNlLCAuaXNFbmQgPSBmYWxzZSB9OworICAgIFBsYXRmb3JtR3Rr U2Nyb2xsRGF0YSBzY3JvbGxEYXRhID0geyAuZGVsdGEgPSBkZWx0YSwgLmV2ZW50VGltZSA9IEdE S19DVVJSRU5UX1RJTUUsIC5zb3VyY2UgPSBHREtfU09VUkNFX1RPVUNIUEFELCAuaXNFbmQgPSBm YWxzZSB9OwogICAgIGhhbmRsZVNjcm9sbFdoZWVsRXZlbnQoJnNjcm9sbERhdGEpOwogCiAgICAg cmV0dXJuIHRydWU7CkBAIC02NTMsOSArNjUxLDggQEAgYm9vbCBWaWV3R2VzdHVyZUNvbnRyb2xs ZXI6OmJlZ2luU2ltdWxhdGVkU3dpcGVJbkRpcmVjdGlvbkZvclRlc3RpbmcoU3dpcGVEaXJlY3QK IAogYm9vbCBWaWV3R2VzdHVyZUNvbnRyb2xsZXI6OmNvbXBsZXRlU2ltdWxhdGVkU3dpcGVJbkRp cmVjdGlvbkZvclRlc3RpbmcoU3dpcGVEaXJlY3Rpb24pCiB7Ci0gICAgUGxhdGZvcm1HdGtTY3Jv bGxEYXRhIHNjcm9sbERhdGEgPSB7IC5kZWx0YSA9IDAsIC5ldmVudFRpbWUgPSBHREtfQ1VSUkVO VF9USU1FLCAuaXNUb3VjaCA9IGZhbHNlLCAuaXNFbmQgPSB0cnVlIH07CisgICAgUGxhdGZvcm1H dGtTY3JvbGxEYXRhIHNjcm9sbERhdGEgPSB7IC5kZWx0YSA9IDAsIC5ldmVudFRpbWUgPSBHREtf Q1VSUkVOVF9USU1FLCAuc291cmNlID0gR0RLX1NPVVJDRV9UT1VDSFBBRCwgLmlzRW5kID0gdHJ1 ZSB9OwogICAgIGhhbmRsZVNjcm9sbFdoZWVsRXZlbnQoJnNjcm9sbERhdGEpOwotICAgIG1faXNT aW11bGF0ZWRTd2lwZSA9IGZhbHNlOwogCiAgICAgcmV0dXJuIHRydWU7CiB9Ci0tIAoyLjMxLjEK Cg==