196614 2019-04-04 11:06:28 -0700 Move "inProgrammaticScroll" down to ScrollableArea 2019-04-04 14:24:40 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser bfulgham cdumez cmarcelo dbates esprehn+autocc ews-watchlist kangil.han koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1524320 0 simon.fraser 2019-04-04 11:06:28 -0700 Move "inProgrammaticScroll" down to ScrollableArea 1524322 1 366729 simon.fraser 2019-04-04 11:08:47 -0700 Created attachment 366729 Patch 1524443 2 simon.fraser 2019-04-04 14:21:39 -0700 https://trac.webkit.org/changeset/243905/webkit 1524444 3 webkit-bug-importer 2019-04-04 14:24:40 -0700 <rdar://problem/49622667> 366729 2019-04-04 11:08:47 -0700 2019-04-04 11:38:04 -0700 Patch bug-196614-20190404110846.patch text/plain 12803 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzODU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTM3ZDE5M2RkZjU3MTU4 MDE1N2I4OWZhOGRkMDNkN2U1ODZmZjM5Zi4uOWQ3MmM2NWI2MDgwZWIwNWIwMDA5MjU0YmE1OTZm ZGRmNjAwNzMxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDE5LTA0LTA0ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgImluUHJv Z3JhbW1hdGljU2Nyb2xsIiBkb3duIHRvIFNjcm9sbGFibGVBcmVhCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTY2MTQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBIGZ1dHVyZSBwYXRjaCB3aWxsIG5lZWQg dG8gdXBkYXRlICJpblByb2dyYW1tYXRpY1Njcm9sbCIgb24gUmVuZGVyTGF5ZXJzLCBzbyBwdXNo CisgICAgICAgIGluUHJvZ3JhbW1hdGljU2Nyb2xsKCkgZG93biB0byBTY3JvbGxhYmxlQXJlYS4K KworICAgICAgICBTY3JvbGxhYmxlQXJlYSBhbHJlYWR5IGhhcyAiaXNTY3JvbGxlZFByb2dyYW1t YXRpY2FsbHkiLCB3aGljaCBJIHJlbmFtZSB0byAic2Nyb2xsU2hvdWxkQ2xlYXJMYXRjaGVkU3Rh dGUiCisgICAgICAgIHRvIHJlZHVjZSBjb25mdXNpb24uIEl0IG1pZ2h0IGJlIHBvc3NpYmxlIHRv IHJlbW92ZSB0aGlzIGluIGZ1dHVyZSB3aXRoIHNvbWUgcmVmYWN0b3JpbmcuCisKKyAgICAgICAg U2FkbHkgd2UgY2FuIG5vIGxvbmdlciB1c2UgU2V0Rm9yU2NvcGU8PiBpbiBGcmFtZVZpZXcgYWZ0 ZXIgdGhpcyBjaGFuZ2Ugc28gYWRkIHNvbWUgbWFudWFsIHNhdmUvcmVzdG9yZSBjb2RlLgorCisg ICAgICAgICogZG9tL0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6c2V0 U2Nyb2xsTGVmdCk6CisgICAgICAgIChXZWJDb3JlOjpFbGVtZW50OjpzZXRTY3JvbGxUb3ApOgor ICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkV2ZW50 SGFuZGxlcjo6Y29tcGxldGVXaWRnZXRXaGVlbEV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkV2 ZW50SGFuZGxlcjo6aGFuZGxlV2hlZWxFdmVudCk6CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVWaWV3OjpzZXRGcmFtZVJlY3QpOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp0b3BDb250ZW50SW5zZXREaWRDaGFuZ2UpOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVWaWV3Ojp1cGRhdGVMYXlvdXRWaWV3cG9ydCk6CisgICAgICAgIChX ZWJDb3JlOjpGcmFtZVZpZXc6OnNldFNjcm9sbFBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6 OkZyYW1lVmlldzo6c2V0V2FzU2Nyb2xsZWRCeVVzZXIpOgorICAgICAgICAqIHBhZ2UvRnJhbWVW aWV3Lmg6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xsVmlldy5oOgorICAgICAgICAoV2ViQ29y ZTo6U2Nyb2xsVmlldzo6aW5Qcm9ncmFtbWF0aWNTY3JvbGwgY29uc3QpOiBEZWxldGVkLgorICAg ICAgICAqIHBsYXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNj cm9sbGFibGVBcmVhOjpTY3JvbGxhYmxlQXJlYSk6CisgICAgICAgICogcGxhdGZvcm0vU2Nyb2xs YWJsZUFyZWEuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbGFibGVBcmVhOjppblByb2dyYW1t YXRpY1Njcm9sbCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6c2V0 SW5Qcm9ncmFtbWF0aWNTY3JvbGwpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6 OnNjcm9sbFNob3VsZENsZWFyTGF0Y2hlZFN0YXRlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6 OlNjcm9sbGFibGVBcmVhOjpzZXRTY3JvbGxTaG91bGRDbGVhckxhdGNoZWRTdGF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpTY3JvbGxhYmxlQXJlYTo6aXNTY3JvbGxlZFByb2dyYW1tYXRpY2FsbHkg Y29uc3QpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsYWJsZUFyZWE6OnNldFNj cm9sbGVkUHJvZ3JhbW1hdGljYWxseSk6IERlbGV0ZWQuCisKIDIwMTktMDQtMDMgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKICAgICAgICAgU2ltcGxpZnkgc29tZSAi cHJvZ3JhbW1hdGljU2Nyb2xsIiBjb2RlIHBhdGhzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKaW5kZXgg MTkzMDQzMjdmODdiYzk5Y2QzMjAwOGM2YmUxYmM0Y2JiODZhNjU5Zi4uN2JjMWNmMzA4ZTlmODQy YzQyMTg0Y2UxYzFmMmVkNjE4ODhhM2NjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9t L0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcApAQCAtMTE0 MCw3ICsxMTQwLDcgQEAgdm9pZCBFbGVtZW50OjpzZXRTY3JvbGxMZWZ0KGludCBuZXdMZWZ0KQog ICAgIGlmIChhdXRvKiByZW5kZXJlciA9IHJlbmRlckJveCgpKSB7CiAgICAgICAgIHJlbmRlcmVy LT5zZXRTY3JvbGxMZWZ0KHN0YXRpY19jYXN0PGludD4obmV3TGVmdCAqIHJlbmRlcmVyLT5zdHls ZSgpLmVmZmVjdGl2ZVpvb20oKSksIFNjcm9sbFR5cGU6OlByb2dyYW1tYXRpYyk7CiAgICAgICAg IGlmIChhdXRvKiBzY3JvbGxhYmxlQXJlYSA9IHJlbmRlcmVyLT5sYXllcigpKQotICAgICAgICAg ICAgc2Nyb2xsYWJsZUFyZWEtPnNldFNjcm9sbGVkUHJvZ3JhbW1hdGljYWxseSh0cnVlKTsKKyAg ICAgICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRTY3JvbGxTaG91bGRDbGVhckxhdGNoZWRTdGF0 ZSh0cnVlKTsKICAgICB9CiB9CiAKQEAgLTExNTcsNyArMTE1Nyw3IEBAIHZvaWQgRWxlbWVudDo6 c2V0U2Nyb2xsVG9wKGludCBuZXdUb3ApCiAgICAgaWYgKGF1dG8qIHJlbmRlcmVyID0gcmVuZGVy Qm94KCkpIHsKICAgICAgICAgcmVuZGVyZXItPnNldFNjcm9sbFRvcChzdGF0aWNfY2FzdDxpbnQ+ KG5ld1RvcCAqIHJlbmRlcmVyLT5zdHlsZSgpLmVmZmVjdGl2ZVpvb20oKSksIFNjcm9sbFR5cGU6 OlByb2dyYW1tYXRpYyk7CiAgICAgICAgIGlmIChhdXRvKiBzY3JvbGxhYmxlQXJlYSA9IHJlbmRl cmVyLT5sYXllcigpKQotICAgICAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNldFNjcm9sbGVkUHJv Z3JhbW1hdGljYWxseSh0cnVlKTsKKyAgICAgICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRTY3Jv bGxTaG91bGRDbGVhckxhdGNoZWRTdGF0ZSh0cnVlKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCA5MzM5MjM2Zjk1ZWQwOGRlNjM3OGZiYWE5MzIzYmNi M2ViNjQ0NGYwLi4zNjllMzgxZDFjMTViODQ4MGMwNDQzMTZjMzMyNTcyNDZmZWRkZjA2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBAIC0yNzQ5LDcgKzI3NDksNyBAQCBib29s IEV2ZW50SGFuZGxlcjo6Y29tcGxldGVXaWRnZXRXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hl ZWxFdmVudCYgZXZlbnQsIGNvbgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCiAgICAgaWYg KHNjcm9sbGFibGVBcmVhKQotICAgICAgICBzY3JvbGxhYmxlQXJlYS0+c2V0U2Nyb2xsZWRQcm9n cmFtbWF0aWNhbGx5KGZhbHNlKTsKKyAgICAgICAgc2Nyb2xsYWJsZUFyZWEtPnNldFNjcm9sbFNo b3VsZENsZWFyTGF0Y2hlZFN0YXRlKGZhbHNlKTsKIAogICAgIHBsYXRmb3JtTm90aWZ5SWZFbmRH ZXN0dXJlKGV2ZW50LCBzY3JvbGxhYmxlQXJlYSk7CiAKQEAgLTI4MTIsMTAgKzI4MTIsMTAgQEAg Ym9vbCBFdmVudEhhbmRsZXI6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2 ZW50JiBldmVudCkKIAogICAgICAgICBpZiAoIWVsZW1lbnQtPmRpc3BhdGNoV2hlZWxFdmVudChh ZGp1c3RlZEV2ZW50KSkgewogICAgICAgICAgICAgbV9pc0hhbmRsaW5nV2hlZWxFdmVudCA9IGZh bHNlOwotICAgICAgICAgICAgaWYgKHNjcm9sbGFibGVBcmVhICYmIHNjcm9sbGFibGVBcmVhLT5p c1Njcm9sbGVkUHJvZ3JhbW1hdGljYWxseSgpKSB7CisgICAgICAgICAgICBpZiAoc2Nyb2xsYWJs ZUFyZWEgJiYgc2Nyb2xsYWJsZUFyZWEtPnNjcm9sbFNob3VsZENsZWFyTGF0Y2hlZFN0YXRlKCkp IHsKICAgICAgICAgICAgICAgICAvLyBXZWIgZGV2ZWxvcGVyIGlzIGNvbnRyb2xsaW5nIHNjcm9s bGluZywgc28gZG9uJ3QgYXR0ZW1wdCB0byBsYXRjaC4KICAgICAgICAgICAgICAgICBjbGVhckxh dGNoZWRTdGF0ZSgpOwotICAgICAgICAgICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRTY3JvbGxl ZFByb2dyYW1tYXRpY2FsbHkoZmFsc2UpOworICAgICAgICAgICAgICAgIHNjcm9sbGFibGVBcmVh LT5zZXRTY3JvbGxTaG91bGRDbGVhckxhdGNoZWRTdGF0ZShmYWxzZSk7CiAgICAgICAgICAgICB9 CiAKICAgICAgICAgICAgIHBsYXRmb3JtTm90aWZ5SWZFbmRHZXN0dXJlKGFkanVzdGVkRXZlbnQs IHNjcm9sbGFibGVBcmVhKTsKQEAgLTI4MjQsNyArMjgyNCw3IEBAIGJvb2wgRXZlbnRIYW5kbGVy OjpoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgZXZlbnQpCiAgICAg fQogCiAgICAgaWYgKHNjcm9sbGFibGVBcmVhKQotICAgICAgICBzY3JvbGxhYmxlQXJlYS0+c2V0 U2Nyb2xsZWRQcm9ncmFtbWF0aWNhbGx5KGZhbHNlKTsKKyAgICAgICAgc2Nyb2xsYWJsZUFyZWEt PnNldFNjcm9sbFNob3VsZENsZWFyTGF0Y2hlZFN0YXRlKGZhbHNlKTsKIAogICAgIGJvb2wgaGFu ZGxlZEV2ZW50ID0gcGxhdGZvcm1Db21wbGV0ZVdoZWVsRXZlbnQoYWRqdXN0ZWRFdmVudCwgc2Ny b2xsYWJsZUNvbnRhaW5lci5nZXQoKSwgc2Nyb2xsYWJsZUFyZWEpOwogICAgIHBsYXRmb3JtTm90 aWZ5SWZFbmRHZXN0dXJlKGFkanVzdGVkRXZlbnQsIHNjcm9sbGFibGVBcmVhKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWVWaWV3LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRnJhbWVWaWV3LmNwcAppbmRleCAxMTE1OWVlYmE4ZjY5NzcyZWU4MGM1ZTg3YWVjYjZhMDFj MzU0ODM4Li5jMDhjNjRiYWQ0NmUyMDhkMGZhOGFhZGE4Y2M1MDFkOWM5ZTVlZDE2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9GcmFtZVZpZXcuY3BwCkBAIC00NjAsNyArNDYwLDggQEAgdm9pZCBGcmFtZVZpZXc6 OnNldEZyYW1lUmVjdChjb25zdCBJbnRSZWN0JiBuZXdSZWN0KQogICAgIGlmIChuZXdSZWN0ID09 IG9sZFJlY3QpCiAgICAgICAgIHJldHVybjsKICAgICAvLyBFdmVyeSBzY3JvbGwgdGhhdCBoYXBw ZW5zIGFzIHRoZSByZXN1bHQgb2YgZnJhbWUgc2l6ZSBjaGFuZ2UgaXMgcHJvZ3JhbW1hdGljLgot ICAgIFNldEZvclNjb3BlPGJvb2w+IGNoYW5nZUluUHJvZ3JhbW1hdGljU2Nyb2xsKG1faW5Qcm9n cmFtbWF0aWNTY3JvbGwsIHRydWUpOworICAgIGJvb2wgd2FzSW5Qcm9ncmFtbWF0aWNTY3JvbGwg PSBpblByb2dyYW1tYXRpY1Njcm9sbCgpOworICAgIHNldEluUHJvZ3JhbW1hdGljU2Nyb2xsKHRy dWUpOwogICAgIFNjcm9sbFZpZXc6OnNldEZyYW1lUmVjdChuZXdSZWN0KTsKIAogICAgIHVwZGF0 ZVNjcm9sbGFibGVBcmVhU2V0KCk7CkBAIC00NzQsNiArNDc1LDcgQEAgdm9pZCBGcmFtZVZpZXc6 OnNldEZyYW1lUmVjdChjb25zdCBJbnRSZWN0JiBuZXdSZWN0KQogICAgICAgICBmcmFtZSgpLnBh Z2UoKS0+cGFnZU92ZXJsYXlDb250cm9sbGVyKCkuZGlkQ2hhbmdlVmlld1NpemUoKTsKIAogICAg IHZpZXdwb3J0Q29udGVudHNDaGFuZ2VkKCk7CisgICAgc2V0SW5Qcm9ncmFtbWF0aWNTY3JvbGwo d2FzSW5Qcm9ncmFtbWF0aWNTY3JvbGwpOwogfQogCiBib29sIEZyYW1lVmlldzo6c2NoZWR1bGVB bmltYXRpb24oKQpAQCAtMTA5MCwxMyArMTA5MiwxNiBAQCB2b2lkIEZyYW1lVmlldzo6dG9wQ29u dGVudEluc2V0RGlkQ2hhbmdlKGZsb2F0IG5ld1RvcENvbnRlbnRJbnNldCkKICAgICAKICAgICBs YXlvdXRDb250ZXh0KCkubGF5b3V0KCk7CiAgICAgLy8gRXZlcnkgc2Nyb2xsIHRoYXQgaGFwcGVu cyBhcyB0aGUgcmVzdWx0IG9mIGNvbnRlbnQgaW5zZXQgY2hhbmdlIGlzIHByb2dyYW1tYXRpYy4K LSAgICBTZXRGb3JTY29wZTxib29sPiBjaGFuZ2VJblByb2dyYW1tYXRpY1Njcm9sbChtX2luUHJv Z3JhbW1hdGljU2Nyb2xsLCB0cnVlKTsKKyAgICBib29sIHdhc0luUHJvZ3JhbW1hdGljU2Nyb2xs ID0gaW5Qcm9ncmFtbWF0aWNTY3JvbGwoKTsKKyAgICBzZXRJblByb2dyYW1tYXRpY1Njcm9sbCh0 cnVlKTsKICAgICB1cGRhdGVTY3JvbGxiYXJzKHNjcm9sbFBvc2l0aW9uKCkpOwogICAgIGlmIChy ZW5kZXJWaWV3LT51c2VzQ29tcG9zaXRpbmcoKSkKICAgICAgICAgcmVuZGVyVmlldy0+Y29tcG9z aXRvcigpLmZyYW1lVmlld0RpZENoYW5nZVNpemUoKTsKIAogICAgIGlmIChUaWxlZEJhY2tpbmcq IHRpbGVkQmFja2luZyA9IHRoaXMtPnRpbGVkQmFja2luZygpKQogICAgICAgICB0aWxlZEJhY2tp bmctPnNldFRvcENvbnRlbnRJbnNldChuZXdUb3BDb250ZW50SW5zZXQpOworCisgICAgc2V0SW5Q cm9ncmFtbWF0aWNTY3JvbGwod2FzSW5Qcm9ncmFtbWF0aWNTY3JvbGwpOwogfQogCiB2b2lkIEZy YW1lVmlldzo6dG9wQ29udGVudERpcmVjdGlvbkRpZENoYW5nZSgpCkBAIC0xNjcwLDcgKzE2NzUs NyBAQCB2b2lkIEZyYW1lVmlldzo6dXBkYXRlTGF5b3V0Vmlld3BvcnQoKQogICAgIExPR19XSVRI X1NUUkVBTShTY3JvbGxpbmcsIHN0cmVhbSA8PCAic3RhYmxlIG9yaWdpbnM6IG1pbjogIiA8PCBt aW5TdGFibGVMYXlvdXRWaWV3cG9ydE9yaWdpbigpIDw8ICIgbWF4OiAiPDwgbWF4U3RhYmxlTGF5 b3V0Vmlld3BvcnRPcmlnaW4oKSk7CiAgICAgCiAgICAgaWYgKG1fbGF5b3V0Vmlld3BvcnRPdmVy cmlkZVJlY3QpIHsKLSAgICAgICAgaWYgKG1faW5Qcm9ncmFtbWF0aWNTY3JvbGwpIHsKKyAgICAg ICAgaWYgKGluUHJvZ3JhbW1hdGljU2Nyb2xsKCkpIHsKICAgICAgICAgICAgIExPR19XSVRIX1NU UkVBTShTY3JvbGxpbmcsIHN0cmVhbSA8PCAiY29tcHV0aW5nIG5ldyBvdmVycmlkZSBsYXlvdXQg dmlld3BvcnQgYmVjYXVzZSBvZiBwcm9ncmFtbWF0aWMgc2Nyb2xsaW5nIik7CiAgICAgICAgICAg ICBMYXlvdXRQb2ludCBuZXdPcmlnaW4gPSBjb21wdXRlTGF5b3V0Vmlld3BvcnRPcmlnaW4odmlz dWFsVmlld3BvcnRSZWN0KCksIG1pblN0YWJsZUxheW91dFZpZXdwb3J0T3JpZ2luKCksIG1heFN0 YWJsZUxheW91dFZpZXdwb3J0T3JpZ2luKCksIGxheW91dFZpZXdwb3J0LCBTdGlja1RvRG9jdW1l bnRCb3VuZHMpOwogICAgICAgICAgICAgc2V0TGF5b3V0Vmlld3BvcnRPdmVycmlkZVJlY3QoTGF5 b3V0UmVjdChuZXdPcmlnaW4sIG1fbGF5b3V0Vmlld3BvcnRPdmVycmlkZVJlY3QudmFsdWUoKS5z aXplKCkpKTsKQEAgLTIyNzQsNyArMjI3OSw5IEBAIHZvaWQgRnJhbWVWaWV3OjpzZXRTY3JvbGxQ b3NpdGlvbihjb25zdCBTY3JvbGxQb3NpdGlvbiYgc2Nyb2xsUG9zaXRpb24pCiB7CiAgICAgTE9H X1dJVEhfU1RSRUFNKFNjcm9sbGluZywgc3RyZWFtIDw8ICJGcmFtZVZpZXc6OnNldFNjcm9sbFBv c2l0aW9uICIgPDwgc2Nyb2xsUG9zaXRpb24gPDwgIiAsIGNsZWFyaW5nIGFuY2hvciIpOwogCi0g ICAgU2V0Rm9yU2NvcGU8Ym9vbD4gY2hhbmdlSW5Qcm9ncmFtbWF0aWNTY3JvbGwobV9pblByb2dy YW1tYXRpY1Njcm9sbCwgdHJ1ZSk7CisgICAgYm9vbCB3YXNJblByb2dyYW1tYXRpY1Njcm9sbCA9 IGluUHJvZ3JhbW1hdGljU2Nyb2xsKCk7CisgICAgc2V0SW5Qcm9ncmFtbWF0aWNTY3JvbGwodHJ1 ZSk7CisKICAgICBtX21haW50YWluU2Nyb2xsUG9zaXRpb25BbmNob3IgPSBudWxscHRyOwogICAg IG1fc2hvdWxkU2Nyb2xsVG9Gb2N1c2VkRWxlbWVudCA9IGZhbHNlOwogICAgIG1fZGVsYXllZFNj cm9sbFRvRm9jdXNlZEVsZW1lbnRUaW1lci5zdG9wKCk7CkBAIC0yMjgyLDYgKzIyODksOCBAQCB2 b2lkIEZyYW1lVmlldzo6c2V0U2Nyb2xsUG9zaXRpb24oY29uc3QgU2Nyb2xsUG9zaXRpb24mIHNj cm9sbFBvc2l0aW9uKQogICAgIGlmIChwYWdlICYmIHBhZ2UtPmV4cGVjdHNXaGVlbEV2ZW50VHJp Z2dlcnMoKSkKICAgICAgICAgc2Nyb2xsQW5pbWF0b3IoKS5zZXRXaGVlbEV2ZW50VGVzdFRyaWdn ZXIocGFnZS0+dGVzdFRyaWdnZXIoKSk7CiAgICAgU2Nyb2xsVmlldzo6c2V0U2Nyb2xsUG9zaXRp b24oc2Nyb2xsUG9zaXRpb24pOworCisgICAgc2V0SW5Qcm9ncmFtbWF0aWNTY3JvbGwod2FzSW5Q cm9ncmFtbWF0aWNTY3JvbGwpOwogfQogCiB2b2lkIEZyYW1lVmlldzo6cmVzZXRTY3JvbGxBbmNo b3IoKQpAQCAtNDEwMCw3ICs0MTA5LDcgQEAgdm9pZCBGcmFtZVZpZXc6OnNldFdhc1Njcm9sbGVk QnlVc2VyKGJvb2wgd2FzU2Nyb2xsZWRCeVVzZXIpCiAKICAgICBtX3Nob3VsZFNjcm9sbFRvRm9j dXNlZEVsZW1lbnQgPSBmYWxzZTsKICAgICBtX2RlbGF5ZWRTY3JvbGxUb0ZvY3VzZWRFbGVtZW50 VGltZXIuc3RvcCgpOwotICAgIGlmIChtX2luUHJvZ3JhbW1hdGljU2Nyb2xsKQorICAgIGlmIChp blByb2dyYW1tYXRpY1Njcm9sbCgpKQogICAgICAgICByZXR1cm47CiAgICAgbV9tYWludGFpblNj cm9sbFBvc2l0aW9uQW5jaG9yID0gbnVsbHB0cjsKICAgICBpZiAobV93YXNTY3JvbGxlZEJ5VXNl ciA9PSB3YXNTY3JvbGxlZEJ5VXNlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv RnJhbWVWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmluZGV4IGMzZjg4 NDM0ZTA1NzJjNGYyODYxN2YxYzQxZWYyNmM1NjRjZmZjZmMuLjU1ZjJhNjdhMDE2NmE4NWU4NmE5 MjgzOTFkNWNjYTczNTA5MzZmYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJh bWVWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApAQCAtNTU1LDkg KzU1NSw2IEBAIHB1YmxpYzoKICAgICBjb25zdCBQYWdpbmF0aW9uJiBwYWdpbmF0aW9uKCkgY29u c3Q7CiAgICAgdm9pZCBzZXRQYWdpbmF0aW9uKGNvbnN0IFBhZ2luYXRpb24mKTsKICAgICAKLSAg ICBib29sIGluUHJvZ3JhbW1hdGljU2Nyb2xsKCkgY29uc3QgZmluYWwgeyByZXR1cm4gbV9pblBy b2dyYW1tYXRpY1Njcm9sbDsgfQotICAgIHZvaWQgc2V0SW5Qcm9ncmFtbWF0aWNTY3JvbGwoYm9v bCBwcm9ncmFtbWF0aWNTY3JvbGwpIHsgbV9pblByb2dyYW1tYXRpY1Njcm9sbCA9IHByb2dyYW1t YXRpY1Njcm9sbDsgfQotCiAjaWYgRU5BQkxFKENTU19ERVZJQ0VfQURBUFRBVElPTikKICAgICBJ bnRTaXplIGluaXRpYWxWaWV3cG9ydFNpemUoKSBjb25zdCB7IHJldHVybiBtX2luaXRpYWxWaWV3 cG9ydFNpemU7IH0KICAgICB2b2lkIHNldEluaXRpYWxWaWV3cG9ydFNpemUoY29uc3QgSW50U2l6 ZSYgc2l6ZSkgeyBtX2luaXRpYWxWaWV3cG9ydFNpemUgPSBzaXplOyB9CkBAIC05MjMsNyArOTIw LDYgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgbV9pc1RyYWNraW5nUmVwYWludHMgeyBmYWxzZSB9 OyAvLyBVc2VkIGZvciB0ZXN0aW5nLgogICAgIGJvb2wgbV93YXNTY3JvbGxlZEJ5VXNlciB7IGZh bHNlIH07Ci0gICAgYm9vbCBtX2luUHJvZ3JhbW1hdGljU2Nyb2xsIHsgZmFsc2UgfTsKICAgICBi b29sIG1fc2hvdWxkU2Nyb2xsVG9Gb2N1c2VkRWxlbWVudCB7IGZhbHNlIH07CiAKICAgICBib29s IG1faXNQYWludGluZyB7IGZhbHNlIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9TY3JvbGxWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxWaWV3LmgK aW5kZXggODdiY2EyZGMzOTJmYzBhYjliZDIzZTgzOWRlMjI2MjM3NjE1NDY5My4uOGViNDY4MzFj YzFjODVlZTE5NjI2NzUzMzRlYzFlMzVmYjAxYzY4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vU2Nyb2xsVmlldy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbFZpZXcuaApAQCAtMTk2LDggKzE5Niw2IEBAIHB1YmxpYzoKICAgICBMZWdhY3lUaWxlQ2Fj aGUqIGxlZ2FjeVRpbGVDYWNoZSgpOwogI2VuZGlmCiAKLSAgICB2aXJ0dWFsIGJvb2wgaW5Qcm9n cmFtbWF0aWNTY3JvbGwoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfQotCiAgICAgLy8gU2l6ZSBh dmFpbGFibGUgZm9yIHZpZXcgY29udGVudHMsIGluY2x1ZGluZyBjb250ZW50IGluc2V0IGFyZWFz LiBOb3QgYWZmZWN0ZWQgYnkgem9vbWluZy4KICAgICBJbnRTaXplIHNpemVGb3JWaXNpYmxlQ29u dGVudChWaXNpYmxlQ29udGVudFJlY3RJbmNsdWRlc1Njcm9sbGJhcnMgPSBFeGNsdWRlU2Nyb2xs YmFycykgY29uc3Q7CiAgICAgLy8gRklYTUU6IHJlbW92ZSB0aGlzLiBJdCdzIG9ubHkgdXNlZCBm b3IgdGhlIGluY29ycmVjdGx5IGJlaGF2aW5nIFNjcm9sbFZpZXc6OnVub2JzY3VyZWRDb250ZW50 UmVjdEludGVybmFsKCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3Jv bGxhYmxlQXJlYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5j cHAKaW5kZXggZTk1ZjIzYWNjNTNhZTc4ZmU1ZGY2MDg4YjdmYTBlZGExMzBkMGNjZC4uNzQ1OWNk ZWJmYTQwMTNjYzZhNzZmMWQ1ODUzNGNjMzE2YjdiMmVhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFyZWEuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbGFibGVBcmVhLmNwcApAQCAtNjYsNyArNjYsOCBAQCBTY3JvbGxhYmxlQXJl YTo6U2Nyb2xsYWJsZUFyZWEoKQogICAgICwgbV9ob3Jpem9udGFsU2Nyb2xsRWxhc3RpY2l0eShT Y3JvbGxFbGFzdGljaXR5Tm9uZSkKICAgICAsIG1fc2Nyb2xsYmFyT3ZlcmxheVN0eWxlKFNjcm9s bGJhck92ZXJsYXlTdHlsZURlZmF1bHQpCiAgICAgLCBtX3Njcm9sbE9yaWdpbkNoYW5nZWQoZmFs c2UpCi0gICAgLCBtX3Njcm9sbGVkUHJvZ3JhbW1hdGljYWxseShmYWxzZSkKKyAgICAsIG1faW5Q cm9ncmFtbWF0aWNTY3JvbGwoZmFsc2UpCisgICAgLCBtX3Njcm9sbFNob3VsZENsZWFyTGF0Y2hl ZFN0YXRlKGZhbHNlKQogewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9TY3JvbGxhYmxlQXJlYS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Nyb2xsYWJsZUFy ZWEuaAppbmRleCAyMTM2MTM5MjIwNDY0NzAxMDY2ZTBiMDFhNTc0MTVlMjNjN2NkMzBmLi5mMGEw MGI2OGE0MmIxMDI5YmY0ZWYyMjRkYWE4OTIzZGU5ZDI0NjY3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9TY3JvbGxhYmxlQXJlYS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL1Njcm9sbGFibGVBcmVhLmgKQEAgLTIyOCw4ICsyMjgsMTEgQEAgcHVibGljOgogICAg IFdFQkNPUkVfRVhQT1JUIHZpcnR1YWwgYm9vbCBzY3JvbGxlZFRvTGVmdCgpIGNvbnN0OwogICAg IFdFQkNPUkVfRVhQT1JUIHZpcnR1YWwgYm9vbCBzY3JvbGxlZFRvUmlnaHQoKSBjb25zdDsKIAot ICAgIGJvb2wgaXNTY3JvbGxlZFByb2dyYW1tYXRpY2FsbHkoKSBjb25zdCB7IHJldHVybiBtX3Nj cm9sbGVkUHJvZ3JhbW1hdGljYWxseTsgfQotICAgIHZvaWQgc2V0U2Nyb2xsZWRQcm9ncmFtbWF0 aWNhbGx5KGJvb2wgc3RhdGUpIHsgbV9zY3JvbGxlZFByb2dyYW1tYXRpY2FsbHkgPSBzdGF0ZTsg fQorICAgIGJvb2wgaW5Qcm9ncmFtbWF0aWNTY3JvbGwoKSBjb25zdCB7IHJldHVybiBtX2luUHJv Z3JhbW1hdGljU2Nyb2xsOyB9CisgICAgdm9pZCBzZXRJblByb2dyYW1tYXRpY1Njcm9sbChib29s IGluUHJvZ3JhbW1hdGljU2Nyb2xsKSB7IG1faW5Qcm9ncmFtbWF0aWNTY3JvbGwgPSBpblByb2dy YW1tYXRpY1Njcm9sbDsgfQorCisgICAgYm9vbCBzY3JvbGxTaG91bGRDbGVhckxhdGNoZWRTdGF0 ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsU2hvdWxkQ2xlYXJMYXRjaGVkU3RhdGU7IH0KKyAg ICB2b2lkIHNldFNjcm9sbFNob3VsZENsZWFyTGF0Y2hlZFN0YXRlKGJvb2wgc2hvdWxkQ2xlYXIp IHsgbV9zY3JvbGxTaG91bGRDbGVhckxhdGNoZWRTdGF0ZSA9IHNob3VsZENsZWFyOyB9CiAKICAg ICBlbnVtIFZpc2libGVDb250ZW50UmVjdEluY2x1ZGVzU2Nyb2xsYmFycyB7IEV4Y2x1ZGVTY3Jv bGxiYXJzLCBJbmNsdWRlU2Nyb2xsYmFycyB9OwogICAgIGVudW0gVmlzaWJsZUNvbnRlbnRSZWN0 QmVoYXZpb3IgewpAQCAtMzkxLDcgKzM5NCw4IEBAIHByaXZhdGU6CiAgICAgdW5zaWduZWQgbV9z Y3JvbGxiYXJPdmVybGF5U3R5bGUgOiAyOyAvLyBTY3JvbGxiYXJPdmVybGF5U3R5bGUKIAogICAg IHVuc2lnbmVkIG1fc2Nyb2xsT3JpZ2luQ2hhbmdlZCA6IDE7Ci0gICAgdW5zaWduZWQgbV9zY3Jv bGxlZFByb2dyYW1tYXRpY2FsbHkgOiAxOworICAgIHVuc2lnbmVkIG1faW5Qcm9ncmFtbWF0aWNT Y3JvbGwgOiAxOworICAgIHVuc2lnbmVkIG1fc2Nyb2xsU2hvdWxkQ2xlYXJMYXRjaGVkU3RhdGUg OiAxOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo=