129632 2014-03-03 15:58:35 -0800 [iOS WebKit2]: Text fields don't zoom in when focused 2014-03-03 16:54:35 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 enrica enrica oldest_to_newest 986544 0 enrica 2014-03-03 15:58:35 -0800 This can be reproduced with any page that has input elements. <rdar://problem/16185230> 986545 1 225704 enrica 2014-03-03 16:01:40 -0800 Created attachment 225704 Patch 986558 2 225704 benjamin 2014-03-03 16:23:52 -0800 Comment on attachment 225704 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=225704&action=review > Source/WebKit2/Shared/AssistedNodeInformation.h:97 > + : minimumScaleFactor(0.1) > + , maximumScaleFactor(DBL_MAX) Maybe -inf and inf instead? > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:416 > + minimumScrollDistance:0]; The indent is wrong here. 986584 3 enrica 2014-03-03 16:54:35 -0800 Committed revision 165022 225704 2014-03-03 16:01:40 -0800 2014-03-03 16:23:52 -0800 Patch zoomtonode.txt text/plain 8104 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTAxNikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE0LTAzLTAzICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgW2lPUyBXZWJLaXQyXTogVGV4 dCBmaWVsZHMgZG9uJ3Qgem9vbSBpbiB3aGVuIGZvY3VzZWQKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTYzMgorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMTYxODUyMzA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgV2hlbiBmb2N1c2luZyB0aGUgbm9kZSB3ZSBuZWVkIHRvIHpvb20gYW5kIGNlbnRlciBp dCBhbmQgcG9zc2libHkKKyAgICAgICAgc2Nyb2xsIHRvIG1ha2UgaXQgdmlzaWJsZS4KKyAgICAg ICAgT24gaVBhZCB3ZSBvbmx5IHNjcm9sbCwgd2l0aG91dCB6b29taW5nLgorCisgICAgICAgICog U2hhcmVkL0Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6QXNz aXN0ZWROb2RlSW5mb3JtYXRpb246OmVuY29kZSk6CisgICAgICAgIChXZWJLaXQ6OkFzc2lzdGVk Tm9kZUluZm9ybWF0aW9uOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9Bc3Npc3RlZE5vZGVJ bmZvcm1hdGlvbi5oOgorICAgICAgICAoV2ViS2l0OjpBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbjo6 QXNzaXN0ZWROb2RlSW5mb3JtYXRpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJWaWV3SW50ZXJuYWwuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW06CisgICAgICAg ICgtW1dLQ29udGVudFZpZXcgX3Njcm9sbFRvUmVjdDp3aXRoT3JpZ2luOm1pbmltdW1TY3JvbGxE aXN0YW5jZTpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZGlzcGxheUZvcm1Ob2RlSW5wdXRW aWV3XSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3N0YXJ0QXNzaXN0aW5nTm9kZTpdKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2U6OmdldEFzc2lzdGVkTm9kZUluZm9ybWF0aW9uKToKKwogMjAxNC0w My0wMyAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBD b21wb3NpdGVkIG1hc2tzIG5vdCB3b3JraW5nIG9uIGlPUyBhZnRlciByMTY0ODkwIApJbmRleDog U291cmNlL1dlYktpdDIvU2hhcmVkL0Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uY3Bw CShyZXZpc2lvbiAxNjQ5ODkpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQXNzaXN0ZWROb2Rl SW5mb3JtYXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NCw2ICs2NCw4IEBAIGJvb2wgV0tP cHRpb25JdGVtOjpkZWNvZGUoSVBDOjpBcmd1bWVudEQKIHZvaWQgQXNzaXN0ZWROb2RlSW5mb3Jt YXRpb246OmVuY29kZShJUEM6OkFyZ3VtZW50RW5jb2RlciYgZW5jb2RlcikgY29uc3QKIHsKICAg ICBlbmNvZGVyIDw8IGVsZW1lbnRSZWN0OworICAgIGVuY29kZXIgPDwgbWluaW11bVNjYWxlRmFj dG9yOworICAgIGVuY29kZXIgPDwgbWF4aW11bVNjYWxlRmFjdG9yOwogICAgIGVuY29kZXIgPDwg aGFzTmV4dE5vZGU7CiAgICAgZW5jb2RlciA8PCBoYXNQcmV2aW91c05vZGU7CiAgICAgZW5jb2Rl ciA8PCBpc0F1dG9jb3JyZWN0OwpAQCAtODQsNiArODYsMTIgQEAgYm9vbCBBc3Npc3RlZE5vZGVJ bmZvcm1hdGlvbjo6ZGVjb2RlKElQQwogICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmVs ZW1lbnRSZWN0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgaWYgKCFkZWNvZGVyLmRl Y29kZShyZXN1bHQubWluaW11bVNjYWxlRmFjdG9yKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwor CisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubWF4aW11bVNjYWxlRmFjdG9yKSkKKyAg ICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuaGFz TmV4dE5vZGUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9Bc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1NoYXJlZC9Bc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5oCShyZXZpc2lvbiAxNjQ5ODkp CisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uaAkod29y a2luZyBjb3B5KQpAQCAtOTMsNyArOTMsOSBAQCBzdHJ1Y3QgV0tPcHRpb25JdGVtIHsKIAogc3Ry dWN0IEFzc2lzdGVkTm9kZUluZm9ybWF0aW9uIHsKICAgICBBc3Npc3RlZE5vZGVJbmZvcm1hdGlv bigpCi0gICAgICAgIDogaGFzTmV4dE5vZGUoZmFsc2UpCisgICAgICAgIDogbWluaW11bVNjYWxl RmFjdG9yKDAuMSkKKyAgICAgICAgLCBtYXhpbXVtU2NhbGVGYWN0b3IoREJMX01BWCkKKyAgICAg ICAgLCBoYXNOZXh0Tm9kZShmYWxzZSkKICAgICAgICAgLCBoYXNQcmV2aW91c05vZGUoZmFsc2Up CiAgICAgICAgICwgaXNBdXRvY29ycmVjdChmYWxzZSkKICAgICAgICAgLCBpc011bHRpU2VsZWN0 KGZhbHNlKQpAQCAtMTA2LDYgKzEwOCw4IEBAIHN0cnVjdCBBc3Npc3RlZE5vZGVJbmZvcm1hdGlv biB7CiAgICAgfQogCiAgICAgV2ViQ29yZTo6SW50UmVjdCBlbGVtZW50UmVjdDsKKyAgICBkb3Vi bGUgbWluaW11bVNjYWxlRmFjdG9yOworICAgIGRvdWJsZSBtYXhpbXVtU2NhbGVGYWN0b3I7CiAg ICAgYm9vbCBoYXNOZXh0Tm9kZTsKICAgICBib29sIGhhc1ByZXZpb3VzTm9kZTsKICAgICBib29s IGlzQXV0b2NvcnJlY3Q7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2ViVmlld0ludGVybmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdJbnRlcm5hbC5oCShyZXZpc2lvbiAxNjQ5ODkpCisrKyBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlld0ludGVybmFsLmgJKHdv cmtpbmcgY29weSkKQEAgLTU5LDYgKzU5LDcgQEAgY2xhc3MgV2ViUGFnZVByb3h5OwogCiAtIChS ZXRhaW5QdHI8Q0dJbWFnZVJlZj4pX3Rha2VWaWV3U25hcHNob3Q7CiAKKy0gKEJPT0wpX3Njcm9s bFRvUmVjdDooV2ViQ29yZTo6RmxvYXRSZWN0KXRhcmdldFJlY3Qgb3JpZ2luOihXZWJDb3JlOjpG bG9hdFBvaW50KW9yaWdpbiBtaW5pbXVtU2Nyb2xsRGlzdGFuY2U6KGZsb2F0KW1pbmltdW1TY3Jv bGxEaXN0YW5jZTsKIC0gKEJPT0wpX3pvb21Ub1JlY3Q6KFdlYkNvcmU6OkZsb2F0UmVjdCl0YXJn ZXRSZWN0IHdpdGhPcmlnaW46KFdlYkNvcmU6OkZsb2F0UG9pbnQpb3JpZ2luIGZpdEVudGlyZVJl Y3Q6KEJPT0wpZml0RW50aXJlUmVjdCBtaW5pbXVtU2NhbGU6KGRvdWJsZSltaW5pbXVtU2NhbGUg bWF4aW11bVNjYWxlOihkb3VibGUpbWF4aW11bVNjYWxlIG1pbmltdW1TY3JvbGxEaXN0YW5jZToo ZmxvYXQpbWluaW11bVNjcm9sbERpc3RhbmNlOwogLSAodm9pZClfem9vbU91dFdpdGhPcmlnaW46 KFdlYkNvcmU6OkZsb2F0UG9pbnQpb3JpZ2luOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcuaAkocmV2aXNpb24gMTY0OTg5KQorKysg U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3LmgJKHdvcmtpbmcgY29w eSkKQEAgLTc4LDYgKzc4LDcgQEAgc3RydWN0IFdlYlBhZ2VDb25maWd1cmF0aW9uOwogCiAtIChS ZXRhaW5QdHI8Q0dJbWFnZVJlZj4pX3Rha2VWaWV3U25hcHNob3Q7CiAKKy0gKEJPT0wpX3Njcm9s bFRvUmVjdDooQ0dSZWN0KXRhcmdldFJlY3Qgd2l0aE9yaWdpbjooQ0dQb2ludClvcmlnaW4gbWlu aW11bVNjcm9sbERpc3RhbmNlOihDR0Zsb2F0KW1pbmltdW1TY3JvbGxEaXN0YW5jZTsKIC0gKEJP T0wpX3pvb21Ub1JlY3Q6KENHUmVjdCl0YXJnZXRSZWN0IHdpdGhPcmlnaW46KENHUG9pbnQpb3Jp Z2luIGZpdEVudGlyZVJlY3Q6KEJPT0wpZml0RW50aXJlUmVjdCBtaW5pbXVtU2NhbGU6KGRvdWJs ZSltaW5pbXVtU2NhbGUgbWF4aW11bVNjYWxlOihkb3VibGUpbWF4aW11bVNjYWxlIG1pbmltdW1T Y3JvbGxEaXN0YW5jZTooQ0dGbG9hdCltaW5pbXVtU2Nyb2xsRGlzdGFuY2U7CiAtICh2b2lkKV96 b29tT3V0V2l0aE9yaWdpbjooQ0dQb2ludClvcmlnaW47CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0JKHJldmlzaW9uIDE2NDk4OSkKKysr IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQkod29ya2luZyBj b3B5KQpAQCAtMjgzLDYgKzI4MywxMSBAQCAtIChSZXRhaW5QdHI8Q0dJbWFnZVJlZj4pX3Rha2VW aWV3U25hcHNoCiAgICAgcmV0dXJuIFtfd2ViVmlldyBfdGFrZVZpZXdTbmFwc2hvdF07CiB9CiAK Ky0gKEJPT0wpX3Njcm9sbFRvUmVjdDooQ0dSZWN0KXRhcmdldFJlY3Qgd2l0aE9yaWdpbjooQ0dQ b2ludClvcmlnaW4gbWluaW11bVNjcm9sbERpc3RhbmNlOihDR0Zsb2F0KW1pbmltdW1TY3JvbGxE aXN0YW5jZQoreworICAgIHJldHVybiBbX3dlYlZpZXcgX3Njcm9sbFRvUmVjdDp0YXJnZXRSZWN0 IG9yaWdpbjpvcmlnaW4gbWluaW11bVNjcm9sbERpc3RhbmNlOm1pbmltdW1TY3JvbGxEaXN0YW5j ZV07Cit9CisKIC0gKEJPT0wpX3pvb21Ub1JlY3Q6KENHUmVjdCl0YXJnZXRSZWN0IHdpdGhPcmln aW46KENHUG9pbnQpb3JpZ2luIGZpdEVudGlyZVJlY3Q6KEJPT0wpZml0RW50aXJlUmVjdCBtaW5p bXVtU2NhbGU6KGRvdWJsZSltaW5pbXVtU2NhbGUgbWF4aW11bVNjYWxlOihkb3VibGUpbWF4aW11 bVNjYWxlIG1pbmltdW1TY3JvbGxEaXN0YW5jZTooQ0dGbG9hdCltaW5pbXVtU2Nyb2xsRGlzdGFu Y2UKIHsKICAgICByZXR1cm4gW193ZWJWaWV3IF96b29tVG9SZWN0OnRhcmdldFJlY3Qgd2l0aE9y aWdpbjpvcmlnaW4gZml0RW50aXJlUmVjdDpmaXRFbnRpcmVSZWN0IG1pbmltdW1TY2FsZTptaW5p bXVtU2NhbGUgbWF4aW11bVNjYWxlOm1heGltdW1TY2FsZSBtaW5pbXVtU2Nyb2xsRGlzdGFuY2U6 bWluaW11bVNjcm9sbERpc3RhbmNlXTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCShyZXZpc2lvbiAx NjQ5ODkpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRl cmFjdGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtNDA2LDcgKzQwNiwxNSBAQCAtIChCT09MKV9y ZXF1aXJlc0tleWJvYXJkUmVzZXRPblJlbG9hZAogCiAtICh2b2lkKV9kaXNwbGF5Rm9ybU5vZGVJ bnB1dFZpZXcKIHsKLSAgICAvLyBGSVhNRTogVGhpcyBpcyB0aGUgcGxhY2Ugd2hlcmUgd2Ugc2hv dWxkIHpvb20gdG8gbm9kZQorICAgIGlmIChVSUN1cnJlbnRVc2VySW50ZXJmYWNlSWRpb21Jc1Bh ZCgpKQorICAgICAgICBbc2VsZiBfc2Nyb2xsVG9SZWN0Ol9hc3Npc3RlZE5vZGVJbmZvcm1hdGlv bi5lbGVtZW50UmVjdCB3aXRoT3JpZ2luOl9wYWdlLT5lZGl0b3JTdGF0ZSgpLmNhcmV0UmVjdEF0 U3RhcnQubG9jYXRpb24oKSBtaW5pbXVtU2Nyb2xsRGlzdGFuY2U6MF07CisgICAgZWxzZQorICAg ICAgICBbc2VsZiBfem9vbVRvUmVjdDpfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uZWxlbWVudFJl Y3QKKyAgICAgICAgICAgICAgIHdpdGhPcmlnaW46X3BhZ2UtPmVkaXRvclN0YXRlKCkuY2FyZXRS ZWN0QXRTdGFydC5sb2NhdGlvbigpCisgICAgICAgICAgICBmaXRFbnRpcmVSZWN0OllFUyBtaW5p bXVtU2NhbGU6X2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLm1pbmltdW1TY2FsZUZhY3RvcgorICAg ICAgICAgICAgIG1heGltdW1TY2FsZTpfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24ubWF4aW11bVNj YWxlRmFjdG9yCisgICAgbWluaW11bVNjcm9sbERpc3RhbmNlOjBdOworCiAgICAgW3NlbGYgX3Vw ZGF0ZUFjY2Vzc29yeV07CiB9CiAKQEAgLTE4NTAsNyArMTg1OCw4IEBAIC0gKHZvaWQpX3N0YXJ0 QXNzaXN0aW5nTm9kZTooY29uc3QgQXNzaXMKICAgICAgICAgICAgIGJyZWFrOwogICAgIH0KICAg ICBbc2VsZiByZWxvYWRJbnB1dFZpZXdzXTsKLSAgICBbc2VsZiBfdXBkYXRlQWNjZXNzb3J5XTsK KyAgICBbc2VsZiBfZGlzcGxheUZvcm1Ob2RlSW5wdXRWaWV3XTsKKwogICAgIC8vIF9pbnB1dFBl cmlwaGVyYWwgaGFzIGJlZW4gaW5pdGlhbGl6ZWQgaW4gaW5wdXRWaWV3IGNhbGxlZCBieSByZWxv YWRJbnB1dFZpZXdzLgogICAgIFtfaW5wdXRQZXJpcGhlcmFsIGJlZ2luRWRpdGluZ107CiB9Cklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQ YWdlSU9TLm1tCShyZXZpc2lvbiAxNjQ5ODkpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTE1NTUsNiArMTU1 NSw4IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBoYXNGb2N1c2FibGVOb2RlKE5vZGUKIHZvaWQgV2Vi UGFnZTo6Z2V0QXNzaXN0ZWROb2RlSW5mb3JtYXRpb24oQXNzaXN0ZWROb2RlSW5mb3JtYXRpb24m IGluZm9ybWF0aW9uKQogewogICAgIGluZm9ybWF0aW9uLmVsZW1lbnRSZWN0ID0gbV9wYWdlLT5m b2N1c0NvbnRyb2xsZXIoKS5mb2N1c2VkT3JNYWluRnJhbWUoKS52aWV3KCktPmNvbnRlbnRzVG9S b290VmlldyhtX2Fzc2lzdGVkTm9kZS0+cmVuZGVyZXIoKS0+YWJzb2x1dGVCb3VuZGluZ0JveFJl Y3QoKSk7CisgICAgaW5mb3JtYXRpb24ubWluaW11bVNjYWxlRmFjdG9yID0gbV92aWV3cG9ydENv bmZpZ3VyYXRpb24ubWluaW11bVNjYWxlKCk7CisgICAgaW5mb3JtYXRpb24ubWF4aW11bVNjYWxl RmFjdG9yID0gbV92aWV3cG9ydENvbmZpZ3VyYXRpb24ubWF4aW11bVNjYWxlKCk7CiAgICAgaW5m b3JtYXRpb24uaGFzTmV4dE5vZGUgPSBoYXNGb2N1c2FibGVOb2RlKG1fYXNzaXN0ZWROb2RlLmdl dCgpLCBtX3BhZ2UuZ2V0KCksIHRydWUpOwogICAgIGluZm9ybWF0aW9uLmhhc1ByZXZpb3VzTm9k ZSA9IGhhc0ZvY3VzYWJsZU5vZGUobV9hc3Npc3RlZE5vZGUuZ2V0KCksIG1fcGFnZS5nZXQoKSwg ZmFsc2UpOwogCg==