167710 2017-02-01 14:32:38 -0800 [iOS WK2] With visual viewports, a fixed bottom bar can be clipped out when the keyboard is visible 2017-02-01 17:15:00 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc glenn kondapallykalyan simon.fraser thorton wenson_hsieh oldest_to_newest 1272282 0 simon.fraser 2017-02-01 14:32:38 -0800 [iOS WK2] With visual viewports, a fixed bottom bar can be clipped out when the keyboard is visible 1272286 1 300355 simon.fraser 2017-02-01 14:37:32 -0800 Created attachment 300355 Patch 1272287 2 simon.fraser 2017-02-01 14:37:55 -0800 rdar://problem/30100286 1272301 3 300355 wenson_hsieh 2017-02-01 15:15:50 -0800 Comment on attachment 300355 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300355&action=review > Source/WebKit2/ChangeLog:13 > += Stray "=" here > Source/WebKit2/UIProcess/ios/WKContentView.mm:379 > + CGRect inputViewContentBounds = [self.window convertRect:inputViewBounds toView:self]; Let's address this separately. It looks like this conversion breaks the behavior where fixed inputs dock to the visible content rect accounting for keyboard bounds. 1272342 4 simon.fraser 2017-02-01 17:15:00 -0800 https://trac.webkit.org/r211541 300355 2017-02-01 14:37:32 -0800 2017-02-01 15:15:50 -0800 Patch bug-167710-20170201143519.patch text/plain 12365 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMzg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTYzMmMzMDY2YzZiODRi Yzk2NjA2YTc2NDIzMGMwNTRlMTVhMWQ2YS4uOTc2NGM4MTE4MjYwM2Y3MGFiZjJjZjcwMTU0OTgx YTgzODQwYjVjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE3LTAyLTAxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1MgV0syXSBX aXRoIHZpc3VhbCB2aWV3cG9ydHMsIGEgZml4ZWQgYm90dG9tIGJhciBjYW4gYmUgY2xpcHBlZCBv dXQgd2hlbiB0aGUga2V5Ym9hcmQgaXMgdmlzaWJsZQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3NzEwCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzMw MTAwMjg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIAor ICAgICAgICBBZGQgYSBiaXQgb2YgbG9nZ2luZyB0byBzaG93IHdoZW4gUkxDIGRlY2lkZXMgdG8g bm90IGNvbXBvc2l0ZSBhIGZpeGVkIGVsZW1lbnQgd2hpY2gKKyAgICAgICAgaXMgb3V0IG9mIGJv dW5kcy4KKworICAgICAgICBUZXN0OiBmYXN0L3Zpc3VhbC12aWV3cG9ydC9pb3MvYm90dG9tLWJh ci13aXRoLWtleWJvYXJkLmh0bWwKKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMYXllckNv bXBvc2l0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXJDb21wb3NpdG9yOjpy ZXF1aXJlc0NvbXBvc2l0aW5nRm9yUG9zaXRpb24pOgorCiAyMDE3LTAxLTMwICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFtpT1NdIHBvc2l0aW9uOmZp eGVkIGluc2lkZSB0b3VjaC1zY3JvbGxhYmxlIG92ZXJmbG93IGlzIG1pc3Bvc2l0aW9uZWQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwppbmRleCAwNDU0MzJlMmRlMTc0ZTUxNDVmYzEwZGU5OTU1MzRhNDNhMDIyMmIyLi4wNzBl OGQwMDBhODU5YjkxZTM4MzRhNGQwZDVkMWI4MjRhNDdmNzY4IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMzAgQEAKKzIwMTctMDItMDEgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5j b20+CisKKyAgICAgICAgW2lPUyBXSzJdIFdpdGggdmlzdWFsIHZpZXdwb3J0cywgYSBmaXhlZCBi b3R0b20gYmFyIGNhbiBiZSBjbGlwcGVkIG91dCB3aGVuIHRoZSBrZXlib2FyZCBpcyB2aXNpYmxl CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjc3MTAK KyAgICAgICAgcmRhcjovL3Byb2JsZW0vMzAxMDAyODYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgdW5vYnNjdXJlZFJlY3RJbkNvbnRlbnRDb29y ZGluYXRlcyBwYXNzZWQgdG8gLWRpZFVwZGF0ZVZpc2libGVSZWN0Oi4uLiBjb3VsZCBwcm9qZWN0 IG91dHNpZGUKKyAgICAgICAgb2YgdGhlIGJvdW5kcyBvZiB0aGUgZG9jdW1lbnQsIHdoaWNoIGlz IE9LIHdoZW4gcnViYmVyLWJhbmRpbmcsIGJ1dCBub3Qgd2hlbiB3ZSdyZSBpbiBhIHN0YWJsZSBz dGF0ZSwKKyAgICAgICAgYmVjYXVzZSB0aGF0IGNhbiBjYXVzZSBmaXhlZCBlbGVtZW50cyB0byBn ZXQgcHVzaGVkIG91dHNpZGUgdGhlIGRvYy4gVGhpcyBoYXBwZW5lZCB3aGVuIHRoZSBrZXlib2Fy ZAorICAgICAgICB0cmlnZ2VyZWQgYm90dG9tIGNvbnRlbnQgaW5zZXRzIG9uIHRoZSBzY3JvbGwg dmlldy4KKz0KKyAgICAgICAgRml4IGJ5IGNvbXB1dGluZyBhIHJlY3RhbmdsZSB3aGljaCBpcyB0 aGUgImFsbG93ZWQiIGJvdW5kcyBvZiBmaXhlZCBjb250ZW50LCB3aGljaCBpcyBwZXJtaXR0ZWQK KyAgICAgICAgdG8gZXh0ZW5kIG91dHNpZGUgdGhlIGRvY3VtZW50IGJvdW5kcyBvbmx5IHdoZW4g cnViYmVyLWJhbmRpbmcsIGFuZCBpbnRlcnNlY3QgdW5vYnNjdXJlZFJlY3RJbkNvbnRlbnRDb29y ZGluYXRlcworICAgICAgICB3aXRoIHRoYXQgcmVjdGFuZ2xlLgorCisgICAgICAgIEFsc28gZml4 IHRoZSBnZW9tZXRyeSBtYXRoIGZvciBpbnRlcnNlY3Rpbmcgd2l0aCBfaW5wdXRWaWV3Qm91bmRz LCB3aGljaCB3YXMgc3RvcmVkIGluIHdpbmRvdyBjb29yZGluYXRlcywKKyAgICAgICAgYnV0IG5l ZWQgY29udmVydGluZyB0byBjb250ZW50IGNvb3JkaW5hdGVzIGJlZm9yZSBkb2luZyBtYXRoLgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgt W1dLV2ViVmlldyBfY29udGVudEJvdW5kc0V4dGVuZGVkRm9yUnViYmVyYmFuZGluZ1dpdGhTY2Fs ZTpdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF91cGRhdGVDb250ZW50UmVjdHNXaXRoU3RhdGU6 XSk6CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tOgorICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IF9jb21wdXRlVW5vYnNjdXJlZENvbnRlbnRSZWN0UmVzcGVjdGluZ0lu cHV0Vmlld0JvdW5kczp1bm9ic2N1cmVkQ29udGVudFJlY3Q6aW5wdXRWaWV3Qm91bmRzOnNjYWxl Ol0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGRpZFVwZGF0ZVZpc2libGVSZWN0OnVub2Jz Y3VyZWRSZWN0OnVub2JzY3VyZWRSZWN0SW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXM6b2JzY3VyZWRJ bnNldDppbnB1dFZpZXdCb3VuZHM6c2NhbGU6bWluaW11bVNjYWxlOmluU3RhYmxlU3RhdGU6aXND aGFuZ2luZ09ic2N1cmVkSW5zZXRzSW50ZXJhY3RpdmVseTplbmNsb3NlZEluU2Nyb2xsYWJsZUFu Y2VzdG9yVmlldzpdKToKKwogMjAxNy0wMS0zMCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2Vy QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBwb3NpdGlvbjpmaXhlZCBpbnNpZGUgdG91Y2gt c2Nyb2xsYWJsZSBvdmVyZmxvdyBpcyBtaXNwb3NpdGlvbmVkCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBvc2l0b3IuY3BwCmluZGV4IGUyZmUxMTU5NmIz ZmYzNmU1MjU1MTc5MTYwMzdmYmJiZmNhYTQzZjAuLjE1YmFiOGM4MzNjOTMzNmE0ZmIzZWM0Y2Vl NmY0YjdmZTgyZGFkMTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJMYXllckNvbXBvc2l0b3IuY3BwCkBAIC0yNzUxLDYgKzI3NTEsNyBAQCBib29sIFJlbmRlckxh eWVyQ29tcG9zaXRvcjo6cmVxdWlyZXNDb21wb3NpdGluZ0ZvclBvc2l0aW9uKFJlbmRlckxheWVy TW9kZWxPYmplYwogICAgIGlmICghdmlld0JvdW5kcy5pbnRlcnNlY3RzKGVuY2xvc2luZ0ludFJl Y3QoYWJzb2x1dGVCb3VuZHMpKSkgewogICAgICAgICBpZiAodmlld3BvcnRDb25zdHJhaW5lZE5v dENvbXBvc2l0ZWRSZWFzb24pCiAgICAgICAgICAgICAqdmlld3BvcnRDb25zdHJhaW5lZE5vdENv bXBvc2l0ZWRSZWFzb24gPSBSZW5kZXJMYXllcjo6Tm90Q29tcG9zaXRlZEZvckJvdW5kc091dE9m VmlldzsKKyAgICAgICAgTE9HX1dJVEhfU1RSRUFNKENvbXBvc2l0aW5nLCBzdHJlYW0gPDwgIkxh eWVyICIgPDwgJmxheWVyIDw8ICIgYm91bmRzICIgPDwgbGF5ZXJCb3VuZHMgPDwgIiBvdXRzaWRl IHZpc2libGUgcmVjdCAiIDw8IHZpZXdCb3VuZHMpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgfQogICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vi Vmlldy5tbQppbmRleCBhY2JjM2Y1MmQ1MjFlYjJhMjk1YjA0YzBmNmZmYmY5ZjFjN2RjZDU2Li5h NDFlYjk0ZjQ5NDFkOWI4MGUwMzRkZmM3ODI0NzJhMzdjODI1NTUwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtMjA4Niw2ICsyMDg2 LDMxIEBAIHN0YXRpYyBib29sIHNjcm9sbFZpZXdDYW5TY3JvbGwoVUlTY3JvbGxWaWV3ICpzY3Jv bGxWaWV3KQogICAgICAgICB8fCAoY29udGVudFNpemUuaGVpZ2h0ICsgY29udGVudEluc2V0LnRv cCArIGNvbnRlbnRJbnNldC5ib3R0b20pID4gYm91bmRzU2l6ZS5oZWlnaHQ7CiB9CiAKKy0gKENH UmVjdClfY29udGVudEJvdW5kc0V4dGVuZGVkRm9yUnViYmVyYmFuZGluZ1dpdGhTY2FsZTooQ0dG bG9hdClzY2FsZUZhY3RvcgoreworICAgIENHUG9pbnQgY29udGVudE9mZnNldCA9IFtfc2Nyb2xs VmlldyBjb250ZW50T2Zmc2V0XTsKKyAgICBDR1BvaW50IGJvdW5kZWRPZmZzZXQgPSBjb250ZW50 T2Zmc2V0Qm91bmRlZEluVmFsaWRSYW5nZShfc2Nyb2xsVmlldy5nZXQoKSwgY29udGVudE9mZnNl dCk7CisKKyAgICBDR0Zsb2F0IGhvcmlvbnRhbFJ1YmJlcmJhbmRBbW91bnRJbkNvbnRlbnRDb29y ZGluYXRlcyA9IChjb250ZW50T2Zmc2V0LnggLSBib3VuZGVkT2Zmc2V0LngpIC8gc2NhbGVGYWN0 b3I7CisgICAgQ0dGbG9hdCB2ZXJ0aWNhbFJ1YmJlcmJhbmRBbW91bnRJbkNvbnRlbnRDb29yZGlu YXRlcyA9IChjb250ZW50T2Zmc2V0LnkgLSBib3VuZGVkT2Zmc2V0LnkpIC8gc2NhbGVGYWN0b3I7 CisKKyAgICBDR1JlY3QgZXh0ZW5kZWRCb3VuZHMgPSBbX2NvbnRlbnRWaWV3IGJvdW5kc107CisK KyAgICBpZiAoaG9yaW9udGFsUnViYmVyYmFuZEFtb3VudEluQ29udGVudENvb3JkaW5hdGVzIDwg MCkgeworICAgICAgICBleHRlbmRlZEJvdW5kcy5vcmlnaW4ueCArPSBob3Jpb250YWxSdWJiZXJi YW5kQW1vdW50SW5Db250ZW50Q29vcmRpbmF0ZXM7CisgICAgICAgIGV4dGVuZGVkQm91bmRzLnNp emUud2lkdGggLT0gaG9yaW9udGFsUnViYmVyYmFuZEFtb3VudEluQ29udGVudENvb3JkaW5hdGVz OworICAgIH0gZWxzZSBpZiAoaG9yaW9udGFsUnViYmVyYmFuZEFtb3VudEluQ29udGVudENvb3Jk aW5hdGVzID4gMCkKKyAgICAgICAgZXh0ZW5kZWRCb3VuZHMuc2l6ZS53aWR0aCArPSBob3Jpb250 YWxSdWJiZXJiYW5kQW1vdW50SW5Db250ZW50Q29vcmRpbmF0ZXM7CisKKyAgICBpZiAodmVydGlj YWxSdWJiZXJiYW5kQW1vdW50SW5Db250ZW50Q29vcmRpbmF0ZXMgPCAwKSB7CisgICAgICAgIGV4 dGVuZGVkQm91bmRzLm9yaWdpbi55ICs9IHZlcnRpY2FsUnViYmVyYmFuZEFtb3VudEluQ29udGVu dENvb3JkaW5hdGVzOworICAgICAgICBleHRlbmRlZEJvdW5kcy5zaXplLmhlaWdodCAtPSB2ZXJ0 aWNhbFJ1YmJlcmJhbmRBbW91bnRJbkNvbnRlbnRDb29yZGluYXRlczsKKyAgICB9IGVsc2UgaWYg KHZlcnRpY2FsUnViYmVyYmFuZEFtb3VudEluQ29udGVudENvb3JkaW5hdGVzID4gMCkKKyAgICAg ICAgZXh0ZW5kZWRCb3VuZHMuc2l6ZS5oZWlnaHQgKz0gdmVydGljYWxSdWJiZXJiYW5kQW1vdW50 SW5Db250ZW50Q29vcmRpbmF0ZXM7CisKKyAgICByZXR1cm4gZXh0ZW5kZWRCb3VuZHM7Cit9CisK IC0gKHZvaWQpX3VwZGF0ZUNvbnRlbnRSZWN0c1dpdGhTdGF0ZTooQk9PTClpblN0YWJsZVN0YXRl CiB7CiAgICAgaWYgKCFbc2VsZiB1c2VzU3RhbmRhcmRDb250ZW50Vmlld10pIHsKQEAgLTIxMTIs MTAgKzIxMzcsMTEgQEAgLSAodm9pZClfdXBkYXRlQ29udGVudFJlY3RzV2l0aFN0YXRlOihCT09M KWluU3RhYmxlU3RhdGUKICAgICBpZiAoIV9oYXZlU2V0T2JzY3VyZWRJbnNldHMpCiAgICAgICAg IGNvbXB1dGVkQ29udGVudEluc2V0VW5hZGp1c3RlZEZvcktleWJvYXJkLmJvdHRvbSAtPSBfdG90 YWxTY3JvbGxWaWV3Qm90dG9tSW5zZXRBZGp1c3RtZW50Rm9yS2V5Ym9hcmQ7CiAKKyAgICBDR0Zs b2F0IHNjYWxlRmFjdG9yID0gY29udGVudFpvb21TY2FsZShzZWxmKTsKKwogICAgIENHUmVjdCB1 bm9ic2N1cmVkUmVjdCA9IFVJRWRnZUluc2V0c0luc2V0UmVjdChmdWxsVmlld1JlY3QsIGNvbXB1 dGVkQ29udGVudEluc2V0VW5hZGp1c3RlZEZvcktleWJvYXJkKTsKICAgICBDR1JlY3QgdW5vYnNj dXJlZFJlY3RJbkNvbnRlbnRDb29yZGluYXRlcyA9IF9mcm96ZW5Vbm9ic2N1cmVkQ29udGVudFJl Y3QgPyBfZnJvemVuVW5vYnNjdXJlZENvbnRlbnRSZWN0LnZhbHVlKCkgOiBbc2VsZiBjb252ZXJ0 UmVjdDp1bm9ic2N1cmVkUmVjdCB0b1ZpZXc6X2NvbnRlbnRWaWV3LmdldCgpXTsKLQotICAgIENH RmxvYXQgc2NhbGVGYWN0b3IgPSBjb250ZW50Wm9vbVNjYWxlKHNlbGYpOworICAgIHVub2JzY3Vy ZWRSZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMgPSBDR1JlY3RJbnRlcnNlY3Rpb24odW5vYnNjdXJl ZFJlY3RJbkNvbnRlbnRDb29yZGluYXRlcywgW3NlbGYgX2NvbnRlbnRCb3VuZHNFeHRlbmRlZEZv clJ1YmJlcmJhbmRpbmdXaXRoU2NhbGU6c2NhbGVGYWN0b3JdKTsKIAogI2lmIEVOQUJMRShDU1Nf U0NST0xMX1NOQVApICYmIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCiAgICAgaWYgKGluU3RhYmxl U3RhdGUpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5t bQppbmRleCA2NmFkNThiZDY0NTI4NzlkOWFkNzYxZTIzZDc1YTdiZTE4N2FlMzhmLi4yNmMwMTIx MmI5ODJmYzg3N2UzODZhNjY1MDA5MTYwOTEwMmYyODA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCkBAIC0zNzQsOCArMzc0LDExIEBAIC0gKHZv aWQpX2RpZEV4aXRTdGFibGVTdGF0ZQogCiAtIChDR1JlY3QpX2NvbXB1dGVVbm9ic2N1cmVkQ29u dGVudFJlY3RSZXNwZWN0aW5nSW5wdXRWaWV3Qm91bmRzOihDR1JlY3QpdmlzaWJsZUNvbnRlbnRS ZWN0IHVub2JzY3VyZWRDb250ZW50UmVjdDooQ0dSZWN0KXVub2JzY3VyZWRDb250ZW50UmVjdCBp bnB1dFZpZXdCb3VuZHM6KENHUmVjdClpbnB1dFZpZXdCb3VuZHMgc2NhbGU6KENHRmxvYXQpc2Nh bGUKIHsKLSAgICBpZiAoaW5wdXRWaWV3Qm91bmRzLnNpemUuaGVpZ2h0KQotICAgICAgICB1bm9i c2N1cmVkQ29udGVudFJlY3Quc2l6ZS5oZWlnaHQgPSBzdGQ6Om1pbjxmbG9hdD4odW5vYnNjdXJl ZENvbnRlbnRSZWN0LnNpemUuaGVpZ2h0LCB2aXNpYmxlQ29udGVudFJlY3Qub3JpZ2luLnkgKyAo aW5wdXRWaWV3Qm91bmRzLm9yaWdpbi55IC8gc2NhbGUpIC0gdW5vYnNjdXJlZENvbnRlbnRSZWN0 Lm9yaWdpbi55KTsKKyAgICBpZiAoaW5wdXRWaWV3Qm91bmRzLnNpemUuaGVpZ2h0KSB7CisgICAg ICAgIC8vIGlucHV0Vmlld0JvdW5kcyBpcyBpbiB3aW5kb3cgY29vcmRpbmF0ZXMsIHNvIG1hcCBp dCBpbnRvIGNvbnRlbnQgY29vcmRpbmF0ZXMuCisgICAgICAgIENHUmVjdCBpbnB1dFZpZXdDb250 ZW50Qm91bmRzID0gW3NlbGYud2luZG93IGNvbnZlcnRSZWN0OmlucHV0Vmlld0JvdW5kcyB0b1Zp ZXc6c2VsZl07CisgICAgICAgIHVub2JzY3VyZWRDb250ZW50UmVjdC5zaXplLmhlaWdodCA9IHN0 ZDo6bWluPGZsb2F0Pih1bm9ic2N1cmVkQ29udGVudFJlY3Quc2l6ZS5oZWlnaHQsIHZpc2libGVD b250ZW50UmVjdC5vcmlnaW4ueSArIChpbnB1dFZpZXdDb250ZW50Qm91bmRzLm9yaWdpbi55IC8g c2NhbGUpIC0gdW5vYnNjdXJlZENvbnRlbnRSZWN0Lm9yaWdpbi55KTsKKyAgICB9CiAgICAgcmV0 dXJuIHVub2JzY3VyZWRDb250ZW50UmVjdDsKIH0KIApAQCAtNDAxLDcgKzQwNCw2IEBAIC0gKHZv aWQpZGlkVXBkYXRlVmlzaWJsZVJlY3Q6KENHUmVjdCl2aXNpYmxlQ29udGVudFJlY3QKICAgICAg ICAgX2hpc3RvcmljYWxLaW5lbWF0aWNEYXRhLmNsZWFyKCk7CiAKICAgICBSZW1vdGVTY3JvbGxp bmdDb29yZGluYXRvclByb3h5KiBzY3JvbGxpbmdDb29yZGluYXRvciA9IF9wYWdlLT5zY3JvbGxp bmdDb29yZGluYXRvclByb3h5KCk7Ci0KICAgICBDR1JlY3QgdW5vYnNjdXJlZENvbnRlbnRSZWN0 UmVzcGVjdGluZ0lucHV0Vmlld0JvdW5kcyA9IFtzZWxmIF9jb21wdXRlVW5vYnNjdXJlZENvbnRl bnRSZWN0UmVzcGVjdGluZ0lucHV0Vmlld0JvdW5kczp2aXNpYmxlQ29udGVudFJlY3QgdW5vYnNj dXJlZENvbnRlbnRSZWN0OnVub2JzY3VyZWRDb250ZW50UmVjdCBpbnB1dFZpZXdCb3VuZHM6aW5w dXRWaWV3Qm91bmRzIHNjYWxlOnpvb21TY2FsZV07CiAgICAgRmxvYXRSZWN0IGZpeGVkUG9zaXRp b25SZWN0Rm9yTGF5b3V0ID0gX3BhZ2UtPmNvbXB1dGVDdXN0b21GaXhlZFBvc2l0aW9uUmVjdCh1 bm9ic2N1cmVkQ29udGVudFJlY3QsIHVub2JzY3VyZWRDb250ZW50UmVjdFJlc3BlY3RpbmdJbnB1 dFZpZXdCb3VuZHMsIF9wYWdlLT5jdXN0b21GaXhlZFBvc2l0aW9uUmVjdCgpLCB6b29tU2NhbGUs IFdlYlBhZ2VQcm94eTo6VW5vYnNjdXJlZFJlY3RDb25zdHJhaW50OjpDb25zdHJhaW5lZFRvRG9j dW1lbnRSZWN0LCBzY3JvbGxpbmdDb29yZGluYXRvci0+dmlzdWFsVmlld3BvcnRFbmFibGVkKCkp OwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKaW5kZXggNjJkYmM5ZGRjNmFiNjQ4MWFjMzA0MDg5MGVmMmU0YjljMmYwZjlmNC4uNzc1 YmU1ZWE5MzJlODA5ZWNmYzg5MjkxMzJiOTNiMDU0MDQ1NGE4ZSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDE3LTAyLTAxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgor CisgICAgICAgIFtpT1MgV0syXSBXaXRoIHZpc3VhbCB2aWV3cG9ydHMsIGEgZml4ZWQgYm90dG9t IGJhciBjYW4gYmUgY2xpcHBlZCBvdXQgd2hlbiB0aGUga2V5Ym9hcmQgaXMgdmlzaWJsZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3NzEwCisgICAg ICAgIHJkYXI6Ly9wcm9ibGVtLzMwMTAwMjg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L3Zpc3VhbC12aWV3cG9ydC9pb3MvYm90dG9tLWJh ci13aXRoLWtleWJvYXJkLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC92aXN1 YWwtdmlld3BvcnQvaW9zL2JvdHRvbS1iYXItd2l0aC1rZXlib2FyZC5odG1sOiBBZGRlZC4KKwog MjAxNy0wMS0zMCAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAg ICAgICBbaU9TXSBwb3NpdGlvbjpmaXhlZCBpbnNpZGUgdG91Y2gtc2Nyb2xsYWJsZSBvdmVyZmxv dyBpcyBtaXNwb3NpdGlvbmVkCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Zpc3VhbC12 aWV3cG9ydC9pb3MvYm90dG9tLWJhci13aXRoLWtleWJvYXJkLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2Zhc3QvdmlzdWFsLXZpZXdwb3J0L2lvcy9ib3R0b20tYmFyLXdpdGgta2V5Ym9hcmQt ZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjJmNmNkMmQ5NjAwYzRjZDM3Nzg0NGM1MmU1NTE3ZGM1 YjVhNjk2NTIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3Zpc3VhbC12aWV3 cG9ydC9pb3MvYm90dG9tLWJhci13aXRoLWtleWJvYXJkLWV4cGVjdGVkLnR4dApAQCAtMCwwICsx LDMgQEAKK0xheW91dCB2aWV3cG9ydDogeyJ0b3AiOjAsInJpZ2h0IjozMjAsImJvdHRvbSI6NTQ4 LCJsZWZ0IjowLCJ3aWR0aCI6MzIwLCJoZWlnaHQiOjU0OH0KK1Zpc3VhbCB2aWV3cG9ydDogeyJ0 b3AiOjM3NSwicmlnaHQiOjIyMCwiYm90dG9tIjo1NDgsImxlZnQiOjAsIndpZHRoIjoyMjAsImhl aWdodCI6MTczfQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3Zpc3VhbC12aWV3cG9y dC9pb3MvYm90dG9tLWJhci13aXRoLWtleWJvYXJkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3Zp c3VhbC12aWV3cG9ydC9pb3MvYm90dG9tLWJhci13aXRoLWtleWJvYXJkLmh0bWwKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uYWFiN2UwZjFlMGI0NGM1ODZjNTE5YzlmYjAzYWMzYmY1NTBlODg5NwotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2Zhc3QvdmlzdWFsLXZpZXdwb3J0L2lvcy9ib3R0b20tYmFyLXdp dGgta2V5Ym9hcmQuaHRtbApAQCAtMCwwICsxLDU4IEBACis8IURPQ1RZUEUgaHRtbD4gPCEtLSB3 ZWJraXQtdGVzdC1ydW5uZXIgWyB1c2VGbGV4aWJsZVZpZXdwb3J0PXRydWUgXSAtLT4KKworPGh0 bWw+Cis8aGVhZD4KKyAgICA8bWV0YSBuYW1lPSJ2aWV3cG9ydCIgY29udGVudD0iaW5pdGlhbC1z Y2FsZT0xLjAiPgorICAgIDxzdHlsZT4KKyAgICAgICAgYm9keSB7CisgICAgICAgICAgICBoZWln aHQ6IDEwMCU7CisgICAgICAgIH0KKyAgICAgICAgLmZpeGVkIHsKKyAgICAgICAgICAgIHBvc2l0 aW9uOiBmaXhlZDsKKyAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6IHNpbHZlcjsKKyAgICAg ICAgICAgIGJvdHRvbTogMDsKKyAgICAgICAgICAgIHBhZGRpbmc6IDEwcHg7CisgICAgICAgIH0K KyAgICA8L3N0eWxlPgorICAgIDxzY3JpcHQ+CisgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5l cikgeworICAgICAgICAgICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgICAgICAg ICB0ZXN0UnVubmVyLmR1bXBBc1RleHQoKTsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9u IGdldEZvY3VzSW5wdXRVSVNjcmlwdCh4LCB5KQorICAgICAgICB7CisgICAgICAgICAgICByZXR1 cm4gYChmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICB1aUNvbnRyb2xsZXIuZGlkRW5kWm9v bWluZ0NhbGxiYWNrID0gZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAgICAgICAgIHVpQ29udHJv bGxlci51aVNjcmlwdENvbXBsZXRlKCk7CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgIAorICAgICAgICAgICAgICAgIHVpQ29udHJvbGxlci5zaW5nbGVUYXBBdFBvaW50KCR7eH0s ICR7eX0sIGZ1bmN0aW9uKCkge30pOworICAgICAgICAgICAgfSkoKTtgOworICAgICAgICB9CisK KyAgICAgICAgZnVuY3Rpb24gcnVuVGVzdCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIGlmICgh d2luZG93LnRlc3RSdW5uZXIgfHwgIXRlc3RSdW5uZXIucnVuVUlTY3JpcHQpCisgICAgICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgICAgICB2YXIgcmVjdCA9IGRvY3VtZW50LmdldEVsZW1l bnRCeUlkKCdpbnB1dCcpLmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOworICAgICAgICAgICAgLy8g c2luZ2xlVGFwQXRQb2ludCB0YWtlcyBkb2N1bWVudCBjb29yZGluYXRlcywgc28gYWRkIHNjcm9s bFRvcCB0byBjbGllbnRSZWN0LnRvcC4KKyAgICAgICAgICAgIHRlc3RSdW5uZXIucnVuVUlTY3Jp cHQoZ2V0Rm9jdXNJbnB1dFVJU2NyaXB0KHJlY3QubGVmdCwgcmVjdC50b3AgKyBkb2N1bWVudC5z Y3JvbGxpbmdFbGVtZW50LnNjcm9sbFRvcCksIGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAg IHZhciBvdXRwdXQgPSAnTGF5b3V0IHZpZXdwb3J0OiAnICsgSlNPTi5zdHJpbmdpZnkoaW50ZXJu YWxzLmxheW91dFZpZXdwb3J0UmVjdCgpKSArICdcblZpc3VhbCB2aWV3cG9ydDogJyArIEpTT04u c3RyaW5naWZ5KGludGVybmFscy52aXN1YWxWaWV3cG9ydFJlY3QoKSkgKyAnXG4nOworICAgICAg ICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdyZXN1bHRzJykuaW5uZXJUZXh0ID0g b3V0cHV0OworCisgICAgICAgICAgICAgICAgdGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAg ICAgICAgICB9KTsKKyAgICAgICAgfQorCisgICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVy KCdsb2FkJywgcnVuVGVzdCwgZmFsc2UpOworICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+ Cis8cHJlIGlkPSJyZXN1bHRzIj48L3ByZT4KKzxkaXYgY2xhc3M9ImZpeGVkIj4KKyAgICA8aW5w dXQgaWQ9ImlucHV0IiB0eXBlPSJ0ZXh0Ij4KKzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo=