189114 2018-08-29 16:23:44 -0700 Long press on picture/link show menu obscured by keyboard 2018-09-10 15:59:25 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 james.savage webkit-unassigned commit-queue james.savage megan_gardner webkit-bug-importer wenson_hsieh oldest_to_newest 1454987 0 james.savage 2018-08-29 16:23:44 -0700 <rdar://problem/42446498> 1455013 1 348447 james.savage 2018-08-29 16:46:22 -0700 Created attachment 348447 Patch 1455075 2 348447 megan_gardner 2018-08-29 17:44:48 -0700 Comment on attachment 348447 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348447&action=review r=me, with comments. > Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm:373 > + CGRect visibleRect = CGRectNull; See associated next comment. I think this should be view.window.bounds (or equivalent) not CGRectNull. > Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm:402 > { Probably rename this to something better if we make the associated changes. > Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm:411 > + visibleRect = view.window.bounds; Could we move this logic to the calling function? I don't like having to do this compare here, if we just set the visible rect to the default before we even call into here, then we can make this cleaner. > Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm:414 > + remove whitespace > Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm:549 > + CGRect visibleRect = CGRectNull; Same as above. Should be view.window.bounds 1455098 3 348447 james.savage 2018-08-29 18:39:38 -0700 Comment on attachment 348447 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=348447&action=review Will come back with a v2. I think moving the free function to an instance method will address your concerns. >> Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm:373 >> + CGRect visibleRect = CGRectNull; > > See associated next comment. > I think this should be view.window.bounds (or equivalent) not CGRectNull. I’m trying to keep the fallback value in one place. If you don’t like using CGRectNull as a sentinel, how about moving presentationStyleForView() to an instance method on WKActionSheetAssistant. That way it could make the delegate call and have the fallback, rather than callers providing it? >> Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm:414 >> + > > remove whitespace This was already here (the diff got out of order), but I can remove it. >> Source/WebKit/UIProcess/ios/WKActionSheetAssistant.mm:549 >> + CGRect visibleRect = CGRectNull; > > Same as above. Should be view.window.bounds Ditto also :P 1455508 4 348579 james.savage 2018-08-30 19:05:25 -0700 Created attachment 348579 Patch 1455528 5 348579 megan_gardner 2018-08-30 20:22:40 -0700 Comment on attachment 348579 Patch I like this better 1458287 6 348579 commit-queue 2018-09-10 15:59:24 -0700 Comment on attachment 348579 Patch Clearing flags on attachment: 348579 Committed r235870: <https://trac.webkit.org/changeset/235870> 1458288 7 commit-queue 2018-09-10 15:59:25 -0700 All reviewed patches have been landed. Closing bug. 348447 2018-08-29 16:46:22 -0700 2018-08-30 19:05:24 -0700 Patch bug-189114-20180829164621.patch text/plain 8677 james.savage U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRjN2M2YzczMWMzYmYwNzVl NWIzNzg3NzY2OGJmODg5Yzk5YzNlNjIuLjdiY2I1NjdhZTNjZjdiMGVhMDQxMTlkODdjMzQxZWQ0 ODE4ZmM0OWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTgtMDgtMjkgIEphbWVzIFNh dmFnZSAgPGphbWVzLnNhdmFnZUBhcHBsZS5jb20+CisKKyAgICAgICAgTG9uZyBwcmVzcyBvbiBw aWN0dXJlL2xpbmsgc2hvdyBtZW51IG9ic2N1cmVkIGJ5IGtleWJvYXJkLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5MTE0LgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZhY3RvciB0aGUgdmlzaWJsZSBi b3VuZHMgb2YgdGhlIHdpbmRvdyBpbnRvIGRlY2lzaW9ucyBhYm91dCB0aGUgcHJlc2VudGF0aW9u CisgICAgICAgIHN0eWxlIGZvciBXS0FjdGlvblNoZWV0LiBUaGlzIGhhbmRsZXMgb2NjbHVzaW9u IGJ5IHRoZSBrZXlib2FyZCwgb3RoZXIgYmFycywKKyAgICAgICAgYW5kIG90aGVyIG92ZXJsYXBw aW5nIGNvbnRlbnQsIHJhdGhlciB0aGFuIGFzc3VtaW5nIHRoZSBwb3BvdmVyIHdpbGwgYmUgZnJl ZSB0bworICAgICAgICBwcmVzZW50IGZyb20gYW55d2hlcmUuCisKKyAgICAgICAgVGVjaG5pY2Fs bHksIHdlIG9ubHkgbmVlZCB0byBhY2NvdW50IGZvciBvdmVybGFwcGluZyBnZW9tZXRyeSB0aGF0 IGFsc28gYWZmZWN0cworICAgICAgICBwb3BvdmVycywgYnV0IHRoZXJlIGlzbid0IGFuIGVhc3kg d2F5IHRvIGdldCB0aGF0IGluZm9ybWF0aW9uLiBUaGlzIHdpbGwgcmVzdWx0CisgICAgICAgIGlu IHByZXNlbnRhdGlvbnMgZmF2b3JpbmcgImZyb20gdG91Y2giIHNvbWV3aGF0IG1vcmUgb2Z0ZW4g dGhhbiBwcmV2aW91c2x5LgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0 QXNzaXN0YW50Lmg6IERlY2xhcmUgYSBuZXcgZGVsZWdhdGUgbWV0aG9kIHRvIGFzaworICAgICAg ICBhYm91dCBvY2NsdXNpb24gZ2VvbWV0cnkuCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0Fj dGlvblNoZWV0QXNzaXN0YW50Lm1tOgorICAgICAgICAoLVtXS0FjdGlvblNoZWV0QXNzaXN0YW50 IHNob3dJbWFnZVNoZWV0XSk6IFVzZSBuZXcgZGVsZWdhdGUgbWV0aG9kLgorICAgICAgICAoLVtX S0FjdGlvblNoZWV0QXNzaXN0YW50IHNob3dMaW5rU2hlZXRdKTogRGl0dG8uCisgICAgICAgIChw cmVzZW50YXRpb25TdHlsZUZvclZpZXcpOiBSZXBsYWNlIHdpbmRvdyBib3VuZHMgd2l0aCB0aGUg bmV3IHVub2NjbHVkZWQgcmVjdAorICAgICAgICBwcm92aWRlZCBieSBkZWxlZ2F0ZS4gSWYgbm9u ZSB3YXMgcHJvdmlkZWQsIGZhbGwtYmFjayB0byB3aW5kb3cgYm91bmRzLgorICAgICAgICAqIFVJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0Nv bnRlbnRWaWV3IHVub2NjbHVkZWRXaW5kb3dCb3VuZHNGb3JBY3Rpb25TaGVldEFzc2lzdGFudDpd KToKKyAgICAgICAgQ2FsY3VsYXRlIHRoZSB1bm9jY2x1ZGVkIHJlY3QgdXNpbmcgLVtVSVNjcm9s bFZpZXcgYWRqdXN0ZWRDb250ZW50SW5zZXRdLCB3aGljaAorICAgICAgICBmYWN0b3JzIGluIGNs aWVudCBzcGVjaWZpZWQgaW5zZXRzIGFuZCBzeXN0ZW0gaW5zZXRzIChzdWNoIGFzIHRoZSBrZXli b2FyZCkuCisKIDIwMTgtMDgtMjggIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5j b20+CiAKICAgICAgICAgV29yayB0b3dhcmRzOiBbaU9TXSBDb25zb2xpZGF0ZSB0aGUgaW1wbGVt ZW50YXRpb25zIG9mIHJlYWRTdHJpbmcsIHN0cmluZ0ZvclR5cGUsIGFuZCByZWFkVVJMIGluIFBs YXRmb3JtUGFzdGVib2FyZElPUy5tbQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQuaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50LmgKaW5kZXggMjU2NzdlOGIxYzZhODIwNDhmMWMz N2JiNjBjZTU5OWNlMTZjZmM3MS4uNzg5MTVmNmE2MTllOTk3YThhMGU3ZWEwZjY5NzgxOTFkMTFh MWM5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hl ZXRBc3Npc3RhbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25T aGVldEFzc2lzdGFudC5oCkBAIC01NCw2ICs1NCw3IEBAIHN0cnVjdCBJbnRlcmFjdGlvbkluZm9y bWF0aW9uQXRQb3NpdGlvbjsKIEBvcHRpb25hbAogLSAoQk9PTClhY3Rpb25TaGVldEFzc2lzdGFu dDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFudCBzaG93Q3VzdG9tU2hlZXRGb3JF bGVtZW50OihfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyAqKWVsZW1lbnQ7CiAtICh2b2lkKXVwZGF0 ZVBvc2l0aW9uSW5mb3JtYXRpb25Gb3JBY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVl dEFzc2lzdGFudCAqKWFzc2lzdGFudDsKKy0gKENHUmVjdCl1bm9jY2x1ZGVkV2luZG93Qm91bmRz Rm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgKilhc3Npc3Rh bnQ7CiAtICh2b2lkKWFjdGlvblNoZWV0QXNzaXN0YW50OihXS0FjdGlvblNoZWV0QXNzaXN0YW50 ICopYXNzaXN0YW50IHdpbGxTdGFydEludGVyYWN0aW9uV2l0aEVsZW1lbnQ6KF9XS0FjdGl2YXRl ZEVsZW1lbnRJbmZvICopZWxlbWVudDsKIC0gKHZvaWQpYWN0aW9uU2hlZXRBc3Npc3RhbnREaWRT dG9wSW50ZXJhY3Rpb246KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgKilhc3Npc3RhbnQ7CiAtIChO U0RpY3Rpb25hcnkgKilkYXRhRGV0ZWN0aW9uQ29udGV4dEZvckFjdGlvblNoZWV0QXNzaXN0YW50 OihXS0FjdGlvblNoZWV0QXNzaXN0YW50ICopYXNzaXN0YW50OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0gYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQppbmRleCA2Zjc0 OGI0YzE0MDE3ODE1MzhmMjQzYTg3MjZkODEwODQ4ZTBmMGZkLi5jNmE0ZDU0MDFiODc1NjI1ZDRl NmU3OTA1OGE0NDFhM2ZkODQzYTYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbQpAQCAtMzcwLDkgKzM3MCwxMyBAQCAt ICh2b2lkKXNob3dJbWFnZVNoZWV0CiAgICAgICAgIGlmICghX2ludGVyYWN0aW9uU2hlZXQpCiAg ICAgICAgICAgICByZXR1cm47CiAKKyAgICAgICAgQ0dSZWN0IHZpc2libGVSZWN0ID0gQ0dSZWN0 TnVsbDsKKyAgICAgICAgaWYgKFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9y KHVub2NjbHVkZWRXaW5kb3dCb3VuZHNGb3JBY3Rpb25TaGVldEFzc2lzdGFudDopXSkKKyAgICAg ICAgICAgIHZpc2libGVSZWN0ID0gW2RlbGVnYXRlIHVub2NjbHVkZWRXaW5kb3dCb3VuZHNGb3JB Y3Rpb25TaGVldEFzc2lzdGFudDpzZWxmXTsKKwogICAgICAgICBfZWxlbWVudEluZm8gPSBXVEZN b3ZlKGVsZW1lbnRJbmZvKTsKIAotICAgICAgICBpZiAoIVtfaW50ZXJhY3Rpb25TaGVldCBwcmVz ZW50U2hlZXQ6cHJlc2VudGF0aW9uU3R5bGVGb3JWaWV3KF92aWV3LmdldEF1dG9yZWxlYXNlZCgp LCBfcG9zaXRpb25JbmZvcm1hdGlvbi52YWx1ZSgpLCBfZWxlbWVudEluZm8uZ2V0KCkpXSkKKyAg ICAgICAgaWYgKCFbX2ludGVyYWN0aW9uU2hlZXQgcHJlc2VudFNoZWV0OnByZXNlbnRhdGlvblN0 eWxlRm9yVmlldyhfdmlldy5nZXRBdXRvcmVsZWFzZWQoKSwgdmlzaWJsZVJlY3QsIF9wb3NpdGlv bkluZm9ybWF0aW9uLnZhbHVlKCksIF9lbGVtZW50SW5mby5nZXQoKSldKQogICAgICAgICAgICAg W3NlbGYgY2xlYW51cFNoZWV0XTsKICAgICB9OwogCkBAIC0zOTQsMjQgKzM5OCwyOSBAQCAtICh2 b2lkKXNob3dJbWFnZVNoZWV0CiAgICAgc2hvd0ltYWdlU2hlZXRXaXRoQWx0ZXJuYXRlVVJMQmxv Y2sobmlsLCBuaWwpOwogfQogCi1zdGF0aWMgV0tBY3Rpb25TaGVldFByZXNlbnRhdGlvblN0eWxl IHByZXNlbnRhdGlvblN0eWxlRm9yVmlldyhVSVZpZXcgKnZpZXcsIGNvbnN0IFdlYktpdDo6SW50 ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24mIHBvc2l0aW9uSW5mbywgX1dLQWN0aXZhdGVk RWxlbWVudEluZm8gKmVsZW1lbnRJbmZvKQorc3RhdGljIFdLQWN0aW9uU2hlZXRQcmVzZW50YXRp b25TdHlsZSBwcmVzZW50YXRpb25TdHlsZUZvclZpZXcoVUlWaWV3ICp2aWV3LCBDR1JlY3QgdW5v Y2NsdWRlZFdpbmRvd0JvdW5kcywgY29uc3QgV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9u QXRQb3NpdGlvbiYgcG9zaXRpb25JbmZvLCBfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyAqZWxlbWVu dEluZm8pCiB7CiAgICAgYXV0byBhcHBhcmVudEVsZW1lbnRSZWN0ID0gW3ZpZXcgY29udmVydFJl Y3Q6cG9zaXRpb25JbmZvLmJvdW5kcyB0b1ZpZXc6dmlldy53aW5kb3ddOwogICAgIGlmIChDR1Jl Y3RJc0VtcHR5KGFwcGFyZW50RWxlbWVudFJlY3QpKQogICAgICAgICByZXR1cm4gV0tBY3Rpb25T aGVldFByZXNlbnRBdFRvdWNoTG9jYXRpb247CiAKLSAgICBhdXRvIHdpbmRvd1JlY3QgPSB2aWV3 LndpbmRvdy5ib3VuZHM7Ci0gICAgYXBwYXJlbnRFbGVtZW50UmVjdCA9IENHUmVjdEludGVyc2Vj dGlvbihhcHBhcmVudEVsZW1lbnRSZWN0LCB3aW5kb3dSZWN0KTsKKyAgICBDR1JlY3QgdmlzaWJs ZVJlY3Q7CisgICAgaWYgKCFDR1JlY3RFcXVhbFRvUmVjdChDR1JlY3ROdWxsLCB1bm9jY2x1ZGVk V2luZG93Qm91bmRzKSkKKyAgICAgICAgdmlzaWJsZVJlY3QgPSB1bm9jY2x1ZGVkV2luZG93Qm91 bmRzOworICAgIGVsc2UKKyAgICAgICAgdmlzaWJsZVJlY3QgPSB2aWV3LndpbmRvdy5ib3VuZHM7 CiAKLSAgICBhdXRvIGxlZnRJbnNldCA9IENHUmVjdEdldE1pblgoYXBwYXJlbnRFbGVtZW50UmVj dCkgLSBDR1JlY3RHZXRNaW5YKHdpbmRvd1JlY3QpOwotICAgIGF1dG8gdG9wSW5zZXQgPSBDR1Jl Y3RHZXRNaW5ZKGFwcGFyZW50RWxlbWVudFJlY3QpIC0gQ0dSZWN0R2V0TWluWSh3aW5kb3dSZWN0 KTsKLSAgICBhdXRvIHJpZ2h0SW5zZXQgPSBDR1JlY3RHZXRNYXhYKHdpbmRvd1JlY3QpIC0gQ0dS ZWN0R2V0TWF4WChhcHBhcmVudEVsZW1lbnRSZWN0KTsKLSAgICBhdXRvIGJvdHRvbUluc2V0ID0g Q0dSZWN0R2V0TWF4WSh3aW5kb3dSZWN0KSAtIENHUmVjdEdldE1heFkoYXBwYXJlbnRFbGVtZW50 UmVjdCk7CisgICAgYXBwYXJlbnRFbGVtZW50UmVjdCA9IENHUmVjdEludGVyc2VjdGlvbihhcHBh cmVudEVsZW1lbnRSZWN0LCB2aXNpYmxlUmVjdCk7CisKKyAgICBhdXRvIGxlZnRJbnNldCA9IENH UmVjdEdldE1pblgoYXBwYXJlbnRFbGVtZW50UmVjdCkgLSBDR1JlY3RHZXRNaW5YKHZpc2libGVS ZWN0KTsKKyAgICBhdXRvIHRvcEluc2V0ID0gQ0dSZWN0R2V0TWluWShhcHBhcmVudEVsZW1lbnRS ZWN0KSAtIENHUmVjdEdldE1pblkodmlzaWJsZVJlY3QpOworICAgIGF1dG8gcmlnaHRJbnNldCA9 IENHUmVjdEdldE1heFgodmlzaWJsZVJlY3QpIC0gQ0dSZWN0R2V0TWF4WChhcHBhcmVudEVsZW1l bnRSZWN0KTsKKyAgICBhdXRvIGJvdHRvbUluc2V0ID0gQ0dSZWN0R2V0TWF4WSh2aXNpYmxlUmVj dCkgLSBDR1JlY3RHZXRNYXhZKGFwcGFyZW50RWxlbWVudFJlY3QpOwogCiAgICAgLy8gSWYgYXQg bGVhc3QgdGhpcyBtdWNoIG9mIHRoZSB3aW5kb3cgaXMgYXZhaWxhYmxlIGZvciB0aGUgcG9wb3Zl ciB0byBkcmF3IGluLCB0aGVuIHRhcmdldCB0aGUgZWxlbWVudCByZWN0IHdoZW4gcHJlc2VudGlu ZyB0aGUgYWN0aW9uIG1lbnUgcG9wb3Zlci4KICAgICAvLyBPdGhlcndpc2UsIHRoZXJlIGlzIG5v dCBlbm91Z2ggc3BhY2UgdG8gcG9zaXRpb24gdGhlIHBvcG92ZXIgYXJvdW5kIHRoZSBlbGVtZW50 LCBzbyByZXZlcnQgdG8gdXNpbmcgdGhlIHRvdWNoIGxvY2F0aW9uIGluc3RlYWQuCiAgICAgc3Rh dGljIGNvbnN0IENHRmxvYXQgbWluaW11bUF2YWlsYWJsZVdpZHRoT3JIZWlnaHRSYXRpbyA9IDAu NDsKLSAgICBpZiAoc3RkOjptYXgobGVmdEluc2V0LCByaWdodEluc2V0KSA8PSBtaW5pbXVtQXZh aWxhYmxlV2lkdGhPckhlaWdodFJhdGlvICogQ0dSZWN0R2V0V2lkdGgod2luZG93UmVjdCkgJiYg c3RkOjptYXgodG9wSW5zZXQsIGJvdHRvbUluc2V0KSA8PSBtaW5pbXVtQXZhaWxhYmxlV2lkdGhP ckhlaWdodFJhdGlvICogQ0dSZWN0R2V0SGVpZ2h0KHdpbmRvd1JlY3QpKQorICAgIGlmIChzdGQ6 Om1heChsZWZ0SW5zZXQsIHJpZ2h0SW5zZXQpIDw9IG1pbmltdW1BdmFpbGFibGVXaWR0aE9ySGVp Z2h0UmF0aW8gKiBDR1JlY3RHZXRXaWR0aCh2aXNpYmxlUmVjdCkgJiYgc3RkOjptYXgodG9wSW5z ZXQsIGJvdHRvbUluc2V0KSA8PSBtaW5pbXVtQXZhaWxhYmxlV2lkdGhPckhlaWdodFJhdGlvICog Q0dSZWN0R2V0SGVpZ2h0KHZpc2libGVSZWN0KSkKICAgICAgICAgcmV0dXJuIFdLQWN0aW9uU2hl ZXRQcmVzZW50QXRUb3VjaExvY2F0aW9uOwogCiAgICAgaWYgKGVsZW1lbnRJbmZvLnR5cGUgPT0g X1dLQWN0aXZhdGVkRWxlbWVudFR5cGVMaW5rICYmIHBvc2l0aW9uSW5mby5saW5rSW5kaWNhdG9y LnRleHRSZWN0c0luQm91bmRpbmdSZWN0Q29vcmRpbmF0ZXMuc2l6ZSgpKQpAQCAtNTM3LDkgKzU0 NiwxMyBAQCAtICh2b2lkKXNob3dMaW5rU2hlZXQKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAor ICAgIENHUmVjdCB2aXNpYmxlUmVjdCA9IENHUmVjdE51bGw7CisgICAgaWYgKFtkZWxlZ2F0ZSBy ZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHVub2NjbHVkZWRXaW5kb3dCb3VuZHNGb3JBY3Rp b25TaGVldEFzc2lzdGFudDopXSkKKyAgICAgICAgdmlzaWJsZVJlY3QgPSBbZGVsZWdhdGUgdW5v Y2NsdWRlZFdpbmRvd0JvdW5kc0ZvckFjdGlvblNoZWV0QXNzaXN0YW50OnNlbGZdOworCiAgICAg X2VsZW1lbnRJbmZvID0gV1RGTW92ZShlbGVtZW50SW5mbyk7CiAKLSAgICBpZiAoIVtfaW50ZXJh Y3Rpb25TaGVldCBwcmVzZW50U2hlZXQ6cHJlc2VudGF0aW9uU3R5bGVGb3JWaWV3KF92aWV3Lmdl dEF1dG9yZWxlYXNlZCgpLCBfcG9zaXRpb25JbmZvcm1hdGlvbi52YWx1ZSgpLCBfZWxlbWVudElu Zm8uZ2V0KCkpXSkKKyAgICBpZiAoIVtfaW50ZXJhY3Rpb25TaGVldCBwcmVzZW50U2hlZXQ6cHJl c2VudGF0aW9uU3R5bGVGb3JWaWV3KF92aWV3LmdldEF1dG9yZWxlYXNlZCgpLCB2aXNpYmxlUmVj dCwgX3Bvc2l0aW9uSW5mb3JtYXRpb24udmFsdWUoKSwgX2VsZW1lbnRJbmZvLmdldCgpKV0pCiAg ICAgICAgIFtzZWxmIGNsZWFudXBTaGVldF07CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDIxNmU1 OWMyMmZjMGZiOTJjNDE0MWJhOWNiN2QyMjJjYjI0N2NjYzAuLjg4OWU5YTU3YzAwNGQyMTNjNTI3 NDZlOGQ3MDQyZTcyNDgzNDcwZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtNDgxNyw2ICs0ODE3LDE1 IEBAIC0gKEJPT0wpYWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQg Kilhc3Npc3RhbnQgc2hvd0N1c3RvbVNoZWV0CiAgICAgcmV0dXJuIE5POwogfQogCisjaWYgX19J UEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwCistIChDR1JlY3QpdW5vY2Ns dWRlZFdpbmRvd0JvdW5kc0ZvckFjdGlvblNoZWV0QXNzaXN0YW50OihXS0FjdGlvblNoZWV0QXNz aXN0YW50ICopYXNzaXN0YW50Cit7CisgICAgVUlFZGdlSW5zZXRzIGNvbnRlbnRJbnNldCA9IFtb X3dlYlZpZXcgc2Nyb2xsVmlld10gYWRqdXN0ZWRDb250ZW50SW5zZXRdOworICAgIENHUmVjdCBy ZWN0ID0gVUlFZGdlSW5zZXRzSW5zZXRSZWN0KFtfd2ViVmlldyBib3VuZHNdLCBjb250ZW50SW5z ZXQpOworICAgIHJldHVybiBbX3dlYlZpZXcgY29udmVydFJlY3Q6cmVjdCB0b1ZpZXc6W3NlbGYg d2luZG93XV07Cit9CisjZW5kaWYKKwogLSAoUmV0YWluUHRyPE5TQXJyYXk+KWFjdGlvblNoZWV0 QXNzaXN0YW50OihXS0FjdGlvblNoZWV0QXNzaXN0YW50ICopYXNzaXN0YW50IGRlY2lkZUFjdGlv bnNGb3JFbGVtZW50OihfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyAqKWVsZW1lbnQgZGVmYXVsdEFj dGlvbnM6KFJldGFpblB0cjxOU0FycmF5PilkZWZhdWx0QWN0aW9ucwogewogICAgIHJldHVybiBf cGFnZS0+dWlDbGllbnQoKS5hY3Rpb25zRm9yRWxlbWVudChlbGVtZW50LCBXVEZNb3ZlKGRlZmF1 bHRBY3Rpb25zKSk7Cg== 348579 2018-08-30 19:05:25 -0700 2018-09-10 15:59:24 -0700 Patch bug-189114-20180830190524.patch text/plain 8562 james.savage U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NDUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRjN2M2YzczMWMzYmYwNzVl NWIzNzg3NzY2OGJmODg5Yzk5YzNlNjIuLjgyYjBkODMzNzZlNDIzZjFiMTU0MmE3OGMzOGFjMDBi NDczMTQ3YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTgtMDgtMzAgIEphbWVzIFNh dmFnZSAgPGphbWVzLnNhdmFnZUBhcHBsZS5jb20+CisKKyAgICAgICAgTG9uZyBwcmVzcyBvbiBw aWN0dXJlL2xpbmsgc2hvdyBtZW51IG9ic2N1cmVkIGJ5IGtleWJvYXJkLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5MTE0LgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSB0aGUgdmlzaWJsZSBib3Vu ZHMgb2YgdGhlIHdpbmRvdywgbm90IHRoZSBmdWxsIGJvdW5kcywgd2hlbiBkZWNpZGluZyBpZgor ICAgICAgICBhbiBlbGVtZW50J3MgcmVjdCB0YWtlcyB1cCB0b28gbXVjaCBzY3JlZW4gc3BhY2Ug dG8gcHJlc2VudCBmcm9tLiBUaGlzIGZhY3RvcnMKKyAgICAgICAgaW4gb2NjbHVzaW9uIG9mIHRo ZSB3aW5kb3cgYnkgdGhlIGtleWJvYXJkLCBiYXJzLCBhbmQgb3RoZXIgb3ZlcmxhcHBpbmcgY29u dGVudC4KKworICAgICAgICBJZiBwb3NzaWJsZSwgaXQgd291bGQgYmUgbmljZSB0byBvbmx5IGFj Y291bnQgZm9yIG92ZXJsYXBwaW5nIGdlb21ldHJ5IHdoaWNoIGEKKyAgICAgICAgcG9wb3ZlciB3 b3VsZCBhdm9pZCwgYnV0IHRoYXQgaW5mb3JtYXRpb24gaXMgbm90IGF2YWlsYWJsZS4gVGhpcyBh cHByb2FjaCB3aWxsCisgICAgICAgIHByb2R1Y2Ugc29tZSBmYWxzZSBwb3NpdGl2ZXMgaW4gZmF2 b3Igb2YgdGhlICJmcm9tIHRvdWNoIiBzdHlsZSwgYnV0IHRob3NlIGFyZQorICAgICAgICBzdGls bCBiZXR0ZXIgdGhhbiBnZXR0aW5nIGFuIHVudXNhYmx5IHNtYWxsIGFjdGlvbiBzaGVldC4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5oOgorICAgICAg ICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbToKKyAgICAgICAgKC1b V0tBY3Rpb25TaGVldEFzc2lzdGFudCBzaG93SW1hZ2VTaGVldF0pOiBVc2UgbmV3IGhlbHBlciBt ZXRob2QgZm9yIHN0eWxlLgorICAgICAgICAoLVtXS0FjdGlvblNoZWV0QXNzaXN0YW50IHNob3dM aW5rU2hlZXRdKTogRGl0dG8uCisgICAgICAgICgtW1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQgX3By ZXNlbnRhdGlvblN0eWxlRm9yUG9zaXRpb25JbmZvOmVsZW1lbnRJbmZvOl0pOgorICAgICAgICBR dWVyeSBuZXcgZGVsZWdhdGUgbWV0aG9kIHRvIGZpZ3VyZSBvdXQgdGhlIHVub2JzY3VyZWQgcmVj dCBvZiB0aGUgd2luZG93LiBUaGlzCisgICAgICAgIGluZm9ybWF0aW9uIG9ubHkgZXhpc3RzIG9u IFdLU2Nyb2xsVmlldywgc28gd2UgaGF2ZSB0byBhc2sgZm9yIGl0LiBJZiB0aGlzIG1ldGhvZAor ICAgICAgICBpcyBub3QgaW1wbGVtZW50ZWQsIGZhbGwgYmFjayB0byB0aGUgY3VycmVudCBhcHBy b2FjaCBvZiBhc3N1bWluZyB0aGUgZnVsbCB3aW5kb3cKKyAgICAgICAgYm91bmRzIGFyZSBhdmFp bGFibGUuCisgICAgICAgIChwcmVzZW50YXRpb25TdHlsZUZvclZpZXcpOiBEZWxldGVkLiBSZXBs YWNlZCBieSBpbnN0YW5jZSBtZXRob2QuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyB1bm9jY2x1 ZGVkV2luZG93Qm91bmRzRm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6XSk6CisgICAgICAgIENhbGN1 bGF0ZSB0aGUgdW5vY2NsdWRlZCByZWN0IHVzaW5nIC1bVUlTY3JvbGxWaWV3IGFkanVzdGVkQ29u dGVudEluc2V0XSwgd2hpY2gKKyAgICAgICAgZmFjdG9ycyBpbiBjbGllbnQgc3BlY2lmaWVkIGlu c2V0cyBhbmQgc3lzdGVtIGluc2V0cyAoc3VjaCBhcyB0aGUga2V5Ym9hcmQpLgorCiAyMDE4LTA4 LTI4ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFdv cmsgdG93YXJkczogW2lPU10gQ29uc29saWRhdGUgdGhlIGltcGxlbWVudGF0aW9ucyBvZiByZWFk U3RyaW5nLCBzdHJpbmdGb3JUeXBlLCBhbmQgcmVhZFVSTCBpbiBQbGF0Zm9ybVBhc3RlYm9hcmRJ T1MubW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNo ZWV0QXNzaXN0YW50LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVl dEFzc2lzdGFudC5oCmluZGV4IDI1Njc3ZThiMWM2YTgyMDQ4ZjFjMzdiYjYwY2U1OTljZTE2Y2Zj NzEuLjc4OTE1ZjZhNjE5ZTk5N2E4YTBlN2VhMGY2OTc4MTkxZDExYTFjOTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50LmgKKysr IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQuaApA QCAtNTQsNiArNTQsNyBAQCBzdHJ1Y3QgSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb247 CiBAb3B0aW9uYWwKIC0gKEJPT0wpYWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRB c3Npc3RhbnQgKilhc3Npc3RhbnQgc2hvd0N1c3RvbVNoZWV0Rm9yRWxlbWVudDooX1dLQWN0aXZh dGVkRWxlbWVudEluZm8gKillbGVtZW50OwogLSAodm9pZCl1cGRhdGVQb3NpdGlvbkluZm9ybWF0 aW9uRm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgKilhc3Np c3RhbnQ7CistIChDR1JlY3QpdW5vY2NsdWRlZFdpbmRvd0JvdW5kc0ZvckFjdGlvblNoZWV0QXNz aXN0YW50OihXS0FjdGlvblNoZWV0QXNzaXN0YW50ICopYXNzaXN0YW50OwogLSAodm9pZClhY3Rp b25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAqKWFzc2lzdGFudCB3aWxs U3RhcnRJbnRlcmFjdGlvbldpdGhFbGVtZW50OihfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyAqKWVs ZW1lbnQ7CiAtICh2b2lkKWFjdGlvblNoZWV0QXNzaXN0YW50RGlkU3RvcEludGVyYWN0aW9uOihX S0FjdGlvblNoZWV0QXNzaXN0YW50ICopYXNzaXN0YW50OwogLSAoTlNEaWN0aW9uYXJ5ICopZGF0 YURldGVjdGlvbkNvbnRleHRGb3JBY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFz c2lzdGFudCAqKWFzc2lzdGFudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KaW5kZXggNmY3NDhiNGMxNDAxNzgxNTM4ZjI0 M2E4NzI2ZDgxMDg0OGUwZjBmZC4uMjAxOGVhZTcwOTRkMTJmYTE5YTEwMGRhOTQzOTk5YjdhMTNh MTE3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hl ZXRBc3Npc3RhbnQubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQWN0aW9u U2hlZXRBc3Npc3RhbnQubW0KQEAgLTM3Miw3ICszNzIsNyBAQCAtICh2b2lkKXNob3dJbWFnZVNo ZWV0CiAKICAgICAgICAgX2VsZW1lbnRJbmZvID0gV1RGTW92ZShlbGVtZW50SW5mbyk7CiAKLSAg ICAgICAgaWYgKCFbX2ludGVyYWN0aW9uU2hlZXQgcHJlc2VudFNoZWV0OnByZXNlbnRhdGlvblN0 eWxlRm9yVmlldyhfdmlldy5nZXRBdXRvcmVsZWFzZWQoKSwgX3Bvc2l0aW9uSW5mb3JtYXRpb24u dmFsdWUoKSwgX2VsZW1lbnRJbmZvLmdldCgpKV0pCisgICAgICAgIGlmICghW19pbnRlcmFjdGlv blNoZWV0IHByZXNlbnRTaGVldDpbc2VsZiBfcHJlc2VudGF0aW9uU3R5bGVGb3JQb3NpdGlvbklu Zm86X3Bvc2l0aW9uSW5mb3JtYXRpb24udmFsdWUoKSBlbGVtZW50SW5mbzpfZWxlbWVudEluZm8u Z2V0KCldXSkKICAgICAgICAgICAgIFtzZWxmIGNsZWFudXBTaGVldF07CiAgICAgfTsKIApAQCAt Mzk0LDI0ICszOTQsMjkgQEAgLSAodm9pZClzaG93SW1hZ2VTaGVldAogICAgIHNob3dJbWFnZVNo ZWV0V2l0aEFsdGVybmF0ZVVSTEJsb2NrKG5pbCwgbmlsKTsKIH0KIAotc3RhdGljIFdLQWN0aW9u U2hlZXRQcmVzZW50YXRpb25TdHlsZSBwcmVzZW50YXRpb25TdHlsZUZvclZpZXcoVUlWaWV3ICp2 aWV3LCBjb25zdCBXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uJiBwb3Np dGlvbkluZm8sIF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvICplbGVtZW50SW5mbykKKy0gKFdLQWN0 aW9uU2hlZXRQcmVzZW50YXRpb25TdHlsZSlfcHJlc2VudGF0aW9uU3R5bGVGb3JQb3NpdGlvbklu Zm86KGNvbnN0IFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24mKXBvc2l0 aW9uSW5mbyBlbGVtZW50SW5mbzooX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gKillbGVtZW50SW5m bwogewotICAgIGF1dG8gYXBwYXJlbnRFbGVtZW50UmVjdCA9IFt2aWV3IGNvbnZlcnRSZWN0OnBv c2l0aW9uSW5mby5ib3VuZHMgdG9WaWV3OnZpZXcud2luZG93XTsKKyAgICBhdXRvIGFwcGFyZW50 RWxlbWVudFJlY3QgPSBbX3ZpZXcgY29udmVydFJlY3Q6cG9zaXRpb25JbmZvLmJvdW5kcyB0b1Zp ZXc6W192aWV3IHdpbmRvd11dOwogICAgIGlmIChDR1JlY3RJc0VtcHR5KGFwcGFyZW50RWxlbWVu dFJlY3QpKQogICAgICAgICByZXR1cm4gV0tBY3Rpb25TaGVldFByZXNlbnRBdFRvdWNoTG9jYXRp b247CiAKLSAgICBhdXRvIHdpbmRvd1JlY3QgPSB2aWV3LndpbmRvdy5ib3VuZHM7Ci0gICAgYXBw YXJlbnRFbGVtZW50UmVjdCA9IENHUmVjdEludGVyc2VjdGlvbihhcHBhcmVudEVsZW1lbnRSZWN0 LCB3aW5kb3dSZWN0KTsKKyAgICBDR1JlY3QgdmlzaWJsZVJlY3Q7CisgICAgYXV0byBkZWxlZ2F0 ZSA9IF9kZWxlZ2F0ZS5nZXQoKTsKKyAgICBpZiAoW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3Rv cjpAc2VsZWN0b3IodW5vY2NsdWRlZFdpbmRvd0JvdW5kc0ZvckFjdGlvblNoZWV0QXNzaXN0YW50 OildKQorICAgICAgICB2aXNpYmxlUmVjdCA9IFtkZWxlZ2F0ZSB1bm9jY2x1ZGVkV2luZG93Qm91 bmRzRm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6c2VsZl07CisgICAgZWxzZQorICAgICAgICB2aXNp YmxlUmVjdCA9IFtbX3ZpZXcgd2luZG93XSBib3VuZHNdOwogCi0gICAgYXV0byBsZWZ0SW5zZXQg PSBDR1JlY3RHZXRNaW5YKGFwcGFyZW50RWxlbWVudFJlY3QpIC0gQ0dSZWN0R2V0TWluWCh3aW5k b3dSZWN0KTsKLSAgICBhdXRvIHRvcEluc2V0ID0gQ0dSZWN0R2V0TWluWShhcHBhcmVudEVsZW1l bnRSZWN0KSAtIENHUmVjdEdldE1pblkod2luZG93UmVjdCk7Ci0gICAgYXV0byByaWdodEluc2V0 ID0gQ0dSZWN0R2V0TWF4WCh3aW5kb3dSZWN0KSAtIENHUmVjdEdldE1heFgoYXBwYXJlbnRFbGVt ZW50UmVjdCk7Ci0gICAgYXV0byBib3R0b21JbnNldCA9IENHUmVjdEdldE1heFkod2luZG93UmVj dCkgLSBDR1JlY3RHZXRNYXhZKGFwcGFyZW50RWxlbWVudFJlY3QpOworICAgIGFwcGFyZW50RWxl bWVudFJlY3QgPSBDR1JlY3RJbnRlcnNlY3Rpb24oYXBwYXJlbnRFbGVtZW50UmVjdCwgdmlzaWJs ZVJlY3QpOworICAgIGF1dG8gbGVmdEluc2V0ID0gQ0dSZWN0R2V0TWluWChhcHBhcmVudEVsZW1l bnRSZWN0KSAtIENHUmVjdEdldE1pblgodmlzaWJsZVJlY3QpOworICAgIGF1dG8gdG9wSW5zZXQg PSBDR1JlY3RHZXRNaW5ZKGFwcGFyZW50RWxlbWVudFJlY3QpIC0gQ0dSZWN0R2V0TWluWSh2aXNp YmxlUmVjdCk7CisgICAgYXV0byByaWdodEluc2V0ID0gQ0dSZWN0R2V0TWF4WCh2aXNpYmxlUmVj dCkgLSBDR1JlY3RHZXRNYXhYKGFwcGFyZW50RWxlbWVudFJlY3QpOworICAgIGF1dG8gYm90dG9t SW5zZXQgPSBDR1JlY3RHZXRNYXhZKHZpc2libGVSZWN0KSAtIENHUmVjdEdldE1heFkoYXBwYXJl bnRFbGVtZW50UmVjdCk7CiAKICAgICAvLyBJZiBhdCBsZWFzdCB0aGlzIG11Y2ggb2YgdGhlIHdp bmRvdyBpcyBhdmFpbGFibGUgZm9yIHRoZSBwb3BvdmVyIHRvIGRyYXcgaW4sIHRoZW4gdGFyZ2V0 IHRoZSBlbGVtZW50IHJlY3Qgd2hlbiBwcmVzZW50aW5nIHRoZSBhY3Rpb24gbWVudSBwb3BvdmVy LgogICAgIC8vIE90aGVyd2lzZSwgdGhlcmUgaXMgbm90IGVub3VnaCBzcGFjZSB0byBwb3NpdGlv biB0aGUgcG9wb3ZlciBhcm91bmQgdGhlIGVsZW1lbnQsIHNvIHJldmVydCB0byB1c2luZyB0aGUg dG91Y2ggbG9jYXRpb24gaW5zdGVhZC4KICAgICBzdGF0aWMgY29uc3QgQ0dGbG9hdCBtaW5pbXVt QXZhaWxhYmxlV2lkdGhPckhlaWdodFJhdGlvID0gMC40OwotICAgIGlmIChzdGQ6Om1heChsZWZ0 SW5zZXQsIHJpZ2h0SW5zZXQpIDw9IG1pbmltdW1BdmFpbGFibGVXaWR0aE9ySGVpZ2h0UmF0aW8g KiBDR1JlY3RHZXRXaWR0aCh3aW5kb3dSZWN0KSAmJiBzdGQ6Om1heCh0b3BJbnNldCwgYm90dG9t SW5zZXQpIDw9IG1pbmltdW1BdmFpbGFibGVXaWR0aE9ySGVpZ2h0UmF0aW8gKiBDR1JlY3RHZXRI ZWlnaHQod2luZG93UmVjdCkpCisgICAgaWYgKHN0ZDo6bWF4KGxlZnRJbnNldCwgcmlnaHRJbnNl dCkgPD0gbWluaW11bUF2YWlsYWJsZVdpZHRoT3JIZWlnaHRSYXRpbyAqIENHUmVjdEdldFdpZHRo KHZpc2libGVSZWN0KSAmJiBzdGQ6Om1heCh0b3BJbnNldCwgYm90dG9tSW5zZXQpIDw9IG1pbmlt dW1BdmFpbGFibGVXaWR0aE9ySGVpZ2h0UmF0aW8gKiBDR1JlY3RHZXRIZWlnaHQodmlzaWJsZVJl Y3QpKQogICAgICAgICByZXR1cm4gV0tBY3Rpb25TaGVldFByZXNlbnRBdFRvdWNoTG9jYXRpb247 CiAKICAgICBpZiAoZWxlbWVudEluZm8udHlwZSA9PSBfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZUxp bmsgJiYgcG9zaXRpb25JbmZvLmxpbmtJbmRpY2F0b3IudGV4dFJlY3RzSW5Cb3VuZGluZ1JlY3RD b29yZGluYXRlcy5zaXplKCkpCkBAIC01MzksNyArNTQ0LDcgQEAgLSAodm9pZClzaG93TGlua1No ZWV0CiAKICAgICBfZWxlbWVudEluZm8gPSBXVEZNb3ZlKGVsZW1lbnRJbmZvKTsKIAotICAgIGlm ICghW19pbnRlcmFjdGlvblNoZWV0IHByZXNlbnRTaGVldDpwcmVzZW50YXRpb25TdHlsZUZvclZp ZXcoX3ZpZXcuZ2V0QXV0b3JlbGVhc2VkKCksIF9wb3NpdGlvbkluZm9ybWF0aW9uLnZhbHVlKCks IF9lbGVtZW50SW5mby5nZXQoKSldKQorICAgIGlmICghW19pbnRlcmFjdGlvblNoZWV0IHByZXNl bnRTaGVldDpbc2VsZiBfcHJlc2VudGF0aW9uU3R5bGVGb3JQb3NpdGlvbkluZm86X3Bvc2l0aW9u SW5mb3JtYXRpb24udmFsdWUoKSBlbGVtZW50SW5mbzpfZWxlbWVudEluZm8uZ2V0KCldXSkKICAg ICAgICAgW3NlbGYgY2xlYW51cFNoZWV0XTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbSBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KaW5kZXggMjE2ZTU5 YzIyZmMwZmI5MmM0MTQxYmE5Y2I3ZDIyMmNiMjQ3Y2NjMC4uODg5ZTlhNTdjMDA0ZDIxM2M1Mjc0 NmU4ZDcwNDJlNzI0ODM0NzBmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv aW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCkBAIC00ODE3LDYgKzQ4MTcsMTUg QEAgLSAoQk9PTClhY3Rpb25TaGVldEFzc2lzdGFudDooV0tBY3Rpb25TaGVldEFzc2lzdGFudCAq KWFzc2lzdGFudCBzaG93Q3VzdG9tU2hlZXQKICAgICByZXR1cm4gTk87CiB9CiAKKyNpZiBfX0lQ SE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMTAwMDAKKy0gKENHUmVjdCl1bm9jY2x1 ZGVkV2luZG93Qm91bmRzRm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Np c3RhbnQgKilhc3Npc3RhbnQKK3sKKyAgICBVSUVkZ2VJbnNldHMgY29udGVudEluc2V0ID0gW1tf d2ViVmlldyBzY3JvbGxWaWV3XSBhZGp1c3RlZENvbnRlbnRJbnNldF07CisgICAgQ0dSZWN0IHJl Y3QgPSBVSUVkZ2VJbnNldHNJbnNldFJlY3QoW193ZWJWaWV3IGJvdW5kc10sIGNvbnRlbnRJbnNl dCk7CisgICAgcmV0dXJuIFtfd2ViVmlldyBjb252ZXJ0UmVjdDpyZWN0IHRvVmlldzpbc2VsZiB3 aW5kb3ddXTsKK30KKyNlbmRpZgorCiAtIChSZXRhaW5QdHI8TlNBcnJheT4pYWN0aW9uU2hlZXRB c3Npc3RhbnQ6KFdLQWN0aW9uU2hlZXRBc3Npc3RhbnQgKilhc3Npc3RhbnQgZGVjaWRlQWN0aW9u c0ZvckVsZW1lbnQ6KF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvICopZWxlbWVudCBkZWZhdWx0QWN0 aW9uczooUmV0YWluUHRyPE5TQXJyYXk+KWRlZmF1bHRBY3Rpb25zCiB7CiAgICAgcmV0dXJuIF9w YWdlLT51aUNsaWVudCgpLmFjdGlvbnNGb3JFbGVtZW50KGVsZW1lbnQsIFdURk1vdmUoZGVmYXVs dEFjdGlvbnMpKTsK