212243 2020-05-21 17:28:33 -0700 iOS: Pressing tab in the Mail subject field moves focus to the body, but pressing shift tab doesn't move it back 2020-05-22 04:15:04 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton megan_gardner simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1655169 0 thorton 2020-05-21 17:28:33 -0700 iOS: Pressing tab in the Mail subject field moves focus to the body, but pressing shift tab doesn't move it back 1655170 1 400004 thorton 2020-05-21 17:31:58 -0700 Created attachment 400004 Patch 1655171 2 thorton 2020-05-21 17:32:00 -0700 <rdar://problem/59127764> 1655183 3 thorton 2020-05-21 18:22:36 -0700 *** Bug 212242 has been marked as a duplicate of this bug. *** 1655255 4 400004 wenson_hsieh 2020-05-21 23:06:29 -0700 Comment on attachment 400004 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400004&action=review > Source/WebCore/page/FocusController.cpp:453 > + Document* document = focusedOrMainFrame().document(); I think we generally prefer the strong ref here, as it’s not clear that the code below won’t nuke document. > Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:847 > + TestWebKitAPI::Util::run(&delegate.get()->_done); Nit - I don’t think you need the .get() here. > Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:862 > + TestWebKitAPI::Util::run(&delegate.get()->_done); Ditto. > Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:876 > + TestWebKitAPI::Util::run(&delegate.get()->_didSendKeyEvent); Ditto. > Tools/TestWebKitAPI/Tests/WebKitCocoa/UIDelegate.mm:878 > + ASSERT_FALSE(delegate.get()->_done); Ditto. 1655284 5 400035 thorton 2020-05-22 03:43:43 -0700 Created attachment 400035 Patch 1655292 6 ews-feeder 2020-05-22 04:15:04 -0700 Committed r262051: <https://trac.webkit.org/changeset/262051> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400035. 400004 2020-05-21 17:31:58 -0700 2020-05-22 03:43:42 -0700 Patch bug-212243-20200521173157.patch text/plain 9906 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjYxOTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2RiZWIxMjlhOTA3MTk3 MTJiMGZlYzVhYzY1NDE5MDA0N2Q1ZjEzNi4uZjBiOTFmZjA4YTVhMGJkNDhhNmNmMDlkMTUxODA1 N2ZiYTRjZThhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA1LTIxICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIGlPUzogUHJlc3Np bmcgdGFiIGluIHRoZSBNYWlsIHN1YmplY3QgZmllbGQgbW92ZXMgZm9jdXMgdG8gdGhlIGJvZHks IGJ1dCBwcmVzc2luZyBzaGlmdCB0YWIgZG9lc24ndCBtb3ZlIGl0IGJhY2sKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjI0MworICAgICAgICA8cmRh cjovL3Byb2JsZW0vNTkxMjc3NjQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTmV3IEFQSSBUZXN0czogV2ViS2l0LlNoaWZ0VGFiVGFrZXNGb2N1c0Zy b21FZGl0YWJsZVdlYlZpZXcgYW5kIFdlYktpdC5UYWJEb2VzTm90VGFrZUZvY3VzRnJvbUVkaXRh YmxlV2ViVmlldworCisgICAgICAgICogcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Rm9jdXNDb250cm9sbGVyOjpyZWxpbnF1aXNoRm9jdXNUb0Nocm9tZSk6Cisg ICAgICAgIChXZWJDb3JlOjpGb2N1c0NvbnRyb2xsZXI6OmFkdmFuY2VGb2N1c0luRG9jdW1lbnRP cmRlcik6CisgICAgICAgICogcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaDoKKyAgICAgICAgRmFjdG9y IG91dCB0aGUgY29kZSB0aGF0IGRlY2lkZXMgd2hldGhlciB0aGUgQ2hyb21lIG1pZ2h0IGFjY2Vw dCBmb2N1cywKKyAgICAgICAgYW5kIHRyYW5zZmVycyBmb2N1cyBvdXQgdG8gdGhlIENocm9tZSwg Zm9yIHVzZSBpbiBFdmVudEhhbmRsZXIuCisKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFuZGxlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpFdmVudEhhbmRsZXI6OmRlZmF1bHRUYWJFdmVudEhhbmRs ZXIpOgorICAgICAgICBJbiB0aGUgY2FzZSB3aGVyZSB3ZSBhcmUgc2hpZnQtdGFiYmluZyBvdXQg b2YgYW4gZWRpdGFibGUgd2ViIHZpZXcsCisgICAgICAgIGFsbG93IGZvY3VzIHRvIHBhc3MgdG8g dGhlIENocm9tZS4gUHJldmlvdXNseSwgd2Ugd291bGQgbm90IGFsbG93IHRoaXMsCisgICAgICAg IGJlY2F1c2UgdGFiS2V5Q3ljbGVzVGhyb3VnaEVsZW1lbnRzIGlzIGZhbHNlIGluIGVkaXRhYmxl IHdlYiB2aWV3cy4KKyAgICAgICAgSG93ZXZlciwgZm9jdXMgZXhpdGluZyB0aGUgd2ViIHZpZXcg ZW50aXJlbHkgbmVlZG4ndCBiZSBjb3ZlcmVkIGJ5CisgICAgICAgICJjeWNsZXMgdGhyb3VnaCBl bGVtZW50cyIgYmVoYXZpb3IuCisgICAgICAgIFdlIGNhbid0IGRvIHRoaXMgZm9yIHBsYWluICJ0 YWIiLCBiZWNhdXNlIHRoYXQgbmVlZHMgdG8gYmUgYWxsb3dlZCB0bworICAgICAgICBpbnNlcnQg YSB0YWIgY2hhcmFjdGVyIGluc3RlYWQuCisKIDIwMjAtMDUtMjAgIE9yaW9sIEJydWZhdSAgPG9i cnVmYXVAaWdhbGlhLmNvbT4KIAogICAgICAgICBbY3NzLWdyaWRdIEZpeCBhdXRvIHJlcGVhdCB3 aXRoIG11bHRpcGxlIHRyYWNrcyBhbmQgZ3V0dGVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRs ZXIuY3BwCmluZGV4IDU1YmQwMjYwZjUyZjFmYWVkZDhlNWYwMTk5OGIzYjA0MzUzZTE5NmMuLjRj NmZiOTVlNmMwYmNlMTczNWFlZTAzYzA2ZDMxMTEwNGYyMzQ0YmIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0V2ZW50SGFuZGxlci5jcHAKQEAgLTQwOTQsOCArNDA5NCw2IEBAIHZvaWQgRXZlbnRIYW5kbGVy OjpkZWZhdWx0VGFiRXZlbnRIYW5kbGVyKEtleWJvYXJkRXZlbnQmIGV2ZW50KQogICAgIFBhZ2Uq IHBhZ2UgPSBtX2ZyYW1lLnBhZ2UoKTsKICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIHJldHVybjsK LSAgICBpZiAoIXBhZ2UtPnRhYktleUN5Y2xlc1Rocm91Z2hFbGVtZW50cygpKQotICAgICAgICBy ZXR1cm47CiAKICAgICBGb2N1c0RpcmVjdGlvbiBmb2N1c0RpcmVjdGlvbiA9IGV2ZW50LnNoaWZ0 S2V5KCkgPyBGb2N1c0RpcmVjdGlvbkJhY2t3YXJkIDogRm9jdXNEaXJlY3Rpb25Gb3J3YXJkOwog CkBAIC00MTAzLDYgKzQxMDEsMTcgQEAgdm9pZCBFdmVudEhhbmRsZXI6OmRlZmF1bHRUYWJFdmVu dEhhbmRsZXIoS2V5Ym9hcmRFdmVudCYgZXZlbnQpCiAgICAgaWYgKG1fZnJhbWUuZG9jdW1lbnQo KS0+aW5EZXNpZ25Nb2RlKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIC8vIEFsbG93IHNoaWZ0 LXRhYiB0byByZWxpbnF1aXNoIGZvY3VzIGV2ZW4gaWYgd2UgZG9uJ3QgYWxsb3cgdGFiIHRvIGN5 Y2xlIGJldHdlZW4gZWxlbWVudHMgaW5zaWRlIHRoZSB2aWV3LgorICAgIC8vIFdlIGNhbiBvbmx5 IGRvIHRoaXMgZm9yIHNoaWZ0LXRhYiwgbm90IHRhYiBpdHNlbGYgYmVjYXVzZSB0YWJLZXlDeWNs ZXNUaHJvdWdoRWxlbWVudHMgaXMgdXNlZCB0byBtYWtlCisgICAgLy8gdGFiIGNoYXJhY3RlciBp bnNlcnRpb24gd29yayBpbiBlZGl0YWJsZSB3ZWIgdmlld3MuCisgICAgaWYgKCFwYWdlLT50YWJL ZXlDeWNsZXNUaHJvdWdoRWxlbWVudHMoKSkgeworICAgICAgICBpZiAoZm9jdXNEaXJlY3Rpb24g PT0gRm9jdXNEaXJlY3Rpb25CYWNrd2FyZCkgeworICAgICAgICAgICAgaWYgKHBhZ2UtPmZvY3Vz Q29udHJvbGxlcigpLnJlbGlucXVpc2hGb2N1c1RvQ2hyb21lKGZvY3VzRGlyZWN0aW9uKSkKKyAg ICAgICAgICAgICAgICBldmVudC5zZXREZWZhdWx0SGFuZGxlZCgpOworICAgICAgICB9CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKICAgICBpZiAocGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuYWR2 YW5jZUZvY3VzKGZvY3VzRGlyZWN0aW9uLCAmZXZlbnQpKQogICAgICAgICBldmVudC5zZXREZWZh dWx0SGFuZGxlZCgpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0Nv bnRyb2xsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3BwCmlu ZGV4IGZmNDEzZDk2NjYzZTE0YTNjNDk1ZjZjMzNmOTU0NWRhOWZmODZjNzYuLjVkYmMwNjJmZjM3 ZWU0NDM1MWE1YzlmNmJkYmI0ZTIzOTY3MWYzM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3Vz Q29udHJvbGxlci5jcHAKQEAgLTQ0OCw2ICs0NDgsMjEgQEAgYm9vbCBGb2N1c0NvbnRyb2xsZXI6 OmFkdmFuY2VGb2N1cyhGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24sIEtleWJvYXJkRXZlbnQqIGV2 ZW4KICAgICByZXR1cm4gZmFsc2U7CiB9CiAKK2Jvb2wgRm9jdXNDb250cm9sbGVyOjpyZWxpbnF1 aXNoRm9jdXNUb0Nocm9tZShGb2N1c0RpcmVjdGlvbiBkaXJlY3Rpb24pCit7CisgICAgRG9jdW1l bnQqIGRvY3VtZW50ID0gZm9jdXNlZE9yTWFpbkZyYW1lKCkuZG9jdW1lbnQoKTsKKyAgICBpZiAo IWRvY3VtZW50KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIW1fcGFnZS5jaHJv bWUoKS5jYW5UYWtlRm9jdXMoZGlyZWN0aW9uKSB8fCBtX3BhZ2UuaXNDb250cm9sbGVkQnlBdXRv bWF0aW9uKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGRvY3VtZW50LT5zZXRGb2N1 c2VkRWxlbWVudChudWxscHRyKTsKKyAgICBzZXRGb2N1c2VkRnJhbWUobnVsbHB0cik7CisgICAg bV9wYWdlLmNocm9tZSgpLnRha2VGb2N1cyhkaXJlY3Rpb24pOworICAgIHJldHVybiB0cnVlOwor fQorCiBib29sIEZvY3VzQ29udHJvbGxlcjo6YWR2YW5jZUZvY3VzSW5Eb2N1bWVudE9yZGVyKEZv Y3VzRGlyZWN0aW9uIGRpcmVjdGlvbiwgS2V5Ym9hcmRFdmVudCogZXZlbnQsIGJvb2wgaW5pdGlh bEZvY3VzKQogewogICAgIEZyYW1lJiBmcmFtZSA9IGZvY3VzZWRPck1haW5GcmFtZSgpOwpAQCAt NDY2LDExICs0ODEsOSBAQCBib29sIEZvY3VzQ29udHJvbGxlcjo6YWR2YW5jZUZvY3VzSW5Eb2N1 bWVudE9yZGVyKEZvY3VzRGlyZWN0aW9uIGRpcmVjdGlvbiwgS2V5YgogCiAgICAgaWYgKCFlbGVt ZW50KSB7CiAgICAgICAgIC8vIFdlIGRpZG4ndCBmaW5kIGEgbm9kZSB0byBmb2N1cywgc28gd2Ug c2hvdWxkIHRyeSB0byBwYXNzIGZvY3VzIHRvIENocm9tZS4KLSAgICAgICAgaWYgKCFpbml0aWFs Rm9jdXMgJiYgbV9wYWdlLmNocm9tZSgpLmNhblRha2VGb2N1cyhkaXJlY3Rpb24pICYmICFtX3Bh Z2UuaXNDb250cm9sbGVkQnlBdXRvbWF0aW9uKCkpIHsKLSAgICAgICAgICAgIGRvY3VtZW50LT5z ZXRGb2N1c2VkRWxlbWVudChudWxscHRyKTsKLSAgICAgICAgICAgIHNldEZvY3VzZWRGcmFtZShu dWxscHRyKTsKLSAgICAgICAgICAgIG1fcGFnZS5jaHJvbWUoKS50YWtlRm9jdXMoZGlyZWN0aW9u KTsKLSAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICBpZiAoIWluaXRpYWxGb2N1cykg eworICAgICAgICAgICAgaWYgKHJlbGlucXVpc2hGb2N1c1RvQ2hyb21lKGRpcmVjdGlvbikpCisg ICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgICAgIH0KIAogICAgICAgICAvLyBDaHJv bWUgZG9lc24ndCB3YW50IGZvY3VzLCBzbyB3ZSBzaG91bGQgd3JhcCBmb2N1cy4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViQ29y ZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5oCmluZGV4IDZjZDYwMGY3ODJlNzJmNDE3N2NiZWIwZDZm YTQ0NmMxYzc4MzNjMmQuLjE3YjcyNWE0MWFkZjI1NzFhYmU3OTA0YzhiNjAwYWU1ZDBkNjIyMzcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaApAQCAtNzgsNiArNzgsOCBAQCBw dWJsaWM6CiAgICAgdm9pZCBzZXRGb2N1c2VkRWxlbWVudE5lZWRzUmVwYWludCgpOwogICAgIFNl Y29uZHMgdGltZVNpbmNlRm9jdXNXYXNTZXQoKSBjb25zdDsKIAorICAgIGJvb2wgcmVsaW5xdWlz aEZvY3VzVG9DaHJvbWUoRm9jdXNEaXJlY3Rpb24pOworCiBwcml2YXRlOgogICAgIHZvaWQgc2V0 QWN0aXZlSW50ZXJuYWwoYm9vbCk7CiAgICAgdm9pZCBzZXRGb2N1c2VkSW50ZXJuYWwoYm9vbCk7 CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2Fj YTM5MGU5MzczNWUxNmNmNmY4NjExN2IzZGYxODc5NTRmOGQzNC4uNmM4Y2RiZTExOTMyN2Q4OTVj ZDUxZGEyOWVhM2VkYzJiZTQzNjhiZSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBi L1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA1LTIxICBUaW0gSG9ydG9u ICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIGlPUzogUHJlc3NpbmcgdGFi IGluIHRoZSBNYWlsIHN1YmplY3QgZmllbGQgbW92ZXMgZm9jdXMgdG8gdGhlIGJvZHksIGJ1dCBw cmVzc2luZyBzaGlmdCB0YWIgZG9lc24ndCBtb3ZlIGl0IGJhY2sKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjI0MworICAgICAgICA8cmRhcjovL3By b2JsZW0vNTkxMjc3NjQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1VJRGVsZWdhdGUubW06 CisgICAgICAgICgtW0ZvY3VzRGVsZWdhdGUgX3dlYlZpZXc6dGFrZUZvY3VzOl0pOgorICAgICAg ICAoLVtGb2N1c0RlbGVnYXRlIHdlYlZpZXc6cnVuSmF2YVNjcmlwdEFsZXJ0UGFuZWxXaXRoTWVz c2FnZTppbml0aWF0ZWRCeUZyYW1lOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAoVEVT VCk6CisKIDIwMjAtMDUtMjAgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNv bT4KIAogICAgICAgICBbaVBhZE9TXSAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3Q6cGVyY2VudGFn ZSBkb2Vzbid0IHdvcmsgaW4gbmF0aXZlIGFwcHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvVUlEZWxlZ2F0ZS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvVUlEZWxlZ2F0ZS5tbQppbmRleCAyYWY5OTg1ZTQyYzJkNGU1 MTZkY2EwYjYwMDFmNTU2NzlkMDliNDNiLi5iOTQ2MDgxMzNhNzQ4MzliZGNhZWFmNGMyNDBhYjlm ZWI2Y2RkYTkwIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1VJRGVsZWdhdGUubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9VSURlbGVnYXRlLm1tCkBAIC04MDksMjMgKzgwOSwyOCBAQCBzdGF0aWMgdm9pZCBzeW50 aGVzaXplVGFiKE5TV2luZG93ICp3aW5kb3csIE5TVmlldyAqdmlldywgYm9vbCB3aXRoU2hpZnRE b3duKQogICAgIFt2aWV3IGtleVVwOnRhYkV2ZW50KHdpbmRvdywgTlNFdmVudFR5cGVLZXlVcCwg d2l0aFNoaWZ0RG93biA/IE5TRXZlbnRNb2RpZmllckZsYWdTaGlmdCA6IDApXTsKIH0KIAotc3Rh dGljIF9XS0ZvY3VzRGlyZWN0aW9uIHRha2VuRGlyZWN0aW9uOwotCiBAaW50ZXJmYWNlIEZvY3Vz RGVsZWdhdGUgOiBOU09iamVjdCA8V0tVSURlbGVnYXRlUHJpdmF0ZT4KK0Bwcm9wZXJ0eSAobm9u YXRvbWljKSBfV0tGb2N1c0RpcmVjdGlvbiB0YWtlbkRpcmVjdGlvbjsKK0Bwcm9wZXJ0eSAobm9u YXRvbWljKSBCT09MIHVzZVNoaWZ0VGFiOwogQGVuZAogCi1AaW1wbGVtZW50YXRpb24gRm9jdXNE ZWxlZ2F0ZQorQGltcGxlbWVudGF0aW9uIEZvY3VzRGVsZWdhdGUgeworQHBhY2thZ2UKKyAgICBi b29sIF9kb25lOworICAgIGJvb2wgX2RpZFNlbmRLZXlFdmVudDsKK30KIAogLSAodm9pZClfd2Vi VmlldzooV0tXZWJWaWV3ICopd2ViVmlldyB0YWtlRm9jdXM6KF9XS0ZvY3VzRGlyZWN0aW9uKWRp cmVjdGlvbgogewotICAgIHRha2VuRGlyZWN0aW9uID0gZGlyZWN0aW9uOwotICAgIGRvbmUgPSB0 cnVlOworICAgIF90YWtlbkRpcmVjdGlvbiA9IGRpcmVjdGlvbjsKKyAgICBfZG9uZSA9IHRydWU7 CiB9CiAKIC0gKHZvaWQpd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBydW5KYXZhU2NyaXB0 QWxlcnRQYW5lbFdpdGhNZXNzYWdlOihOU1N0cmluZyAqKW1lc3NhZ2UgaW5pdGlhdGVkQnlGcmFt ZTooV0tGcmFtZUluZm8gKilmcmFtZSBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikodm9pZCkp Y29tcGxldGlvbkhhbmRsZXIKIHsKICAgICBjb21wbGV0aW9uSGFuZGxlcigpOwotICAgIHN5bnRo ZXNpemVUYWIoW3dlYlZpZXcgd2luZG93XSwgd2ViVmlldywgdHJ1ZSk7CisgICAgX2RpZFNlbmRL ZXlFdmVudCA9IHRydWU7CisgICAgc3ludGhlc2l6ZVRhYihbd2ViVmlldyB3aW5kb3ddLCB3ZWJW aWV3LCBfdXNlU2hpZnRUYWIpOwogfQogCiBAZW5kCkBAIC04MzQsMTIgKzgzOSw0MyBAQCBURVNU KFdlYktpdCwgRm9jdXMpCiB7CiAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmll dyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIDgwMCwgNjAwKV0pOwogICAg IGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtbRm9jdXNEZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOwor ICAgIFtkZWxlZ2F0ZSBzZXRVc2VTaGlmdFRhYjpZRVNdOwogICAgIFt3ZWJWaWV3IHNldFVJRGVs ZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOwogICAgIE5TU3RyaW5nICpodG1sID0gQCI8c2NyaXB0PmZ1 bmN0aW9uIGxvYWRlZCgpIHsgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2luJykuZm9jdXMoKTsg YWxlcnQoJ3JlYWR5Jyk7IH08L3NjcmlwdD4iCiAgICAgIjxib2R5IG9ubG9hZD0nbG9hZGVkKCkn PjxpbnB1dCB0eXBlPSd0ZXh0JyBpZD0naW4nPjwvYm9keT4iOwogICAgIFt3ZWJWaWV3IGxvYWRI VE1MU3RyaW5nOmh0bWwgYmFzZVVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHA6Ly9leGFt cGxlLmNvbS8iXV07Ci0gICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKLSAgICBB U1NFUlRfRVEodGFrZW5EaXJlY3Rpb24sIF9XS0ZvY3VzRGlyZWN0aW9uQmFja3dhcmQpOworICAg IFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZGVsZWdhdGUuZ2V0KCktPl9kb25lKTsKKyAgICBB U1NFUlRfRVEoW2RlbGVnYXRlIHRha2VuRGlyZWN0aW9uXSwgX1dLRm9jdXNEaXJlY3Rpb25CYWNr d2FyZCk7Cit9CisKK1RFU1QoV2ViS2l0LCBTaGlmdFRhYlRha2VzRm9jdXNGcm9tRWRpdGFibGVX ZWJWaWV3KQoreworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2Nd IGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCA4MDAsIDYwMCldKTsKKyAgICBbd2ViVmll dyBfc2V0RWRpdGFibGU6WUVTXTsKKworICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5TKFtbRm9j dXNEZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFtkZWxlZ2F0ZSBzZXRVc2VTaGlmdFRhYjpZ RVNdOworICAgIFt3ZWJWaWV3IHNldFVJRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworICAgIE5T U3RyaW5nICpodG1sID0gQCI8c2NyaXB0PmZ1bmN0aW9uIGxvYWRlZCgpIHsgZG9jdW1lbnQuYm9k eS5mb2N1cygpOyBhbGVydCgncmVhZHknKTsgfTwvc2NyaXB0PiIKKyAgICAiPGJvZHkgb25sb2Fk PSdsb2FkZWQoKSc+PC9ib2R5PiI7CisgICAgW3dlYlZpZXcgbG9hZEhUTUxTdHJpbmc6aHRtbCBi YXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cDovL2V4YW1wbGUuY29tLyJdXTsKKyAg ICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRlbGVnYXRlLmdldCgpLT5fZG9uZSk7CisgICAg QVNTRVJUX0VRKFtkZWxlZ2F0ZSB0YWtlbkRpcmVjdGlvbl0sIF9XS0ZvY3VzRGlyZWN0aW9uQmFj a3dhcmQpOworfQorCitURVNUKFdlYktpdCwgVGFiRG9lc05vdFRha2VGb2N1c0Zyb21FZGl0YWJs ZVdlYlZpZXcpCit7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcg YWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCA4MDAsIDYwMCldKTsKKyAgICBb d2ViVmlldyBfc2V0RWRpdGFibGU6WUVTXTsKKworICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9wdE5T KFtbRm9jdXNEZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldFVJRGVsZWdh dGU6ZGVsZWdhdGUuZ2V0KCldOworICAgIE5TU3RyaW5nICpodG1sID0gQCI8c2NyaXB0PmZ1bmN0 aW9uIGxvYWRlZCgpIHsgZG9jdW1lbnQuYm9keS5mb2N1cygpOyBhbGVydCgncmVhZHknKTsgfTwv c2NyaXB0PiIKKyAgICAiPGJvZHkgb25sb2FkPSdsb2FkZWQoKSc+PC9ib2R5PiI7CisgICAgW3dl YlZpZXcgbG9hZEhUTUxTdHJpbmc6aHRtbCBiYXNlVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAi aHR0cDovL2V4YW1wbGUuY29tLyJdXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRl bGVnYXRlLmdldCgpLT5fZGlkU2VuZEtleUV2ZW50KTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoIlx0 IiwgW3dlYlZpZXcgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpAImRvY3VtZW50LmJvZHku dGV4dENvbnRlbnQiXSk7CisgICAgQVNTRVJUX0ZBTFNFKGRlbGVnYXRlLmdldCgpLT5fZG9uZSk7 CiB9CiAKICNkZWZpbmUgTU9VU0VfRVZFTlRfQ0FVU0VTX0RPV05MT0FEIDAK 400035 2020-05-22 03:43:43 -0700 2020-05-22 04:15:04 -0700 Patch bug-212243-20200522034342.patch text/plain 9956 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMDQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGFmNzdmY2IzYTc3YmIw NTIyZDk1NzFlNjI5ZWYwMzJiOTAyOWZiMS4uMTBkYWM1ODhmZTdiMzgzYzljOTQ2MTczMjM1MGM0 ZTJlYmRhNmQwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDIwLTA1LTIxICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIGlPUzogUHJlc3Np bmcgdGFiIGluIHRoZSBNYWlsIHN1YmplY3QgZmllbGQgbW92ZXMgZm9jdXMgdG8gdGhlIGJvZHks IGJ1dCBwcmVzc2luZyBzaGlmdCB0YWIgZG9lc24ndCBtb3ZlIGl0IGJhY2sKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjI0MworICAgICAgICA8cmRh cjovL3Byb2JsZW0vNTkxMjc3NjQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVo LgorCisgICAgICAgIE5ldyBBUEkgVGVzdHM6IFdlYktpdC5TaGlmdFRhYlRha2VzRm9jdXNGcm9t RWRpdGFibGVXZWJWaWV3IGFuZCBXZWJLaXQuVGFiRG9lc05vdFRha2VGb2N1c0Zyb21FZGl0YWJs ZVdlYlZpZXcKKworICAgICAgICAqIHBhZ2UvRm9jdXNDb250cm9sbGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZvY3VzQ29udHJvbGxlcjo6cmVsaW5xdWlzaEZvY3VzVG9DaHJvbWUpOgorICAg ICAgICAoV2ViQ29yZTo6Rm9jdXNDb250cm9sbGVyOjphZHZhbmNlRm9jdXNJbkRvY3VtZW50T3Jk ZXIpOgorICAgICAgICAqIHBhZ2UvRm9jdXNDb250cm9sbGVyLmg6CisgICAgICAgIEZhY3RvciBv dXQgdGhlIGNvZGUgdGhhdCBkZWNpZGVzIHdoZXRoZXIgdGhlIENocm9tZSBtaWdodCBhY2NlcHQg Zm9jdXMsCisgICAgICAgIGFuZCB0cmFuc2ZlcnMgZm9jdXMgb3V0IHRvIHRoZSBDaHJvbWUsIGZv ciB1c2UgaW4gRXZlbnRIYW5kbGVyLgorCisgICAgICAgICogcGFnZS9FdmVudEhhbmRsZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6RXZlbnRIYW5kbGVyOjpkZWZhdWx0VGFiRXZlbnRIYW5kbGVy KToKKyAgICAgICAgSW4gdGhlIGNhc2Ugd2hlcmUgd2UgYXJlIHNoaWZ0LXRhYmJpbmcgb3V0IG9m IGFuIGVkaXRhYmxlIHdlYiB2aWV3LAorICAgICAgICBhbGxvdyBmb2N1cyB0byBwYXNzIHRvIHRo ZSBDaHJvbWUuIFByZXZpb3VzbHksIHdlIHdvdWxkIG5vdCBhbGxvdyB0aGlzLAorICAgICAgICBi ZWNhdXNlIHRhYktleUN5Y2xlc1Rocm91Z2hFbGVtZW50cyBpcyBmYWxzZSBpbiBlZGl0YWJsZSB3 ZWIgdmlld3MuCisgICAgICAgIEhvd2V2ZXIsIGZvY3VzIGV4aXRpbmcgdGhlIHdlYiB2aWV3IGVu dGlyZWx5IG5lZWRuJ3QgYmUgY292ZXJlZCBieQorICAgICAgICAiY3ljbGVzIHRocm91Z2ggZWxl bWVudHMiIGJlaGF2aW9yLgorICAgICAgICBXZSBjYW4ndCBkbyB0aGlzIGZvciBwbGFpbiAidGFi IiwgYmVjYXVzZSB0aGF0IG5lZWRzIHRvIGJlIGFsbG93ZWQgdG8KKyAgICAgICAgaW5zZXJ0IGEg dGFiIGNoYXJhY3RlciBpbnN0ZWFkLgorCiAyMDIwLTA1LTIxICBXZW5zb24gSHNpZWggIDx3ZW5z b25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIERhdGFUcmFuc2Zlci5maWxlcyBjb250YWlu cyBtdWx0aXBsZSBmaWxlcyB3aGVuIHBhc3RpbmcgYSBzaW5nbGUgaW1hZ2Ugd2l0aCBtdWx0aXBs ZSByZXByZXNlbnRhdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRI YW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCA1 NWJkMDI2MGY1MmYxZmFlZGQ4ZTVmMDE5OThiM2IwNDM1M2UxOTZjLi40YzZmYjk1ZTZjMGJjZTE3 MzVhZWUwM2MwNmQzMTExMDRmMjM0NGJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIu Y3BwCkBAIC00MDk0LDggKzQwOTQsNiBAQCB2b2lkIEV2ZW50SGFuZGxlcjo6ZGVmYXVsdFRhYkV2 ZW50SGFuZGxlcihLZXlib2FyZEV2ZW50JiBldmVudCkKICAgICBQYWdlKiBwYWdlID0gbV9mcmFt ZS5wYWdlKCk7CiAgICAgaWYgKCFwYWdlKQogICAgICAgICByZXR1cm47Ci0gICAgaWYgKCFwYWdl LT50YWJLZXlDeWNsZXNUaHJvdWdoRWxlbWVudHMoKSkKLSAgICAgICAgcmV0dXJuOwogCiAgICAg Rm9jdXNEaXJlY3Rpb24gZm9jdXNEaXJlY3Rpb24gPSBldmVudC5zaGlmdEtleSgpID8gRm9jdXNE aXJlY3Rpb25CYWNrd2FyZCA6IEZvY3VzRGlyZWN0aW9uRm9yd2FyZDsKIApAQCAtNDEwMyw2ICs0 MTAxLDE3IEBAIHZvaWQgRXZlbnRIYW5kbGVyOjpkZWZhdWx0VGFiRXZlbnRIYW5kbGVyKEtleWJv YXJkRXZlbnQmIGV2ZW50KQogICAgIGlmIChtX2ZyYW1lLmRvY3VtZW50KCktPmluRGVzaWduTW9k ZSgpKQogICAgICAgICByZXR1cm47CiAKKyAgICAvLyBBbGxvdyBzaGlmdC10YWIgdG8gcmVsaW5x dWlzaCBmb2N1cyBldmVuIGlmIHdlIGRvbid0IGFsbG93IHRhYiB0byBjeWNsZSBiZXR3ZWVuIGVs ZW1lbnRzIGluc2lkZSB0aGUgdmlldy4KKyAgICAvLyBXZSBjYW4gb25seSBkbyB0aGlzIGZvciBz aGlmdC10YWIsIG5vdCB0YWIgaXRzZWxmIGJlY2F1c2UgdGFiS2V5Q3ljbGVzVGhyb3VnaEVsZW1l bnRzIGlzIHVzZWQgdG8gbWFrZQorICAgIC8vIHRhYiBjaGFyYWN0ZXIgaW5zZXJ0aW9uIHdvcmsg aW4gZWRpdGFibGUgd2ViIHZpZXdzLgorICAgIGlmICghcGFnZS0+dGFiS2V5Q3ljbGVzVGhyb3Vn aEVsZW1lbnRzKCkpIHsKKyAgICAgICAgaWYgKGZvY3VzRGlyZWN0aW9uID09IEZvY3VzRGlyZWN0 aW9uQmFja3dhcmQpIHsKKyAgICAgICAgICAgIGlmIChwYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS5y ZWxpbnF1aXNoRm9jdXNUb0Nocm9tZShmb2N1c0RpcmVjdGlvbikpCisgICAgICAgICAgICAgICAg ZXZlbnQuc2V0RGVmYXVsdEhhbmRsZWQoKTsKKyAgICAgICAgfQorICAgICAgICByZXR1cm47Cisg ICAgfQorCiAgICAgaWYgKHBhZ2UtPmZvY3VzQ29udHJvbGxlcigpLmFkdmFuY2VGb2N1cyhmb2N1 c0RpcmVjdGlvbiwgJmV2ZW50KSkKICAgICAgICAgZXZlbnQuc2V0RGVmYXVsdEhhbmRsZWQoKTsK IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRm9jdXNDb250cm9sbGVyLmNwcAppbmRleCBmZjQxM2Q5NjY2 M2UxNGEzYzQ5NWY2YzMzZjk1NDVkYTlmZjg2Yzc2Li42Nzg1NDcyMjAzYjgxZTFhMWQ1Zjk2MTE1 MDE4OTE4ZGViMWQ3MjY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZvY3VzQ29u dHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuY3Bw CkBAIC00NDgsNiArNDQ4LDIxIEBAIGJvb2wgRm9jdXNDb250cm9sbGVyOjphZHZhbmNlRm9jdXMo Rm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uLCBLZXlib2FyZEV2ZW50KiBldmVuCiAgICAgcmV0dXJu IGZhbHNlOwogfQogCitib29sIEZvY3VzQ29udHJvbGxlcjo6cmVsaW5xdWlzaEZvY3VzVG9DaHJv bWUoRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uKQoreworICAgIFJlZlB0cjxEb2N1bWVudD4gZG9j dW1lbnQgPSBmb2N1c2VkT3JNYWluRnJhbWUoKS5kb2N1bWVudCgpOworICAgIGlmICghZG9jdW1l bnQpCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGlmICghbV9wYWdlLmNocm9tZSgpLmNh blRha2VGb2N1cyhkaXJlY3Rpb24pIHx8IG1fcGFnZS5pc0NvbnRyb2xsZWRCeUF1dG9tYXRpb24o KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgZG9jdW1lbnQtPnNldEZvY3VzZWRFbGVt ZW50KG51bGxwdHIpOworICAgIHNldEZvY3VzZWRGcmFtZShudWxscHRyKTsKKyAgICBtX3BhZ2Uu Y2hyb21lKCkudGFrZUZvY3VzKGRpcmVjdGlvbik7CisgICAgcmV0dXJuIHRydWU7Cit9CisKIGJv b2wgRm9jdXNDb250cm9sbGVyOjphZHZhbmNlRm9jdXNJbkRvY3VtZW50T3JkZXIoRm9jdXNEaXJl Y3Rpb24gZGlyZWN0aW9uLCBLZXlib2FyZEV2ZW50KiBldmVudCwgYm9vbCBpbml0aWFsRm9jdXMp CiB7CiAgICAgRnJhbWUmIGZyYW1lID0gZm9jdXNlZE9yTWFpbkZyYW1lKCk7CkBAIC00NjYsMTEg KzQ4MSw5IEBAIGJvb2wgRm9jdXNDb250cm9sbGVyOjphZHZhbmNlRm9jdXNJbkRvY3VtZW50T3Jk ZXIoRm9jdXNEaXJlY3Rpb24gZGlyZWN0aW9uLCBLZXliCiAKICAgICBpZiAoIWVsZW1lbnQpIHsK ICAgICAgICAgLy8gV2UgZGlkbid0IGZpbmQgYSBub2RlIHRvIGZvY3VzLCBzbyB3ZSBzaG91bGQg dHJ5IHRvIHBhc3MgZm9jdXMgdG8gQ2hyb21lLgotICAgICAgICBpZiAoIWluaXRpYWxGb2N1cyAm JiBtX3BhZ2UuY2hyb21lKCkuY2FuVGFrZUZvY3VzKGRpcmVjdGlvbikgJiYgIW1fcGFnZS5pc0Nv bnRyb2xsZWRCeUF1dG9tYXRpb24oKSkgewotICAgICAgICAgICAgZG9jdW1lbnQtPnNldEZvY3Vz ZWRFbGVtZW50KG51bGxwdHIpOwotICAgICAgICAgICAgc2V0Rm9jdXNlZEZyYW1lKG51bGxwdHIp OwotICAgICAgICAgICAgbV9wYWdlLmNocm9tZSgpLnRha2VGb2N1cyhkaXJlY3Rpb24pOwotICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGlmICghaW5pdGlhbEZvY3VzKSB7CisgICAg ICAgICAgICBpZiAocmVsaW5xdWlzaEZvY3VzVG9DaHJvbWUoZGlyZWN0aW9uKSkKKyAgICAgICAg ICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQogCiAgICAgICAgIC8vIENocm9tZSBkb2Vz bid0IHdhbnQgZm9jdXMsIHNvIHdlIHNob3VsZCB3cmFwIGZvY3VzLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv Rm9jdXNDb250cm9sbGVyLmgKaW5kZXggNmNkNjAwZjc4MmU3MmY0MTc3Y2JlYjBkNmZhNDQ2YzFj NzgzM2MyZC4uMTdiNzI1YTQxYWRmMjU3MWFiZTc5MDRjOGI2MDBhZTVkMGQ2MjIzNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Gb2N1c0NvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0ZvY3VzQ29udHJvbGxlci5oCkBAIC03OCw2ICs3OCw4IEBAIHB1YmxpYzoK ICAgICB2b2lkIHNldEZvY3VzZWRFbGVtZW50TmVlZHNSZXBhaW50KCk7CiAgICAgU2Vjb25kcyB0 aW1lU2luY2VGb2N1c1dhc1NldCgpIGNvbnN0OwogCisgICAgYm9vbCByZWxpbnF1aXNoRm9jdXNU b0Nocm9tZShGb2N1c0RpcmVjdGlvbik7CisKIHByaXZhdGU6CiAgICAgdm9pZCBzZXRBY3RpdmVJ bnRlcm5hbChib29sKTsKICAgICB2b2lkIHNldEZvY3VzZWRJbnRlcm5hbChib29sKTsKZGlmZiAt LWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjMDczMzQ2Zjhj ZmE3MWU4NGMwNTVkYzliMDQ3MjhkZGM0YTMwNGI0Li5iMWFkOTlhNmUwZjU2NDBkZTcxMDJjOTYw NWQyZWMzZTBiMjg3OGJhIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjAtMDUtMjEgIFRpbSBIb3J0b24gIDx0aW1v dGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgaU9TOiBQcmVzc2luZyB0YWIgaW4gdGhl IE1haWwgc3ViamVjdCBmaWVsZCBtb3ZlcyBmb2N1cyB0byB0aGUgYm9keSwgYnV0IHByZXNzaW5n IHNoaWZ0IHRhYiBkb2Vzbid0IG1vdmUgaXQgYmFjaworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMjQzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81 OTEyNzc2ND4KKworICAgICAgICBSZXZpZXdlZCBieSBXZW5zb24gSHNpZWguCisKKyAgICAgICAg KiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1VJRGVsZWdhdGUubW06CisgICAgICAg ICgtW0ZvY3VzRGVsZWdhdGUgX3dlYlZpZXc6dGFrZUZvY3VzOl0pOgorICAgICAgICAoLVtGb2N1 c0RlbGVnYXRlIHdlYlZpZXc6cnVuSmF2YVNjcmlwdEFsZXJ0UGFuZWxXaXRoTWVzc2FnZTppbml0 aWF0ZWRCeUZyYW1lOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAoVEVTVCk6CisKIDIw MjAtMDUtMjEgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAg ICAgRGF0YVRyYW5zZmVyLmZpbGVzIGNvbnRhaW5zIG11bHRpcGxlIGZpbGVzIHdoZW4gcGFzdGlu ZyBhIHNpbmdsZSBpbWFnZSB3aXRoIG11bHRpcGxlIHJlcHJlc2VudGF0aW9ucwpkaWZmIC0tZ2l0 IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9VSURlbGVnYXRlLm1tIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9VSURlbGVnYXRlLm1tCmluZGV4 IDJhZjk5ODVlNDJjMmQ0ZTUxNmRjYTBiNjAwMWY1NTY3OWQwOWI0M2IuLjIyOWVlOWI4ZjlkZjdh NmM5OWM4MDcyMjZiODdiN2NiMGZlYzk3NDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvVUlEZWxlZ2F0ZS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1VJRGVsZWdhdGUubW0KQEAgLTgwOSwyMyArODA5LDI4IEBA IHN0YXRpYyB2b2lkIHN5bnRoZXNpemVUYWIoTlNXaW5kb3cgKndpbmRvdywgTlNWaWV3ICp2aWV3 LCBib29sIHdpdGhTaGlmdERvd24pCiAgICAgW3ZpZXcga2V5VXA6dGFiRXZlbnQod2luZG93LCBO U0V2ZW50VHlwZUtleVVwLCB3aXRoU2hpZnREb3duID8gTlNFdmVudE1vZGlmaWVyRmxhZ1NoaWZ0 IDogMCldOwogfQogCi1zdGF0aWMgX1dLRm9jdXNEaXJlY3Rpb24gdGFrZW5EaXJlY3Rpb247Ci0K IEBpbnRlcmZhY2UgRm9jdXNEZWxlZ2F0ZSA6IE5TT2JqZWN0IDxXS1VJRGVsZWdhdGVQcml2YXRl PgorQHByb3BlcnR5IChub25hdG9taWMpIF9XS0ZvY3VzRGlyZWN0aW9uIHRha2VuRGlyZWN0aW9u OworQHByb3BlcnR5IChub25hdG9taWMpIEJPT0wgdXNlU2hpZnRUYWI7CiBAZW5kCiAKLUBpbXBs ZW1lbnRhdGlvbiBGb2N1c0RlbGVnYXRlCitAaW1wbGVtZW50YXRpb24gRm9jdXNEZWxlZ2F0ZSB7 CitAcGFja2FnZQorICAgIGJvb2wgX2RvbmU7CisgICAgYm9vbCBfZGlkU2VuZEtleUV2ZW50Owor fQogCiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHRha2VGb2N1czooX1dL Rm9jdXNEaXJlY3Rpb24pZGlyZWN0aW9uCiB7Ci0gICAgdGFrZW5EaXJlY3Rpb24gPSBkaXJlY3Rp b247Ci0gICAgZG9uZSA9IHRydWU7CisgICAgX3Rha2VuRGlyZWN0aW9uID0gZGlyZWN0aW9uOwor ICAgIF9kb25lID0gdHJ1ZTsKIH0KIAogLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJW aWV3IHJ1bkphdmFTY3JpcHRBbGVydFBhbmVsV2l0aE1lc3NhZ2U6KE5TU3RyaW5nICopbWVzc2Fn ZSBpbml0aWF0ZWRCeUZyYW1lOihXS0ZyYW1lSW5mbyAqKWZyYW1lIGNvbXBsZXRpb25IYW5kbGVy Oih2b2lkICheKSh2b2lkKSljb21wbGV0aW9uSGFuZGxlcgogewogICAgIGNvbXBsZXRpb25IYW5k bGVyKCk7Ci0gICAgc3ludGhlc2l6ZVRhYihbd2ViVmlldyB3aW5kb3ddLCB3ZWJWaWV3LCB0cnVl KTsKKyAgICBfZGlkU2VuZEtleUV2ZW50ID0gdHJ1ZTsKKyAgICBzeW50aGVzaXplVGFiKFt3ZWJW aWV3IHdpbmRvd10sIHdlYlZpZXcsIF91c2VTaGlmdFRhYik7CiB9CiAKIEBlbmQKQEAgLTgzNCwx MiArODM5LDQzIEBAIFRFU1QoV2ViS2l0LCBGb2N1cykKIHsKICAgICBhdXRvIHdlYlZpZXcgPSBh ZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwg ODAwLCA2MDApXSk7CiAgICAgYXV0byBkZWxlZ2F0ZSA9IGFkb3B0TlMoW1tGb2N1c0RlbGVnYXRl IGFsbG9jXSBpbml0XSk7CisgICAgW2RlbGVnYXRlIHNldFVzZVNoaWZ0VGFiOllFU107CiAgICAg W3dlYlZpZXcgc2V0VUlEZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CiAgICAgTlNTdHJpbmcgKmh0 bWwgPSBAIjxzY3JpcHQ+ZnVuY3Rpb24gbG9hZGVkKCkgeyBkb2N1bWVudC5nZXRFbGVtZW50QnlJ ZCgnaW4nKS5mb2N1cygpOyBhbGVydCgncmVhZHknKTsgfTwvc2NyaXB0PiIKICAgICAiPGJvZHkg b25sb2FkPSdsb2FkZWQoKSc+PGlucHV0IHR5cGU9J3RleHQnIGlkPSdpbic+PC9ib2R5PiI7CiAg ICAgW3dlYlZpZXcgbG9hZEhUTUxTdHJpbmc6aHRtbCBiYXNlVVJMOltOU1VSTCBVUkxXaXRoU3Ry aW5nOkAiaHR0cDovL2V4YW1wbGUuY29tLyJdXTsKLSAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpy dW4oJmRvbmUpOwotICAgIEFTU0VSVF9FUSh0YWtlbkRpcmVjdGlvbiwgX1dLRm9jdXNEaXJlY3Rp b25CYWNrd2FyZCk7CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkZWxlZ2F0ZS0+X2Rv bmUpOworICAgIEFTU0VSVF9FUShbZGVsZWdhdGUgdGFrZW5EaXJlY3Rpb25dLCBfV0tGb2N1c0Rp cmVjdGlvbkJhY2t3YXJkKTsKK30KKworVEVTVChXZWJLaXQsIFNoaWZ0VGFiVGFrZXNGb2N1c0Zy b21FZGl0YWJsZVdlYlZpZXcpCit7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2Vi VmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIDgwMCwgNjAwKV0pOwor ICAgIFt3ZWJWaWV3IF9zZXRFZGl0YWJsZTpZRVNdOworCisgICAgYXV0byBkZWxlZ2F0ZSA9IGFk b3B0TlMoW1tGb2N1c0RlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW2RlbGVnYXRlIHNldFVz ZVNoaWZ0VGFiOllFU107CisgICAgW3dlYlZpZXcgc2V0VUlEZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQo KV07CisgICAgTlNTdHJpbmcgKmh0bWwgPSBAIjxzY3JpcHQ+ZnVuY3Rpb24gbG9hZGVkKCkgeyBk b2N1bWVudC5ib2R5LmZvY3VzKCk7IGFsZXJ0KCdyZWFkeScpOyB9PC9zY3JpcHQ+IgorICAgICI8 Ym9keSBvbmxvYWQ9J2xvYWRlZCgpJz48L2JvZHk+IjsKKyAgICBbd2ViVmlldyBsb2FkSFRNTFN0 cmluZzpodG1sIGJhc2VVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJodHRwOi8vZXhhbXBsZS5j b20vIl1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZGVsZWdhdGUtPl9kb25lKTsK KyAgICBBU1NFUlRfRVEoW2RlbGVnYXRlIHRha2VuRGlyZWN0aW9uXSwgX1dLRm9jdXNEaXJlY3Rp b25CYWNrd2FyZCk7Cit9CisKK1RFU1QoV2ViS2l0LCBUYWJEb2VzTm90VGFrZUZvY3VzRnJvbUVk aXRhYmxlV2ViVmlldykKK3sKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2Vi VmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIDgwMCwgNjAwKV0pOwor ICAgIFt3ZWJWaWV3IF9zZXRFZGl0YWJsZTpZRVNdOworCisgICAgYXV0byBkZWxlZ2F0ZSA9IGFk b3B0TlMoW1tGb2N1c0RlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0VUlE ZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisgICAgTlNTdHJpbmcgKmh0bWwgPSBAIjxzY3JpcHQ+ ZnVuY3Rpb24gbG9hZGVkKCkgeyBkb2N1bWVudC5ib2R5LmZvY3VzKCk7IGFsZXJ0KCdyZWFkeScp OyB9PC9zY3JpcHQ+IgorICAgICI8Ym9keSBvbmxvYWQ9J2xvYWRlZCgpJz48L2JvZHk+IjsKKyAg ICBbd2ViVmlldyBsb2FkSFRNTFN0cmluZzpodG1sIGJhc2VVUkw6W05TVVJMIFVSTFdpdGhTdHJp bmc6QCJodHRwOi8vZXhhbXBsZS5jb20vIl1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1 bigmZGVsZWdhdGUtPl9kaWRTZW5kS2V5RXZlbnQpOworICAgIEVYUEVDVF9XS19TVFJFUSgiXHQi LCBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQuYm9keS50 ZXh0Q29udGVudCJdKTsKKyAgICBBU1NFUlRfRkFMU0UoZGVsZWdhdGUtPl9kb25lKTsKIH0KIAog I2RlZmluZSBNT1VTRV9FVkVOVF9DQVVTRVNfRE9XTkxPQUQgMAo=