220708 2021-01-18 03:04:52 -0800 Remove recently added glue code: RenderLayer::(setAdjustForIOSCaretWhenScrolling / setScrollShouldClearLatchedState / setConstrainsScrollingToContentEdge) 2021-01-18 13:13:14 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 60305 1 zimmermann zimmermann aperez bfulgham cdumez changseok cmarcelo esprehn+autocc ews-watchlist fred.wang glenn kangil.han kondapallykalyan mifenton pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1720315 0 zimmermann 2021-01-18 03:04:52 -0800 Remove recently added glue code: RenderLayer::(setAdjustForIOSCaretWhenScrolling / setScrollShouldClearLatchedState / setConstrainsScrollingToContentEdge) 1720317 1 417825 zimmermann 2021-01-18 03:05:32 -0800 Created attachment 417825 Patch, v1 We can use RenderLayerScrollableArea directly instead and get rid of the glue code that was only added to ease the landing of the patch on bug 60305 1720398 2 zimmermann 2021-01-18 13:12:31 -0800 Committed r271585: <https://trac.webkit.org/changeset/r271585> 1720399 3 webkit-bug-importer 2021-01-18 13:13:14 -0800 <rdar://problem/73329027> 417825 2021-01-18 03:05:32 -0800 2021-01-18 05:15:02 -0800 Patch, v1 bug-220708-20210118120531.patch text/plain 12821 zimmermann U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2RiMTY3NmRlZWM1Zjkz YTBjNzNkZDljNjUwN2RmZDMwNjlmNmU0Ni4uYWNlMTI5ZDhiM2RmMmE5M2EyNjc4YTRlYjBlMmU3 YzljMTQ4ZTg3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTAxLTE4ICBOaWtv bGFzIFppbW1lcm1hbm4gIDxuemltbWVybWFubkBpZ2FsaWEuY29tPgorCisgICAgICAgIFJlbW92 ZSByZWNlbnRseSBhZGRlZCBnbHVlIGNvZGU6IFJlbmRlckxheWVyOjooc2V0QWRqdXN0Rm9ySU9T Q2FyZXRXaGVuU2Nyb2xsaW5nIC8gc2V0U2Nyb2xsU2hvdWxkQ2xlYXJMYXRjaGVkU3RhdGUgLyBz ZXRDb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50RWRnZSkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDcwOAorCisgICAgICAgIEZvbGxvdy11cCBv biBwYXRjaCBhZHJlc3NpbmcgdGhlIHJlbW92YWwgb2YgdGhlIGdsdWUgY29kZSB0aGF0CisgICAg ICAgIGZvcndhcmRzIGNhbGxzIGZyb20gUmVuZGVyTGF5ZXIgdG8gUmVuZGVyTGF5ZXJTY3JvbGxh YmxlQXJlYSAoc2VlCisgICAgICAgIHdlYmtpdC5vcmcvYi82MDMwNSkuCisKKyAgICAgICAgQ292 ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNldFNjcm9sbExlZnQpOgorICAgICAgICAoV2ViQ29y ZTo6RWxlbWVudDo6c2V0U2Nyb2xsVG9wKToKKyAgICAgICAgKiBlZGl0aW5nL0ZyYW1lU2VsZWN0 aW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lU2VsZWN0aW9uOjpyZXZlYWxTZWxlY3Rp b24pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJMYXllcjo6c2Nyb2xsKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVy OjpzZXRBZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcpOiBEZWxldGVkLgorICAgICAgICAo V2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNldFNjcm9sbFNob3VsZENsZWFyTGF0Y2hlZFN0YXRlKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzZXRDb25zdHJhaW5zU2Ny b2xsaW5nVG9Db250ZW50RWRnZSk6IERlbGV0ZWQuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckxheWVyLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck1hcnF1ZWUuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTWFycXVlZTo6UmVuZGVyTWFycXVlZSk6CisKIDIwMjEtMDEtMTgg IE5pa29sYXMgWmltbWVybWFubiAgPG56aW1tZXJtYW5uQGlnYWxpYS5jb20+CiAKICAgICAgICAg UmVtb3ZlIHJlY2VudGx5IGFkZGVkIGdsdWUgY29kZTogUmVuZGVyTGF5ZXI6OihzY3JvbGxUb09m ZnNldCAvIHNjcm9sbFRvWE9mZnNldCAvIHNjcm9sbFRvWU9mZnNldCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXRMZWdhY3kvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFj L0NoYW5nZUxvZwppbmRleCBmMzBhZTliZTAzNWJmMjUzMjZkMjJjNjE0ZmU1ZjEwM2Y0MzJjMDll Li5hMmFlNjIwNTFkMzZjZWZhMTIzMDNlMTQ3OWYyYWUwMzllOWM2MDE2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0TGVnYWN5L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdExlZ2Fj eS9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDEtMTggIE5pa29sYXMgWmlt bWVybWFubiAgPG56aW1tZXJtYW5uQGlnYWxpYS5jb20+CisKKyAgICAgICAgUmVtb3ZlIHJlY2Vu dGx5IGFkZGVkIGdsdWUgY29kZTogUmVuZGVyTGF5ZXI6OihzZXRBZGp1c3RGb3JJT1NDYXJldFdo ZW5TY3JvbGxpbmcgLyBzZXRTY3JvbGxTaG91bGRDbGVhckxhdGNoZWRTdGF0ZSAvIHNldENvbnN0 cmFpbnNTY3JvbGxpbmdUb0NvbnRlbnRFZGdlKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwNzA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgRm9sbG93LXVwIG9uIHBhdGNoIGFkcmVzc2luZyB0aGUgcmVt b3ZhbCBvZiB0aGUgZ2x1ZSBjb2RlIHRoYXQKKyAgICAgICAgZm9yd2FyZHMgY2FsbHMgZnJvbSBS ZW5kZXJMYXllciB0byBSZW5kZXJMYXllclNjcm9sbGFibGVBcmVhIChzZWUKKyAgICAgICAgd2Vi a2l0Lm9yZy9iLzYwMzA1KS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgor CisgICAgICAgICogRE9NL0RPTUhUTUwubW06CisgICAgICAgICgtW0RPTUhUTUxFbGVtZW50IHNl dFNjcm9sbFhPZmZzZXQ6c2Nyb2xsWU9mZnNldDphZGp1c3RGb3JJT1NDYXJldDpdKToKKyAgICAg ICAgKiBXZWJWaWV3L1dlYkZyYW1lLm1tOgorICAgICAgICAoLVtXZWJGcmFtZSBfc2Nyb2xsRE9N UmFuZ2VUb1Zpc2libGU6XSk6CisgICAgICAgICgtW1dlYkZyYW1lIF9zY3JvbGxET01SYW5nZVRv VmlzaWJsZTp3aXRoSW5zZXQ6XSk6CisKIDIwMjEtMDEtMTggIE5pa29sYXMgWmltbWVybWFubiAg PG56aW1tZXJtYW5uQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHJlY2VudGx5IGFkZGVk IGdsdWUgY29kZTogUmVuZGVyTGF5ZXI6OihzY3JvbGxUb09mZnNldCAvIHNjcm9sbFRvWE9mZnNl dCAvIHNjcm9sbFRvWU9mZnNldCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNwcAppbmRleCBjYzVlMGRlNGIx NzQ2NzQ4MjY0MDUzZDhjNWFjYzkyZjk4ZGVmMmNmLi5hOTJlYmY3NzNhMjA3YWJkMWI4MzBlNzdj MWVhOTQ2MjE5MDQyOGUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCkBAIC05Miw2ICs5Miw3IEBA CiAjaW5jbHVkZSAiUmVuZGVyTGF5ZXIuaCIKICNpbmNsdWRlICJSZW5kZXJMYXllckJhY2tpbmcu aCIKICNpbmNsdWRlICJSZW5kZXJMYXllckNvbXBvc2l0b3IuaCIKKyNpbmNsdWRlICJSZW5kZXJM YXllclNjcm9sbGFibGVBcmVhLmgiCiAjaW5jbHVkZSAiUmVuZGVyTGlzdEJveC5oIgogI2luY2x1 ZGUgIlJlbmRlclRoZW1lLmgiCiAjaW5jbHVkZSAiUmVuZGVyVHJlZVVwZGF0ZXIuaCIKQEAgLTEz MzYsNyArMTMzNyw3IEBAIHZvaWQgRWxlbWVudDo6c2V0U2Nyb2xsTGVmdChpbnQgbmV3TGVmdCkK ICAgICBpZiAoYXV0byogcmVuZGVyZXIgPSByZW5kZXJCb3goKSkgewogICAgICAgICBpbnQgY2xh bXBlZExlZnQgPSBjbGFtcFRvSW50ZWdlcihuZXdMZWZ0ICogcmVuZGVyZXItPnN0eWxlKCkuZWZm ZWN0aXZlWm9vbSgpKTsKICAgICAgICAgcmVuZGVyZXItPnNldFNjcm9sbExlZnQoY2xhbXBlZExl ZnQsIG9wdGlvbnMpOwotICAgICAgICBpZiAoYXV0byogc2Nyb2xsYWJsZUFyZWEgPSByZW5kZXJl ci0+bGF5ZXIoKSkKKyAgICAgICAgaWYgKGF1dG8qIHNjcm9sbGFibGVBcmVhID0gcmVuZGVyZXIt PmxheWVyKCkgPyByZW5kZXJlci0+bGF5ZXIoKS0+c2Nyb2xsYWJsZUFyZWEoKSA6IG51bGxwdHIp CiAgICAgICAgICAgICBzY3JvbGxhYmxlQXJlYS0+c2V0U2Nyb2xsU2hvdWxkQ2xlYXJMYXRjaGVk U3RhdGUodHJ1ZSk7CiAgICAgfQogfQpAQCAtMTM1OSw3ICsxMzYwLDcgQEAgdm9pZCBFbGVtZW50 OjpzZXRTY3JvbGxUb3AoaW50IG5ld1RvcCkKICAgICBpZiAoYXV0byogcmVuZGVyZXIgPSByZW5k ZXJCb3goKSkgewogICAgICAgICBpbnQgY2xhbXBlZFRvcCA9IGNsYW1wVG9JbnRlZ2VyKG5ld1Rv cCAqIHJlbmRlcmVyLT5zdHlsZSgpLmVmZmVjdGl2ZVpvb20oKSk7CiAgICAgICAgIHJlbmRlcmVy LT5zZXRTY3JvbGxUb3AoY2xhbXBlZFRvcCwgb3B0aW9ucyk7Ci0gICAgICAgIGlmIChhdXRvKiBz Y3JvbGxhYmxlQXJlYSA9IHJlbmRlcmVyLT5sYXllcigpKQorICAgICAgICBpZiAoYXV0byogc2Ny b2xsYWJsZUFyZWEgPSByZW5kZXJlci0+bGF5ZXIoKSA/IHJlbmRlcmVyLT5sYXllcigpLT5zY3Jv bGxhYmxlQXJlYSgpIDogbnVsbHB0cikKICAgICAgICAgICAgIHNjcm9sbGFibGVBcmVhLT5zZXRT Y3JvbGxTaG91bGRDbGVhckxhdGNoZWRTdGF0ZSh0cnVlKTsKICAgICB9CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCmluZGV4IDliNjdkMjk3ZTE5MWYyZTRjYzZm M2JkZGZlMzExZjJkNjUzNTAwMjUuLjg0ZGU5OGM4YmFlNjQyZGI3NzI5Mjc3M2FkNzA0OTM2NjRm ODg5MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uY3BwCkBAIC01 OCw2ICs1OCw3IEBACiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlJhbmdlLmgiCiAjaW5j bHVkZSAiUmVuZGVyTGF5ZXIuaCIKKyNpbmNsdWRlICJSZW5kZXJMYXllclNjcm9sbGFibGVBcmVh LmgiCiAjaW5jbHVkZSAiUmVuZGVyVGV4dC5oIgogI2luY2x1ZGUgIlJlbmRlclRleHRDb250cm9s LmgiCiAjaW5jbHVkZSAiUmVuZGVyVGhlbWUuaCIKQEAgLTIzOTEsOSArMjM5MiwxMCBAQCB2b2lk IEZyYW1lU2VsZWN0aW9uOjpyZXZlYWxTZWxlY3Rpb24oU2VsZWN0aW9uUmV2ZWFsTW9kZSByZXZl YWxNb2RlLCBjb25zdCBTY3JvbAogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgICAgIGlm IChSZW5kZXJMYXllciogbGF5ZXIgPSBzdGFydC5kZXByZWNhdGVkTm9kZSgpLT5yZW5kZXJlcigp LT5lbmNsb3NpbmdMYXllcigpKSB7CiAgICAgICAgICAgICBpZiAoIW1fc2Nyb2xsaW5nU3VwcHJl c3NDb3VudCkgewotICAgICAgICAgICAgICAgIGxheWVyLT5zZXRBZGp1c3RGb3JJT1NDYXJldFdo ZW5TY3JvbGxpbmcodHJ1ZSk7CisgICAgICAgICAgICAgICAgYXV0byogc2Nyb2xsYWJsZUxheWVy ID0gbGF5ZXItPmVuc3VyZUxheWVyU2Nyb2xsYWJsZUFyZWEoKTsKKyAgICAgICAgICAgICAgICBz Y3JvbGxhYmxlTGF5ZXItPnNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyh0cnVlKTsK ICAgICAgICAgICAgICAgICBsYXllci0+c2Nyb2xsUmVjdFRvVmlzaWJsZShyZWN0LCBpbnNpZGVG aXhlZCwgeyByZXZlYWxNb2RlLCBhbGlnbm1lbnQsIGFsaWdubWVudCwgU2hvdWxkQWxsb3dDcm9z c09yaWdpblNjcm9sbGluZzo6WWVzIH0pOwotICAgICAgICAgICAgICAgIGxheWVyLT5zZXRBZGp1 c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcoZmFsc2UpOworICAgICAgICAgICAgICAgIHNjcm9s bGFibGVMYXllci0+c2V0QWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKGZhbHNlKTsKICAg ICAgICAgICAgICAgICB1cGRhdGVBcHBlYXJhbmNlKCk7CiAgICAgICAgICAgICAgICAgaWYgKG1f ZG9jdW1lbnQtPnBhZ2UoKSkKICAgICAgICAgICAgICAgICAgICAgbV9kb2N1bWVudC0+cGFnZSgp LT5jaHJvbWUoKS5jbGllbnQoKS5ub3RpZnlSZXZlYWxlZFNlbGVjdGlvbkJ5U2Nyb2xsaW5nRnJh bWUoKm1fZG9jdW1lbnQtPmZyYW1lKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckxheWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllci5jcHAKaW5kZXggMGQyNmVjMjZkNWY5ZGVkOTU0ODA4NTE1NmRkMWM1NzY0OTM4YjQ2MC4u MmVjNWQ1Mzg4ZGZlMTAzMDU2YzFjMDczMzBlYjA3NTA2ZDRkYTRlMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCkBAIC00MjIsMTkgKzQyMiw2IEBAIHZvaWQgUmVu ZGVyTGF5ZXI6OnNldFJlcXVpcmVzU2Nyb2xsUG9zaXRpb25SZWNvbmNpbGlhdGlvbihib29sIHJl cXVpcmVzUmVjb25jaWxpCiAgICAgICAgIG1fc2Nyb2xsYWJsZUFyZWEtPnNldFJlcXVpcmVzU2Ny b2xsUG9zaXRpb25SZWNvbmNpbGlhdGlvbihyZXF1aXJlc1JlY29uY2lsaWF0aW9uKTsKIH0KIAot I2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCi12b2lkIFJlbmRlckxheWVyOjpzZXRBZGp1c3RGb3JJ T1NDYXJldFdoZW5TY3JvbGxpbmcoYm9vbCBhZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcp Ci17Ci0gICAgZW5zdXJlTGF5ZXJTY3JvbGxhYmxlQXJlYSgpLT5zZXRBZGp1c3RGb3JJT1NDYXJl dFdoZW5TY3JvbGxpbmcoYWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKTsKLX0KLSNlbmRp ZgotCi12b2lkIFJlbmRlckxheWVyOjpzZXRTY3JvbGxTaG91bGRDbGVhckxhdGNoZWRTdGF0ZShi b29sIHNob3VsZENsZWFyKQotewotICAgIGlmIChtX3Njcm9sbGFibGVBcmVhKQotICAgICAgICBt X3Njcm9sbGFibGVBcmVhLT5zZXRTY3JvbGxTaG91bGRDbGVhckxhdGNoZWRTdGF0ZShzaG91bGRD bGVhcik7Ci19Ci0KIGJvb2wgUmVuZGVyTGF5ZXI6OnNob3VsZFBsYWNlQmxvY2tEaXJlY3Rpb25T Y3JvbGxiYXJPbkxlZnQoKSBjb25zdAogewogICAgIHJldHVybiByZW5kZXJlcigpLnNob3VsZFBs YWNlQmxvY2tEaXJlY3Rpb25TY3JvbGxiYXJPbkxlZnQoKTsKQEAgLTYwNSwxMiArNTkyLDYgQEAg Ym9vbCBSZW5kZXJMYXllcjo6c2Nyb2xsKFNjcm9sbERpcmVjdGlvbiBkaXJlY3Rpb24sIFNjcm9s bEdyYW51bGFyaXR5IGdyYW51bGFyaXQKIHsKICAgICByZXR1cm4gZW5zdXJlTGF5ZXJTY3JvbGxh YmxlQXJlYSgpLT5zY3JvbGwoZGlyZWN0aW9uLCBncmFudWxhcml0eSwgbXVsdGlwbGllcik7CiB9 Ci0KLXZvaWQgUmVuZGVyTGF5ZXI6OnNldENvbnN0cmFpbnNTY3JvbGxpbmdUb0NvbnRlbnRFZGdl KGJvb2wgY29uc3RyYWluc1Njcm9sbGluZ1RvQ29udGVudEVkZ2UpCi17Ci0gICAgaWYgKG1fc2Ny b2xsYWJsZUFyZWEpCi0gICAgICAgIG1fc2Nyb2xsYWJsZUFyZWEtPnNldENvbnN0cmFpbnNTY3Jv bGxpbmdUb0NvbnRlbnRFZGdlKGNvbnN0cmFpbnNTY3JvbGxpbmdUb0NvbnRlbnRFZGdlKTsKLX0K IC8vIEVuZCBvZiB0ZW1wb3JhcnkgZ2x1ZSBjb2RlCiAKIHZvaWQgUmVuZGVyTGF5ZXI6OmFkZENo aWxkKFJlbmRlckxheWVyJiBjaGlsZCwgUmVuZGVyTGF5ZXIqIGJlZm9yZUNoaWxkKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAppbmRleCBhMjRmYTAwNzFjMjRkM2Q2OTlmNzY4 NzVhNzM2OTA5Y2EzNWEzMjgxLi4yOTE1ZTVmMDEzMDg3ZGJjNjhlMjkwNDNmMGU1NTQ3MjkyYWY5 MzBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuaApAQCAtMTY4LDEwICsx NjgsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRTY3JvbGxQb3NpdGlvbihjb25zdCBTY3JvbGxQ b3NpdGlvbiYsIGNvbnN0IFNjcm9sbFBvc2l0aW9uQ2hhbmdlT3B0aW9ucyYpOwogICAgIHZvaWQg c2Nyb2xsQnlSZWN1cnNpdmVseShjb25zdCBJbnRTaXplJiBkZWx0YSwgU2Nyb2xsYWJsZUFyZWEq KiBzY3JvbGxlZEFyZWEgPSBudWxscHRyKTsKICAgICB2b2lkIHNldFJlcXVpcmVzU2Nyb2xsUG9z aXRpb25SZWNvbmNpbGlhdGlvbihib29sIHJlcXVpcmVzUmVjb25jaWxpYXRpb24gPSB0cnVlKTsK LSNpZiBQTEFURk9STShJT1NfRkFNSUxZKQotICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgc2V0QWRq dXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKGJvb2wpOwotI2VuZGlmCi0gICAgdm9pZCBzZXRT Y3JvbGxTaG91bGRDbGVhckxhdGNoZWRTdGF0ZShib29sKTsKICAgICBib29sIHNob3VsZFBsYWNl QmxvY2tEaXJlY3Rpb25TY3JvbGxiYXJPbkxlZnQoKSBjb25zdDsKICAgICBib29sIGNvbnRhaW5z RGlydHlPdmVybGF5U2Nyb2xsYmFycygpIGNvbnN0OwogICAgIGJvb2wgaGFzU2Nyb2xsYWJsZU9y UnViYmVyYmFuZGFibGVBbmNlc3RvcigpOwpAQCAtMjAxLDcgKzE5Nyw2IEBAIHB1YmxpYzoKICAg ICBpbnQgdmVydGljYWxTY3JvbGxiYXJXaWR0aChPdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5j eSA9IElnbm9yZU92ZXJsYXlTY3JvbGxiYXJTaXplKSBjb25zdDsKICAgICBpbnQgaG9yaXpvbnRh bFNjcm9sbGJhckhlaWdodChPdmVybGF5U2Nyb2xsYmFyU2l6ZVJlbGV2YW5jeSA9IElnbm9yZU92 ZXJsYXlTY3JvbGxiYXJTaXplKSBjb25zdDsKICAgICBib29sIHNjcm9sbChTY3JvbGxEaXJlY3Rp b24sIFNjcm9sbEdyYW51bGFyaXR5LCBmbG9hdCBtdWx0aXBsaWVyID0gMSk7Ci0gICAgdm9pZCBz ZXRDb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50RWRnZShib29sKTsKICAgICAvLyBFbmQgb2Yg dGVtcG9yYXJ5IGdsdWUgY29kZQogCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNYXJxdWVlLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNYXJxdWVlLmNwcAppbmRleCBiMTJkMDBkMWNmOTE1Njk1 ZTgxYTg5MGFjMGRkODg5YzExNzgxMDQ0Li42OTE2NmIyZGFlOWUxYzAyM2VjMjE5MjllZDBkYjJh NTJjMTBmMDdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWFy cXVlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1hcnF1ZWUuY3Bw CkBAIC02MSw3ICs2MSw5IEBAIFJlbmRlck1hcnF1ZWU6OlJlbmRlck1hcnF1ZWUoUmVuZGVyTGF5 ZXIqIGxheWVyKQogICAgIDogbV9sYXllcihsYXllcikKICAgICAsIG1fdGltZXIoKnRoaXMsICZS ZW5kZXJNYXJxdWVlOjp0aW1lckZpcmVkKQogewotICAgIGxheWVyLT5zZXRDb25zdHJhaW5zU2Ny b2xsaW5nVG9Db250ZW50RWRnZShmYWxzZSk7CisgICAgQVNTRVJUKGxheWVyKTsKKyAgICBBU1NF UlQobGF5ZXItPnNjcm9sbGFibGVBcmVhKCkpOworICAgIGxheWVyLT5zY3JvbGxhYmxlQXJlYSgp LT5zZXRDb25zdHJhaW5zU2Nyb2xsaW5nVG9Db250ZW50RWRnZShmYWxzZSk7CiB9CiAKIFJlbmRl ck1hcnF1ZWU6On5SZW5kZXJNYXJxdWVlKCkgPSBkZWZhdWx0OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdExlZ2FjeS9tYWMvRE9NL0RPTUhUTUwubW0gYi9Tb3VyY2UvV2ViS2l0TGVnYWN5L21h Yy9ET00vRE9NSFRNTC5tbQppbmRleCBmZDU0NjE0OWJlNGRkODk1MjY1ZjkyZTBiYzBlNGMyZWRj ODNiZjM0Li5iZDM5OWE2YzIwZmUyZGFlNGYzMmE3MjE0N2QwNjI1MGZjMjQzYjM4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9ET00vRE9NSFRNTC5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0TGVnYWN5L21hYy9ET00vRE9NSFRNTC5tbQpAQCAtMTE3LDEzICsxMTcsMTMgQEAgLSAo dm9pZClzZXRTY3JvbGxYT2Zmc2V0OihpbnQpeCBzY3JvbGxZT2Zmc2V0OihpbnQpeSBhZGp1c3RG b3JJT1NDYXJldDooQk9PTClhZGoKICAgICBhdXRvKiBzY3JvbGxhYmxlTGF5ZXIgPSBsYXllci0+ ZW5zdXJlTGF5ZXJTY3JvbGxhYmxlQXJlYSgpOwogCiAgICAgaWYgKGFkanVzdEZvcklPU0NhcmV0 KQotICAgICAgICBsYXllci0+c2V0QWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKHRydWUp OworICAgICAgICBzY3JvbGxhYmxlTGF5ZXItPnNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9s bGluZyh0cnVlKTsKIAogICAgIGF1dG8gc2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zID0gV2Vi Q29yZTo6U2Nyb2xsUG9zaXRpb25DaGFuZ2VPcHRpb25zOjpjcmVhdGVQcm9ncmFtbWF0aWMoKTsK ICAgICBzY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlvbnMuY2xhbXBpbmcgPSBXZWJDb3JlOjpTY3Jv bGxDbGFtcGluZzo6VW5jbGFtcGVkOwogICAgIHNjcm9sbGFibGVMYXllci0+c2Nyb2xsVG9PZmZz ZXQoV2ViQ29yZTo6U2Nyb2xsT2Zmc2V0KHgsIHkpLCBzY3JvbGxQb3NpdGlvbkNoYW5nZU9wdGlv bnMpOwogICAgIGlmIChhZGp1c3RGb3JJT1NDYXJldCkKLSAgICAgICAgbGF5ZXItPnNldEFkanVz dEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyhmYWxzZSk7CisgICAgICAgIHNjcm9sbGFibGVMYXll ci0+c2V0QWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKGZhbHNlKTsKIH0KIAogLSAodm9p ZClhYnNvbHV0ZVBvc2l0aW9uOihpbnQgKil4IDooaW50ICopeSA6KGludCAqKXcgOihpbnQgKilo CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1t IGIvU291cmNlL1dlYktpdExlZ2FjeS9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQppbmRleCA0NDc1 OGViMTJiMjg0NmY2YTY2MWFiNjAzM2Q0Yzg5Zjg0YWUxODE5Li40YWQ5YmFjZGY3NzdjOTlkOTI0 Nzk4OTk2ZjRjYTU1ZmVmZDA0ZmJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0TGVnYWN5L21h Yy9XZWJWaWV3L1dlYkZyYW1lLm1tCisrKyBiL1NvdXJjZS9XZWJLaXRMZWdhY3kvbWFjL1dlYlZp ZXcvV2ViRnJhbWUubW0KQEAgLTk1LDYgKzk1LDcgQEAKICNpbXBvcnQgPFdlYkNvcmUvUHJpbnRD b250ZXh0Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1JhbmdlLmg+CiAjaW1wb3J0IDxXZWJDb3JlL1Jl bmRlckxheWVyLmg+CisjaW1wb3J0IDxXZWJDb3JlL1JlbmRlckxheWVyU2Nyb2xsYWJsZUFyZWEu aD4KICNpbXBvcnQgPFdlYkNvcmUvUmVuZGVyVmlldy5oPgogI2ltcG9ydCA8V2ViQ29yZS9SZW5k ZXJXaWRnZXQuaD4KICNpbXBvcnQgPFdlYkNvcmUvUmVuZGVyZWREb2N1bWVudE1hcmtlci5oPgpA QCAtNzQxLDkgKzc0MiwxMCBAQCAtICh2b2lkKV9zY3JvbGxET01SYW5nZVRvVmlzaWJsZTooRE9N UmFuZ2UgKilyYW5nZQogI2Vsc2UKICAgICAgICAgYXV0byogbGF5ZXIgPSBzdGFydE5vZGUtPnJl bmRlcmVyKCktPmVuY2xvc2luZ0xheWVyKCk7CiAgICAgICAgIGlmIChsYXllcikgewotICAgICAg ICAgICAgbGF5ZXItPnNldEFkanVzdEZvcklPU0NhcmV0V2hlblNjcm9sbGluZyh0cnVlKTsKKyAg ICAgICAgICAgIGF1dG8qIHNjcm9sbGFibGVMYXllciA9IGxheWVyLT5lbnN1cmVMYXllclNjcm9s bGFibGVBcmVhKCk7CisgICAgICAgICAgICBzY3JvbGxhYmxlTGF5ZXItPnNldEFkanVzdEZvcklP U0NhcmV0V2hlblNjcm9sbGluZyh0cnVlKTsKICAgICAgICAgICAgIHN0YXJ0Tm9kZS0+cmVuZGVy ZXIoKS0+c2Nyb2xsUmVjdFRvVmlzaWJsZShXZWJDb3JlOjplbmNsb3NpbmdJbnRSZWN0KHJhbmdl UmVjdCksIGluc2lkZUZpeGVkLCB7IFdlYkNvcmU6OlNlbGVjdGlvblJldmVhbE1vZGU6OlJldmVh bCwgV2ViQ29yZTo6U2Nyb2xsQWxpZ25tZW50OjphbGlnblRvRWRnZUlmTmVlZGVkLCBXZWJDb3Jl OjpTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQsIFdlYkNvcmU6OlNob3VsZEFs bG93Q3Jvc3NPcmlnaW5TY3JvbGxpbmc6OlllcyB9KTsKLSAgICAgICAgICAgIGxheWVyLT5zZXRB ZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcoZmFsc2UpOworICAgICAgICAgICAgc2Nyb2xs YWJsZUxheWVyLT5zZXRBZGp1c3RGb3JJT1NDYXJldFdoZW5TY3JvbGxpbmcoZmFsc2UpOwogICAg ICAgICAgICAgX3ByaXZhdGUtPmNvcmVGcmFtZS0+c2VsZWN0aW9uKCkuc2V0Q2FyZXRSZWN0TmVl ZHNVcGRhdGUoKTsKICAgICAgICAgICAgIF9wcml2YXRlLT5jb3JlRnJhbWUtPnNlbGVjdGlvbigp LnVwZGF0ZUFwcGVhcmFuY2UoKTsKICAgICAgICAgfQpAQCAtNzYxLDkgKzc2MywxMCBAQCAtICh2 b2lkKV9zY3JvbGxET01SYW5nZVRvVmlzaWJsZTooRE9NUmFuZ2UgKilyYW5nZSB3aXRoSW5zZXQ6 KENHRmxvYXQpaW5zZXQKICAgICBpZiAoc3RhcnROb2RlICYmIHN0YXJ0Tm9kZS0+cmVuZGVyZXIo KSkgewogICAgICAgICBhdXRvKiBsYXllciA9IHN0YXJ0Tm9kZS0+cmVuZGVyZXIoKS0+ZW5jbG9z aW5nTGF5ZXIoKTsKICAgICAgICAgaWYgKGxheWVyKSB7Ci0gICAgICAgICAgICBsYXllci0+c2V0 QWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKHRydWUpOworICAgICAgICAgICAgYXV0byog c2Nyb2xsYWJsZUxheWVyID0gbGF5ZXItPmVuc3VyZUxheWVyU2Nyb2xsYWJsZUFyZWEoKTsKKyAg ICAgICAgICAgIHNjcm9sbGFibGVMYXllci0+c2V0QWRqdXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xs aW5nKHRydWUpOwogICAgICAgICAgICAgc3RhcnROb2RlLT5yZW5kZXJlcigpLT5zY3JvbGxSZWN0 VG9WaXNpYmxlKFdlYkNvcmU6OmVuY2xvc2luZ0ludFJlY3QocmFuZ2VSZWN0KSwgaW5zaWRlRml4 ZWQsIHsgV2ViQ29yZTo6U2VsZWN0aW9uUmV2ZWFsTW9kZTo6UmV2ZWFsLCBXZWJDb3JlOjpTY3Jv bGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQsIFdlYkNvcmU6OlNjcm9sbEFsaWdubWVu dDo6YWxpZ25Ub0VkZ2VJZk5lZWRlZCwgV2ViQ29yZTo6U2hvdWxkQWxsb3dDcm9zc09yaWdpblNj cm9sbGluZzo6WWVzfSk7Ci0gICAgICAgICAgICBsYXllci0+c2V0QWRqdXN0Rm9ySU9TQ2FyZXRX aGVuU2Nyb2xsaW5nKGZhbHNlKTsKKyAgICAgICAgICAgIHNjcm9sbGFibGVMYXllci0+c2V0QWRq dXN0Rm9ySU9TQ2FyZXRXaGVuU2Nyb2xsaW5nKGZhbHNlKTsKIAogICAgICAgICAgICAgYXV0byBj b3JlRnJhbWUgPSBjb3JlKHNlbGYpOwogICAgICAgICAgICAgaWYgKGNvcmVGcmFtZSkgewo=