198656 2019-06-07 05:17:26 -0700 REGRESSION (r245006): Setting scrollview.scrollEnabled clobbers any scrollEnabled set by a client 2019-06-07 22:05:53 -0700 1 1 1 Unclassified WebKit Scrolling WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=153852 InRadar P2 Normal --- 1 koivisto webkit-unassigned commit-queue fred.wang simon.fraser thorton wenson_hsieh oldest_to_newest 1542804 0 koivisto 2019-06-07 05:17:26 -0700 Remember user setting separately. 1542805 1 koivisto 2019-06-07 05:18:12 -0700 <rdar://problem/51494585> 1542806 2 371582 koivisto 2019-06-07 05:23:38 -0700 Created attachment 371582 patch 1542863 3 371582 thorton 2019-06-07 10:30:48 -0700 Comment on attachment 371582 patch We need to do something similar for zoomEnabled and a bunch of other properties, but this is a good start (and fixes a regression, where the others have been broken for ages). 1542876 4 koivisto 2019-06-07 10:54:01 -0700 If this pattern looks ok I can do zoom too here as it is basically the same thing. 1542882 5 simon.fraser 2019-06-07 11:06:40 -0700 Devs have also complained about scroll-snap code overriding the deceleration values. 1542885 6 wenson_hsieh 2019-06-07 11:18:08 -0700 (In reply to Simon Fraser (smfr) from comment #5) > Devs have also complained about scroll-snap code overriding the deceleration > values. Hm...could've sworn I fixed this in r188541 :/ 1542886 7 wenson_hsieh 2019-06-07 11:19:39 -0700 (In reply to Wenson Hsieh from comment #6) > (In reply to Simon Fraser (smfr) from comment #5) > > Devs have also complained about scroll-snap code overriding the deceleration > > values. > > Hm...could've sworn I fixed this in r188541 :/ Ah, maybe r211197 undid this... 1542890 8 thorton 2019-06-07 11:38:42 -0700 (In reply to Antti Koivisto from comment #4) > If this pattern looks ok I can do zoom too here as it is basically the same > thing. Please do! The number of times I've seen people trying to override viewForZooming to achieve this and then hosing everything is v. high (inspiring https://trac.webkit.org/changeset/228253/webkit). 1542907 9 371604 koivisto 2019-06-07 13:01:47 -0700 Created attachment 371604 with zooming fix too 1543059 10 371604 commit-queue 2019-06-07 22:05:51 -0700 Comment on attachment 371604 with zooming fix too Clearing flags on attachment: 371604 Committed r246230: <https://trac.webkit.org/changeset/246230> 1543060 11 commit-queue 2019-06-07 22:05:53 -0700 All reviewed patches have been landed. Closing bug. 371582 2019-06-07 05:23:38 -0700 2019-06-07 13:01:47 -0700 patch scrollenabled-clobber.patch text/plain 4281 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDYxOTUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE5LTA2LTA3ICBBbnR0aSBLb2l2 aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjQ1MDA2KTog U2V0dGluZyBzY3JvbGx2aWV3LnNjcm9sbEVuYWJsZWQgY2xvYmJlcnMgYW55IHNjcm9sbEVuYWJs ZWQgc2V0IGJ5IGEgY2xpZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTg2NTYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUxNDk0NTg1PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbG93IGNsaWVu dCB0byBkaXNhYmxlIHNjcm9sbGluZy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbW1pdExheWVyVHJlZTpd KToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3Lm1tOgorICAgICAgICAoLVtXS1Njcm9sbFZpZXcgaW5p dFdpdGhGcmFtZTpdKToKKyAgICAgICAgKC1bV0tTY3JvbGxWaWV3IHNldFNjcm9sbEVuYWJsZWQ6 XSk6CisgICAgICAgICgtW1dLU2Nyb2xsVmlldyBfc2V0U2Nyb2xsRW5hYmxlZEludGVybmFsOl0p OgorICAgICAgICAoLVtXS1Njcm9sbFZpZXcgX3VwZGF0ZVNjcm9sbGFiaWxpdHldKToKKwogMjAx OS0wNi0wNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgUkVHUkVTU0lPTihyMjQzMDk0KTogW0dUS11bV1BFXSBTdGFsZSBjb250ZW50IGFmdGVy IHJlc3RvcmluZyB0aGUgd2ViIHZpZXcgc2Vzc2lvbgpJbmRleDogU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCShyZXZpc2lvbiAyNDYxODYpCisrKyBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCSh3b3JraW5nIGNv cHkpCkBAIC0xOTkwLDcgKzE5OTAsNyBAQCAtICh2b2lkKV9kaWRDb21taXRMYXllclRyZWU6KGNv bnN0IFdlYktpCiAjaWYgRU5BQkxFKEFTWU5DX1NDUk9MTElORykKICAgICBib29sIGhhc0RvY2tl ZElucHV0VmlldyA9ICFDR1JlY3RJc0VtcHR5KF9pbnB1dFZpZXdCb3VuZHMpOwogICAgIGJvb2wg aXNab29tZWQgPSBsYXllclRyZWVUcmFuc2FjdGlvbi5wYWdlU2NhbGVGYWN0b3IoKSA+IGxheWVy VHJlZVRyYW5zYWN0aW9uLmluaXRpYWxTY2FsZUZhY3RvcigpOwotICAgIFtfc2Nyb2xsVmlldyBz ZXRTY3JvbGxFbmFibGVkOl9wYWdlLT5zY3JvbGxpbmdDb29yZGluYXRvclByb3h5KCktPmhhc1Nj cm9sbGFibGVNYWluRnJhbWUoKSB8fCBoYXNEb2NrZWRJbnB1dFZpZXcgfHwgaXNab29tZWRdOwor ICAgIFtfc2Nyb2xsVmlldyBfc2V0U2Nyb2xsRW5hYmxlZEludGVybmFsOl9wYWdlLT5zY3JvbGxp bmdDb29yZGluYXRvclByb3h5KCktPmhhc1Njcm9sbGFibGVNYWluRnJhbWUoKSB8fCBoYXNEb2Nr ZWRJbnB1dFZpZXcgfHwgaXNab29tZWRdOwogI2VuZGlmCiAgICAgaWYgKCFsYXllclRyZWVUcmFu c2FjdGlvbi5zY2FsZVdhc1NldEJ5VUlQcm9jZXNzKCkgJiYgIVtfc2Nyb2xsVmlldyBpc1pvb21p bmddICYmICFbX3Njcm9sbFZpZXcgaXNab29tQm91bmNpbmddICYmICFbX3Njcm9sbFZpZXcgX2lz QW5pbWF0aW5nWm9vbV0gJiYgW19zY3JvbGxWaWV3IHpvb21TY2FsZV0gIT0gbGF5ZXJUcmVlVHJh bnNhY3Rpb24ucGFnZVNjYWxlRmFjdG9yKCkpIHsKICAgICAgICAgTE9HX1dJVEhfU1RSRUFNKFZp c2libGVSZWN0cywgc3RyZWFtIDw8ICIgdXBkYXRpbmcgc2Nyb2xsIHZpZXcgd2l0aCBwYWdlU2Nh bGVGYWN0b3IgIiA8PCBsYXllclRyZWVUcmFuc2FjdGlvbi5wYWdlU2NhbGVGYWN0b3IoKSk7Cklu ZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5oCShyZXZpc2lv biAyNDYxODYpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3LmgJ KHdvcmtpbmcgY29weSkKQEAgLTM0LDYgKzM0LDcgQEAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBh c3NpZ24pIFdLV2ViVmlldyA8VUlTY3JvbGxWaWV3RGVsZWdhdGU+ICppbnRlcm5hbERlbGVnYXRl OwogCiAtICh2b2lkKV9zZXRDb250ZW50U2l6ZVByZXNlcnZpbmdDb250ZW50T2Zmc2V0RHVyaW5n UnViYmVyYmFuZDooQ0dTaXplKWNvbnRlbnRTaXplOworLSAodm9pZClfc2V0U2Nyb2xsRW5hYmxl ZEludGVybmFsOihCT09MKWVuYWJsZWQ7CiAKICNpZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9S RVFVSVJFRCA+PSAxMTAwMDAKIEBwcm9wZXJ0eSAobm9uYXRvbWljLCBhc3NpZ24sIHJlYWRvbmx5 KSBCT09MIF9jb250ZW50SW5zZXRBZGp1c3RtZW50QmVoYXZpb3JXYXNFeHRlcm5hbGx5T3ZlcnJp ZGRlbjsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5t bQkocmV2aXNpb24gMjQ2MTg2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLU2Ny b2xsVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtMTMwLDYgKzEzMCw4IEBAIC0gKGlkKWZvcndh cmRpbmdUYXJnZXRGb3JTZWxlY3RvcjooU0VMKWEKICAgICBCT09MIF9jb250ZW50SW5zZXRBZGp1 c3RtZW50QmVoYXZpb3JXYXNFeHRlcm5hbGx5T3ZlcnJpZGRlbjsKICNlbmRpZgogICAgIENHRmxv YXQgX2tleWJvYXJkQm90dG9tSW5zZXRBZGp1c3RtZW50OworICAgIEJPT0wgX3Njcm9sbEVuYWJs ZWRCeUNsaWVudDsKKyAgICBCT09MIF9zY3JvbGxFbmFibGVkSW50ZXJuYWw7CiB9CiAKIC0gKGlk KWluaXRXaXRoRnJhbWU6KENHUmVjdClmcmFtZQpAQCAtMTM5LDYgKzE0MSw5IEBAIC0gKGlkKWlu aXRXaXRoRnJhbWU6KENHUmVjdClmcmFtZQogICAgIGlmICghc2VsZikKICAgICAgICAgcmV0dXJu IG5pbDsKIAorICAgIF9zY3JvbGxFbmFibGVkQnlDbGllbnQgPSBZRVM7CisgICAgX3Njcm9sbEVu YWJsZWRJbnRlcm5hbCA9IFlFUzsKKwogICAgIHNlbGYuYWx3YXlzQm91bmNlVmVydGljYWwgPSBZ RVM7CiAgICAgc2VsZi5kaXJlY3Rpb25hbExvY2tFbmFibGVkID0gWUVTOwogICAgIFtzZWxmIF9z ZXRJbmRpY2F0b3JJbnNldEFkanVzdG1lbnRCZWhhdmlvcjpVSVNjcm9sbFZpZXdJbmRpY2F0b3JJ bnNldEFkanVzdG1lbnRBbHdheXNdOwpAQCAtMzU0LDYgKzM1OSwyMyBAQCAtIChVSUVkZ2VJbnNl dHMpX3N5c3RlbUNvbnRlbnRJbnNldAogICAgIHJldHVybiBzeXN0ZW1Db250ZW50SW5zZXQ7CiB9 CiAKKy0gKHZvaWQpc2V0U2Nyb2xsRW5hYmxlZDooQk9PTCl2YWx1ZQoreworICAgIF9zY3JvbGxF bmFibGVkQnlDbGllbnQgPSB2YWx1ZTsKKyAgICBbc2VsZiBfdXBkYXRlU2Nyb2xsYWJpbGl0eV07 Cit9CisKKy0gKHZvaWQpX3NldFNjcm9sbEVuYWJsZWRJbnRlcm5hbDooQk9PTCl2YWx1ZQorewor ICAgIF9zY3JvbGxFbmFibGVkSW50ZXJuYWwgPSB2YWx1ZTsKKyAgICBbc2VsZiBfdXBkYXRlU2Ny b2xsYWJpbGl0eV07Cit9CisKKy0gKHZvaWQpX3VwZGF0ZVNjcm9sbGFiaWxpdHkKK3sKKyAgICBb c3VwZXIgc2V0U2Nyb2xsRW5hYmxlZDooX3Njcm9sbEVuYWJsZWRCeUNsaWVudCAmJiBfc2Nyb2xs RW5hYmxlZEludGVybmFsKV07Cit9CisKICNpZiBQTEFURk9STShXQVRDSE9TKQogCiAtICh2b2lk KWFkZEdlc3R1cmVSZWNvZ25pemVyOihVSUdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29n bml6ZXIK 371604 2019-06-07 13:01:47 -0700 2019-06-07 22:05:51 -0700 with zooming fix too scrollenabled-clobber-2.patch text/plain 5289 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNDYxOTUpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA2LTA3ICBBbnR0aSBLb2l2 aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjQ1MDA2KTog U2V0dGluZyBzY3JvbGx2aWV3LnNjcm9sbEVuYWJsZWQgY2xvYmJlcnMgYW55IHNjcm9sbEVuYWJs ZWQgc2V0IGJ5IGEgY2xpZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTg2NTYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUxNDk0NTg1PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFsbG93IGNsaWVu dCB0byBkaXNhYmxlIHNjcm9sbGluZyBhbmQgem9vbWluZy4KKworICAgICAgICAqIFVJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbW1p dExheWVyVHJlZTpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3Lm1tOgorICAgICAgICAoLVtXS1Nj cm9sbFZpZXcgaW5pdFdpdGhGcmFtZTpdKToKKyAgICAgICAgKC1bV0tTY3JvbGxWaWV3IHNldFNj cm9sbEVuYWJsZWQ6XSk6CisgICAgICAgICgtW1dLU2Nyb2xsVmlldyBfc2V0U2Nyb2xsRW5hYmxl ZEludGVybmFsOl0pOgorICAgICAgICAoLVtXS1Njcm9sbFZpZXcgX3VwZGF0ZVNjcm9sbGFiaWxp dHldKToKKyAgICAgICAgKC1bV0tTY3JvbGxWaWV3IHNldFpvb21FbmFibGVkOl0pOgorICAgICAg ICAoLVtXS1Njcm9sbFZpZXcgX3NldFpvb21FbmFibGVkSW50ZXJuYWw6XSk6CisgICAgICAgICgt W1dLU2Nyb2xsVmlldyBfdXBkYXRlWm9vbWFiaWxpdHldKToKKwogMjAxOS0wNi0wNiAgQ2FybG9z IEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lP TihyMjQzMDk0KTogW0dUS11bV1BFXSBTdGFsZSBjb250ZW50IGFmdGVyIHJlc3RvcmluZyB0aGUg d2ViIHZpZXcgc2Vzc2lvbgpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3Lm1tCShyZXZpc2lvbiAyNDYxODYpCisrKyBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xOTg2LDEx ICsxOTg2LDExIEBAIC0gKHZvaWQpX2RpZENvbW1pdExheWVyVHJlZTooY29uc3QgV2ViS2kKIAog ICAgIFtfc2Nyb2xsVmlldyBzZXRNaW5pbXVtWm9vbVNjYWxlOmxheWVyVHJlZVRyYW5zYWN0aW9u Lm1pbmltdW1TY2FsZUZhY3RvcigpXTsKICAgICBbX3Njcm9sbFZpZXcgc2V0TWF4aW11bVpvb21T Y2FsZTpsYXllclRyZWVUcmFuc2FjdGlvbi5tYXhpbXVtU2NhbGVGYWN0b3IoKV07Ci0gICAgW19z Y3JvbGxWaWV3IHNldFpvb21FbmFibGVkOmxheWVyVHJlZVRyYW5zYWN0aW9uLmFsbG93c1VzZXJT Y2FsaW5nKCldOworICAgIFtfc2Nyb2xsVmlldyBfc2V0Wm9vbUVuYWJsZWRJbnRlcm5hbDpsYXll clRyZWVUcmFuc2FjdGlvbi5hbGxvd3NVc2VyU2NhbGluZygpXTsKICNpZiBFTkFCTEUoQVNZTkNf U0NST0xMSU5HKQogICAgIGJvb2wgaGFzRG9ja2VkSW5wdXRWaWV3ID0gIUNHUmVjdElzRW1wdHko X2lucHV0Vmlld0JvdW5kcyk7CiAgICAgYm9vbCBpc1pvb21lZCA9IGxheWVyVHJlZVRyYW5zYWN0 aW9uLnBhZ2VTY2FsZUZhY3RvcigpID4gbGF5ZXJUcmVlVHJhbnNhY3Rpb24uaW5pdGlhbFNjYWxl RmFjdG9yKCk7Ci0gICAgW19zY3JvbGxWaWV3IHNldFNjcm9sbEVuYWJsZWQ6X3BhZ2UtPnNjcm9s bGluZ0Nvb3JkaW5hdG9yUHJveHkoKS0+aGFzU2Nyb2xsYWJsZU1haW5GcmFtZSgpIHx8IGhhc0Rv Y2tlZElucHV0VmlldyB8fCBpc1pvb21lZF07CisgICAgW19zY3JvbGxWaWV3IF9zZXRTY3JvbGxF bmFibGVkSW50ZXJuYWw6X3BhZ2UtPnNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkoKS0+aGFzU2Ny b2xsYWJsZU1haW5GcmFtZSgpIHx8IGhhc0RvY2tlZElucHV0VmlldyB8fCBpc1pvb21lZF07CiAj ZW5kaWYKICAgICBpZiAoIWxheWVyVHJlZVRyYW5zYWN0aW9uLnNjYWxlV2FzU2V0QnlVSVByb2Nl c3MoKSAmJiAhW19zY3JvbGxWaWV3IGlzWm9vbWluZ10gJiYgIVtfc2Nyb2xsVmlldyBpc1pvb21C b3VuY2luZ10gJiYgIVtfc2Nyb2xsVmlldyBfaXNBbmltYXRpbmdab29tXSAmJiBbX3Njcm9sbFZp ZXcgem9vbVNjYWxlXSAhPSBsYXllclRyZWVUcmFuc2FjdGlvbi5wYWdlU2NhbGVGYWN0b3IoKSkg ewogICAgICAgICBMT0dfV0lUSF9TVFJFQU0oVmlzaWJsZVJlY3RzLCBzdHJlYW0gPDwgIiB1cGRh dGluZyBzY3JvbGwgdmlldyB3aXRoIHBhZ2VTY2FsZUZhY3RvciAiIDw8IGxheWVyVHJlZVRyYW5z YWN0aW9uLnBhZ2VTY2FsZUZhY3RvcigpKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS1Njcm9sbFZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tTY3JvbGxWaWV3LmgJKHJldmlzaW9uIDI0NjE4NikKKysrIFNvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcuaAkod29ya2luZyBjb3B5KQpAQCAtMzQsNiArMzQs OCBAQAogQHByb3BlcnR5IChub25hdG9taWMsIGFzc2lnbikgV0tXZWJWaWV3IDxVSVNjcm9sbFZp ZXdEZWxlZ2F0ZT4gKmludGVybmFsRGVsZWdhdGU7CiAKIC0gKHZvaWQpX3NldENvbnRlbnRTaXpl UHJlc2VydmluZ0NvbnRlbnRPZmZzZXREdXJpbmdSdWJiZXJiYW5kOihDR1NpemUpY29udGVudFNp emU7CistICh2b2lkKV9zZXRTY3JvbGxFbmFibGVkSW50ZXJuYWw6KEJPT0wpZW5hYmxlZDsKKy0g KHZvaWQpX3NldFpvb21FbmFibGVkSW50ZXJuYWw6KEJPT0wpZW5hYmxlZDsKIAogI2lmIF9fSVBI T05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDExMDAwMAogQHByb3BlcnR5IChub25hdG9t aWMsIGFzc2lnbiwgcmVhZG9ubHkpIEJPT0wgX2NvbnRlbnRJbnNldEFkanVzdG1lbnRCZWhhdmlv cldhc0V4dGVybmFsbHlPdmVycmlkZGVuOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLU2Nyb2xsVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tTY3JvbGxWaWV3Lm1tCShyZXZpc2lvbiAyNDYxODYpCisrKyBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMzAsNiAr MTMwLDEwIEBAIC0gKGlkKWZvcndhcmRpbmdUYXJnZXRGb3JTZWxlY3RvcjooU0VMKWEKICAgICBC T09MIF9jb250ZW50SW5zZXRBZGp1c3RtZW50QmVoYXZpb3JXYXNFeHRlcm5hbGx5T3ZlcnJpZGRl bjsKICNlbmRpZgogICAgIENHRmxvYXQgX2tleWJvYXJkQm90dG9tSW5zZXRBZGp1c3RtZW50Owor ICAgIEJPT0wgX3Njcm9sbEVuYWJsZWRCeUNsaWVudDsKKyAgICBCT09MIF9zY3JvbGxFbmFibGVk SW50ZXJuYWw7CisgICAgQk9PTCBfem9vbUVuYWJsZWRCeUNsaWVudDsKKyAgICBCT09MIF96b29t RW5hYmxlZEludGVybmFsOwogfQogCiAtIChpZClpbml0V2l0aEZyYW1lOihDR1JlY3QpZnJhbWUK QEAgLTEzOSw2ICsxNDMsMTEgQEAgLSAoaWQpaW5pdFdpdGhGcmFtZTooQ0dSZWN0KWZyYW1lCiAg ICAgaWYgKCFzZWxmKQogICAgICAgICByZXR1cm4gbmlsOwogCisgICAgX3Njcm9sbEVuYWJsZWRC eUNsaWVudCA9IFlFUzsKKyAgICBfc2Nyb2xsRW5hYmxlZEludGVybmFsID0gWUVTOworICAgIF96 b29tRW5hYmxlZEJ5Q2xpZW50ID0gWUVTOworICAgIF96b29tRW5hYmxlZEludGVybmFsID0gWUVT OworCiAgICAgc2VsZi5hbHdheXNCb3VuY2VWZXJ0aWNhbCA9IFlFUzsKICAgICBzZWxmLmRpcmVj dGlvbmFsTG9ja0VuYWJsZWQgPSBZRVM7CiAgICAgW3NlbGYgX3NldEluZGljYXRvckluc2V0QWRq dXN0bWVudEJlaGF2aW9yOlVJU2Nyb2xsVmlld0luZGljYXRvckluc2V0QWRqdXN0bWVudEFsd2F5 c107CkBAIC0zNTQsNiArMzYzLDQwIEBAIC0gKFVJRWRnZUluc2V0cylfc3lzdGVtQ29udGVudElu c2V0CiAgICAgcmV0dXJuIHN5c3RlbUNvbnRlbnRJbnNldDsKIH0KIAorLSAodm9pZClzZXRTY3Jv bGxFbmFibGVkOihCT09MKXZhbHVlCit7CisgICAgX3Njcm9sbEVuYWJsZWRCeUNsaWVudCA9IHZh bHVlOworICAgIFtzZWxmIF91cGRhdGVTY3JvbGxhYmlsaXR5XTsKK30KKworLSAodm9pZClfc2V0 U2Nyb2xsRW5hYmxlZEludGVybmFsOihCT09MKXZhbHVlCit7CisgICAgX3Njcm9sbEVuYWJsZWRJ bnRlcm5hbCA9IHZhbHVlOworICAgIFtzZWxmIF91cGRhdGVTY3JvbGxhYmlsaXR5XTsKK30KKwor LSAodm9pZClfdXBkYXRlU2Nyb2xsYWJpbGl0eQoreworICAgIFtzdXBlciBzZXRTY3JvbGxFbmFi bGVkOihfc2Nyb2xsRW5hYmxlZEJ5Q2xpZW50ICYmIF9zY3JvbGxFbmFibGVkSW50ZXJuYWwpXTsK K30KKworLSAodm9pZClzZXRab29tRW5hYmxlZDooQk9PTCl2YWx1ZQoreworICAgIF96b29tRW5h YmxlZEJ5Q2xpZW50ID0gdmFsdWU7CisgICAgW3NlbGYgX3VwZGF0ZVpvb21hYmlsaXR5XTsKK30K KworLSAodm9pZClfc2V0Wm9vbUVuYWJsZWRJbnRlcm5hbDooQk9PTCl2YWx1ZQoreworICAgIF96 b29tRW5hYmxlZEludGVybmFsID0gdmFsdWU7CisgICAgW3NlbGYgX3VwZGF0ZVpvb21hYmlsaXR5 XTsKK30KKworLSAodm9pZClfdXBkYXRlWm9vbWFiaWxpdHkKK3sKKyAgICBbc3VwZXIgc2V0Wm9v bUVuYWJsZWQ6KF96b29tRW5hYmxlZEJ5Q2xpZW50ICYmIF96b29tRW5hYmxlZEludGVybmFsKV07 Cit9CisKICNpZiBQTEFURk9STShXQVRDSE9TKQogCiAtICh2b2lkKWFkZEdlc3R1cmVSZWNvZ25p emVyOihVSUdlc3R1cmVSZWNvZ25pemVyICopZ2VzdHVyZVJlY29nbml6ZXIK