182718 2018-02-12 16:08:18 -0800 Set the appropriate AutoFill context for suggested passwords 2018-02-18 09:51:56 -0800 1 1 1 Unclassified WebKit WebKit Misc. Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rabbasian webkit-unassigned commit-queue dbates rabbasian thorton webkit-bug-importer wenson_hsieh yongjun_zhang oldest_to_newest 1398522 0 rabbasian 2018-02-12 16:08:18 -0800 Provide ability to set the appropriate AutoFill context for AutoFill password suggestion. 1398523 1 rabbasian 2018-02-12 16:08:42 -0800 <rdar://problem/36326863> 1398528 2 333642 rabbasian 2018-02-12 16:21:54 -0800 Created attachment 333642 Patch 1399306 3 333856 rabbasian 2018-02-14 16:10:42 -0800 Created attachment 333856 Patch 1399328 4 333856 thorton 2018-02-14 17:02:23 -0800 Comment on attachment 333856 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333856&action=review > Source/WebKit/UIProcess/API/Cocoa/_WKFormInputSession.h:47 > +@property (nonatomic, readonly) BOOL requiresStrongPasswordAssistance WK_API_AVAILABLE(ios(12.0)); This should use WK_IOS_TBD or whatever. 1399461 5 rabbasian 2018-02-15 08:23:40 -0800 I will update the patch with WK_IOS_TBD. 1399464 6 333903 rabbasian 2018-02-15 08:31:20 -0800 Created attachment 333903 Patch 1399898 7 333903 wenson_hsieh 2018-02-16 09:19:37 -0800 Comment on attachment 333903 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333903&action=review r=me (I'm not a WebKit2 owner though, so a WebKit2 owner should r+ if looks OK) > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:4035 > + _firstResponderRequiresStrongPasswordAssistance = [inputDelegate _webView:_webView focusRequiresStrongPasswordAssistance:focusedElementInfo.get()]; Nit - it's a tiny bit weird for the thing that "requires strong password assistance" to be different between the ivar and the delegate method (firstResponder(…) vs. focus(…)). Could we choose one to make it consistent? 1399944 8 333903 thorton 2018-02-16 11:10:30 -0800 Comment on attachment 333903 Patch Agree with Wenson’s comment about the oddly slightly different names. 1399953 9 rabbasian 2018-02-16 11:27:47 -0800 I will use 'focus' terminology. Thanks! 1399982 10 334061 rabbasian 2018-02-16 12:41:25 -0800 Created attachment 334061 Patch 1400231 11 334061 commit-queue 2018-02-18 09:51:54 -0800 Comment on attachment 334061 Patch Clearing flags on attachment: 334061 Committed r228605: <https://trac.webkit.org/changeset/228605> 1400232 12 commit-queue 2018-02-18 09:51:56 -0800 All reviewed patches have been landed. Closing bug. 333642 2018-02-12 16:21:54 -0800 2018-02-14 16:10:40 -0800 Patch bug-182718-20180212162153.patch text/plain 5685 rabbasian U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NDAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYyYzJkMWVlYWJiMTEyNGQy ZmE2ZTMwNzA2OWNiMGQxZjIxOGZjYzkuLmE2MGFkY2E0NjdmY2M1ZDAxZTlmZGQ5NTRlNWU0M2Rm MzZjZTFhMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTgtMDItMTIgIFJlemEgQWJi YXNpYW4gIDxyYWJiYXNpYW5AYXBwbGUuY29tPgorCisgICAgICAgIFNldCB0aGUgYXBwcm9wcmlh dGUgQXV0b0ZpbGwgY29udGV4dCBmb3Igc3VnZ2VzdGVkIHBhc3N3b3Jkcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjcxOAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMzYzMjY4NjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUHJvdmlkZSBhYmlsaXR5IHRvIHNldCB0aGUgYXBwcm9wcmlhdGUgQXV0 b0ZpbGwgY29udGV4dCBmb3IgQXV0b0ZpbGwgcGFzc3dvcmQgc3VnZ2VzdGlvbi4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLRm9jdXNlZEVsZW1lbnRJbmZvLmg6CisgICAgICAg ICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaDoKKyAgICAgICAgKiBV SVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAgICAgKC1bV0tD b250ZW50VmlldyBjbGVhbnVwSW50ZXJhY3Rpb25dKToKKyAgICAgICAgKC1bV0tDb250ZW50Vmll dyBfc3RhcnRBc3Npc3RpbmdOb2RlOnVzZXJJc0ludGVyYWN0aW5nOmJsdXJQcmV2aW91c05vZGU6 Y2hhbmdpbmdBY3Rpdml0eVN0YXRlOnVzZXJPYmplY3Q6XSk6CisgICAgICAgIENoZWNrIGlmIHRo ZSBmb2N1c2VkIGVsZW1lbnQgcmVxdWlyZXMgYXNzaXN0YW5jZSBmb3IgQXV0b0ZpbGwgc3VnZ2Vz dGVkIHBhc3N3b3JkLgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9zdG9wQXNzaXN0aW5nTm9k ZV0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF9hdXRvZmlsbENvbnRleHRdKTogSWYgdGhl IGZpcnN0IHJlc3BvbmRlciBpcyBhIHBhc3N3b3JkIGVsZW1lbnQgYW5kIHJlcXVpcmVzCisgICAg ICAgIGFzc2lzdGFuY2UgZm9yIEF1dG9GaWxsIHN1Z2dlc3RlZCBwYXNzd29yZCwgc2V0IHRoZSBh cHByb3ByaWF0ZSBBdXRvRmlsbCBjb250ZXh0LgorCiAyMDE4LTAyLTEyICBXZW5zb24gSHNpZWgg IDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAgIFtFeHRyYSB6b29tIG1vZGVdIEFk ZCBzdXBwb3J0IGZvciA8aW5wdXQgdHlwZT0ndGltZSc+IHVzaW5nIHRpbWUgcGlja2VyIFVJCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLRm9jdXNlZEVs ZW1lbnRJbmZvLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLRm9jdXNl ZEVsZW1lbnRJbmZvLmgKaW5kZXggNmExNWY1NjRjYmZhMjQ4ZTQ2YmZmMGQyYzY0NzVkNTQ0OTQ3 OTJhZS4uNzNkYzVjMzI1MjBlZGJkZDNiMmViNTgxZmNhZmI1ZmYyZWI3ZGM3YSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0ZvY3VzZWRFbGVtZW50SW5m by5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tGb2N1c2VkRWxl bWVudEluZm8uaApAQCAtNzYsNiArNzYsNyBAQCB0eXBlZGVmIE5TX0VOVU0oTlNJbnRlZ2VyLCBX S0lucHV0VHlwZSkgewogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBnZXR0ZXI9aXNV c2VySW5pdGlhdGVkKSBCT09MIHVzZXJJbml0aWF0ZWQ7CiAKIEBwcm9wZXJ0eSAobm9uYXRvbWlj LCByZWFkb25seSkgTlNPYmplY3QgPE5TU2VjdXJlQ29kaW5nPiAqdXNlck9iamVjdCBXS19BUElf QVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKK0Bwcm9wZXJ0 eSAobm9uYXRvbWljKSBCT09MIHJlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlIFdLX0FQ SV9BVkFJTEFCTEUobWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogCiBAZW5k CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24uaAppbmRleCAwNDc3MTZhZjY2NjA3OGU4MWI0NjI5ZjcyZWMwODJlMmJlMTM1 ZTcwLi4wNDU2YWViZDZhNjM2YzI1MTgzMTNlMmRmZGEwNGUyNTc0ZGE3N2IwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgK KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5oCkBAIC0yMzUsNiArMjM1LDggQEAgc3RydWN0IFdLQXV0b0NvcnJlY3Rpb25EYXRhIHsKICAg ICBCT09MIF9uZWVkc0RlZmVycmVkRW5kU2Nyb2xsaW5nU2VsZWN0aW9uVXBkYXRlOwogICAgIEJP T0wgX2lzQ2hhbmdpbmdGb2N1czsKIAorICAgIEJPT0wgX2ZpcnN0UmVzcG9uZGVyUmVxdWlyZXNT dHJvbmdQYXNzd29yZEFzc2lzdGFuY2U7CisKICNpZiBFTkFCTEUoREFUQV9JTlRFUkFDVElPTikK ICAgICBXZWJLaXQ6OkRyYWdEcm9wSW50ZXJhY3Rpb25TdGF0ZSBfZHJhZ0Ryb3BJbnRlcmFjdGlv blN0YXRlOwogICAgIFJldGFpblB0cjxVSURyYWdJbnRlcmFjdGlvbj4gX2RyYWdJbnRlcmFjdGlv bjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3 SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmll d0ludGVyYWN0aW9uLm1tCmluZGV4IDRjN2JiMDAyMzVkMWIyMWVjZTIzMDFhZjQ2OWVjYWM0NjZh ZDZhNDIuLjFmMTIyZTQ5MTYyODE5ZDYxODMwNWFmMDBmY2ZmNmZkYzg0ZjJlODkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbQpAQCAtNDAwLDYgKzQwMCw4IEBAIEBpbXBsZW1lbnRhdGlvbiBXS0ZvY3VzZWRFbGVt ZW50SW5mbyB7CiAgICAgUmV0YWluUHRyPE5TT2JqZWN0IDxOU1NlY3VyZUNvZGluZz4+IF91c2Vy T2JqZWN0OwogfQogCitAc3ludGhlc2l6ZSByZXF1aXJlc1N0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5j ZT1fcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2U7CisKIC0gKGluc3RhbmNldHlwZSlp bml0V2l0aEFzc2lzdGVkTm9kZUluZm9ybWF0aW9uOihjb25zdCBBc3Npc3RlZE5vZGVJbmZvcm1h dGlvbiYpaW5mb3JtYXRpb24gaXNVc2VySW5pdGlhdGVkOihCT09MKWlzVXNlckluaXRpYXRlZCB1 c2VyT2JqZWN0OihOU09iamVjdCA8TlNTZWN1cmVDb2Rpbmc+ICopdXNlck9iamVjdAogewogICAg IGlmICghKHNlbGYgPSBbc3VwZXIgaW5pdF0pKQpAQCAtNjU5LDYgKzY2MSw4IEBAIC0gKHZvaWQp Y2xlYW51cEludGVyYWN0aW9uCiAgICAgW19oaWdobGlnaHRWaWV3IHJlbW92ZUZyb21TdXBlcnZp ZXddOwogICAgIF9vdXRzdGFuZGluZ1Bvc2l0aW9uSW5mb3JtYXRpb25SZXF1ZXN0ID0gc3RkOjpu dWxsb3B0OwogCisgICAgX2ZpcnN0UmVzcG9uZGVyUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lz dGFuY2UgPSBOTzsKKwogICAgIGlmIChfaW50ZXJhY3Rpb25WaWV3c0NvbnRhaW5lclZpZXcpIHsK ICAgICAgICAgW3NlbGYubGF5ZXIgcmVtb3ZlT2JzZXJ2ZXI6c2VsZiBmb3JLZXlQYXRoOkAidHJh bnNmb3JtIl07CiAgICAgICAgIFtfaW50ZXJhY3Rpb25WaWV3c0NvbnRhaW5lclZpZXcgcmVtb3Zl RnJvbVN1cGVydmlld107CkBAIC00MDIzLDYgKzQwMjcsNyBAQCAtICh2b2lkKV9zdGFydEFzc2lz dGluZ05vZGU6KGNvbnN0IEFzc2lzdGVkTm9kZUluZm9ybWF0aW9uJilpbmZvcm1hdGlvbiB1c2Vy SXNJbgogCiAgICAgQk9PTCBlZGl0YWJsZUNoYW5nZWQgPSBbc2VsZiBzZXRJc0VkaXRhYmxlOllF U107CiAgICAgX2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uID0gaW5mb3JtYXRpb247CisgICAgX2Zp cnN0UmVzcG9uZGVyUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UgPSBmb2N1c2VkRWxl bWVudEluZm8uZ2V0KCkucmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2U7CiAgICAgX2lu cHV0UGVyaXBoZXJhbCA9IG5pbDsKICAgICBfdHJhaXRzID0gbmlsOwogCkBAIC00MDgwLDYgKzQw ODUsNyBAQCAtICh2b2lkKV9zdG9wQXNzaXN0aW5nTm9kZQogCiAgICAgX2Fzc2lzdGVkTm9kZUlu Zm9ybWF0aW9uLmVsZW1lbnRUeXBlID0gSW5wdXRUeXBlOjpOb25lOwogICAgIF9pbnB1dFBlcmlw aGVyYWwgPSBuaWw7CisgICAgX2ZpcnN0UmVzcG9uZGVyUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFz c2lzdGFuY2UgPSBOTzsKIAogICAgIFtzZWxmIF9zdG9wQXNzaXN0aW5nS2V5Ym9hcmRdOwogICAg IFtfZm9ybUFjY2Vzc29yeVZpZXcgaGlkZUF1dG9GaWxsQnV0dG9uXTsKQEAgLTUwNTEsMTQgKzUw NTcsMTggQEAgLSAoTlNBcnJheTxVSURyYWdJdGVtICo+ICopX2l0ZW1zRm9yQmVnaW5uaW5nT3JB ZGRpbmdUb1Nlc3Npb25XaXRoUmVnaXN0cmF0aW9uTGkKIAogLSAoTlNEaWN0aW9uYXJ5ICopX2F1 dG9maWxsQ29udGV4dAogewotICAgIGlmIChfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uZWxlbWVu dFR5cGUgPT0gSW5wdXRUeXBlOjpOb25lIHx8ICFfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uYWNj ZXB0c0F1dG9maWxsZWRMb2dpbkNyZWRlbnRpYWxzKQorICAgIEJPT0wgcHJvdmlkZVN0cm9uZ1Bh c3N3b3JkQXNzaXN0YW5jZSA9IF9maXJzdFJlc3BvbmRlclJlcXVpcmVzU3Ryb25nUGFzc3dvcmRB c3Npc3RhbmNlICYmIF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5lbGVtZW50VHlwZSA9PSBJbnB1 dFR5cGU6OlBhc3N3b3JkOworICAgIGlmIChfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uZWxlbWVu dFR5cGUgPT0gSW5wdXRUeXBlOjpOb25lIHx8ICghX2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmFj Y2VwdHNBdXRvZmlsbGVkTG9naW5DcmVkZW50aWFscyAmJiAhcHJvdmlkZVN0cm9uZ1Bhc3N3b3Jk QXNzaXN0YW5jZSkpCiAgICAgICAgIHJldHVybiBuaWw7CiAKKyAgICBpZiAocHJvdmlkZVN0cm9u Z1Bhc3N3b3JkQXNzaXN0YW5jZSkKKyAgICAgICAgcmV0dXJuIEB7IEAiX2F1dG9tYXRpY1Bhc3N3 b3JkS2V5Ym9hcmQiIDogQFlFUyB9OworCiAgICAgTlNVUkwgKnBsYXRmb3JtVVJMID0gX2Fzc2lz dGVkTm9kZUluZm9ybWF0aW9uLnJlcHJlc2VudGluZ1BhZ2VVUkw7Ci0gICAgaWYgKCFwbGF0Zm9y bVVSTCkKLSAgICAgICAgcmV0dXJuIG5pbDsKKyAgICBpZiAocGxhdGZvcm1VUkwpCisgICAgICAg IHJldHVybiBAeyBAIl9XZWJWaWV3VVJMIiA6IHBsYXRmb3JtVVJMIH07CiAKLSAgICByZXR1cm4g QHsgQCJfV2ViVmlld1VSTCIgOiBwbGF0Zm9ybVVSTCB9OworICAgIHJldHVybiBuaWw7CiB9CiAK ICNwcmFnbWEgbWFyayAtIFVJRHJhZ0ludGVyYWN0aW9uRGVsZWdhdGUK 333856 2018-02-14 16:10:42 -0800 2018-02-15 08:31:18 -0800 Patch bug-182718-20180214161042.patch text/plain 9338 rabbasian U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NDAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYyYzJkMWVlYWJiMTEyNGQy ZmE2ZTMwNzA2OWNiMGQxZjIxOGZjYzkuLjRkM2I4Y2E5OTZkMzNlODIyYjUwY2ExM2ZmNjY0YjQw NTAzMjM0MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTgtMDItMTQgIFJlemEgQWJi YXNpYW4gIDxyYWJiYXNpYW5AYXBwbGUuY29tPgorCisgICAgICAgIFNldCB0aGUgYXBwcm9wcmlh dGUgQXV0b0ZpbGwgY29udGV4dCBmb3Igc3VnZ2VzdGVkIHBhc3N3b3Jkcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjcxOAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMzYzMjY4NjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQmVmb3JlIHN0YXJ0aW5nIHRoZSBpbnB1dCBzZXNzaW9uLCBjYWxsIHRo ZSBuZXcgZGVsZWdhdGUgdG8gcXVlcnkgaWYgQXV0b0ZpbGwgcGFzc3dvcmQgc3VnZ2VzdGlvbiBh c3Npc3RhbmNlCisgICAgICAgIGlzIHJlcXVpcmVkIGZvciB0aGUgZm9jdXNlZCBlbGVtZW50Lgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tGb3JtSW5wdXRTZXNzaW9uLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tJbnB1dERlbGVnYXRlLmg6CisgICAgICAg IEludHJvZHVjZSBhIG5ldyBkZWxlZ2F0ZSB0byBiZSBjYWxsZWQgIGJlZm9yZSBzdGFydGluZyBh biBpbnB1dCBzZXNzaW9uIHRvIHF1ZXJ5IGlmIEF1dG9GaWxsIHBhc3N3b3JkIHN1Z2dlc3Rpb24K KyAgICAgICAgYXNzaXN0YW5jZSBpcyByZXF1aXJlZCBmb3IgdGhlIGZvY3VzZWQgZWxlbWVudC4K KyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAg ICAoLVtXS0Zvcm1JbnB1dFNlc3Npb24gaW5pdFdpdGhDb250ZW50Vmlldzpmb2N1c2VkRWxlbWVu dEluZm86cmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2U6XSk6CisgICAgICAgICgtW1dL Rm9ybUlucHV0U2Vzc2lvbiByZXF1aXJlc1N0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZV0pOgorICAg ICAgICAoLVtXS0NvbnRlbnRWaWV3IGNsZWFudXBJbnRlcmFjdGlvbl0pOgorICAgICAgICAoLVtX S0NvbnRlbnRWaWV3IF9zdGFydEFzc2lzdGluZ05vZGU6dXNlcklzSW50ZXJhY3Rpbmc6Ymx1clBy ZXZpb3VzTm9kZTpjaGFuZ2luZ0FjdGl2aXR5U3RhdGU6dXNlck9iamVjdDpdKToKKyAgICAgICAg Q2FsbCB0aGUgZGVsZWdhdGUgdG8gZmluZCBvdXQgaWYgQXV0b0ZpbGwgc3VnZ2VzdGVkIHBhc3N3 b3JkIGFzc2lzdGFuY2UgaXMgcmVxdWlyZWQuCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3N0 b3BBc3Npc3RpbmdOb2RlXSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2F1dG9maWxsQ29u dGV4dF0pOiBJZiB0aGUgZmlyc3QgcmVzcG9uZGVyIGlzIGEgcGFzc3dvcmQgZWxlbWVudCBhbmQg cmVxdWlyZXMKKyAgICAgICAgYXNzaXN0YW5jZSBmb3IgQXV0b0ZpbGwgc3VnZ2VzdGVkIHBhc3N3 b3JkLCBzZXQgdGhlIGFwcHJvcHJpYXRlIEF1dG9GaWxsIGNvbnRleHQuCisgICAgICAgICgtW1dL Rm9ybUlucHV0U2Vzc2lvbiBpbml0V2l0aENvbnRlbnRWaWV3OmZvY3VzZWRFbGVtZW50SW5mbzpd KTogRGVsZXRlZC4KKwogMjAxOC0wMi0xMiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFw cGxlLmNvbT4KIAogICAgICAgICBbRXh0cmEgem9vbSBtb2RlXSBBZGQgc3VwcG9ydCBmb3IgPGlu cHV0IHR5cGU9J3RpbWUnPiB1c2luZyB0aW1lIHBpY2tlciBVSQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0Zvcm1JbnB1dFNlc3Npb24uaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tGb3JtSW5wdXRTZXNzaW9uLmgKaW5kZXgg MDlkZmIyZjBiNDVmNzUzYzg5N2UxOTk4MWIyNTFmODY1OTliZWM0ZC4uNzY3MjE4ZDhjNWFjMTVm NGFmZDc4OGU2NTI3Nzk2OGQ0ZDQ0ZDBkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS0Zvcm1JbnB1dFNlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLRm9ybUlucHV0U2Vzc2lvbi5oCkBAIC00NCw2ICs0NCw3 IEBACiBAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSkgTlNBcnJheTxVSVRleHRTdWdnZXN0aW9u ICo+ICpzdWdnZXN0aW9ucyBXS19BUElfQVZBSUxBQkxFKGlvcygxMC4wKSk7CiBAcHJvcGVydHkg KG5vbmF0b21pYykgQk9PTCBhY2Nlc3NvcnlWaWV3U2hvdWxkTm90U2hvdyBXS19BUElfQVZBSUxB QkxFKGlvcygxMC4wKSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBmb3JjZVNlY3VyZVRl eHRFbnRyeSBXS19BUElfQVZBSUxBQkxFKGlvcygxMC4wKSk7CitAcHJvcGVydHkgKG5vbmF0b21p YywgcmVhZG9ubHkpIEJPT0wgcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UgV0tfQVBJ X0FWQUlMQUJMRShpb3MoMTIuMCkpOwogI2VuZGlmCiAKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tJbnB1dERlbGVnYXRlLmggYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLSW5wdXREZWxlZ2F0ZS5oCmluZGV4IDVjM2I1 MDg2MTdmOWJhZjQzMTM0OWI4NzE2OWVkMWM4OWQwYTJiNjQuLjI0NzdjOGY5ZmNlZThmZWU1YTBl YWU1N2JhYjgxNGQyMzcyZWRmNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9Db2NvYS9fV0tJbnB1dERlbGVnYXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL19XS0lucHV0RGVsZWdhdGUuaApAQCAtNDUsNiArNDUsNyBAQAogLSAoQk9P TClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBmb2N1c1Nob3VsZFN0YXJ0SW5wdXRTZXNz aW9uOihpZCA8X1dLRm9jdXNlZEVsZW1lbnRJbmZvPilpbmZvOwogLSAodm9pZClfd2ViVmlldzoo V0tXZWJWaWV3ICopd2ViVmlldyBhY2Nlc3NvcnlWaWV3Q3VzdG9tQnV0dG9uVGFwcGVkSW5Gb3Jt SW5wdXRTZXNzaW9uOihpZCA8X1dLRm9ybUlucHV0U2Vzc2lvbj4paW5wdXRTZXNzaW9uOwogLSAo dm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBpbnNlcnRUZXh0U3VnZ2VzdGlvbjoo VUlUZXh0U3VnZ2VzdGlvbiAqKXN1Z2dlc3Rpb24gaW5JbnB1dFNlc3Npb246KGlkIDxfV0tGb3Jt SW5wdXRTZXNzaW9uPilpbnB1dFNlc3Npb24gV0tfQVBJX0FWQUlMQUJMRShpb3MoMTAuMCkpOwor LSAoQk9PTClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBmb2N1c1JlcXVpcmVzU3Ryb25n UGFzc3dvcmRBc3Npc3RhbmNlOihpZCA8X1dLRm9jdXNlZEVsZW1lbnRJbmZvPilpbmZvIFdLX0FQ SV9BVkFJTEFCTEUoaW9zKDEyLjApKTsKICNlbmRpZgogCiBAZW5kCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLmgKaW5kZXgg MDQ3NzE2YWY2NjYwNzhlODFiNDYyOWY3MmVjMDgyZTJiZTEzNWU3MC4uMDQ1NmFlYmQ2YTYzNmMy NTE4MzEzZTJkZmRhMDRlMjU3NGRhNzdiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaApAQCAtMjM1LDYgKzIzNSw4 IEBAIHN0cnVjdCBXS0F1dG9Db3JyZWN0aW9uRGF0YSB7CiAgICAgQk9PTCBfbmVlZHNEZWZlcnJl ZEVuZFNjcm9sbGluZ1NlbGVjdGlvblVwZGF0ZTsKICAgICBCT09MIF9pc0NoYW5naW5nRm9jdXM7 CiAKKyAgICBCT09MIF9maXJzdFJlc3BvbmRlclJlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3Rh bmNlOworCiAjaWYgRU5BQkxFKERBVEFfSU5URVJBQ1RJT04pCiAgICAgV2ViS2l0OjpEcmFnRHJv cEludGVyYWN0aW9uU3RhdGUgX2RyYWdEcm9wSW50ZXJhY3Rpb25TdGF0ZTsKICAgICBSZXRhaW5Q dHI8VUlEcmFnSW50ZXJhY3Rpb24+IF9kcmFnSW50ZXJhY3Rpb247CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQppbmRl eCA0YzdiYjAwMjM1ZDFiMjFlY2UyMzAxYWY0NjllY2FjNDY2YWQ2YTQyLi4wNmViZjBhZDc3OGVj ZTIwY2VlYTA0ZTA5YWQwZjk3OTQwNDdjZDQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTI3NSw3ICsy NzUsNyBAQCBAZW5kCiAKIEBpbnRlcmZhY2UgV0tGb3JtSW5wdXRTZXNzaW9uIDogTlNPYmplY3Qg PF9XS0Zvcm1JbnB1dFNlc3Npb24+CiAKLS0gKGluc3RhbmNldHlwZSlpbml0V2l0aENvbnRlbnRW aWV3OihXS0NvbnRlbnRWaWV3ICopdmlldyBmb2N1c2VkRWxlbWVudEluZm86KFdLRm9jdXNlZEVs ZW1lbnRJbmZvICopZWxlbWVudEluZm87CistIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhDb250ZW50 VmlldzooV0tDb250ZW50VmlldyAqKXZpZXcgZm9jdXNlZEVsZW1lbnRJbmZvOihXS0ZvY3VzZWRF bGVtZW50SW5mbyAqKWVsZW1lbnRJbmZvIHJlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNl OihCT09MKXJlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlOwogLSAodm9pZClpbnZhbGlk YXRlOwogCiBAZW5kCkBAIC0yODcsMTUgKzI4NywxNyBAQCBAaW1wbGVtZW50YXRpb24gV0tGb3Jt SW5wdXRTZXNzaW9uIHsKICAgICBSZXRhaW5QdHI8TlNBcnJheTxVSVRleHRTdWdnZXN0aW9uICo+ PiBfc3VnZ2VzdGlvbnM7CiAgICAgQk9PTCBfYWNjZXNzb3J5Vmlld1Nob3VsZE5vdFNob3c7CiAg ICAgQk9PTCBfZm9yY2VTZWN1cmVUZXh0RW50cnk7CisgICAgQk9PTCBfcmVxdWlyZXNTdHJvbmdQ YXNzd29yZEFzc2lzdGFuY2U7CiB9CiAKLS0gKGluc3RhbmNldHlwZSlpbml0V2l0aENvbnRlbnRW aWV3OihXS0NvbnRlbnRWaWV3ICopdmlldyBmb2N1c2VkRWxlbWVudEluZm86KFdLRm9jdXNlZEVs ZW1lbnRJbmZvICopZWxlbWVudEluZm8KKy0gKGluc3RhbmNldHlwZSlpbml0V2l0aENvbnRlbnRW aWV3OihXS0NvbnRlbnRWaWV3ICopdmlldyBmb2N1c2VkRWxlbWVudEluZm86KFdLRm9jdXNlZEVs ZW1lbnRJbmZvICopZWxlbWVudEluZm8gcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2U6 KEJPT0wpcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UKIHsKICAgICBpZiAoIShzZWxm ID0gW3N1cGVyIGluaXRdKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAogICAgIF9jb250ZW50Vmll dyA9IHZpZXc7CiAgICAgX2ZvY3VzZWRFbGVtZW50SW5mbyA9IGVsZW1lbnRJbmZvOworICAgIF9y ZXF1aXJlc1N0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSA9IHJlcXVpcmVzU3Ryb25nUGFzc3dvcmRB c3Npc3RhbmNlOwogCiAgICAgcmV0dXJuIHNlbGY7CiB9CkBAIC0zODQsNiArMzg2LDExIEBAIC0g KHZvaWQpc2V0U3VnZ2VzdGlvbnM6KE5TQXJyYXk8VUlUZXh0U3VnZ2VzdGlvbiAqPiAqKXN1Z2dl c3Rpb25zCiAgICAgW3N1Z2dlc3Rpb25EZWxlZ2F0ZSBzZXRTdWdnZXN0aW9uczpzdWdnZXN0aW9u c107CiB9CiAKKy0gKEJPT0wpcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UKK3sKKyAg ICByZXR1cm4gX3JlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlOworfQorCiAtICh2b2lk KWludmFsaWRhdGUKIHsKICAgICBpZCA8VUlUZXh0SW5wdXRTdWdnZXN0aW9uRGVsZWdhdGU+IHN1 Z2dlc3Rpb25EZWxlZ2F0ZSA9IChpZCA8VUlUZXh0SW5wdXRTdWdnZXN0aW9uRGVsZWdhdGU+KV9j b250ZW50Vmlldy5pbnB1dERlbGVnYXRlOwpAQCAtNjU5LDYgKzY2Niw4IEBAIC0gKHZvaWQpY2xl YW51cEludGVyYWN0aW9uCiAgICAgW19oaWdobGlnaHRWaWV3IHJlbW92ZUZyb21TdXBlcnZpZXdd OwogICAgIF9vdXRzdGFuZGluZ1Bvc2l0aW9uSW5mb3JtYXRpb25SZXF1ZXN0ID0gc3RkOjpudWxs b3B0OwogCisgICAgX2ZpcnN0UmVzcG9uZGVyUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFu Y2UgPSBOTzsKKwogICAgIGlmIChfaW50ZXJhY3Rpb25WaWV3c0NvbnRhaW5lclZpZXcpIHsKICAg ICAgICAgW3NlbGYubGF5ZXIgcmVtb3ZlT2JzZXJ2ZXI6c2VsZiBmb3JLZXlQYXRoOkAidHJhbnNm b3JtIl07CiAgICAgICAgIFtfaW50ZXJhY3Rpb25WaWV3c0NvbnRhaW5lclZpZXcgcmVtb3ZlRnJv bVN1cGVydmlld107CkBAIC00MDIxLDYgKzQwMzAsMTAgQEAgLSAodm9pZClfc3RhcnRBc3Npc3Rp bmdOb2RlOihjb25zdCBBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiYpaW5mb3JtYXRpb24gdXNlcklz SW4KICAgICBpZiAoX2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmVsZW1lbnRUeXBlID09IGluZm9y bWF0aW9uLmVsZW1lbnRUeXBlICYmIF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5lbGVtZW50UmVj dCA9PSBpbmZvcm1hdGlvbi5lbGVtZW50UmVjdCkKICAgICAgICAgcmV0dXJuOwogCisgICAgX2Zp cnN0UmVzcG9uZGVyUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UgPSBOTzsKKyAgICBp ZiAoW2lucHV0RGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpm b2N1c1JlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlOildKQorICAgICAgICBfZmlyc3RS ZXNwb25kZXJSZXF1aXJlc1N0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSA9IFtpbnB1dERlbGVnYXRl IF93ZWJWaWV3Ol93ZWJWaWV3IGZvY3VzUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2U6 Zm9jdXNlZEVsZW1lbnRJbmZvLmdldCgpXTsKKwogICAgIEJPT0wgZWRpdGFibGVDaGFuZ2VkID0g W3NlbGYgc2V0SXNFZGl0YWJsZTpZRVNdOwogICAgIF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiA9 IGluZm9ybWF0aW9uOwogICAgIF9pbnB1dFBlcmlwaGVyYWwgPSBuaWw7CkBAIC00MDY0LDcgKzQw NzcsNyBAQCAtICh2b2lkKV9zdGFydEFzc2lzdGluZ05vZGU6KGNvbnN0IEFzc2lzdGVkTm9kZUlu Zm9ybWF0aW9uJilpbmZvcm1hdGlvbiB1c2VySXNJbgogICAgIFtfaW5wdXRQZXJpcGhlcmFsIGJl Z2luRWRpdGluZ107CiAKICAgICBpZiAoW2lucHV0RGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9y OkBzZWxlY3Rvcihfd2ViVmlldzpkaWRTdGFydElucHV0U2Vzc2lvbjopXSkgewotICAgICAgICBf Zm9ybUlucHV0U2Vzc2lvbiA9IGFkb3B0TlMoW1tXS0Zvcm1JbnB1dFNlc3Npb24gYWxsb2NdIGlu aXRXaXRoQ29udGVudFZpZXc6c2VsZiBmb2N1c2VkRWxlbWVudEluZm86Zm9jdXNlZEVsZW1lbnRJ bmZvLmdldCgpXSk7CisgICAgICAgIF9mb3JtSW5wdXRTZXNzaW9uID0gYWRvcHROUyhbW1dLRm9y bUlucHV0U2Vzc2lvbiBhbGxvY10gaW5pdFdpdGhDb250ZW50VmlldzpzZWxmIGZvY3VzZWRFbGVt ZW50SW5mbzpmb2N1c2VkRWxlbWVudEluZm8uZ2V0KCkgcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFz c2lzdGFuY2U6X2ZpcnN0UmVzcG9uZGVyUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2Vd KTsKICAgICAgICAgW2lucHV0RGVsZWdhdGUgX3dlYlZpZXc6X3dlYlZpZXcgZGlkU3RhcnRJbnB1 dFNlc3Npb246X2Zvcm1JbnB1dFNlc3Npb24uZ2V0KCldOwogICAgIH0KICAgICAKQEAgLTQwODAs NiArNDA5Myw3IEBAIC0gKHZvaWQpX3N0b3BBc3Npc3RpbmdOb2RlCiAKICAgICBfYXNzaXN0ZWRO b2RlSW5mb3JtYXRpb24uZWxlbWVudFR5cGUgPSBJbnB1dFR5cGU6Ok5vbmU7CiAgICAgX2lucHV0 UGVyaXBoZXJhbCA9IG5pbDsKKyAgICBfZmlyc3RSZXNwb25kZXJSZXF1aXJlc1N0cm9uZ1Bhc3N3 b3JkQXNzaXN0YW5jZSA9IE5POwogCiAgICAgW3NlbGYgX3N0b3BBc3Npc3RpbmdLZXlib2FyZF07 CiAgICAgW19mb3JtQWNjZXNzb3J5VmlldyBoaWRlQXV0b0ZpbGxCdXR0b25dOwpAQCAtNTA1MSwx NCArNTA2NSwxOCBAQCAtIChOU0FycmF5PFVJRHJhZ0l0ZW0gKj4gKilfaXRlbXNGb3JCZWdpbm5p bmdPckFkZGluZ1RvU2Vzc2lvbldpdGhSZWdpc3RyYXRpb25MaQogCiAtIChOU0RpY3Rpb25hcnkg KilfYXV0b2ZpbGxDb250ZXh0CiB7Ci0gICAgaWYgKF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5l bGVtZW50VHlwZSA9PSBJbnB1dFR5cGU6Ok5vbmUgfHwgIV9hc3Npc3RlZE5vZGVJbmZvcm1hdGlv bi5hY2NlcHRzQXV0b2ZpbGxlZExvZ2luQ3JlZGVudGlhbHMpCisgICAgQk9PTCBwcm92aWRlU3Ry b25nUGFzc3dvcmRBc3Npc3RhbmNlID0gX2ZpcnN0UmVzcG9uZGVyUmVxdWlyZXNTdHJvbmdQYXNz d29yZEFzc2lzdGFuY2UgJiYgX2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmVsZW1lbnRUeXBlID09 IElucHV0VHlwZTo6UGFzc3dvcmQ7CisgICAgaWYgKF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5l bGVtZW50VHlwZSA9PSBJbnB1dFR5cGU6Ok5vbmUgfHwgKCFfYXNzaXN0ZWROb2RlSW5mb3JtYXRp b24uYWNjZXB0c0F1dG9maWxsZWRMb2dpbkNyZWRlbnRpYWxzICYmICFwcm92aWRlU3Ryb25nUGFz c3dvcmRBc3Npc3RhbmNlKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAorICAgIGlmIChwcm92aWRl U3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlKQorICAgICAgICByZXR1cm4gQHsgQCJfYXV0b21hdGlj UGFzc3dvcmRLZXlib2FyZCIgOiBAWUVTIH07CisKICAgICBOU1VSTCAqcGxhdGZvcm1VUkwgPSBf YXNzaXN0ZWROb2RlSW5mb3JtYXRpb24ucmVwcmVzZW50aW5nUGFnZVVSTDsKLSAgICBpZiAoIXBs YXRmb3JtVVJMKQotICAgICAgICByZXR1cm4gbmlsOworICAgIGlmIChwbGF0Zm9ybVVSTCkKKyAg ICAgICAgcmV0dXJuIEB7IEAiX1dlYlZpZXdVUkwiIDogcGxhdGZvcm1VUkwgfTsKIAotICAgIHJl dHVybiBAeyBAIl9XZWJWaWV3VVJMIiA6IHBsYXRmb3JtVVJMIH07CisgICAgcmV0dXJuIG5pbDsK IH0KIAogI3ByYWdtYSBtYXJrIC0gVUlEcmFnSW50ZXJhY3Rpb25EZWxlZ2F0ZQo= 333903 2018-02-15 08:31:20 -0800 2018-02-16 12:41:24 -0800 Patch bug-182718-20180215083119.patch text/plain 9350 rabbasian U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NDAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYyYzJkMWVlYWJiMTEyNGQy ZmE2ZTMwNzA2OWNiMGQxZjIxOGZjYzkuLjRkM2I4Y2E5OTZkMzNlODIyYjUwY2ExM2ZmNjY0YjQw NTAzMjM0MTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTgtMDItMTQgIFJlemEgQWJi YXNpYW4gIDxyYWJiYXNpYW5AYXBwbGUuY29tPgorCisgICAgICAgIFNldCB0aGUgYXBwcm9wcmlh dGUgQXV0b0ZpbGwgY29udGV4dCBmb3Igc3VnZ2VzdGVkIHBhc3N3b3Jkcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjcxOAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMzYzMjY4NjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQmVmb3JlIHN0YXJ0aW5nIHRoZSBpbnB1dCBzZXNzaW9uLCBjYWxsIHRo ZSBuZXcgZGVsZWdhdGUgdG8gcXVlcnkgaWYgQXV0b0ZpbGwgcGFzc3dvcmQgc3VnZ2VzdGlvbiBh c3Npc3RhbmNlCisgICAgICAgIGlzIHJlcXVpcmVkIGZvciB0aGUgZm9jdXNlZCBlbGVtZW50Lgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tGb3JtSW5wdXRTZXNzaW9uLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tJbnB1dERlbGVnYXRlLmg6CisgICAgICAg IEludHJvZHVjZSBhIG5ldyBkZWxlZ2F0ZSB0byBiZSBjYWxsZWQgIGJlZm9yZSBzdGFydGluZyBh biBpbnB1dCBzZXNzaW9uIHRvIHF1ZXJ5IGlmIEF1dG9GaWxsIHBhc3N3b3JkIHN1Z2dlc3Rpb24K KyAgICAgICAgYXNzaXN0YW5jZSBpcyByZXF1aXJlZCBmb3IgdGhlIGZvY3VzZWQgZWxlbWVudC4K KyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAg ICAoLVtXS0Zvcm1JbnB1dFNlc3Npb24gaW5pdFdpdGhDb250ZW50Vmlldzpmb2N1c2VkRWxlbWVu dEluZm86cmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2U6XSk6CisgICAgICAgICgtW1dL Rm9ybUlucHV0U2Vzc2lvbiByZXF1aXJlc1N0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZV0pOgorICAg ICAgICAoLVtXS0NvbnRlbnRWaWV3IGNsZWFudXBJbnRlcmFjdGlvbl0pOgorICAgICAgICAoLVtX S0NvbnRlbnRWaWV3IF9zdGFydEFzc2lzdGluZ05vZGU6dXNlcklzSW50ZXJhY3Rpbmc6Ymx1clBy ZXZpb3VzTm9kZTpjaGFuZ2luZ0FjdGl2aXR5U3RhdGU6dXNlck9iamVjdDpdKToKKyAgICAgICAg Q2FsbCB0aGUgZGVsZWdhdGUgdG8gZmluZCBvdXQgaWYgQXV0b0ZpbGwgc3VnZ2VzdGVkIHBhc3N3 b3JkIGFzc2lzdGFuY2UgaXMgcmVxdWlyZWQuCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX3N0 b3BBc3Npc3RpbmdOb2RlXSk6CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2F1dG9maWxsQ29u dGV4dF0pOiBJZiB0aGUgZmlyc3QgcmVzcG9uZGVyIGlzIGEgcGFzc3dvcmQgZWxlbWVudCBhbmQg cmVxdWlyZXMKKyAgICAgICAgYXNzaXN0YW5jZSBmb3IgQXV0b0ZpbGwgc3VnZ2VzdGVkIHBhc3N3 b3JkLCBzZXQgdGhlIGFwcHJvcHJpYXRlIEF1dG9GaWxsIGNvbnRleHQuCisgICAgICAgICgtW1dL Rm9ybUlucHV0U2Vzc2lvbiBpbml0V2l0aENvbnRlbnRWaWV3OmZvY3VzZWRFbGVtZW50SW5mbzpd KTogRGVsZXRlZC4KKwogMjAxOC0wMi0xMiAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFw cGxlLmNvbT4KIAogICAgICAgICBbRXh0cmEgem9vbSBtb2RlXSBBZGQgc3VwcG9ydCBmb3IgPGlu cHV0IHR5cGU9J3RpbWUnPiB1c2luZyB0aW1lIHBpY2tlciBVSQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0Zvcm1JbnB1dFNlc3Npb24uaCBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tGb3JtSW5wdXRTZXNzaW9uLmgKaW5kZXgg MDlkZmIyZjBiNDVmNzUzYzg5N2UxOTk4MWIyNTFmODY1OTliZWM0ZC4uZTZmZTY1ODg0ZTM2NDUy Y2FjNzQ2MDMwODhmMDJjZjc4MjBjOWI3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS0Zvcm1JbnB1dFNlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLRm9ybUlucHV0U2Vzc2lvbi5oCkBAIC00NCw2ICs0NCw3 IEBACiBAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSkgTlNBcnJheTxVSVRleHRTdWdnZXN0aW9u ICo+ICpzdWdnZXN0aW9ucyBXS19BUElfQVZBSUxBQkxFKGlvcygxMC4wKSk7CiBAcHJvcGVydHkg KG5vbmF0b21pYykgQk9PTCBhY2Nlc3NvcnlWaWV3U2hvdWxkTm90U2hvdyBXS19BUElfQVZBSUxB QkxFKGlvcygxMC4wKSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBmb3JjZVNlY3VyZVRl eHRFbnRyeSBXS19BUElfQVZBSUxBQkxFKGlvcygxMC4wKSk7CitAcHJvcGVydHkgKG5vbmF0b21p YywgcmVhZG9ubHkpIEJPT0wgcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UgV0tfQVBJ X0FWQUlMQUJMRShpb3MoV0tfSU9TX1RCQSkpOwogI2VuZGlmCiAKIEBlbmQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tJbnB1dERlbGVnYXRlLmggYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLSW5wdXREZWxlZ2F0ZS5oCmluZGV4 IDVjM2I1MDg2MTdmOWJhZjQzMTM0OWI4NzE2OWVkMWM4OWQwYTJiNjQuLmE5ODYyNDBjODM1NDY4 M2FlZjJlODE0ZDI2ZWVhODAwNWEzODU5YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tJbnB1dERlbGVnYXRlLmgKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL19XS0lucHV0RGVsZWdhdGUuaApAQCAtNDUsNiArNDUsNyBAQAog LSAoQk9PTClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBmb2N1c1Nob3VsZFN0YXJ0SW5w dXRTZXNzaW9uOihpZCA8X1dLRm9jdXNlZEVsZW1lbnRJbmZvPilpbmZvOwogLSAodm9pZClfd2Vi VmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBhY2Nlc3NvcnlWaWV3Q3VzdG9tQnV0dG9uVGFwcGVk SW5Gb3JtSW5wdXRTZXNzaW9uOihpZCA8X1dLRm9ybUlucHV0U2Vzc2lvbj4paW5wdXRTZXNzaW9u OwogLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBpbnNlcnRUZXh0U3VnZ2Vz dGlvbjooVUlUZXh0U3VnZ2VzdGlvbiAqKXN1Z2dlc3Rpb24gaW5JbnB1dFNlc3Npb246KGlkIDxf V0tGb3JtSW5wdXRTZXNzaW9uPilpbnB1dFNlc3Npb24gV0tfQVBJX0FWQUlMQUJMRShpb3MoMTAu MCkpOworLSAoQk9PTClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBmb2N1c1JlcXVpcmVz U3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlOihpZCA8X1dLRm9jdXNlZEVsZW1lbnRJbmZvPilpbmZv IFdLX0FQSV9BVkFJTEFCTEUoaW9zKFdLX0lPU19UQkEpKTsKICNlbmRpZgogCiBAZW5kCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLmgKaW5kZXggMDQ3NzE2YWY2NjYwNzhlODFiNDYyOWY3MmVjMDgyZTJiZTEzNWU3MC4uMDQ1 NmFlYmQ2YTYzNmMyNTE4MzEzZTJkZmRhMDRlMjU3NGRhNzdiMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaApAQCAt MjM1LDYgKzIzNSw4IEBAIHN0cnVjdCBXS0F1dG9Db3JyZWN0aW9uRGF0YSB7CiAgICAgQk9PTCBf bmVlZHNEZWZlcnJlZEVuZFNjcm9sbGluZ1NlbGVjdGlvblVwZGF0ZTsKICAgICBCT09MIF9pc0No YW5naW5nRm9jdXM7CiAKKyAgICBCT09MIF9maXJzdFJlc3BvbmRlclJlcXVpcmVzU3Ryb25nUGFz c3dvcmRBc3Npc3RhbmNlOworCiAjaWYgRU5BQkxFKERBVEFfSU5URVJBQ1RJT04pCiAgICAgV2Vi S2l0OjpEcmFnRHJvcEludGVyYWN0aW9uU3RhdGUgX2RyYWdEcm9wSW50ZXJhY3Rpb25TdGF0ZTsK ICAgICBSZXRhaW5QdHI8VUlEcmFnSW50ZXJhY3Rpb24+IF9kcmFnSW50ZXJhY3Rpb247CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbQppbmRleCA0YzdiYjAwMjM1ZDFiMjFlY2UyMzAxYWY0NjllY2FjNDY2YWQ2YTQyLi4w NmViZjBhZDc3OGVjZTIwY2VlYTA0ZTA5YWQwZjk3OTQwNDdjZDQ1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0K QEAgLTI3NSw3ICsyNzUsNyBAQCBAZW5kCiAKIEBpbnRlcmZhY2UgV0tGb3JtSW5wdXRTZXNzaW9u IDogTlNPYmplY3QgPF9XS0Zvcm1JbnB1dFNlc3Npb24+CiAKLS0gKGluc3RhbmNldHlwZSlpbml0 V2l0aENvbnRlbnRWaWV3OihXS0NvbnRlbnRWaWV3ICopdmlldyBmb2N1c2VkRWxlbWVudEluZm86 KFdLRm9jdXNlZEVsZW1lbnRJbmZvICopZWxlbWVudEluZm87CistIChpbnN0YW5jZXR5cGUpaW5p dFdpdGhDb250ZW50VmlldzooV0tDb250ZW50VmlldyAqKXZpZXcgZm9jdXNlZEVsZW1lbnRJbmZv OihXS0ZvY3VzZWRFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZvIHJlcXVpcmVzU3Ryb25nUGFzc3dv cmRBc3Npc3RhbmNlOihCT09MKXJlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlOwogLSAo dm9pZClpbnZhbGlkYXRlOwogCiBAZW5kCkBAIC0yODcsMTUgKzI4NywxNyBAQCBAaW1wbGVtZW50 YXRpb24gV0tGb3JtSW5wdXRTZXNzaW9uIHsKICAgICBSZXRhaW5QdHI8TlNBcnJheTxVSVRleHRT dWdnZXN0aW9uICo+PiBfc3VnZ2VzdGlvbnM7CiAgICAgQk9PTCBfYWNjZXNzb3J5Vmlld1Nob3Vs ZE5vdFNob3c7CiAgICAgQk9PTCBfZm9yY2VTZWN1cmVUZXh0RW50cnk7CisgICAgQk9PTCBfcmVx dWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2U7CiB9CiAKLS0gKGluc3RhbmNldHlwZSlpbml0 V2l0aENvbnRlbnRWaWV3OihXS0NvbnRlbnRWaWV3ICopdmlldyBmb2N1c2VkRWxlbWVudEluZm86 KFdLRm9jdXNlZEVsZW1lbnRJbmZvICopZWxlbWVudEluZm8KKy0gKGluc3RhbmNldHlwZSlpbml0 V2l0aENvbnRlbnRWaWV3OihXS0NvbnRlbnRWaWV3ICopdmlldyBmb2N1c2VkRWxlbWVudEluZm86 KFdLRm9jdXNlZEVsZW1lbnRJbmZvICopZWxlbWVudEluZm8gcmVxdWlyZXNTdHJvbmdQYXNzd29y ZEFzc2lzdGFuY2U6KEJPT0wpcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UKIHsKICAg ICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRdKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAogICAg IF9jb250ZW50VmlldyA9IHZpZXc7CiAgICAgX2ZvY3VzZWRFbGVtZW50SW5mbyA9IGVsZW1lbnRJ bmZvOworICAgIF9yZXF1aXJlc1N0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSA9IHJlcXVpcmVzU3Ry b25nUGFzc3dvcmRBc3Npc3RhbmNlOwogCiAgICAgcmV0dXJuIHNlbGY7CiB9CkBAIC0zODQsNiAr Mzg2LDExIEBAIC0gKHZvaWQpc2V0U3VnZ2VzdGlvbnM6KE5TQXJyYXk8VUlUZXh0U3VnZ2VzdGlv biAqPiAqKXN1Z2dlc3Rpb25zCiAgICAgW3N1Z2dlc3Rpb25EZWxlZ2F0ZSBzZXRTdWdnZXN0aW9u czpzdWdnZXN0aW9uc107CiB9CiAKKy0gKEJPT0wpcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lz dGFuY2UKK3sKKyAgICByZXR1cm4gX3JlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlOwor fQorCiAtICh2b2lkKWludmFsaWRhdGUKIHsKICAgICBpZCA8VUlUZXh0SW5wdXRTdWdnZXN0aW9u RGVsZWdhdGU+IHN1Z2dlc3Rpb25EZWxlZ2F0ZSA9IChpZCA8VUlUZXh0SW5wdXRTdWdnZXN0aW9u RGVsZWdhdGU+KV9jb250ZW50Vmlldy5pbnB1dERlbGVnYXRlOwpAQCAtNjU5LDYgKzY2Niw4IEBA IC0gKHZvaWQpY2xlYW51cEludGVyYWN0aW9uCiAgICAgW19oaWdobGlnaHRWaWV3IHJlbW92ZUZy b21TdXBlcnZpZXddOwogICAgIF9vdXRzdGFuZGluZ1Bvc2l0aW9uSW5mb3JtYXRpb25SZXF1ZXN0 ID0gc3RkOjpudWxsb3B0OwogCisgICAgX2ZpcnN0UmVzcG9uZGVyUmVxdWlyZXNTdHJvbmdQYXNz d29yZEFzc2lzdGFuY2UgPSBOTzsKKwogICAgIGlmIChfaW50ZXJhY3Rpb25WaWV3c0NvbnRhaW5l clZpZXcpIHsKICAgICAgICAgW3NlbGYubGF5ZXIgcmVtb3ZlT2JzZXJ2ZXI6c2VsZiBmb3JLZXlQ YXRoOkAidHJhbnNmb3JtIl07CiAgICAgICAgIFtfaW50ZXJhY3Rpb25WaWV3c0NvbnRhaW5lclZp ZXcgcmVtb3ZlRnJvbVN1cGVydmlld107CkBAIC00MDIxLDYgKzQwMzAsMTAgQEAgLSAodm9pZClf c3RhcnRBc3Npc3RpbmdOb2RlOihjb25zdCBBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiYpaW5mb3Jt YXRpb24gdXNlcklzSW4KICAgICBpZiAoX2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmVsZW1lbnRU eXBlID09IGluZm9ybWF0aW9uLmVsZW1lbnRUeXBlICYmIF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlv bi5lbGVtZW50UmVjdCA9PSBpbmZvcm1hdGlvbi5lbGVtZW50UmVjdCkKICAgICAgICAgcmV0dXJu OwogCisgICAgX2ZpcnN0UmVzcG9uZGVyUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2Ug PSBOTzsKKyAgICBpZiAoW2lucHV0RGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rv cihfd2ViVmlldzpmb2N1c1JlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlOildKQorICAg ICAgICBfZmlyc3RSZXNwb25kZXJSZXF1aXJlc1N0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSA9IFtp bnB1dERlbGVnYXRlIF93ZWJWaWV3Ol93ZWJWaWV3IGZvY3VzUmVxdWlyZXNTdHJvbmdQYXNzd29y ZEFzc2lzdGFuY2U6Zm9jdXNlZEVsZW1lbnRJbmZvLmdldCgpXTsKKwogICAgIEJPT0wgZWRpdGFi bGVDaGFuZ2VkID0gW3NlbGYgc2V0SXNFZGl0YWJsZTpZRVNdOwogICAgIF9hc3Npc3RlZE5vZGVJ bmZvcm1hdGlvbiA9IGluZm9ybWF0aW9uOwogICAgIF9pbnB1dFBlcmlwaGVyYWwgPSBuaWw7CkBA IC00MDY0LDcgKzQwNzcsNyBAQCAtICh2b2lkKV9zdGFydEFzc2lzdGluZ05vZGU6KGNvbnN0IEFz c2lzdGVkTm9kZUluZm9ybWF0aW9uJilpbmZvcm1hdGlvbiB1c2VySXNJbgogICAgIFtfaW5wdXRQ ZXJpcGhlcmFsIGJlZ2luRWRpdGluZ107CiAKICAgICBpZiAoW2lucHV0RGVsZWdhdGUgcmVzcG9u ZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpkaWRTdGFydElucHV0U2Vzc2lvbjopXSkg ewotICAgICAgICBfZm9ybUlucHV0U2Vzc2lvbiA9IGFkb3B0TlMoW1tXS0Zvcm1JbnB1dFNlc3Np b24gYWxsb2NdIGluaXRXaXRoQ29udGVudFZpZXc6c2VsZiBmb2N1c2VkRWxlbWVudEluZm86Zm9j dXNlZEVsZW1lbnRJbmZvLmdldCgpXSk7CisgICAgICAgIF9mb3JtSW5wdXRTZXNzaW9uID0gYWRv cHROUyhbW1dLRm9ybUlucHV0U2Vzc2lvbiBhbGxvY10gaW5pdFdpdGhDb250ZW50VmlldzpzZWxm IGZvY3VzZWRFbGVtZW50SW5mbzpmb2N1c2VkRWxlbWVudEluZm8uZ2V0KCkgcmVxdWlyZXNTdHJv bmdQYXNzd29yZEFzc2lzdGFuY2U6X2ZpcnN0UmVzcG9uZGVyUmVxdWlyZXNTdHJvbmdQYXNzd29y ZEFzc2lzdGFuY2VdKTsKICAgICAgICAgW2lucHV0RGVsZWdhdGUgX3dlYlZpZXc6X3dlYlZpZXcg ZGlkU3RhcnRJbnB1dFNlc3Npb246X2Zvcm1JbnB1dFNlc3Npb24uZ2V0KCldOwogICAgIH0KICAg ICAKQEAgLTQwODAsNiArNDA5Myw3IEBAIC0gKHZvaWQpX3N0b3BBc3Npc3RpbmdOb2RlCiAKICAg ICBfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uZWxlbWVudFR5cGUgPSBJbnB1dFR5cGU6Ok5vbmU7 CiAgICAgX2lucHV0UGVyaXBoZXJhbCA9IG5pbDsKKyAgICBfZmlyc3RSZXNwb25kZXJSZXF1aXJl c1N0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSA9IE5POwogCiAgICAgW3NlbGYgX3N0b3BBc3Npc3Rp bmdLZXlib2FyZF07CiAgICAgW19mb3JtQWNjZXNzb3J5VmlldyBoaWRlQXV0b0ZpbGxCdXR0b25d OwpAQCAtNTA1MSwxNCArNTA2NSwxOCBAQCAtIChOU0FycmF5PFVJRHJhZ0l0ZW0gKj4gKilfaXRl bXNGb3JCZWdpbm5pbmdPckFkZGluZ1RvU2Vzc2lvbldpdGhSZWdpc3RyYXRpb25MaQogCiAtIChO U0RpY3Rpb25hcnkgKilfYXV0b2ZpbGxDb250ZXh0CiB7Ci0gICAgaWYgKF9hc3Npc3RlZE5vZGVJ bmZvcm1hdGlvbi5lbGVtZW50VHlwZSA9PSBJbnB1dFR5cGU6Ok5vbmUgfHwgIV9hc3Npc3RlZE5v ZGVJbmZvcm1hdGlvbi5hY2NlcHRzQXV0b2ZpbGxlZExvZ2luQ3JlZGVudGlhbHMpCisgICAgQk9P TCBwcm92aWRlU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlID0gX2ZpcnN0UmVzcG9uZGVyUmVxdWly ZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UgJiYgX2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmVs ZW1lbnRUeXBlID09IElucHV0VHlwZTo6UGFzc3dvcmQ7CisgICAgaWYgKF9hc3Npc3RlZE5vZGVJ bmZvcm1hdGlvbi5lbGVtZW50VHlwZSA9PSBJbnB1dFR5cGU6Ok5vbmUgfHwgKCFfYXNzaXN0ZWRO b2RlSW5mb3JtYXRpb24uYWNjZXB0c0F1dG9maWxsZWRMb2dpbkNyZWRlbnRpYWxzICYmICFwcm92 aWRlU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAorICAg IGlmIChwcm92aWRlU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlKQorICAgICAgICByZXR1cm4gQHsg QCJfYXV0b21hdGljUGFzc3dvcmRLZXlib2FyZCIgOiBAWUVTIH07CisKICAgICBOU1VSTCAqcGxh dGZvcm1VUkwgPSBfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24ucmVwcmVzZW50aW5nUGFnZVVSTDsK LSAgICBpZiAoIXBsYXRmb3JtVVJMKQotICAgICAgICByZXR1cm4gbmlsOworICAgIGlmIChwbGF0 Zm9ybVVSTCkKKyAgICAgICAgcmV0dXJuIEB7IEAiX1dlYlZpZXdVUkwiIDogcGxhdGZvcm1VUkwg fTsKIAotICAgIHJldHVybiBAeyBAIl9XZWJWaWV3VVJMIiA6IHBsYXRmb3JtVVJMIH07CisgICAg cmV0dXJuIG5pbDsKIH0KIAogI3ByYWdtYSBtYXJrIC0gVUlEcmFnSW50ZXJhY3Rpb25EZWxlZ2F0 ZQo= 334061 2018-02-16 12:41:25 -0800 2018-02-18 09:51:54 -0800 Patch bug-182718-20180216124125.patch text/plain 9302 rabbasian U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4NTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM5ZDYzNjViZmU1OTAyZGIy NWEwODI2MDliNWUyZWE4NjQ1YjBmMTMuLjI4MzFmZGIxMWRjZDUzMGQwOTI4ZGNiZWFjYWNlYjcx OTM4YmQxNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTgtMDItMTQgIFJlemEgQWJi YXNpYW4gIDxyYWJiYXNpYW5AYXBwbGUuY29tPgorCisgICAgICAgIFNldCB0aGUgYXBwcm9wcmlh dGUgQXV0b0ZpbGwgY29udGV4dCBmb3Igc3VnZ2VzdGVkIHBhc3N3b3Jkcy4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjcxOAorICAgICAgICA8cmRh cjovL3Byb2JsZW0vMzYzMjY4NjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVo IGFuZCBUaW0gSG9ydG9uLgorCisgICAgICAgIEJlZm9yZSBzdGFydGluZyB0aGUgaW5wdXQgc2Vz c2lvbiwgY2FsbCB0aGUgbmV3IGRlbGVnYXRlIHRvIHF1ZXJ5IGlmIEF1dG9GaWxsIHBhc3N3b3Jk IHN1Z2dlc3Rpb24gYXNzaXN0YW5jZQorICAgICAgICBpcyByZXF1aXJlZCBmb3IgdGhlIGZvY3Vz ZWQgZWxlbWVudC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLRm9ybUlucHV0 U2Vzc2lvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLSW5wdXREZWxlZ2F0 ZS5oOgorICAgICAgICBJbnRyb2R1Y2UgYSBuZXcgZGVsZWdhdGUgdG8gYmUgY2FsbGVkICBiZWZv cmUgc3RhcnRpbmcgYW4gaW5wdXQgc2Vzc2lvbiB0byBxdWVyeSBpZiBBdXRvRmlsbCBwYXNzd29y ZCBzdWdnZXN0aW9uCisgICAgICAgIGFzc2lzdGFuY2UgaXMgcmVxdWlyZWQgZm9yIHRoZSBmb2N1 c2VkIGVsZW1lbnQuCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJh Y3Rpb24uaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbToKKyAgICAgICAgKC1bV0tGb3JtSW5wdXRTZXNzaW9uIGluaXRXaXRoQ29udGVudFZpZXc6 Zm9jdXNlZEVsZW1lbnRJbmZvOnJlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlOl0pOgor ICAgICAgICAoLVtXS0Zvcm1JbnB1dFNlc3Npb24gcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lz dGFuY2VdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBjbGVhbnVwSW50ZXJhY3Rpb25dKToK KyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfc3RhcnRBc3Npc3RpbmdOb2RlOnVzZXJJc0ludGVy YWN0aW5nOmJsdXJQcmV2aW91c05vZGU6Y2hhbmdpbmdBY3Rpdml0eVN0YXRlOnVzZXJPYmplY3Q6 XSk6CisgICAgICAgIENhbGwgdGhlIGRlbGVnYXRlIHRvIGZpbmQgb3V0IGlmIEF1dG9GaWxsIHN1 Z2dlc3RlZCBwYXNzd29yZCBhc3Npc3RhbmNlIGlzIHJlcXVpcmVkLgorICAgICAgICAoLVtXS0Nv bnRlbnRWaWV3IF9zdG9wQXNzaXN0aW5nTm9kZV0pOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3 IF9hdXRvZmlsbENvbnRleHRdKTogSWYgdGhlIGZpcnN0IHJlc3BvbmRlciBpcyBhIHBhc3N3b3Jk IGVsZW1lbnQgYW5kIHJlcXVpcmVzCisgICAgICAgIGFzc2lzdGFuY2UgZm9yIEF1dG9GaWxsIHN1 Z2dlc3RlZCBwYXNzd29yZCwgc2V0IHRoZSBhcHByb3ByaWF0ZSBBdXRvRmlsbCBjb250ZXh0Lgor ICAgICAgICAoLVtXS0Zvcm1JbnB1dFNlc3Npb24gaW5pdFdpdGhDb250ZW50Vmlldzpmb2N1c2Vk RWxlbWVudEluZm86XSk6IERlbGV0ZWQuCisKIDIwMTgtMDItMTYgIFBlciBBcm5lIFZvbGxhbiAg PHB2b2xsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBzdG9wcGluZyBvZiBydW4g bG9vcCBpbiB0aGUgV2ViQ29udGVudCBwcm9jZXNzIHdoZW4gdXNpbmcgTlNSdW5Mb29wLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0Zvcm1JbnB1dFNl c3Npb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tGb3JtSW5wdXRT ZXNzaW9uLmgKaW5kZXggMDlkZmIyZjBiNDVmNzUzYzg5N2UxOTk4MWIyNTFmODY1OTliZWM0ZC4u ZTZmZTY1ODg0ZTM2NDUyY2FjNzQ2MDMwODhmMDJjZjc4MjBjOWI3NyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0Zvcm1JbnB1dFNlc3Npb24uaAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLRm9ybUlucHV0U2Vzc2lvbi5o CkBAIC00NCw2ICs0NCw3IEBACiBAcHJvcGVydHkgKG5vbmF0b21pYywgY29weSkgTlNBcnJheTxV SVRleHRTdWdnZXN0aW9uICo+ICpzdWdnZXN0aW9ucyBXS19BUElfQVZBSUxBQkxFKGlvcygxMC4w KSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9PTCBhY2Nlc3NvcnlWaWV3U2hvdWxkTm90U2hv dyBXS19BUElfQVZBSUxBQkxFKGlvcygxMC4wKSk7CiBAcHJvcGVydHkgKG5vbmF0b21pYykgQk9P TCBmb3JjZVNlY3VyZVRleHRFbnRyeSBXS19BUElfQVZBSUxBQkxFKGlvcygxMC4wKSk7CitAcHJv cGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIEJPT0wgcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFz c2lzdGFuY2UgV0tfQVBJX0FWQUlMQUJMRShpb3MoV0tfSU9TX1RCQSkpOwogI2VuZGlmCiAKIEBl bmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tJbnB1 dERlbGVnYXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLSW5wdXRE ZWxlZ2F0ZS5oCmluZGV4IDVjM2I1MDg2MTdmOWJhZjQzMTM0OWI4NzE2OWVkMWM4OWQwYTJiNjQu LmE5ODYyNDBjODM1NDY4M2FlZjJlODE0ZDI2ZWVhODAwNWEzODU5YjIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tJbnB1dERlbGVnYXRlLmgKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0lucHV0RGVsZWdhdGUuaApAQCAt NDUsNiArNDUsNyBAQAogLSAoQk9PTClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBmb2N1 c1Nob3VsZFN0YXJ0SW5wdXRTZXNzaW9uOihpZCA8X1dLRm9jdXNlZEVsZW1lbnRJbmZvPilpbmZv OwogLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBhY2Nlc3NvcnlWaWV3Q3Vz dG9tQnV0dG9uVGFwcGVkSW5Gb3JtSW5wdXRTZXNzaW9uOihpZCA8X1dLRm9ybUlucHV0U2Vzc2lv bj4paW5wdXRTZXNzaW9uOwogLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBp bnNlcnRUZXh0U3VnZ2VzdGlvbjooVUlUZXh0U3VnZ2VzdGlvbiAqKXN1Z2dlc3Rpb24gaW5JbnB1 dFNlc3Npb246KGlkIDxfV0tGb3JtSW5wdXRTZXNzaW9uPilpbnB1dFNlc3Npb24gV0tfQVBJX0FW QUlMQUJMRShpb3MoMTAuMCkpOworLSAoQk9PTClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmll dyBmb2N1c1JlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlOihpZCA8X1dLRm9jdXNlZEVs ZW1lbnRJbmZvPilpbmZvIFdLX0FQSV9BVkFJTEFCTEUoaW9zKFdLX0lPU19UQkEpKTsKICNlbmRp ZgogCiBAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLmgKaW5kZXggNGVjN2NhNzUwZjYzYTkwNWIxZDcwMzk4MGJjYTdh MDA0Y2M0MmExMy4uYTc5MTBlN2E0Yzk0YWQ1OWIxZTY4MWU0MGQ2Nzg3ODc5MjE1MTMwNCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24uaApAQCAtMjM2LDYgKzIzNiw4IEBAIHN0cnVjdCBXS0F1dG9Db3JyZWN0aW9uRGF0 YSB7CiAgICAgQk9PTCBfbmVlZHNEZWZlcnJlZEVuZFNjcm9sbGluZ1NlbGVjdGlvblVwZGF0ZTsK ICAgICBCT09MIF9pc0NoYW5naW5nRm9jdXM7CiAKKyAgICBCT09MIF9mb2N1c1JlcXVpcmVzU3Ry b25nUGFzc3dvcmRBc3Npc3RhbmNlOworCiAjaWYgRU5BQkxFKERBVEFfSU5URVJBQ1RJT04pCiAg ICAgV2ViS2l0OjpEcmFnRHJvcEludGVyYWN0aW9uU3RhdGUgX2RyYWdEcm9wSW50ZXJhY3Rpb25T dGF0ZTsKICAgICBSZXRhaW5QdHI8VUlEcmFnSW50ZXJhY3Rpb24+IF9kcmFnSW50ZXJhY3Rpb247 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbQppbmRleCAyOTM4MWNhOTVkN2NiY2FlODk1OTE5YmNkYzUxYzk0MzBjYjRm ZGYwLi40NTZkMzkwMDVhMThmMTY0NWI3YjMyZGRmNWE0MTRmMGQwY2NjNTk3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rp b24ubW0KQEAgLTI3Niw3ICsyNzYsNyBAQCBAZW5kCiAKIEBpbnRlcmZhY2UgV0tGb3JtSW5wdXRT ZXNzaW9uIDogTlNPYmplY3QgPF9XS0Zvcm1JbnB1dFNlc3Npb24+CiAKLS0gKGluc3RhbmNldHlw ZSlpbml0V2l0aENvbnRlbnRWaWV3OihXS0NvbnRlbnRWaWV3ICopdmlldyBmb2N1c2VkRWxlbWVu dEluZm86KFdLRm9jdXNlZEVsZW1lbnRJbmZvICopZWxlbWVudEluZm87CistIChpbnN0YW5jZXR5 cGUpaW5pdFdpdGhDb250ZW50VmlldzooV0tDb250ZW50VmlldyAqKXZpZXcgZm9jdXNlZEVsZW1l bnRJbmZvOihXS0ZvY3VzZWRFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZvIHJlcXVpcmVzU3Ryb25n UGFzc3dvcmRBc3Npc3RhbmNlOihCT09MKXJlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNl OwogLSAodm9pZClpbnZhbGlkYXRlOwogCiBAZW5kCkBAIC0yODgsMTUgKzI4OCwxNyBAQCBAaW1w bGVtZW50YXRpb24gV0tGb3JtSW5wdXRTZXNzaW9uIHsKICAgICBSZXRhaW5QdHI8TlNBcnJheTxV SVRleHRTdWdnZXN0aW9uICo+PiBfc3VnZ2VzdGlvbnM7CiAgICAgQk9PTCBfYWNjZXNzb3J5Vmll d1Nob3VsZE5vdFNob3c7CiAgICAgQk9PTCBfZm9yY2VTZWN1cmVUZXh0RW50cnk7CisgICAgQk9P TCBfcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2U7CiB9CiAKLS0gKGluc3RhbmNldHlw ZSlpbml0V2l0aENvbnRlbnRWaWV3OihXS0NvbnRlbnRWaWV3ICopdmlldyBmb2N1c2VkRWxlbWVu dEluZm86KFdLRm9jdXNlZEVsZW1lbnRJbmZvICopZWxlbWVudEluZm8KKy0gKGluc3RhbmNldHlw ZSlpbml0V2l0aENvbnRlbnRWaWV3OihXS0NvbnRlbnRWaWV3ICopdmlldyBmb2N1c2VkRWxlbWVu dEluZm86KFdLRm9jdXNlZEVsZW1lbnRJbmZvICopZWxlbWVudEluZm8gcmVxdWlyZXNTdHJvbmdQ YXNzd29yZEFzc2lzdGFuY2U6KEJPT0wpcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UK IHsKICAgICBpZiAoIShzZWxmID0gW3N1cGVyIGluaXRdKSkKICAgICAgICAgcmV0dXJuIG5pbDsK IAogICAgIF9jb250ZW50VmlldyA9IHZpZXc7CiAgICAgX2ZvY3VzZWRFbGVtZW50SW5mbyA9IGVs ZW1lbnRJbmZvOworICAgIF9yZXF1aXJlc1N0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSA9IHJlcXVp cmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlOwogCiAgICAgcmV0dXJuIHNlbGY7CiB9CkBAIC0z ODUsNiArMzg3LDExIEBAIC0gKHZvaWQpc2V0U3VnZ2VzdGlvbnM6KE5TQXJyYXk8VUlUZXh0U3Vn Z2VzdGlvbiAqPiAqKXN1Z2dlc3Rpb25zCiAgICAgW3N1Z2dlc3Rpb25EZWxlZ2F0ZSBzZXRTdWdn ZXN0aW9uczpzdWdnZXN0aW9uc107CiB9CiAKKy0gKEJPT0wpcmVxdWlyZXNTdHJvbmdQYXNzd29y ZEFzc2lzdGFuY2UKK3sKKyAgICByZXR1cm4gX3JlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3Rh bmNlOworfQorCiAtICh2b2lkKWludmFsaWRhdGUKIHsKICAgICBpZCA8VUlUZXh0SW5wdXRTdWdn ZXN0aW9uRGVsZWdhdGU+IHN1Z2dlc3Rpb25EZWxlZ2F0ZSA9IChpZCA8VUlUZXh0SW5wdXRTdWdn ZXN0aW9uRGVsZWdhdGU+KV9jb250ZW50Vmlldy5pbnB1dERlbGVnYXRlOwpAQCAtNjYwLDYgKzY2 Nyw4IEBAIC0gKHZvaWQpY2xlYW51cEludGVyYWN0aW9uCiAgICAgW19oaWdobGlnaHRWaWV3IHJl bW92ZUZyb21TdXBlcnZpZXddOwogICAgIF9vdXRzdGFuZGluZ1Bvc2l0aW9uSW5mb3JtYXRpb25S ZXF1ZXN0ID0gc3RkOjpudWxsb3B0OwogCisgICAgX2ZvY3VzUmVxdWlyZXNTdHJvbmdQYXNzd29y ZEFzc2lzdGFuY2UgPSBOTzsKKwogICAgIGlmIChfaW50ZXJhY3Rpb25WaWV3c0NvbnRhaW5lclZp ZXcpIHsKICAgICAgICAgW3NlbGYubGF5ZXIgcmVtb3ZlT2JzZXJ2ZXI6c2VsZiBmb3JLZXlQYXRo OkAidHJhbnNmb3JtIl07CiAgICAgICAgIFtfaW50ZXJhY3Rpb25WaWV3c0NvbnRhaW5lclZpZXcg cmVtb3ZlRnJvbVN1cGVydmlld107CkBAIC00MDIxLDYgKzQwMzAsMTAgQEAgLSAodm9pZClfc3Rh cnRBc3Npc3RpbmdOb2RlOihjb25zdCBBc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiYpaW5mb3JtYXRp b24gdXNlcklzSW4KICAgICBpZiAoX2Fzc2lzdGVkTm9kZUluZm9ybWF0aW9uLmVsZW1lbnRUeXBl ID09IGluZm9ybWF0aW9uLmVsZW1lbnRUeXBlICYmIF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5l bGVtZW50UmVjdCA9PSBpbmZvcm1hdGlvbi5lbGVtZW50UmVjdCkKICAgICAgICAgcmV0dXJuOwog CisgICAgX2ZvY3VzUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UgPSBOTzsKKyAgICBp ZiAoW2lucHV0RGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpm b2N1c1JlcXVpcmVzU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlOildKQorICAgICAgICBfZm9jdXNS ZXF1aXJlc1N0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSA9IFtpbnB1dERlbGVnYXRlIF93ZWJWaWV3 Ol93ZWJWaWV3IGZvY3VzUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2U6Zm9jdXNlZEVs ZW1lbnRJbmZvLmdldCgpXTsKKwogICAgIEJPT0wgZWRpdGFibGVDaGFuZ2VkID0gW3NlbGYgc2V0 SXNFZGl0YWJsZTpZRVNdOwogICAgIF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbiA9IGluZm9ybWF0 aW9uOwogICAgIF9pbnB1dFBlcmlwaGVyYWwgPSBuaWw7CkBAIC00MDY0LDcgKzQwNzcsNyBAQCAt ICh2b2lkKV9zdGFydEFzc2lzdGluZ05vZGU6KGNvbnN0IEFzc2lzdGVkTm9kZUluZm9ybWF0aW9u JilpbmZvcm1hdGlvbiB1c2VySXNJbgogICAgIFtfaW5wdXRQZXJpcGhlcmFsIGJlZ2luRWRpdGlu Z107CiAKICAgICBpZiAoW2lucHV0RGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rv cihfd2ViVmlldzpkaWRTdGFydElucHV0U2Vzc2lvbjopXSkgewotICAgICAgICBfZm9ybUlucHV0 U2Vzc2lvbiA9IGFkb3B0TlMoW1tXS0Zvcm1JbnB1dFNlc3Npb24gYWxsb2NdIGluaXRXaXRoQ29u dGVudFZpZXc6c2VsZiBmb2N1c2VkRWxlbWVudEluZm86Zm9jdXNlZEVsZW1lbnRJbmZvLmdldCgp XSk7CisgICAgICAgIF9mb3JtSW5wdXRTZXNzaW9uID0gYWRvcHROUyhbW1dLRm9ybUlucHV0U2Vz c2lvbiBhbGxvY10gaW5pdFdpdGhDb250ZW50VmlldzpzZWxmIGZvY3VzZWRFbGVtZW50SW5mbzpm b2N1c2VkRWxlbWVudEluZm8uZ2V0KCkgcmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2U6 X2ZvY3VzUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2VdKTsKICAgICAgICAgW2lucHV0 RGVsZWdhdGUgX3dlYlZpZXc6X3dlYlZpZXcgZGlkU3RhcnRJbnB1dFNlc3Npb246X2Zvcm1JbnB1 dFNlc3Npb24uZ2V0KCldOwogICAgIH0KICAgICAKQEAgLTQwODAsNiArNDA5Myw3IEBAIC0gKHZv aWQpX3N0b3BBc3Npc3RpbmdOb2RlCiAKICAgICBfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uZWxl bWVudFR5cGUgPSBJbnB1dFR5cGU6Ok5vbmU7CiAgICAgX2lucHV0UGVyaXBoZXJhbCA9IG5pbDsK KyAgICBfZm9jdXNSZXF1aXJlc1N0cm9uZ1Bhc3N3b3JkQXNzaXN0YW5jZSA9IE5POwogCiAgICAg W3NlbGYgX3N0b3BBc3Npc3RpbmdLZXlib2FyZF07CiAgICAgW19mb3JtQWNjZXNzb3J5VmlldyBo aWRlQXV0b0ZpbGxCdXR0b25dOwpAQCAtNTA4MCwxNCArNTA5NCwxOCBAQCAtIChOU0FycmF5PFVJ RHJhZ0l0ZW0gKj4gKilfaXRlbXNGb3JCZWdpbm5pbmdPckFkZGluZ1RvU2Vzc2lvbldpdGhSZWdp c3RyYXRpb25MaQogCiAtIChOU0RpY3Rpb25hcnkgKilfYXV0b2ZpbGxDb250ZXh0CiB7Ci0gICAg aWYgKF9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5lbGVtZW50VHlwZSA9PSBJbnB1dFR5cGU6Ok5v bmUgfHwgIV9hc3Npc3RlZE5vZGVJbmZvcm1hdGlvbi5hY2NlcHRzQXV0b2ZpbGxlZExvZ2luQ3Jl ZGVudGlhbHMpCisgICAgQk9PTCBwcm92aWRlU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlID0gX2Zv Y3VzUmVxdWlyZXNTdHJvbmdQYXNzd29yZEFzc2lzdGFuY2UgJiYgX2Fzc2lzdGVkTm9kZUluZm9y bWF0aW9uLmVsZW1lbnRUeXBlID09IElucHV0VHlwZTo6UGFzc3dvcmQ7CisgICAgaWYgKF9hc3Np c3RlZE5vZGVJbmZvcm1hdGlvbi5lbGVtZW50VHlwZSA9PSBJbnB1dFR5cGU6Ok5vbmUgfHwgKCFf YXNzaXN0ZWROb2RlSW5mb3JtYXRpb24uYWNjZXB0c0F1dG9maWxsZWRMb2dpbkNyZWRlbnRpYWxz ICYmICFwcm92aWRlU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlKSkKICAgICAgICAgcmV0dXJuIG5p bDsKIAorICAgIGlmIChwcm92aWRlU3Ryb25nUGFzc3dvcmRBc3Npc3RhbmNlKQorICAgICAgICBy ZXR1cm4gQHsgQCJfYXV0b21hdGljUGFzc3dvcmRLZXlib2FyZCIgOiBAWUVTIH07CisKICAgICBO U1VSTCAqcGxhdGZvcm1VUkwgPSBfYXNzaXN0ZWROb2RlSW5mb3JtYXRpb24ucmVwcmVzZW50aW5n UGFnZVVSTDsKLSAgICBpZiAoIXBsYXRmb3JtVVJMKQotICAgICAgICByZXR1cm4gbmlsOworICAg IGlmIChwbGF0Zm9ybVVSTCkKKyAgICAgICAgcmV0dXJuIEB7IEAiX1dlYlZpZXdVUkwiIDogcGxh dGZvcm1VUkwgfTsKIAotICAgIHJldHVybiBAeyBAIl9XZWJWaWV3VVJMIiA6IHBsYXRmb3JtVVJM IH07CisgICAgcmV0dXJuIG5pbDsKIH0KIAogI3ByYWdtYSBtYXJrIC0gVUlEcmFnSW50ZXJhY3Rp b25EZWxlZ2F0ZQo=