195268 2019-03-04 00:30:33 -0800 iOS: Using ⌥ to scroll horizontally is no different than arrow key 2019-03-10 19:55:02 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton bfulgham commit-queue darin webkit-bug-importer oldest_to_newest 1512077 0 thorton 2019-03-04 00:30:33 -0800 iOS: Using ⌥ to scroll horizontally is no different than arrow key 1512078 1 363496 thorton 2019-03-04 00:30:44 -0800 Created attachment 363496 Patch 1512079 2 thorton 2019-03-04 00:30:47 -0800 <rdar://problem/48326682> 1512674 3 363496 bfulgham 2019-03-05 09:43:59 -0800 Comment on attachment 363496 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363496&action=review > Source/WebKit/ChangeLog:3 > + iOS: Using ⌥ to scroll horizontally is no different than arrow key Should this comment be ASCII only? > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:4428 > + return directionIsHorizontal ? documentSize.width : documentSize.height; We could have a helper function that converted ScrollingDirection + CGSize to the right output. Then it could be used in WKKeyboardScrollingAnimator.mm 'distanceForIncrement', too. But not today. 1514632 4 363496 darin 2019-03-10 17:08:58 -0700 Comment on attachment 363496 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363496&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:4435 > return [self convertSize:CGSizeMake(0, WebCore::Scrollbar::pixelsPerLineStep()) toView:_webView].height; Should this assert !horizontal? 1514649 5 363496 thorton 2019-03-10 19:28:40 -0700 Comment on attachment 363496 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=363496&action=review >> Source/WebKit/ChangeLog:3 >> + iOS: Using ⌥ to scroll horizontally is no different than arrow key > > Should this comment be ASCII only? No, the only thing that has a problem with this is the review tool. We have this problem a lot with smart quotes too :) >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:4435 >> return [self convertSize:CGSizeMake(0, WebCore::Scrollbar::pixelsPerLineStep()) toView:_webView].height; > > Should this assert !horizontal? No, definitely not. The default left/right arrow key behavior is "by line" and uses the vertical line height. 1514663 6 363496 commit-queue 2019-03-10 19:55:00 -0700 Comment on attachment 363496 Patch Clearing flags on attachment: 363496 Committed r242695: <https://trac.webkit.org/changeset/242695> 1514664 7 commit-queue 2019-03-10 19:55:02 -0700 All reviewed patches have been landed. Closing bug. 363496 2019-03-04 00:30:44 -0800 2019-03-10 19:55:00 -0700 Patch bug-195268-20190304003043.patch text/plain 9467 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyMzQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDc2NmVlYjkxNmVkNTIzODg1 ZWY0Mzc5ZTU4MjRlZGYwYjFkYzg5MTIuLmM0NWMyZDI1OTFmMTMwZjA4ZDExOTFkOWEzODZjMjY3 YTMxZjg1YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTktMDMtMDQgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgaU9TOiBVc2luZyDijKUg dG8gc2Nyb2xsIGhvcml6b250YWxseSBpcyBubyBkaWZmZXJlbnQgdGhhbiBhcnJvdyBrZXkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NTI2OAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNDgzMjY2ODI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBrZXlib2FyZFNjcm9sbFZpZXdB bmltYXRvcjpkaXN0YW5jZUZvckluY3JlbWVudDppbkRpcmVjdGlvbjpdKToKKyAgICAgICAgKC1b V0tDb250ZW50VmlldyBrZXlib2FyZFNjcm9sbFZpZXdBbmltYXRvcjpkaXN0YW5jZUZvckluY3Jl bWVudDpdKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLS2V5Ym9hcmRTY3Jv bGxpbmdBbmltYXRvci5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tLZXlib2FyZFNjcm9s bGluZ0FuaW1hdG9yLm1tOgorICAgICAgICAoLVtXS0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3Ig a2V5Ym9hcmRTY3JvbGxGb3JFdmVudDpdKToKKyAgICAgICAgKC1bV0tLZXlib2FyZFNjcm9sbFZp ZXdBbmltYXRvciBzZXREZWxlZ2F0ZTpdKToKKyAgICAgICAgKC1bV0tLZXlib2FyZFNjcm9sbFZp ZXdBbmltYXRvciBkaXN0YW5jZUZvckluY3JlbWVudDppbkRpcmVjdGlvbjpdKToKKyAgICAgICAg KC1bV0tLZXlib2FyZFNjcm9sbFZpZXdBbmltYXRvciBkaXN0YW5jZUZvckluY3JlbWVudDpdKTog RGVsZXRlZC4KKyAgICAgICAgQWRkIGEgZGlyZWN0aW9uIHBhcmFtZXRlciB0byAtZGlzdGFuY2VG b3JJbmNyZW1lbnQ6LCBzbyB0aGUgY2xpZW50CisgICAgICAgIGNhbiByZXR1cm4gYSBkaWZmZXJl bnQgcGFnZS9kb2N1bWVudCBzaXplIGJhc2VkIG9uIHRoZSBzY3JvbGxpbmcgYXhpcy4KKyAgICAg ICAgQWRvcHQgaXQgYm90aCBpbiB0aGUgZGVmYXVsdCBpbXBsZW1lbnRhdGlvbiBhbmQgaW4gV0tD b250ZW50Vmlld0ludGVyYWN0aW9uLgorICAgICAgICBNYWtlIHRoZSBvcHRpb24ga2V5IHNjcm9s bCBieSBwYWdlIHdoZW4gc2Nyb2xsaW5nIGhvcml6b250YWxseSwgbGlrZSBpdAorICAgICAgICBk b2VzIHdoZW4gc2Nyb2xsaW5nIHZlcnRpY2FsbHkuCisKIDIwMTktMDMtMDMgIFphbGFuIEJ1anRh cyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29udGVudENoYW5nZU9ic2VydmVyXSBD b250ZW50IG9ic2VydmF0aW9uIHNob3VsZCBiZSBsaW1pdGVkIHRvIHRoZSBjdXJyZW50IGRvY3Vt ZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggMzdiMzYyMDNjNGQxMTBmYjJiOTU3OWJlNWUzMWUwOWQ3 MjU3OGFiMi4uOTM2OTk0MmU3MDFlZDEwMzU4OWE0ZjZkOTM3MjYzN2M3YmRlNmE1MyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLm1tCkBAIC00NDE4LDEzICs0NDE4LDE5IEBAIC0gKEJPT0wpaXNTY3JvbGxhYmxlRm9y S2V5Ym9hcmRTY3JvbGxWaWV3QW5pbWF0b3I6KFdLS2V5Ym9hcmRTY3JvbGxWaWV3QW5pbWF0b3IK ICAgICByZXR1cm4gWUVTOwogfQogCi0tIChDR0Zsb2F0KWtleWJvYXJkU2Nyb2xsVmlld0FuaW1h dG9yOihXS0tleWJvYXJkU2Nyb2xsVmlld0FuaW1hdG9yICopYW5pbWF0b3IgZGlzdGFuY2VGb3JJ bmNyZW1lbnQ6KFdlYktpdDo6U2Nyb2xsaW5nSW5jcmVtZW50KWluY3JlbWVudAorLSAoQ0dGbG9h dClrZXlib2FyZFNjcm9sbFZpZXdBbmltYXRvcjooV0tLZXlib2FyZFNjcm9sbFZpZXdBbmltYXRv ciAqKWFuaW1hdG9yIGRpc3RhbmNlRm9ySW5jcmVtZW50OihXZWJLaXQ6OlNjcm9sbGluZ0luY3Jl bWVudClpbmNyZW1lbnQgaW5EaXJlY3Rpb246KFdlYktpdDo6U2Nyb2xsaW5nRGlyZWN0aW9uKWRp cmVjdGlvbgogeworICAgIEJPT0wgZGlyZWN0aW9uSXNIb3Jpem9udGFsID0gZGlyZWN0aW9uID09 IFdlYktpdDo6U2Nyb2xsaW5nRGlyZWN0aW9uOjpMZWZ0IHx8IGRpcmVjdGlvbiA9PSBXZWJLaXQ6 OlNjcm9sbGluZ0RpcmVjdGlvbjo6UmlnaHQ7CisKICAgICBzd2l0Y2ggKGluY3JlbWVudCkgewot ICAgIGNhc2UgV2ViS2l0OjpTY3JvbGxpbmdJbmNyZW1lbnQ6OkRvY3VtZW50OgotICAgICAgICBy ZXR1cm4gW3NlbGYgY29udmVydFJlY3Q6c2VsZi5ib3VuZHMgdG9WaWV3Ol93ZWJWaWV3XS5zaXpl LmhlaWdodDsKLSAgICBjYXNlIFdlYktpdDo6U2Nyb2xsaW5nSW5jcmVtZW50OjpQYWdlOgotICAg ICAgICByZXR1cm4gW3NlbGYgY29udmVydFNpemU6Q0dTaXplTWFrZSgwLCBXZWJDb3JlOjpTY3Jv bGxiYXI6OnBhZ2VTdGVwKF9wYWdlLT51bm9ic2N1cmVkQ29udGVudFJlY3QoKS5oZWlnaHQoKSwg c2VsZi5ib3VuZHMuc2l6ZS5oZWlnaHQpKSB0b1ZpZXc6X3dlYlZpZXddLmhlaWdodDsKKyAgICBj YXNlIFdlYktpdDo6U2Nyb2xsaW5nSW5jcmVtZW50OjpEb2N1bWVudDogeworICAgICAgICBDR1Np emUgZG9jdW1lbnRTaXplID0gW3NlbGYgY29udmVydFJlY3Q6c2VsZi5ib3VuZHMgdG9WaWV3Ol93 ZWJWaWV3XS5zaXplOworICAgICAgICByZXR1cm4gZGlyZWN0aW9uSXNIb3Jpem9udGFsID8gZG9j dW1lbnRTaXplLndpZHRoIDogZG9jdW1lbnRTaXplLmhlaWdodDsKKyAgICB9CisgICAgY2FzZSBX ZWJLaXQ6OlNjcm9sbGluZ0luY3JlbWVudDo6UGFnZTogeworICAgICAgICBDR1NpemUgcGFnZVNp emUgPSBbc2VsZiBjb252ZXJ0U2l6ZTpDR1NpemVNYWtlKDAsIFdlYkNvcmU6OlNjcm9sbGJhcjo6 cGFnZVN0ZXAoX3BhZ2UtPnVub2JzY3VyZWRDb250ZW50UmVjdCgpLmhlaWdodCgpLCBzZWxmLmJv dW5kcy5zaXplLmhlaWdodCkpIHRvVmlldzpfd2ViVmlld107CisgICAgICAgIHJldHVybiBkaXJl Y3Rpb25Jc0hvcml6b250YWwgPyBwYWdlU2l6ZS53aWR0aCA6IHBhZ2VTaXplLmhlaWdodDsKKyAg ICB9CiAgICAgY2FzZSBXZWJLaXQ6OlNjcm9sbGluZ0luY3JlbWVudDo6TGluZToKICAgICAgICAg cmV0dXJuIFtzZWxmIGNvbnZlcnRTaXplOkNHU2l6ZU1ha2UoMCwgV2ViQ29yZTo6U2Nyb2xsYmFy OjpwaXhlbHNQZXJMaW5lU3RlcCgpKSB0b1ZpZXc6X3dlYlZpZXddLmhlaWdodDsKICAgICB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tLZXlib2FyZFNjcm9sbGlu Z0FuaW1hdG9yLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tLZXlib2FyZFNjcm9s bGluZ0FuaW1hdG9yLmgKaW5kZXggNmJhNmNhZGE4ODU0NjdjYzdhNjMzNjAzMGUxMjZjYjk2N2E4 MTRkNC4uYzdiMzA0MTQyNzZlNTJlYjJhZTM3NWI5ZTEyNTA5NWJiOGEwZGQyMiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRv ci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5n QW5pbWF0b3IuaApAQCAtMzcsNiArMzcsMTMgQEAgZW51bSBjbGFzcyBTY3JvbGxpbmdJbmNyZW1l bnQgOiB1aW50OF90IHsKICAgICBMaW5lCiB9OwogCitlbnVtIGNsYXNzIFNjcm9sbGluZ0RpcmVj dGlvbiA6IHVpbnQ4X3QgeworICAgIFVwLAorICAgIERvd24sCisgICAgTGVmdCwKKyAgICBSaWdo dAorfTsKKwogfQogCiBAY2xhc3MgVUlTY3JvbGxWaWV3OwpAQCAtNjIsNyArNjksNyBAQCBlbnVt IGNsYXNzIFNjcm9sbGluZ0luY3JlbWVudCA6IHVpbnQ4X3QgewogQHByb3RvY29sIFdLS2V5Ym9h cmRTY3JvbGxWaWV3QW5pbWF0b3JEZWxlZ2F0ZSA8TlNPYmplY3Q+CiBAb3B0aW9uYWwKIC0gKEJP T0wpaXNTY3JvbGxhYmxlRm9yS2V5Ym9hcmRTY3JvbGxWaWV3QW5pbWF0b3I6KFdLS2V5Ym9hcmRT Y3JvbGxWaWV3QW5pbWF0b3IgKilhbmltYXRvcjsKLS0gKENHRmxvYXQpa2V5Ym9hcmRTY3JvbGxW aWV3QW5pbWF0b3I6KFdLS2V5Ym9hcmRTY3JvbGxWaWV3QW5pbWF0b3IgKilhbmltYXRvciBkaXN0 YW5jZUZvckluY3JlbWVudDooV2ViS2l0OjpTY3JvbGxpbmdJbmNyZW1lbnQpaW5jcmVtZW50Owor LSAoQ0dGbG9hdClrZXlib2FyZFNjcm9sbFZpZXdBbmltYXRvcjooV0tLZXlib2FyZFNjcm9sbFZp ZXdBbmltYXRvciAqKWFuaW1hdG9yIGRpc3RhbmNlRm9ySW5jcmVtZW50OihXZWJLaXQ6OlNjcm9s bGluZ0luY3JlbWVudClpbmNyZW1lbnQgaW5EaXJlY3Rpb246KFdlYktpdDo6U2Nyb2xsaW5nRGly ZWN0aW9uKWRpcmVjdGlvbjsKIC0gKHZvaWQpa2V5Ym9hcmRTY3JvbGxWaWV3QW5pbWF0b3JXaWxs U2Nyb2xsOihXS0tleWJvYXJkU2Nyb2xsVmlld0FuaW1hdG9yICopYW5pbWF0b3I7CiAtICh2b2lk KWtleWJvYXJkU2Nyb2xsVmlld0FuaW1hdG9yRGlkRmluaXNoU2Nyb2xsaW5nOihXS0tleWJvYXJk U2Nyb2xsVmlld0FuaW1hdG9yICopYW5pbWF0b3I7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tLZXlib2FyZFNjcm9sbGluZ0FuaW1hdG9yLm1tCmluZGV4 IGUzMGZhOGI3NGIxNDUyYWYxMGQ2MGQwMDk2YTliYTM4NmJiYjQzNTkuLmQ4N2U2NWRjNjVjNzQw NzU0NzYyNDE1NmQwZTgxN2VhOTBiYTU0YjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL2lvcy9XS0tleWJvYXJkU2Nyb2xsaW5nQW5pbWF0b3IubW0KKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dLS2V5Ym9hcmRTY3JvbGxpbmdBbmltYXRvci5tbQpAQCAtNDIs OCArNDIsNiBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAotZW51bSBjbGFzcyBTY3JvbGxpbmdE aXJlY3Rpb24gOiB1aW50OF90IHsgVXAsIERvd24sIExlZnQsIFJpZ2h0IH07Ci0KIHN0cnVjdCBL ZXlib2FyZFNjcm9sbCB7CiAgICAgV2ViQ29yZTo6RmxvYXRTaXplIG9mZnNldDsgLy8gUG9pbnRz IHBlciBpbmNyZW1lbnQuCiAgICAgV2ViQ29yZTo6RmxvYXRTaXplIG1heGltdW1WZWxvY2l0eTsg Ly8gUG9pbnRzIHBlciBzZWNvbmQuCkBAIC02OSw3ICs2Nyw3IEBAIHN0cnVjdCBLZXlib2FyZFNj cm9sbFBhcmFtZXRlcnMgewogQHByb3RvY29sIFdLS2V5Ym9hcmRTY3JvbGxhYmxlSW50ZXJuYWwg PE5TT2JqZWN0PgogQHJlcXVpcmVkCiAtIChCT09MKWlzS2V5Ym9hcmRTY3JvbGxhYmxlOwotLSAo Q0dGbG9hdClkaXN0YW5jZUZvckluY3JlbWVudDooV2ViS2l0OjpTY3JvbGxpbmdJbmNyZW1lbnQp aW5jcmVtZW50OworLSAoQ0dGbG9hdClkaXN0YW5jZUZvckluY3JlbWVudDooV2ViS2l0OjpTY3Jv bGxpbmdJbmNyZW1lbnQpaW5jcmVtZW50IGluRGlyZWN0aW9uOihXZWJLaXQ6OlNjcm9sbGluZ0Rp cmVjdGlvbilkaXJlY3Rpb247CiAtICh2b2lkKXNjcm9sbFRvQ29udGVudE9mZnNldDooV2ViQ29y ZTo6RmxvYXRQb2ludClvZmZzZXQgYW5pbWF0ZWQ6KEJPT0wpYW5pbWF0ZWQ7CiAtICh2b2lkKXNj cm9sbFdpdGhTY3JvbGxUb0V4dGVudEFuaW1hdGlvblRvOihDR1BvaW50KW9mZnNldDsKIC0gKENH UG9pbnQpY29udGVudE9mZnNldDsKQEAgLTIzMyw2ICsyMzEsOCBAQCAtIChPcHRpb25hbDxXZWJL aXQ6OktleWJvYXJkU2Nyb2xsPilrZXlib2FyZFNjcm9sbEZvckV2ZW50Oig6OldlYkV2ZW50ICop ZXZlbnQKICAgICAgICAgc3dpdGNoIChrZXkpIHsKICAgICAgICAgY2FzZSBLZXk6OkxlZnRBcnJv dzoKICAgICAgICAgY2FzZSBLZXk6OlJpZ2h0QXJyb3c6CisgICAgICAgICAgICBpZiAoYWx0UHJl c3NlZCkKKyAgICAgICAgICAgICAgICByZXR1cm4gV2ViS2l0OjpTY3JvbGxpbmdJbmNyZW1lbnQ6 OlBhZ2U7CiAgICAgICAgICAgICByZXR1cm4gV2ViS2l0OjpTY3JvbGxpbmdJbmNyZW1lbnQ6Okxp bmU7CiAgICAgICAgIGNhc2UgS2V5OjpVcEFycm93OgogICAgICAgICBjYXNlIEtleTo6RG93bkFy cm93OgpAQCAtMjcxLDcgKzI3MSw3IEBAIC0gKE9wdGlvbmFsPFdlYktpdDo6S2V5Ym9hcmRTY3Jv bGw+KWtleWJvYXJkU2Nyb2xsRm9yRXZlbnQ6KDo6V2ViRXZlbnQgKilldmVudAogICAgICAgICB9 OwogICAgIH0oKTsKIAotICAgIENHRmxvYXQgc2Nyb2xsRGlzdGFuY2UgPSBbX3Njcm9sbGFibGUg ZGlzdGFuY2VGb3JJbmNyZW1lbnQ6aW5jcmVtZW50XTsKKyAgICBDR0Zsb2F0IHNjcm9sbERpc3Rh bmNlID0gW19zY3JvbGxhYmxlIGRpc3RhbmNlRm9ySW5jcmVtZW50OmluY3JlbWVudCBpbkRpcmVj dGlvbjpkaXJlY3Rpb25dOwogCiAgICAgV2ViS2l0OjpLZXlib2FyZFNjcm9sbCBzY3JvbGw7CiAg ICAgc2Nyb2xsLm9mZnNldCA9IHVuaXRWZWN0b3IoZGlyZWN0aW9uKS5zY2FsZWQoc2Nyb2xsRGlz dGFuY2UpOwpAQCAtNTQ0LDcgKzU0NCw3IEBAIC0gKHZvaWQpc2V0RGVsZWdhdGU6KGlkIDxXS0tl eWJvYXJkU2Nyb2xsVmlld0FuaW1hdG9yRGVsZWdhdGU+KWRlbGVnYXRlCiAgICAgX2RlbGVnYXRl ID0gZGVsZWdhdGU7CiAKICAgICBfZGVsZWdhdGVSZXNwb25kc1RvSXNLZXlib2FyZFNjcm9sbGFi bGUgPSBbX2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoaXNTY3JvbGxhYmxl Rm9yS2V5Ym9hcmRTY3JvbGxWaWV3QW5pbWF0b3I6KV07Ci0gICAgX2RlbGVnYXRlUmVzcG9uZHNU b0Rpc3RhbmNlRm9ySW5jcmVtZW50ID0gW19kZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNl bGVjdG9yKGtleWJvYXJkU2Nyb2xsVmlld0FuaW1hdG9yOmRpc3RhbmNlRm9ySW5jcmVtZW50Oild OworICAgIF9kZWxlZ2F0ZVJlc3BvbmRzVG9EaXN0YW5jZUZvckluY3JlbWVudCA9IFtfZGVsZWdh dGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihrZXlib2FyZFNjcm9sbFZpZXdBbmltYXRv cjpkaXN0YW5jZUZvckluY3JlbWVudDppbkRpcmVjdGlvbjopXTsKICAgICBfZGVsZWdhdGVSZXNw b25kc1RvV2lsbFNjcm9sbCA9IFtfZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rv cihrZXlib2FyZFNjcm9sbFZpZXdBbmltYXRvcldpbGxTY3JvbGw6KV07CiAgICAgX2RlbGVnYXRl UmVzcG9uZHNUb0RpZEZpbmlzaFNjcm9sbGluZyA9IFtfZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVj dG9yOkBzZWxlY3RvcihrZXlib2FyZFNjcm9sbFZpZXdBbmltYXRvckRpZEZpbmlzaFNjcm9sbGlu ZzopXTsKIH0KQEAgLTU3MSw3ICs1NzEsNyBAQCAtIChCT09MKWlzS2V5Ym9hcmRTY3JvbGxhYmxl CiAgICAgcmV0dXJuIFtfZGVsZWdhdGUgaXNTY3JvbGxhYmxlRm9yS2V5Ym9hcmRTY3JvbGxWaWV3 QW5pbWF0b3I6c2VsZl07CiB9CiAKLS0gKENHRmxvYXQpZGlzdGFuY2VGb3JJbmNyZW1lbnQ6KFdl YktpdDo6U2Nyb2xsaW5nSW5jcmVtZW50KWluY3JlbWVudAorLSAoQ0dGbG9hdClkaXN0YW5jZUZv ckluY3JlbWVudDooV2ViS2l0OjpTY3JvbGxpbmdJbmNyZW1lbnQpaW5jcmVtZW50IGluRGlyZWN0 aW9uOihXZWJLaXQ6OlNjcm9sbGluZ0RpcmVjdGlvbilkaXJlY3Rpb24KIHsKICAgICBhdXRvIHNj cm9sbFZpZXcgPSBfc2Nyb2xsVmlldy5nZXRBdXRvcmVsZWFzZWQoKTsKICAgICBpZiAoIXNjcm9s bFZpZXcpCkBAIC01ODAsMTIgKzU4MCwxNCBAQCAtIChDR0Zsb2F0KWRpc3RhbmNlRm9ySW5jcmVt ZW50OihXZWJLaXQ6OlNjcm9sbGluZ0luY3JlbWVudClpbmNyZW1lbnQKICAgICBjb25zdCBDR0Zs b2F0IGRlZmF1bHRQYWdlU2Nyb2xsRnJhY3Rpb24gPSAwLjg7CiAgICAgY29uc3QgQ0dGbG9hdCBk ZWZhdWx0TGluZVNjcm9sbEhlaWdodCA9IDQwOwogCisgICAgQk9PTCBkaXJlY3Rpb25Jc0hvcml6 b250YWwgPSBkaXJlY3Rpb24gPT0gV2ViS2l0OjpTY3JvbGxpbmdEaXJlY3Rpb246OkxlZnQgfHwg ZGlyZWN0aW9uID09IFdlYktpdDo6U2Nyb2xsaW5nRGlyZWN0aW9uOjpSaWdodDsKKwogICAgIGlm ICghX2RlbGVnYXRlUmVzcG9uZHNUb0Rpc3RhbmNlRm9ySW5jcmVtZW50KSB7CiAgICAgICAgIHN3 aXRjaCAoaW5jcmVtZW50KSB7CiAgICAgICAgIGNhc2UgV2ViS2l0OjpTY3JvbGxpbmdJbmNyZW1l bnQ6OkRvY3VtZW50OgotICAgICAgICAgICAgcmV0dXJuIHNjcm9sbFZpZXcuY29udGVudFNpemUu aGVpZ2h0OworICAgICAgICAgICAgcmV0dXJuIGRpcmVjdGlvbklzSG9yaXpvbnRhbCA/IHNjcm9s bFZpZXcuY29udGVudFNpemUud2lkdGggOiBzY3JvbGxWaWV3LmNvbnRlbnRTaXplLmhlaWdodDsK ICAgICAgICAgY2FzZSBXZWJLaXQ6OlNjcm9sbGluZ0luY3JlbWVudDo6UGFnZToKLSAgICAgICAg ICAgIHJldHVybiBzY3JvbGxWaWV3LmZyYW1lLnNpemUuaGVpZ2h0ICogZGVmYXVsdFBhZ2VTY3Jv bGxGcmFjdGlvbjsKKyAgICAgICAgICAgIHJldHVybiAoZGlyZWN0aW9uSXNIb3Jpem9udGFsID8g c2Nyb2xsVmlldy5mcmFtZS5zaXplLndpZHRoIDogc2Nyb2xsVmlldy5mcmFtZS5zaXplLmhlaWdo dCkgKiBkZWZhdWx0UGFnZVNjcm9sbEZyYWN0aW9uOwogICAgICAgICBjYXNlIFdlYktpdDo6U2Ny b2xsaW5nSW5jcmVtZW50OjpMaW5lOgogICAgICAgICAgICAgcmV0dXJuIGRlZmF1bHRMaW5lU2Ny b2xsSGVpZ2h0ICogc2Nyb2xsVmlldy56b29tU2NhbGU7CiAgICAgICAgIH0KQEAgLTU5Myw3ICs1 OTUsNyBAQCAtIChDR0Zsb2F0KWRpc3RhbmNlRm9ySW5jcmVtZW50OihXZWJLaXQ6OlNjcm9sbGlu Z0luY3JlbWVudClpbmNyZW1lbnQKICAgICAgICAgcmV0dXJuIDA7CiAgICAgfQogCi0gICAgcmV0 dXJuIFtfZGVsZWdhdGUga2V5Ym9hcmRTY3JvbGxWaWV3QW5pbWF0b3I6c2VsZiBkaXN0YW5jZUZv ckluY3JlbWVudDppbmNyZW1lbnRdOworICAgIHJldHVybiBbX2RlbGVnYXRlIGtleWJvYXJkU2Ny b2xsVmlld0FuaW1hdG9yOnNlbGYgZGlzdGFuY2VGb3JJbmNyZW1lbnQ6aW5jcmVtZW50IGluRGly ZWN0aW9uOmRpcmVjdGlvbl07CiB9CiAKIC0gKHZvaWQpc2Nyb2xsVG9Db250ZW50T2Zmc2V0OihX ZWJDb3JlOjpGbG9hdFBvaW50KWNvbnRlbnRPZmZzZXREZWx0YSBhbmltYXRlZDooQk9PTClhbmlt YXRlZAo=