175032 2017-08-01 09:49:02 -0700 Highlight for search match in overflow node is not properly scrolled 2019-06-28 20:49:17 -0700 1 1 1 Unclassified WebKit Frames WebKit Nightly Build iPhone / iPad iOS 11 RESOLVED FIXED InRadar P2 Normal --- 1 fred.wang thorton commit-queue dvoytenko malte simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1333825 0 316865 fred.wang 2017-08-01 09:49:02 -0700 Created attachment 316865 testcase Use "Find in page" in that text case to search "text" and highlight the single search match. Then scroll the overflow node: The highlighted text does not moved with the content of the overflow node. Extracting this from bug 163911, as that seems orthogonal. 1406095 1 335689 fred.wang 2018-03-13 04:56:47 -0700 Created attachment 335689 testcase This is an extended testcase, showing that dynamic scrolls of the main frame or of the subframe make the selection disappear (contrary to desktop). So to summarize: - User scroll of a the main frame with hightlighted text works. - User scroll of a subframe with hightlighted text does not update the position of the highlighted text. - Programmatic scroll of the main frame or a subframe with hightlighted text makes the selection disappear. 1548998 2 373166 thorton 2019-06-28 17:14:01 -0700 Created attachment 373166 Patch 1549015 3 373166 commit-queue 2019-06-28 20:48:24 -0700 Comment on attachment 373166 Patch Clearing flags on attachment: 373166 Committed r246948: <https://trac.webkit.org/changeset/246948> 1549016 4 commit-queue 2019-06-28 20:48:25 -0700 All reviewed patches have been landed. Closing bug. 1549017 5 webkit-bug-importer 2019-06-28 20:49:17 -0700 <rdar://problem/52369021> 316865 2017-08-01 09:49:02 -0700 2018-03-13 04:56:47 -0700 testcase find-highlight.html text/html 813 fred.wang PCFET0NUWVBFIGh0bWw+CjxodG1sPjxoZWFkPgo8bWV0YSBodHRwLWVxdWl2PSJjb250ZW50LXR5 cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD1VVEYtOCI+CiAgPG1ldGEgY2hhcnNldD0i dXRmLTgiPgogIDx0aXRsZT5GaW5kIGhpZ2hsaWdodDwvdGl0bGU+CiAgPG1ldGEgbmFtZT0idmll d3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCI+CiAgPHN0eWxlPgogICAgLnNjcm9s bGFibGUgewogICAgICBiYWNrZ3JvdW5kOiBncmF5OwogICAgICB3aWR0aDogMjAwcHg7CiAgICAg IGhlaWdodDogMjAwcHg7CiAgICAgIG92ZXJmbG93LXk6IGF1dG87CiAgICAgIC13ZWJraXQtb3Zl cmZsb3ctc2Nyb2xsaW5nOiB0b3VjaDsKICAgIH0KICAgIC5yZWN0IHsKICAgICAgd2lkdGg6IDEw MHB4OwogICAgICBoZWlnaHQ6IDUwMHB4OwogICAgfQogIDwvc3R5bGU+CjwvaGVhZD4KPGJvZHk+ CiAgPHA+VXNlICJGaW5kIGluIHBhZ2UiIHRvIHNlYXJjaCAidGV4dCIgYW5kIGhpZ2hsaWdodCB0 aGUgc2luZ2xlIHNlYXJjaCBtYXRjaC4gVGhlbiBzY3JvbGwgdGhlIG92ZXJmbG93IG5vZGUuIFRo ZSBoaWdobGlnaHRlZCB0ZXh0IHNob3VsZCBzY3JvbGwgdG9vLjwvcD4KICA8ZGl2IGNsYXNzPSJz Y3JvbGxhYmxlIj4KICAgIDxkaXYgc3R5bGU9ImhlaWdodDogNTBweDsgYmFja2dyb3VuZDogYmx1 ZSI+PC9kaXY+CiAgICB0ZXh0CiAgICA8ZGl2IGNsYXNzPSJyZWN0IiBzdHlsZT0iYmFja2dyb3Vu ZDogbGluZWFyLWdyYWRpZW50KDEzNWRlZywgZ3JlZW4sIGJsdWUpIj48L2Rpdj4KICA8L2Rpdj4K PC9ib2R5PjwvaHRtbD4K 335689 2018-03-13 04:56:47 -0700 2018-03-13 04:56:47 -0700 testcase 175032.html text/html 1125 fred.wang PCFET0NUWVBFIGh0bWw+CjxodG1sPjxoZWFkPgo8bWV0YSBodHRwLWVxdWl2PSJjb250ZW50LXR5 cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD1VVEYtOCI+CiAgPG1ldGEgY2hhcnNldD0i dXRmLTgiPgogIDx0aXRsZT5GaW5kIGhpZ2hsaWdodDwvdGl0bGU+CiAgPG1ldGEgbmFtZT0idmll d3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCI+CiAgPHN0eWxlPgogICAgI3Njcm9s bGFibGUgewogICAgICBiYWNrZ3JvdW5kOiBncmF5OwogICAgICB3aWR0aDogMjAwcHg7CiAgICAg IGhlaWdodDogMjAwcHg7CiAgICAgIG92ZXJmbG93LXk6IGF1dG87CiAgICAgIC13ZWJraXQtb3Zl cmZsb3ctc2Nyb2xsaW5nOiB0b3VjaDsKICAgIH0KICAgIC5yZWN0IHsKICAgICAgd2lkdGg6IDEw MHB4OwogICAgICBoZWlnaHQ6IDUwMHB4OwogICAgfQogIDwvc3R5bGU+CjwvaGVhZD4KPGJvZHk+ CiAgPHA+VXNlICJGaW5kIGluIHBhZ2UiIHRvIHNlYXJjaCAidGV4dCIgYW5kIGhpZ2hsaWdodCB0 aGUgc2luZ2xlIHNlYXJjaCBtYXRjaC4gVGhlbiBzY3JvbGwgdGhlIG92ZXJmbG93IG5vZGUuIFRo ZSBoaWdobGlnaHRlZCB0ZXh0IHNob3VsZCBzY3JvbGwgdG9vLjwvcD4KICA8ZGl2IGlkPSJzY3Jv bGxhYmxlIj4KICAgIDxkaXYgc3R5bGU9ImhlaWdodDogNTBweDsgYmFja2dyb3VuZDogYmx1ZSI+ PC9kaXY+CiAgICB0ZXh0CiAgICA8ZGl2IGNsYXNzPSJyZWN0IiBzdHlsZT0iYmFja2dyb3VuZDog bGluZWFyLWdyYWRpZW50KDEzNWRlZywgZ3JlZW4sIGJsdWUpIj48L2Rpdj4KICA8L2Rpdj4KCiAg PHA+V2l0aCBkeW5hbWljIHNjcm9sbCwgdGhlIGhpZ2h0bGlnaHQgZGlzYXBwZWFyczo8L3A+CiAg PGlucHV0IHR5cGU9ImJ1dHRvbiIgb25jbGljaz0iZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Nj cm9sbGFibGUnKS5zY3JvbGxCeSgwLCAyMCkiIHZhbHVlPSJEeW5hbWljIHNjcm9sbCBvZiBzdWJm cmFtZSIvPgogIDxpbnB1dCB0eXBlPSJidXR0b24iIG9uY2xpY2s9IndpbmRvdy5zY3JvbGxCeSgw LCAyMCkiIHZhbHVlPSJEeW5hbWljIHNjcm9sbCBvZiBtYWluIGZyYW1lIi8+CiAgPGRpdiBzdHls ZT0iaGVpZ2h0OiA0MDAwcHgiPjwvZGl2PgkKPC9ib2R5PjwvaHRtbD4K 373166 2019-06-28 17:14:01 -0700 2019-06-28 20:48:24 -0700 Patch bug-175032-20190628171401.patch text/plain 10390 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2OTA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTk2ODI0ZjRhZGE4OGNm YzljOTVhZmY1YjRlZTczOTc5ZmIxNDgxZS4uZTJiYjM3YjYwZmMwNTJhMTBiZTZjYjg5MTdmMDIz MTdmOTVjZDBiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTA2LTI4ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIGlPUyBXZWJLaXQy IGZpbmQtaW4tcGFnZSBpbmRpY2F0b3IgZG9lc24ndCBtb3ZlIHdpdGggJ292ZXJmbG93OiBzY3Jv bGwnCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzUw MzIKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI5MzQ2NDgyPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5j cHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZVNlbGVjdGlvbjo6c2VsZWN0aW9uQm91bmRzIGNv bnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lU2VsZWN0aW9uOjpyZXZlYWxTZWxlY3Rpb24p OgorICAgICAgICAqIGVkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaDoKKyAgICAgICAgTWFrZSBzZWxl Y3Rpb25Cb3VuZHMnIGNsaXBUb1Zpc2libGVDb250ZW50IHBhcmFtIGFuIGVudW0gY2xhc3MuCisK KyAgICAgICAgKiBwYWdlL1RleHRJbmRpY2F0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aW5p dGlhbGl6ZUluZGljYXRvcik6CisgICAgICAgIFNhdmUgdGhlIHVuLWNsaXBwZWQgc2VsZWN0aW9u IHJlY3Q7IG90aGVyd2lzZSB3ZSdsbCBmcmVxdWVudGx5IHNhdmUgMCwgMAorICAgICAgICBoZXJl IHdoZW4gZmluZGluZyBhIG1hdGNoIHRoYXQgaXMgb2ZmLXNjcmVlbi4KKwogMjAxOS0wNi0yNyAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNT SU9OIChyMjQ2ODY5KTogQVNTRVJUSU9OIEZBSUxFRDogIXJlbmRlcmVyKCkuaGFzUmVwYWludExh eW91dFJlY3RzKCkgfHwgcmVuZGVyZXIoKS5yZXBhaW50TGF5b3V0UmVjdHMoKS5tX3JlcGFpbnRS ZWN0ID09IHJlbmRlcmVyKCkuY2xpcHBlZE92ZXJmbG93UmVjdEZvclJlcGFpbnQocmVuZGVyZXIo KS5jb250YWluZXJGb3JSZXBhaW50KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY5ZDliMTczMTg3NWJlMTdlOTRh NTkyYjAzYzU0OGVjZWFlYTU2OTkuLjY3NGU2ZmM3NGFlNDY1MzE1MmQxMjQyYjA1ZjM1ZWVmNTE5 Yzk0OTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTktMDYtMjggIFRpbSBIb3J0b24g IDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgaU9TIFdlYktpdDIgZmluZC1p bi1wYWdlIGluZGljYXRvciBkb2Vzbid0IG1vdmUgd2l0aCAnb3ZlcmZsb3c6IHNjcm9sbCcKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTAzMgorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMjkzNDY0ODI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xs ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6ZHJhd1JlY3QpOgorICAg ICAgICAoV2ViS2l0OjpGaW5kQ29udHJvbGxlcjo6ZGlkU2Nyb2xsQWZmZWN0aW5nRmluZEluZGlj YXRvclBvc2l0aW9uKToKKyAgICAgICAgQWRvcHQgdGhlIG1hY09TIGNvZGUgdGhhdCBub3RpY2Vz IHRoYXQgdGhlIGZpbmQgaGlnaGxpZ2h0IGRvZXNuJ3QgbWF0Y2gKKyAgICAgICAgaXRzIG9yaWdp bmFsIHBvc2l0aW9uLCBidXQgaW5zdGVhZCBvZiBoaWRpbmcgdGhlIGhpZ2hsaWdodCBsaWtlIHdl IGRvIG9uIG1hY09TLAorICAgICAgICB1cGRhdGUgaXQuIFdlIGRvIHRoaXMgYXN5bmNocm9ub3Vz bHkgdG8gYXZvaWQgbXV0YXRpbmcgdGhlIGxheWVyIHRyZWUKKyAgICAgICAgaW4gdGhlIG1pZGRs ZSBvZiBwYWludGluZywgd2hpY2ggaXMgbm90IC90cnVseS8gdW5zYWZlLCBidXQgZGVmaW5pdGVs eQorICAgICAgICBub24taWRlYWwgYW5kIGNhdXNlcyBmdW4gZmxhc2hlcy4KKworICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5oOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9pb3MvRmluZENvbnRyb2xsZXJJT1MubW06CisgICAgICAgIChXZWJLaXQ6OkZp bmRDb250cm9sbGVyOjp1cGRhdGVGaW5kSW5kaWNhdG9yKToKKyAgICAgICAgU3RvcmUgbV9maW5k SW5kaWNhdG9yUmVjdCB3aGVuIHVwZGF0aW5nIHRoZSBpbmRpY2F0b3IsIGp1c3QgbGlrZSB3ZSBk byBvbiBtYWNPUy4KKwogMjAxOS0wNi0yNyAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5j b20+CiAKICAgICAgICAgW2lPU10gU2VsZWN0IGFsbCB3aXRoIGV4aXN0aW5nIHJhbmdlIHNlbGVj dGlvbiByZXBsYWNlcyByYW5nZSBpbnN0ZWFkIG9mIHNlbGVjdGluZyBhbGwgdGV4dApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcAppbmRleCBjMzRmYTdjZWQ0NzliYzkw NDM0ZDRhODBiYWI1ZGE5MTNmZjE5NmRjLi4zNGRlODk2ZTMwOTlkYWU2YzE0ZmM1YmYwODNhOGU2 ZTQwOWEwNWNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0 aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmNwcApA QCAtMjI4OCw3ICsyMjg4LDcgQEAgYm9vbCBGcmFtZVNlbGVjdGlvbjo6c2hvdWxkRGVsZXRlU2Vs ZWN0aW9uKGNvbnN0IFZpc2libGVTZWxlY3Rpb24mIHNlbGVjdGlvbikgY28KICAgICByZXR1cm4g bV9mcmFtZS0+ZWRpdG9yKCkuY2xpZW50KCktPnNob3VsZERlbGV0ZVJhbmdlKHNlbGVjdGlvbi50 b05vcm1hbGl6ZWRSYW5nZSgpLmdldCgpKTsKIH0KIAotRmxvYXRSZWN0IEZyYW1lU2VsZWN0aW9u OjpzZWxlY3Rpb25Cb3VuZHMoYm9vbCBjbGlwVG9WaXNpYmxlQ29udGVudCkgY29uc3QKK0Zsb2F0 UmVjdCBGcmFtZVNlbGVjdGlvbjo6c2VsZWN0aW9uQm91bmRzKENsaXBUb1Zpc2libGVDb250ZW50 IGNsaXBUb1Zpc2libGVDb250ZW50KSBjb25zdAogewogICAgIGlmICghbV9mcmFtZS0+ZG9jdW1l bnQoKSkKICAgICAgICAgcmV0dXJuIExheW91dFJlY3QoKTsKQEAgLTIyOTksOCArMjI5OSwxMyBA QCBGbG9hdFJlY3QgRnJhbWVTZWxlY3Rpb246OnNlbGVjdGlvbkJvdW5kcyhib29sIGNsaXBUb1Zp c2libGVDb250ZW50KSBjb25zdAogICAgICAgICByZXR1cm4gTGF5b3V0UmVjdCgpOwogCiAgICAg YXV0byYgc2VsZWN0aW9uID0gcmVuZGVyVmlldy0+c2VsZWN0aW9uKCk7Ci0gICAgYXV0byBzZWxl Y3Rpb25SZWN0ID0gY2xpcFRvVmlzaWJsZUNvbnRlbnQgPyBzZWxlY3Rpb24uYm91bmRzQ2xpcHBl ZFRvVmlzaWJsZUNvbnRlbnQoKSA6IHNlbGVjdGlvbi5ib3VuZHMoKTsKLSAgICByZXR1cm4gY2xp cFRvVmlzaWJsZUNvbnRlbnQgPyBpbnRlcnNlY3Rpb24oc2VsZWN0aW9uUmVjdCwgcmVuZGVyVmll dy0+ZnJhbWVWaWV3KCkudmlzaWJsZUNvbnRlbnRSZWN0KFNjcm9sbGFibGVBcmVhOjpMZWdhY3lJ T1NEb2N1bWVudFZpc2libGVSZWN0KSkgOiBzZWxlY3Rpb25SZWN0OworCisgICAgaWYgKGNsaXBU b1Zpc2libGVDb250ZW50ID09IENsaXBUb1Zpc2libGVDb250ZW50OjpZZXMpIHsKKyAgICAgICAg YXV0byBzZWxlY3Rpb25SZWN0ID0gc2VsZWN0aW9uLmJvdW5kc0NsaXBwZWRUb1Zpc2libGVDb250 ZW50KCk7CisgICAgICAgIHJldHVybiBpbnRlcnNlY3Rpb24oc2VsZWN0aW9uUmVjdCwgcmVuZGVy Vmlldy0+ZnJhbWVWaWV3KCkudmlzaWJsZUNvbnRlbnRSZWN0KFNjcm9sbGFibGVBcmVhOjpMZWdh Y3lJT1NEb2N1bWVudFZpc2libGVSZWN0KSk7CisgICAgfQorCisgICAgcmV0dXJuIHNlbGVjdGlv bi5ib3VuZHMoKTsKIH0KIAogdm9pZCBGcmFtZVNlbGVjdGlvbjo6Z2V0Q2xpcHBlZFZpc2libGVU ZXh0UmVjdGFuZ2xlcyhWZWN0b3I8RmxvYXRSZWN0PiYgcmVjdGFuZ2xlcywgVGV4dFJlY3Rhbmds ZUhlaWdodCB0ZXh0UmVjdEhlaWdodCkgY29uc3QKQEAgLTIzOTEsNyArMjM5Niw3IEBAIHZvaWQg RnJhbWVTZWxlY3Rpb246OnJldmVhbFNlbGVjdGlvbihTZWxlY3Rpb25SZXZlYWxNb2RlIHJldmVh bE1vZGUsIGNvbnN0IFNjcm9sCiAgICAgICAgIHJlY3QgPSBhYnNvbHV0ZUNhcmV0Qm91bmRzKCZp bnNpZGVGaXhlZCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgVmlzaWJsZVNlbGVjdGlvbjo6 UmFuZ2VTZWxlY3Rpb246Ci0gICAgICAgIHJlY3QgPSByZXZlYWxFeHRlbnRPcHRpb24gPT0gUmV2 ZWFsRXh0ZW50ID8gVmlzaWJsZVBvc2l0aW9uKG1fc2VsZWN0aW9uLmV4dGVudCgpKS5hYnNvbHV0 ZUNhcmV0Qm91bmRzKCkgOiBlbmNsb3NpbmdJbnRSZWN0KHNlbGVjdGlvbkJvdW5kcyhmYWxzZSkp OworICAgICAgICByZWN0ID0gcmV2ZWFsRXh0ZW50T3B0aW9uID09IFJldmVhbEV4dGVudCA/IFZp c2libGVQb3NpdGlvbihtX3NlbGVjdGlvbi5leHRlbnQoKSkuYWJzb2x1dGVDYXJldEJvdW5kcygp IDogZW5jbG9zaW5nSW50UmVjdChzZWxlY3Rpb25Cb3VuZHMoQ2xpcFRvVmlzaWJsZUNvbnRlbnQ6 Ok5vKSk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZWRpdGluZy9GcmFtZVNlbGVjdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9GcmFt ZVNlbGVjdGlvbi5oCmluZGV4IDExNjZhMWUyYTkyMWQ4YWM2ZGEzYjNlMTkzNmE0MTEzYTM0NjI3 NDIuLmFjM2ZhZGFjZDQ3OWU3MDMwM2RjMWVkNjcxOTc4MDgzMjQxNWU5NmYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRnJhbWVTZWxlY3Rpb24uaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0ZyYW1lU2VsZWN0aW9uLmgKQEAgLTI2OSw3ICsyNjksOCBAQCBwdWJsaWM6 CiAgICAgdm9pZCBzZXRUeXBpbmdTdHlsZShSZWZQdHI8RWRpdGluZ1N0eWxlPiYmIHN0eWxlKSB7 IG1fdHlwaW5nU3R5bGUgPSBXVEZNb3ZlKHN0eWxlKTsgfQogICAgIHZvaWQgY2xlYXJUeXBpbmdT dHlsZSgpOwogCi0gICAgV0VCQ09SRV9FWFBPUlQgRmxvYXRSZWN0IHNlbGVjdGlvbkJvdW5kcyhi b29sIGNsaXBUb1Zpc2libGVDb250ZW50ID0gdHJ1ZSkgY29uc3Q7CisgICAgZW51bSBjbGFzcyBD bGlwVG9WaXNpYmxlQ29udGVudCA6IHVpbnQ4X3QgeyBObywgWWVzIH07CisgICAgV0VCQ09SRV9F WFBPUlQgRmxvYXRSZWN0IHNlbGVjdGlvbkJvdW5kcyhDbGlwVG9WaXNpYmxlQ29udGVudCA9IENs aXBUb1Zpc2libGVDb250ZW50OjpZZXMpIGNvbnN0OwogCiAgICAgZW51bSBjbGFzcyBUZXh0UmVj dGFuZ2xlSGVpZ2h0IHsgVGV4dEhlaWdodCwgU2VsZWN0aW9uSGVpZ2h0IH07CiAgICAgV0VCQ09S RV9FWFBPUlQgdm9pZCBnZXRDbGlwcGVkVmlzaWJsZVRleHRSZWN0YW5nbGVzKFZlY3RvcjxGbG9h dFJlY3Q+JiwgVGV4dFJlY3RhbmdsZUhlaWdodCA9IFRleHRSZWN0YW5nbGVIZWlnaHQ6OlNlbGVj dGlvbkhlaWdodCkgY29uc3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1RleHRJ bmRpY2F0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9UZXh0SW5kaWNhdG9yLmNwcAppbmRl eCBhMDVkMmViOGQ3NWUzMDcwN2VjYjUyNGJlODBjYWI2MThlNDViYWEzLi45ZTYyYjE0ZGQwYzE5 YzcxYmU5ZTA3MTM4NGEwMGQ2ZmI1OTExMjVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL1RleHRJbmRpY2F0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvVGV4dEluZGlj YXRvci5jcHAKQEAgLTM4MCw3ICszODAsNyBAQCBzdGF0aWMgYm9vbCBpbml0aWFsaXplSW5kaWNh dG9yKFRleHRJbmRpY2F0b3JEYXRhJiBkYXRhLCBGcmFtZSYgZnJhbWUsIGNvbnN0IFJhbgogCiAg ICAgLy8gU3RvcmUgdGhlIHNlbGVjdGlvbiByZWN0IGluIHdpbmRvdyBjb29yZGluYXRlcywgdG8g YmUgdXNlZCBzdWJzZXF1ZW50bHkKICAgICAvLyB0byBkZXRlcm1pbmUgaWYgdGhlIGluZGljYXRv ciBhbmQgc2VsZWN0aW9uIHN0aWxsIHByZWNpc2VseSBvdmVybGFwLgotICAgIGRhdGEuc2VsZWN0 aW9uUmVjdEluUm9vdFZpZXdDb29yZGluYXRlcyA9IGZyYW1lLnZpZXcoKS0+Y29udGVudHNUb1Jv b3RWaWV3KGVuY2xvc2luZ0ludFJlY3QoZnJhbWUuc2VsZWN0aW9uKCkuc2VsZWN0aW9uQm91bmRz KCkpKTsKKyAgICBkYXRhLnNlbGVjdGlvblJlY3RJblJvb3RWaWV3Q29vcmRpbmF0ZXMgPSBmcmFt ZS52aWV3KCktPmNvbnRlbnRzVG9Sb290VmlldyhlbmNsb3NpbmdJbnRSZWN0KGZyYW1lLnNlbGVj dGlvbigpLnNlbGVjdGlvbkJvdW5kcyhGcmFtZVNlbGVjdGlvbjo6Q2xpcFRvVmlzaWJsZUNvbnRl bnQ6Ok5vKSkpOwogICAgIGRhdGEudGV4dEJvdW5kaW5nUmVjdEluUm9vdFZpZXdDb29yZGluYXRl cyA9IHRleHRCb3VuZGluZ1JlY3RJblJvb3RWaWV3Q29vcmRpbmF0ZXM7CiAgICAgZGF0YS50ZXh0 UmVjdHNJbkJvdW5kaW5nUmVjdENvb3JkaW5hdGVzID0gdGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RD b29yZGluYXRlczsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvRmluZENvbnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2Uv RmluZENvbnRyb2xsZXIuY3BwCmluZGV4IDYzY2MyODM5MmU0ODBkZmJkNTQzMmQ2OTAwMGZhMzhm MjJkZTY2MmYuLjRlYzY1Yjc4MDZlNzM4MmU0MjE1MTllNWQ3NDBlZjgwMjQyYzNlMGYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5j cHAKQEAgLTQ5OSwxNyArNDk5LDMxIEBAIHZvaWQgRmluZENvbnRyb2xsZXI6OmRyYXdSZWN0KFBh Z2VPdmVybGF5JiwgR3JhcGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRleHQsIGNvCiAgICAgZm9y IChhdXRvJiBwYXRoIDogd2hpdGVGcmFtZVBhdGhzKQogICAgICAgICBncmFwaGljc0NvbnRleHQu ZmlsbFBhdGgocGF0aCk7CiAKLSAgICBpZiAoIW1faXNTaG93aW5nRmluZEluZGljYXRvciB8fCAh c2hvdWxkSGlkZUZpbmRJbmRpY2F0b3JPblNjcm9sbCgpKQorICAgIGlmICghbV9pc1Nob3dpbmdG aW5kSW5kaWNhdG9yKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAoRnJhbWUqIHNlbGVjdGVk RnJhbWUgPSBmcmFtZVdpdGhTZWxlY3Rpb24obV93ZWJQYWdlLT5jb3JlUGFnZSgpKSkgewotICAg ICAgICBJbnRSZWN0IGZpbmRJbmRpY2F0b3JSZWN0ID0gc2VsZWN0ZWRGcmFtZS0+dmlldygpLT5j b250ZW50c1RvUm9vdFZpZXcoZW5jbG9zaW5nSW50UmVjdChzZWxlY3RlZEZyYW1lLT5zZWxlY3Rp b24oKS5zZWxlY3Rpb25Cb3VuZHMoKSkpOwotCi0gICAgICAgIGlmIChmaW5kSW5kaWNhdG9yUmVj dCAhPSBtX2ZpbmRJbmRpY2F0b3JSZWN0KQotICAgICAgICAgICAgaGlkZUZpbmRJbmRpY2F0b3Io KTsKKyAgICAgICAgSW50UmVjdCBmaW5kSW5kaWNhdG9yUmVjdCA9IHNlbGVjdGVkRnJhbWUtPnZp ZXcoKS0+Y29udGVudHNUb1Jvb3RWaWV3KGVuY2xvc2luZ0ludFJlY3Qoc2VsZWN0ZWRGcmFtZS0+ c2VsZWN0aW9uKCkuc2VsZWN0aW9uQm91bmRzKEZyYW1lU2VsZWN0aW9uOjpDbGlwVG9WaXNpYmxl Q29udGVudDo6Tm8pKSk7CisKKyAgICAgICAgaWYgKGZpbmRJbmRpY2F0b3JSZWN0ICE9IG1fZmlu ZEluZGljYXRvclJlY3QpIHsKKyAgICAgICAgICAgIC8vIFdlIGFyZSB1bmRlcm5lYXRoIHBhaW50 aW5nLCBzbyBpdCdzIG5vdCBzYWZlIHRvIG11dGF0ZSB0aGUgbGF5ZXIgdHJlZSBzeW5jaHJvbm91 c2x5LgorICAgICAgICAgICAgY2FsbE9uTWFpblRocmVhZChbd2Vha1dlYlBhZ2UgPSBtYWtlV2Vh a1B0cihtX3dlYlBhZ2UpXSB7CisgICAgICAgICAgICAgICAgaWYgKCF3ZWFrV2ViUGFnZSkKKyAg ICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIHdlYWtXZWJQYWdlLT5m aW5kQ29udHJvbGxlcigpLmRpZFNjcm9sbEFmZmVjdGluZ0ZpbmRJbmRpY2F0b3JQb3NpdGlvbigp OworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KICAgICB9CiB9CiAKK3ZvaWQgRmluZENvbnRy b2xsZXI6OmRpZFNjcm9sbEFmZmVjdGluZ0ZpbmRJbmRpY2F0b3JQb3NpdGlvbigpCit7CisgICAg aWYgKHNob3VsZEhpZGVGaW5kSW5kaWNhdG9yT25TY3JvbGwoKSkKKyAgICAgICAgaGlkZUZpbmRJ bmRpY2F0b3IoKTsKKyAgICBlbHNlIGlmIChGcmFtZSAqc2VsZWN0ZWRGcmFtZSA9IGZyYW1lV2l0 aFNlbGVjdGlvbihtX3dlYlBhZ2UtPmNvcmVQYWdlKCkpKQorICAgICAgICB1cGRhdGVGaW5kSW5k aWNhdG9yKCpzZWxlY3RlZEZyYW1lLCB0cnVlLCBmYWxzZSk7Cit9CisKIGJvb2wgRmluZENvbnRy b2xsZXI6Om1vdXNlRXZlbnQoUGFnZU92ZXJsYXkmLCBjb25zdCBQbGF0Zm9ybU1vdXNlRXZlbnQm IG1vdXNlRXZlbnQpCiB7CiAgICAgaWYgKG1vdXNlRXZlbnQudHlwZSgpID09IFBsYXRmb3JtRXZl bnQ6Ok1vdXNlUHJlc3NlZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJQYWdlL0ZpbmRDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFn ZS9GaW5kQ29udHJvbGxlci5oCmluZGV4IGUyZjRhMTEwZDAyYWMzYTQ1MzE4Mjg5Njc1ZDZhMDA5 OGZiYzAxYWYuLjk4M2NiMzM2MWZmOGI5MzAyOWRiZDczZWMwMzYyNjVkZDMyZjg4NmYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVyLmgK KysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xsZXIuaApA QCAtOTIsNiArOTIsNyBAQCBwcml2YXRlOgogICAgIAogICAgIHVuc2lnbmVkIGZpbmRJbmRpY2F0 b3JSYWRpdXMoKSBjb25zdDsKICAgICBib29sIHNob3VsZEhpZGVGaW5kSW5kaWNhdG9yT25TY3Jv bGwoKSBjb25zdDsKKyAgICB2b2lkIGRpZFNjcm9sbEFmZmVjdGluZ0ZpbmRJbmRpY2F0b3JQb3Np dGlvbigpOwogCiAgICAgV2ViUGFnZSogbV93ZWJQYWdlOwogICAgIFdlYkNvcmU6OlBhZ2VPdmVy bGF5KiBtX2ZpbmRQYWdlT3ZlcmxheSB7IG51bGxwdHIgfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9GaW5kQ29udHJvbGxlcklPUy5tbSBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9GaW5kQ29udHJvbGxlcklPUy5tbQppbmRl eCBkY2I2NGU5MzNjNDIwOTFlNTZmNDAyMjAyYTIxOGM4ODEwNzFjNmQwLi45YWJiMmE3OTI5OWQ1 OTZiOTFlNmVmNjFjYTQzZWY4NjE5MGE5MDQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvV2ViUGFnZS9pb3MvRmluZENvbnRyb2xsZXJJT1MubW0KKysrIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL0ZpbmRDb250cm9sbGVySU9TLm1tCkBAIC05OSw2 ICs5OSw3IEBAIGJvb2wgRmluZENvbnRyb2xsZXI6OnVwZGF0ZUZpbmRJbmRpY2F0b3IoRnJhbWUm IHNlbGVjdGVkRnJhbWUsIGJvb2wgaXNTaG93aW5nT3ZlCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAogICAgIG1fZmluZEluZGljYXRvck92ZXJsYXlDbGllbnQgPSBzdGQ6Om1ha2VfdW5pcXVlPEZp bmRJbmRpY2F0b3JPdmVybGF5Q2xpZW50SU9TPihzZWxlY3RlZEZyYW1lLCB0ZXh0SW5kaWNhdG9y LmdldCgpKTsKKyAgICBtX2ZpbmRJbmRpY2F0b3JSZWN0ID0gZW5jbG9zaW5nSW50UmVjdCh0ZXh0 SW5kaWNhdG9yLT5zZWxlY3Rpb25SZWN0SW5Sb290Vmlld0Nvb3JkaW5hdGVzKCkpOwogICAgIG1f ZmluZEluZGljYXRvck92ZXJsYXkgPSBQYWdlT3ZlcmxheTo6Y3JlYXRlKCptX2ZpbmRJbmRpY2F0 b3JPdmVybGF5Q2xpZW50LCBQYWdlT3ZlcmxheTo6T3ZlcmxheVR5cGU6OkRvY3VtZW50KTsKICAg ICBtX3dlYlBhZ2UtPmNvcmVQYWdlKCktPnBhZ2VPdmVybGF5Q29udHJvbGxlcigpLmluc3RhbGxQ YWdlT3ZlcmxheSgqbV9maW5kSW5kaWNhdG9yT3ZlcmxheSwgUGFnZU92ZXJsYXk6OkZhZGVNb2Rl OjpEb05vdEZhZGUpOwogCg==