196424 2019-03-29 21:36:44 -0700 Plumb through a ScrollType value that indicates whether a scroll was a user or programmatic scroll 2019-04-01 11:36:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 195584 1 simon.fraser simon.fraser simon.fraser webkit-bug-importer zalan oldest_to_newest 1522738 0 simon.fraser 2019-03-29 21:36:44 -0700 Plumb through a ScrollType value that indicates whether a scroll was a user or programmatic scroll 1522739 1 366351 simon.fraser 2019-03-29 21:38:02 -0700 Created attachment 366351 Patch 1522975 2 simon.fraser 2019-04-01 11:34:17 -0700 https://trac.webkit.org/r243701 1522977 3 webkit-bug-importer 2019-04-01 11:36:19 -0700 <rdar://problem/49487414> 366351 2019-03-29 21:38:02 -0700 2019-03-29 21:38:57 -0700 Patch bug-196424-20190329213801.patch text/plain 12344 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTUxMzZhOGM0MzE0NTdl MjkzMzk4MWRjNzJiMzM3YTk4NzYzM2ZhOC4uN2RiYzlhYjY1NTFmZmU0ZGQ4Njc2Y2I3NmRlNTcz NjNkNDIyZTAwYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE5LTAzLTI5ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFBsdW1iIHRocm91 Z2ggYSBTY3JvbGxUeXBlIHZhbHVlIHRoYXQgaW5kaWNhdGVzIHdoZXRoZXIgYSBzY3JvbGwgd2Fz IGEgdXNlciBvciBwcm9ncmFtbWF0aWMgc2Nyb2xsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY0MjQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBJbiBwcmVwYXJhdGlvbiBmb3IgZml4aW5nIHdlYmtpdC5v cmcvYi8xOTU1ODQsIHdlIG5lZWQgdG8ga25vdyBpZiBhbiBvdmVyZmxvdyBzY3JvbGwKKyAgICAg ICAgaXMgcHJvZ3JhbW1hdGljLCBzbyBwbHVtYiB0aHJvdWdoIGFuIGVudW0gdmFsdWUuIFRoZSBm dW5jdGlvbnMgdG91Y2hlZCBieSB0aGlzIHBhdGNoIGFyZQorICAgICAgICBvbmx5IGV2ZXIgY2Fs bGVkIGZvciBwcm9ncmFtbWF0aWMgc2Nyb2xscy4KKworICAgICAgICAqIGRvbS9FbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNjcm9sbFRvKToKKyAgICAgICAgKFdlYkNv cmU6OkVsZW1lbnQ6OnNldFNjcm9sbExlZnQpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6 c2V0U2Nyb2xsVG9wKToKKyAgICAgICAgKiBwbGF0Zm9ybS9TY3JvbGxUeXBlcy5oOgorICAgICAg ICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94 OjpzZXRTY3JvbGxMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6c2V0U2Nyb2xs VG9wKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlckxheWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzY3Jv bGxUb1hQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2Nyb2xsVG9Z UG9zaXRpb24pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5oOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxp c3RCb3g6OnNldFNjcm9sbExlZnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlzdEJveDo6 c2V0U2Nyb2xsVG9wKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lOjpzZXRTY3JvbGxMZWZ0KToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6c2V0U2Nyb2xs VG9wKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVMaW5lLmg6 CisKIDIwMTktMDMtMjggIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAK ICAgICAgICAgW21hY09TIFdLMl0gT3ZlcmxheXMgb24gaW5zdGFncmFtLmNvbSBhcmUgc2hpZnRl ZCBpZiB5b3UgY2xpY2sgb24gYSBwaG90byBhZnRlciBzY3JvbGxpbmcKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50 LmNwcAppbmRleCA5MTJmMTg0Zjk1MDI3MjEyMTQ0NmJjMTNlMjhmMTY0ZjU4ZDc3YzE5Li4zOTVk ODY5Njc4NTRiMDdhNTZjMWExYmFiMGUxNTQxZDMzOWI2M2M2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQu Y3BwCkBAIC04MTgsOCArODE4LDggQEAgdm9pZCBFbGVtZW50OjpzY3JvbGxUbyhjb25zdCBTY3Jv bGxUb09wdGlvbnMmIG9wdGlvbnMsIFNjcm9sbENsYW1waW5nIGNsYW1waW5nKQogICAgICAgICBh ZGp1c3RGb3JBYnNvbHV0ZVpvb20ocmVuZGVyZXItPnNjcm9sbExlZnQoKSwgKnJlbmRlcmVyKSwK ICAgICAgICAgYWRqdXN0Rm9yQWJzb2x1dGVab29tKHJlbmRlcmVyLT5zY3JvbGxUb3AoKSwgKnJl bmRlcmVyKQogICAgICk7Ci0gICAgcmVuZGVyZXItPnNldFNjcm9sbExlZnQoY2xhbXBUb0ludGVn ZXIoc2Nyb2xsVG9PcHRpb25zLmxlZnQudmFsdWUoKSAqIHJlbmRlcmVyLT5zdHlsZSgpLmVmZmVj dGl2ZVpvb20oKSksIGNsYW1waW5nKTsKLSAgICByZW5kZXJlci0+c2V0U2Nyb2xsVG9wKGNsYW1w VG9JbnRlZ2VyKHNjcm9sbFRvT3B0aW9ucy50b3AudmFsdWUoKSAqIHJlbmRlcmVyLT5zdHlsZSgp LmVmZmVjdGl2ZVpvb20oKSksIGNsYW1waW5nKTsKKyAgICByZW5kZXJlci0+c2V0U2Nyb2xsTGVm dChjbGFtcFRvSW50ZWdlcihzY3JvbGxUb09wdGlvbnMubGVmdC52YWx1ZSgpICogcmVuZGVyZXIt PnN0eWxlKCkuZWZmZWN0aXZlWm9vbSgpKSwgU2Nyb2xsVHlwZTo6UHJvZ3JhbW1hdGljLCBjbGFt cGluZyk7CisgICAgcmVuZGVyZXItPnNldFNjcm9sbFRvcChjbGFtcFRvSW50ZWdlcihzY3JvbGxU b09wdGlvbnMudG9wLnZhbHVlKCkgKiByZW5kZXJlci0+c3R5bGUoKS5lZmZlY3RpdmVab29tKCkp LCBTY3JvbGxUeXBlOjpQcm9ncmFtbWF0aWMsIGNsYW1waW5nKTsKIH0KIAogdm9pZCBFbGVtZW50 OjpzY3JvbGxUbyhkb3VibGUgeCwgZG91YmxlIHkpCkBAIC0xMTQwLDcgKzExNDAsNyBAQCB2b2lk IEVsZW1lbnQ6OnNldFNjcm9sbExlZnQoaW50IG5ld0xlZnQpCiAgICAgfQogCiAgICAgaWYgKGF1 dG8qIHJlbmRlcmVyID0gcmVuZGVyQm94KCkpIHsKLSAgICAgICAgcmVuZGVyZXItPnNldFNjcm9s bExlZnQoc3RhdGljX2Nhc3Q8aW50PihuZXdMZWZ0ICogcmVuZGVyZXItPnN0eWxlKCkuZWZmZWN0 aXZlWm9vbSgpKSk7CisgICAgICAgIHJlbmRlcmVyLT5zZXRTY3JvbGxMZWZ0KHN0YXRpY19jYXN0 PGludD4obmV3TGVmdCAqIHJlbmRlcmVyLT5zdHlsZSgpLmVmZmVjdGl2ZVpvb20oKSksIFNjcm9s bFR5cGU6OlByb2dyYW1tYXRpYyk7CiAgICAgICAgIGlmIChhdXRvKiBzY3JvbGxhYmxlQXJlYSA9 IHJlbmRlcmVyLT5sYXllcigpKQogICAgICAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNldFNjcm9s bGVkUHJvZ3JhbW1hdGljYWxseSh0cnVlKTsKICAgICB9CkBAIC0xMTU3LDcgKzExNTcsNyBAQCB2 b2lkIEVsZW1lbnQ6OnNldFNjcm9sbFRvcChpbnQgbmV3VG9wKQogICAgIH0KIAogICAgIGlmIChh dXRvKiByZW5kZXJlciA9IHJlbmRlckJveCgpKSB7Ci0gICAgICAgIHJlbmRlcmVyLT5zZXRTY3Jv bGxUb3Aoc3RhdGljX2Nhc3Q8aW50PihuZXdUb3AgKiByZW5kZXJlci0+c3R5bGUoKS5lZmZlY3Rp dmVab29tKCkpKTsKKyAgICAgICAgcmVuZGVyZXItPnNldFNjcm9sbFRvcChzdGF0aWNfY2FzdDxp bnQ+KG5ld1RvcCAqIHJlbmRlcmVyLT5zdHlsZSgpLmVmZmVjdGl2ZVpvb20oKSksIFNjcm9sbFR5 cGU6OlByb2dyYW1tYXRpYyk7CiAgICAgICAgIGlmIChhdXRvKiBzY3JvbGxhYmxlQXJlYSA9IHJl bmRlcmVyLT5sYXllcigpKQogICAgICAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNldFNjcm9sbGVk UHJvZ3JhbW1hdGljYWxseSh0cnVlKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9TY3JvbGxUeXBlcy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xs VHlwZXMuaAppbmRleCBiZTY5NjU0NGQwNmM5MDhmYmNjYTFkYTRhMTRiNWVkMTU2Y2Y2ZmJhLi44 OTExNDkxMDNkMzZjZTNhYTYzNDQ1MDEyOGJjODljNDQwMmZiYThjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxUeXBlcy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbFR5cGVzLmgKQEAgLTMwLDYgKzMwLDExIEBACiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIAorZW51bSBjbGFzcyBTY3JvbGxUeXBlIDogdWludDhfdCB7CisgICAgVXNlciwKKyAg ICBQcm9ncmFtbWF0aWMKK307CisKIGVudW0gU2Nyb2xsRGlyZWN0aW9uIDogdWludDhfdCB7CiAg ICAgU2Nyb2xsVXAsCiAgICAgU2Nyb2xsRG93biwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckJveC5jcHAKaW5kZXggMjRmMjA4ZDdlYTE0MjEzNTU1NzJkMjQ4NWRiMzdmOTQxMjMwMjk2MC4u ZmJmYjNjYWU0NWU5Y2VlOWU3NWE0ZTcyZTgyY2QxN2U3YTM3MjRiNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5jcHAKQEAgLTU3NSwyMCArNTc1LDIwIEBAIHN0YXRpYyB2b2lk IHNldHVwV2hlZWxFdmVudFRlc3RUcmlnZ2VyKFJlbmRlckxheWVyJiBsYXllcikKICAgICBsYXll ci5zY3JvbGxBbmltYXRvcigpLnNldFdoZWVsRXZlbnRUZXN0VHJpZ2dlcihwYWdlLnRlc3RUcmln Z2VyKCkpOwogfQogCi12b2lkIFJlbmRlckJveDo6c2V0U2Nyb2xsTGVmdChpbnQgbmV3TGVmdCwg U2Nyb2xsQ2xhbXBpbmcgY2xhbXBpbmcpCit2b2lkIFJlbmRlckJveDo6c2V0U2Nyb2xsTGVmdChp bnQgbmV3TGVmdCwgU2Nyb2xsVHlwZSBzY3JvbGxUeXBlLCBTY3JvbGxDbGFtcGluZyBjbGFtcGlu ZykKIHsKICAgICBpZiAoIWhhc092ZXJmbG93Q2xpcCgpIHx8ICFsYXllcigpKQogICAgICAgICBy ZXR1cm47CiAgICAgc2V0dXBXaGVlbEV2ZW50VGVzdFRyaWdnZXIoKmxheWVyKCkpOwotICAgIGxh eWVyKCktPnNjcm9sbFRvWFBvc2l0aW9uKG5ld0xlZnQsIGNsYW1waW5nKTsKKyAgICBsYXllcigp LT5zY3JvbGxUb1hQb3NpdGlvbihuZXdMZWZ0LCBzY3JvbGxUeXBlLCBjbGFtcGluZyk7CiB9CiAK LXZvaWQgUmVuZGVyQm94OjpzZXRTY3JvbGxUb3AoaW50IG5ld1RvcCwgU2Nyb2xsQ2xhbXBpbmcg Y2xhbXBpbmcpCit2b2lkIFJlbmRlckJveDo6c2V0U2Nyb2xsVG9wKGludCBuZXdUb3AsIFNjcm9s bFR5cGUgc2Nyb2xsVHlwZSwgU2Nyb2xsQ2xhbXBpbmcgY2xhbXBpbmcpCiB7CiAgICAgaWYgKCFo YXNPdmVyZmxvd0NsaXAoKSB8fCAhbGF5ZXIoKSkKICAgICAgICAgcmV0dXJuOwogICAgIHNldHVw V2hlZWxFdmVudFRlc3RUcmlnZ2VyKCpsYXllcigpKTsKLSAgICBsYXllcigpLT5zY3JvbGxUb1lQ b3NpdGlvbihuZXdUb3AsIGNsYW1waW5nKTsKKyAgICBsYXllcigpLT5zY3JvbGxUb1lQb3NpdGlv bihuZXdUb3AsIHNjcm9sbFR5cGUsIGNsYW1waW5nKTsKIH0KIAogdm9pZCBSZW5kZXJCb3g6OmFi c29sdXRlUmVjdHMoVmVjdG9yPEludFJlY3Q+JiByZWN0cywgY29uc3QgTGF5b3V0UG9pbnQmIGFj Y3VtdWxhdGVkT2Zmc2V0KSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmlu ZGV4IDlmY2QyMzk5MTFhZjNhMzAwOGUwMTUyNjMyMDAzMGQ5NzgxYTY3Y2UuLjhiY2M4NDhhM2Iz NDk4ODQxNzc0MGQxNzhlNzQ5Y2M0ZDNlMmRiNzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQm94LmgKQEAgLTI0Nyw4ICsyNDcsOCBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBpbnQgc2Ny b2xsVG9wKCkgY29uc3Q7CiAgICAgdmlydHVhbCBpbnQgc2Nyb2xsV2lkdGgoKSBjb25zdDsKICAg ICB2aXJ0dWFsIGludCBzY3JvbGxIZWlnaHQoKSBjb25zdDsKLSAgICB2aXJ0dWFsIHZvaWQgc2V0 U2Nyb2xsTGVmdChpbnQsIFNjcm9sbENsYW1waW5nID0gU2Nyb2xsQ2xhbXBpbmc6OkNsYW1wZWQp OwotICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxUb3AoaW50LCBTY3JvbGxDbGFtcGluZyA9IFNj cm9sbENsYW1waW5nOjpDbGFtcGVkKTsKKyAgICB2aXJ0dWFsIHZvaWQgc2V0U2Nyb2xsTGVmdChp bnQsIFNjcm9sbFR5cGUsIFNjcm9sbENsYW1waW5nID0gU2Nyb2xsQ2xhbXBpbmc6OkNsYW1wZWQp OworICAgIHZpcnR1YWwgdm9pZCBzZXRTY3JvbGxUb3AoaW50LCBTY3JvbGxUeXBlLCBTY3JvbGxD bGFtcGluZyA9IFNjcm9sbENsYW1waW5nOjpDbGFtcGVkKTsKIAogICAgIExheW91dFVuaXQgbWFy Z2luVG9wKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gbV9tYXJnaW5Cb3gudG9wKCk7IH0KICAg ICBMYXlvdXRVbml0IG1hcmdpbkJvdHRvbSgpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG1fbWFy Z2luQm94LmJvdHRvbSgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cAppbmRleCBmYzUxOWY4NTgzOTExMTQxZjBjOTkyOWQzYzhiNjg5MWI2NDcxY2E1Li44MWQzYzU3 ODQwMDdmMjQ4MjQ4ZmJjMDhmNzljYzhjNzVlNjU2OGExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJMYXllci5jcHAKQEAgLTIzMjEsMTMgKzIzMjEsMTMgQEAgdm9pZCBSZW5kZXJM YXllcjo6YXBwbHlQb3N0TGF5b3V0U2Nyb2xsUG9zaXRpb25JZk5lZWRlZCgpCiAgICAgbV9wb3N0 TGF5b3V0U2Nyb2xsUG9zaXRpb24gPSBXVEY6Om51bGxvcHQ7CiB9CiAKLXZvaWQgUmVuZGVyTGF5 ZXI6OnNjcm9sbFRvWFBvc2l0aW9uKGludCB4LCBTY3JvbGxDbGFtcGluZyBjbGFtcGluZykKK3Zv aWQgUmVuZGVyTGF5ZXI6OnNjcm9sbFRvWFBvc2l0aW9uKGludCB4LCBTY3JvbGxUeXBlLCBTY3Jv bGxDbGFtcGluZyBjbGFtcGluZykKIHsKICAgICBTY3JvbGxQb3NpdGlvbiBwb3NpdGlvbih4LCBt X3Njcm9sbFBvc2l0aW9uLnkoKSk7CiAgICAgc2Nyb2xsVG9PZmZzZXQoc2Nyb2xsT2Zmc2V0RnJv bVBvc2l0aW9uKHBvc2l0aW9uKSwgY2xhbXBpbmcpOwogfQogCi12b2lkIFJlbmRlckxheWVyOjpz Y3JvbGxUb1lQb3NpdGlvbihpbnQgeSwgU2Nyb2xsQ2xhbXBpbmcgY2xhbXBpbmcpCit2b2lkIFJl bmRlckxheWVyOjpzY3JvbGxUb1lQb3NpdGlvbihpbnQgeSwgU2Nyb2xsVHlwZSwgU2Nyb2xsQ2xh bXBpbmcgY2xhbXBpbmcpCiB7CiAgICAgU2Nyb2xsUG9zaXRpb24gcG9zaXRpb24obV9zY3JvbGxQ b3NpdGlvbi54KCksIHkpOwogICAgIHNjcm9sbFRvT2Zmc2V0KHNjcm9sbE9mZnNldEZyb21Qb3Np dGlvbihwb3NpdGlvbiksIGNsYW1waW5nKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmgKaW5kZXggMjI5OGY2YmY2MmMyZTYzN2Y0MzgwM2I1YzU5YjZiNGE1OTlmMTcyOS4uMWRi MDk0MTVjNjQ0YTc1MDFlN2U4NzFkOWIxM2I0NWFjZTYzN2JlMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmgKQEAgLTQxNCw4ICs0MTQsOCBAQCBwdWJsaWM6CiAgICAgdm9p ZCBzY3JvbGxUb1hPZmZzZXQoaW50IHgsIFNjcm9sbENsYW1waW5nIGNsYW1waW5nID0gU2Nyb2xs Q2xhbXBpbmc6OkNsYW1wZWQpIHsgc2Nyb2xsVG9PZmZzZXQoU2Nyb2xsT2Zmc2V0KHgsIHNjcm9s bE9mZnNldCgpLnkoKSksIGNsYW1waW5nKTsgfQogICAgIHZvaWQgc2Nyb2xsVG9ZT2Zmc2V0KGlu dCB5LCBTY3JvbGxDbGFtcGluZyBjbGFtcGluZyA9IFNjcm9sbENsYW1waW5nOjpDbGFtcGVkKSB7 IHNjcm9sbFRvT2Zmc2V0KFNjcm9sbE9mZnNldChzY3JvbGxPZmZzZXQoKS54KCksIHkpLCBjbGFt cGluZyk7IH0KIAotICAgIHZvaWQgc2Nyb2xsVG9YUG9zaXRpb24oaW50IHgsIFNjcm9sbENsYW1w aW5nID0gU2Nyb2xsQ2xhbXBpbmc6OkNsYW1wZWQpOwotICAgIHZvaWQgc2Nyb2xsVG9ZUG9zaXRp b24oaW50IHksIFNjcm9sbENsYW1waW5nID0gU2Nyb2xsQ2xhbXBpbmc6OkNsYW1wZWQpOworICAg IHZvaWQgc2Nyb2xsVG9YUG9zaXRpb24oaW50IHgsIFNjcm9sbFR5cGUsIFNjcm9sbENsYW1waW5n ID0gU2Nyb2xsQ2xhbXBpbmc6OkNsYW1wZWQpOworICAgIHZvaWQgc2Nyb2xsVG9ZUG9zaXRpb24o aW50IHksIFNjcm9sbFR5cGUsIFNjcm9sbENsYW1waW5nID0gU2Nyb2xsQ2xhbXBpbmc6OkNsYW1w ZWQpOwogCiAgICAgdm9pZCBzZXRQb3N0TGF5b3V0U2Nyb2xsUG9zaXRpb24oT3B0aW9uYWw8U2Ny b2xsUG9zaXRpb24+KTsKICAgICB2b2lkIGFwcGx5UG9zdExheW91dFNjcm9sbFBvc2l0aW9uSWZO ZWVkZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0 Qm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAppbmRl eCBjMWRmODBmYWZjNzJiMzM4MTk3NGM2ODc2ZWE3MGJjYjQ4ZTY2NTM3Li5mZTk4MmUwNDc3ZjBm OTEyZTIxZGEzZjRkYzMzMDk3MTNhNTY0YWQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxpc3RCb3guY3BwCkBAIC03NDksNyArNzQ5LDcgQEAgaW50IFJlbmRlckxpc3RCb3g6 OnNjcm9sbExlZnQoKSBjb25zdAogICAgIHJldHVybiAwOwogfQogCi12b2lkIFJlbmRlckxpc3RC b3g6OnNldFNjcm9sbExlZnQoaW50LCBTY3JvbGxDbGFtcGluZykKK3ZvaWQgUmVuZGVyTGlzdEJv eDo6c2V0U2Nyb2xsTGVmdChpbnQsIFNjcm9sbFR5cGUsIFNjcm9sbENsYW1waW5nKQogewogfQog CkBAIC03NjYsNyArNzY2LDcgQEAgc3RhdGljIHZvaWQgc2V0dXBXaGVlbEV2ZW50VGVzdFRyaWdn ZXIoUmVuZGVyTGlzdEJveCYgcmVuZGVyZXIpCiAgICAgcmVuZGVyZXIuc2Nyb2xsQW5pbWF0b3Io KS5zZXRXaGVlbEV2ZW50VGVzdFRyaWdnZXIocmVuZGVyZXIucGFnZSgpLnRlc3RUcmlnZ2VyKCkp OwogfQogCi12b2lkIFJlbmRlckxpc3RCb3g6OnNldFNjcm9sbFRvcChpbnQgbmV3VG9wLCBTY3Jv bGxDbGFtcGluZykKK3ZvaWQgUmVuZGVyTGlzdEJveDo6c2V0U2Nyb2xsVG9wKGludCBuZXdUb3As IFNjcm9sbFR5cGUsIFNjcm9sbENsYW1waW5nKQogewogICAgIC8vIERldGVybWluZSBhbiBpbmRl eCBhbmQgc2Nyb2xsIHRvIGl0LiAgICAKICAgICBpbnQgaW5kZXggPSBuZXdUb3AgLyBpdGVtSGVp Z2h0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJv eC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaAppbmRleCA3Njk1 YzJkNjJiMTUxZTZkNGQ0NGI5MTgwNmE1ZWZhMWNlN2RlZDI2Li4zY2QxNjk3ZTJhNDhhNTNlYTlk MGExMzIwYWZjOWEwZTE1MGE0MjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGlzdEJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM aXN0Qm94LmgKQEAgLTEwNiw4ICsxMDYsOCBAQCBwcml2YXRlOgogICAgIGludCBzY3JvbGxUb3Ao KSBjb25zdCBvdmVycmlkZTsKICAgICBpbnQgc2Nyb2xsV2lkdGgoKSBjb25zdCBvdmVycmlkZTsK ICAgICBpbnQgc2Nyb2xsSGVpZ2h0KCkgY29uc3Qgb3ZlcnJpZGU7Ci0gICAgdm9pZCBzZXRTY3Jv bGxMZWZ0KGludCwgU2Nyb2xsQ2xhbXBpbmcpIG92ZXJyaWRlOwotICAgIHZvaWQgc2V0U2Nyb2xs VG9wKGludCwgU2Nyb2xsQ2xhbXBpbmcpIG92ZXJyaWRlOworICAgIHZvaWQgc2V0U2Nyb2xsTGVm dChpbnQsIFNjcm9sbFR5cGUsIFNjcm9sbENsYW1waW5nKSBvdmVycmlkZTsKKyAgICB2b2lkIHNl dFNjcm9sbFRvcChpbnQsIFNjcm9sbFR5cGUsIFNjcm9sbENsYW1waW5nKSBvdmVycmlkZTsKIAog ICAgIGJvb2wgbm9kZUF0UG9pbnQoY29uc3QgSGl0VGVzdFJlcXVlc3QmLCBIaXRUZXN0UmVzdWx0 JiwgY29uc3QgSGl0VGVzdExvY2F0aW9uJiBsb2NhdGlvbkluQ29udGFpbmVyLCBjb25zdCBMYXlv dXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEhpdFRlc3RBY3Rpb24pIG92ZXJyaWRlOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5n bGVMaW5lLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNp bmdsZUxpbmUuY3BwCmluZGV4IDMwNTRiNDQ3NjJjOWRjNDlhYWEyNzI5YmQ0Yzc5Njc3YWYxNzhh ODUuLmEzMDE4ZmQwNzdkOTk2MGMyN2EwNDBlYjBiZTMzMTg5MTA5MmFhZWQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxp bmUuY3BwCkBAIC0zNzYsMTMgKzM3NiwxMyBAQCBpbnQgUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVM aW5lOjpzY3JvbGxUb3AoKSBjb25zdAogICAgIHJldHVybiBSZW5kZXJCbG9ja0Zsb3c6OnNjcm9s bFRvcCgpOwogfQogCi12b2lkIFJlbmRlclRleHRDb250cm9sU2luZ2xlTGluZTo6c2V0U2Nyb2xs TGVmdChpbnQgbmV3TGVmdCwgU2Nyb2xsQ2xhbXBpbmcpCit2b2lkIFJlbmRlclRleHRDb250cm9s U2luZ2xlTGluZTo6c2V0U2Nyb2xsTGVmdChpbnQgbmV3TGVmdCwgU2Nyb2xsVHlwZSwgU2Nyb2xs Q2xhbXBpbmcpCiB7CiAgICAgaWYgKGlubmVyVGV4dEVsZW1lbnQoKSkKICAgICAgICAgaW5uZXJU ZXh0RWxlbWVudCgpLT5zZXRTY3JvbGxMZWZ0KG5ld0xlZnQpOwogfQogCi12b2lkIFJlbmRlclRl eHRDb250cm9sU2luZ2xlTGluZTo6c2V0U2Nyb2xsVG9wKGludCBuZXdUb3AsIFNjcm9sbENsYW1w aW5nKQordm9pZCBSZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmU6OnNldFNjcm9sbFRvcChpbnQg bmV3VG9wLCBTY3JvbGxUeXBlLCBTY3JvbGxDbGFtcGluZykKIHsKICAgICBpZiAoaW5uZXJUZXh0 RWxlbWVudCgpKQogICAgICAgICBpbm5lclRleHRFbGVtZW50KCktPnNldFNjcm9sbFRvcChuZXdU b3ApOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250 cm9sU2luZ2xlTGluZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250 cm9sU2luZ2xlTGluZS5oCmluZGV4IDlmY2FkY2Y2MjVhMjc2OGEzM2M3ZGM0YjE2MWU5ZTJhYzg2 Njk4NWYuLjNmNTc4NmRmZTQwMGViODBmZDhlMmIzOTA2NjYyYmQ5OWI5NGYxM2EgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbFNpbmdsZUxpbmUu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2xTaW5nbGVM aW5lLmgKQEAgLTU3LDggKzU3LDggQEAgcHJpdmF0ZToKICAgICBpbnQgc2Nyb2xsVG9wKCkgY29u c3Qgb3ZlcnJpZGU7CiAgICAgaW50IHNjcm9sbFdpZHRoKCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAg aW50IHNjcm9sbEhlaWdodCgpIGNvbnN0IG92ZXJyaWRlOwotICAgIHZvaWQgc2V0U2Nyb2xsTGVm dChpbnQsIFNjcm9sbENsYW1waW5nKSBvdmVycmlkZTsKLSAgICB2b2lkIHNldFNjcm9sbFRvcChp bnQsIFNjcm9sbENsYW1waW5nKSBvdmVycmlkZTsKKyAgICB2b2lkIHNldFNjcm9sbExlZnQoaW50 LCBTY3JvbGxUeXBlLCBTY3JvbGxDbGFtcGluZykgb3ZlcnJpZGU7CisgICAgdm9pZCBzZXRTY3Jv bGxUb3AoaW50LCBTY3JvbGxUeXBlLCBTY3JvbGxDbGFtcGluZykgb3ZlcnJpZGU7CiAgICAgYm9v bCBzY3JvbGwoU2Nyb2xsRGlyZWN0aW9uLCBTY3JvbGxHcmFudWxhcml0eSwgZmxvYXQgbXVsdGlw bGllciA9IDEsIEVsZW1lbnQqKiBzdG9wRWxlbWVudCA9IG51bGxwdHIsIFJlbmRlckJveCogc3Rh cnRCb3ggPSBudWxscHRyLCBjb25zdCBJbnRQb2ludCYgd2hlZWxFdmVudEFic29sdXRlUG9pbnQg PSBJbnRQb2ludCgpKSBmaW5hbDsKICAgICBib29sIGxvZ2ljYWxTY3JvbGwoU2Nyb2xsTG9naWNh bERpcmVjdGlvbiwgU2Nyb2xsR3JhbnVsYXJpdHksIGZsb2F0IG11bHRpcGxpZXIgPSAxLCBFbGVt ZW50Kiogc3RvcEVsZW1lbnQgPSAwKSBmaW5hbDsKIAo=