196021 2019-03-20 11:49:48 -0700 [iOS] Inline -_ensureFormAccessoryView into -formAccessoryView and have -_updateAccessory ensure we have a form accessory 2019-03-21 11:16:17 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Local Build iPhone / iPad iOS 12 RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1519044 0 dbates 2019-03-20 11:49:48 -0700 I don't see much benefit to -formAccessoryView being implemented in terms of -_ensureFormAccessoryView just inline the latter into the former and remove a method. Also, every caller except -formAccessoryView calls -_ensureFormAccessoryView followed immediately by -_updateAccessory. So, let's have -_updateAccessory just ensure we have a form accessory view instead of each caller. 1519052 1 365374 dbates 2019-03-20 11:55:14 -0700 Created attachment 365374 Patch 1519723 2 365374 wenson_hsieh 2019-03-21 10:47:16 -0700 Comment on attachment 365374 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365374&action=review > Source/WebKit/ChangeLog:9 > + Every caller of -_ensureFormAccessoryView, except -formAccessoryView, immediately the call with > + -_updateAccessory. Let's just have -_updateAccessory ensure we have a form accessory view and Nit - "immediately the call with" > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3784 > + [self formAccessoryView]; // Creates one if needed. Nit - we can also do something like: UIWebFormAccessory *accessoryView = [self formAccessoryView]; ...and then just use the accessoryView variable below, instead of _formAccessoryView. I think we wouldn't need the comment if we did this. 1519735 3 365374 dbates 2019-03-21 11:01:57 -0700 Comment on attachment 365374 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365374&action=review >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3784 >> + [self formAccessoryView]; // Creates one if needed. > > Nit - we can also do something like: > > UIWebFormAccessory *accessoryView = [self formAccessoryView]; > > ...and then just use the accessoryView variable below, instead of _formAccessoryView. I think we wouldn't need the comment if we did this. Of course! What was I thinking! 1519745 4 365374 dbates 2019-03-21 11:10:07 -0700 Comment on attachment 365374 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=365374&action=review >>> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3784 >>> + [self formAccessoryView]; // Creates one if needed. >> >> Nit - we can also do something like: >> >> UIWebFormAccessory *accessoryView = [self formAccessoryView]; >> >> ...and then just use the accessoryView variable below, instead of _formAccessoryView. I think we wouldn't need the comment if we did this. > > Of course! What was I thinking! I'm still going to keep the comment though, because it seems subtle and I absolutely can envision a person in the future coming through this code, realizing we have _formAccessoryView and without thinking swap out the self.formAccessoryView with _formAccessoryView. 1519746 5 dbates 2019-03-21 11:10:58 -0700 (In reply to Daniel Bates from comment #4) > Comment on attachment 365374 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=365374&action=review > > >>> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:3784 > >>> + [self formAccessoryView]; // Creates one if needed. > >> > >> Nit - we can also do something like: > >> > >> UIWebFormAccessory *accessoryView = [self formAccessoryView]; > >> > >> ...and then just use the accessoryView variable below, instead of _formAccessoryView. I think we wouldn't need the comment if we did this. > > > > Of course! What was I thinking! > > I'm still going to keep the comment though, because it seems subtle and I > absolutely can envision a person in the future coming through this code, > realizing we have _formAccessoryView and without thinking swap out the > self.formAccessoryView with _formAccessoryView. Having a test would be better to catch this though :/ Leaving the comment in for now. 1519755 6 365573 dbates 2019-03-21 11:14:01 -0700 Created attachment 365573 To Land 1519757 7 dbates 2019-03-21 11:15:04 -0700 Committed r243302: <https://trac.webkit.org/changeset/243302> 1519760 8 webkit-bug-importer 2019-03-21 11:16:17 -0700 <rdar://problem/49115052> 365374 2019-03-20 11:55:14 -0700 2019-03-21 11:14:00 -0700 Patch bug-196021-20190320115513.patch text/plain 4424 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMTQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUwMWU2OGRjNDRkNmRiNjE4 ZTk4ZTIwOWQyNTcxNjVkMjUzMzJiYzAuLjM4MTNiNGE2ZGNjNDc4NGJlNjk1MzZhOGY2ZDlkMWQ0 N2FjYzkyNjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTktMDMtMjAgIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIElubGluZSAtX2Vuc3Vy ZUZvcm1BY2Nlc3NvcnlWaWV3IGludG8gLWZvcm1BY2Nlc3NvcnlWaWV3IGFuZCBoYXZlIC1fdXBk YXRlQWNjZXNzb3J5IGVuc3VyZSB3ZSBoYXZlIGEgZm9ybSBhY2Nlc3NvcnkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NjAyMQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEV2ZXJ5IGNhbGxlciBvZiAtX2Vu c3VyZUZvcm1BY2Nlc3NvcnlWaWV3LCBleGNlcHQgLWZvcm1BY2Nlc3NvcnlWaWV3LCBpbW1lZGlh dGVseSB0aGUgY2FsbCB3aXRoCisgICAgICAgIC1fdXBkYXRlQWNjZXNzb3J5LiBMZXQncyBqdXN0 IGhhdmUgLV91cGRhdGVBY2Nlc3NvcnkgZW5zdXJlIHdlIGhhdmUgYSBmb3JtIGFjY2Vzc29yeSB2 aWV3IGFuZAorICAgICAgICBpbmxpbmUgdGhlIGltcGxlbWVudGF0aW9uIG9mIC1fZW5zdXJlRm9y bUFjY2Vzc29yeVZpZXcgaW50byAtZm9ybUFjY2Vzc29yeVZpZXcgc28gd2UgY2FuIHJlbW92ZQor ICAgICAgICBvbmUgbWV0aG9kLgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgaW5wdXRWaWV3XSk6 IFJlbW92ZSBjYWxsIHRvIC1fZW5zdXJlRm9ybUFjY2Vzc29yeVZpZXcsIC1fdXBkYXRlQWNjZXNz b3J5IHdpbGwgZG8KKyAgICAgICAgdGhlIGVxdWl2YWxlbnQgd29yayBmb3IgdXMuCisgICAgICAg ICgtW1dLQ29udGVudFZpZXcgZm9ybUFjY2Vzc29yeVZpZXddKTogTW92ZWQgaW1wbGVtZW50YXRp b24gb2YgLV9lbnN1cmVGb3JtQWNjZXNzb3J5VmlldyBpbnRvIGhlcmUuCisgICAgICAgICgtW1dL Q29udGVudFZpZXcgX3VwZGF0ZUFjY2Vzc29yeV0pOiBDYWxsIFtzZWxmIGZvcm1BY2Nlc3NvcnlW aWV3XSB0byBlbnN1cmUgd2UgaGF2ZSBhIGZvcm0gYWNjZXNzb3J5IHZpZXcuCisgICAgICAgICgt W1dLQ29udGVudFZpZXcgX2VsZW1lbnREaWRGb2N1czp1c2VySXNJbnRlcmFjdGluZzpibHVyUHJl dmlvdXNOb2RlOmNoYW5naW5nQWN0aXZpdHlTdGF0ZTp1c2VyT2JqZWN0Ol0pOgorICAgICAgICBS ZW1vdmUgY2FsbCB0byAtX2Vuc3VyZUZvcm1BY2Nlc3NvcnlWaWV3LCAtX3VwZGF0ZUFjY2Vzc29y eSB3aWxsIGRvCisgICAgICAgIHRoZSBlcXVpdmFsZW50IHdvcmsgZm9yIHVzLgorICAgICAgICAo LVtXS0NvbnRlbnRWaWV3IF9lbnN1cmVGb3JtQWNjZXNzb3J5Vmlld10pOiBEZWxldGVkLgorCiAy MDE5LTAzLTIwICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBb aU9TXSBHcm91cCBVSVdlYkZvcm1BY2Nlc3NvcnlEZWxlZ2F0ZS1yZWxhdGVkIGNvZGUgYW5kIHRp Z2h0ZW4gaXQgdXAgYSBiaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCmluZGV4IDI2ZjQ1ODZlZmQ0ZjUxYjQxYjM2 MWZmY2Q1NjA4NTA4ODEwZGMwNTIuLjMzZjEyZTBjNDdmYTNkYzY4YmNiNjU4NzRjMDA1MjQzMjY1 NDg0MWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29u dGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAtMTY2MSw3ICsxNjYxLDYgQEAgLSAoVUlWaWV3ICop aW5wdXRWaWV3CiAgICAgICAgIC8vIEZvciBpbnN0YW5jZSwgb25lIHVzZSBjYXNlIHRoYXQgY3Vy cmVudGx5IHJlbGllcyBvbiB0aGlzIGRldGFpbCBpcyBhZGp1c3RpbmcgdGhlIHpvb20gc2NhbGUg YW5kIHZpZXdwb3J0IHVwb24KICAgICAgICAgLy8gcm90YXRpb24sIHdoZW4gYSBzZWxlY3QgZWxl bWVudCBpcyBmb2N1c2VkLiBTZWUgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzE5Mjg3OD4gZm9yIG1v cmUgaW5mb3JtYXRpb24uCiAgICAgICAgIFtzZWxmIF96b29tVG9SZXZlYWxGb2N1c2VkRWxlbWVu dF07Ci0gICAgICAgIFtzZWxmIF9lbnN1cmVGb3JtQWNjZXNzb3J5Vmlld107CiAgICAgICAgIFtz ZWxmIF91cGRhdGVBY2Nlc3NvcnldOwogICAgIH0KIApAQCAtMjQ3MiwxNSArMjQ3MSw2IEBAIC0g KFVJVGV4dElucHV0QXNzaXN0YW50SXRlbSAqKWlucHV0QXNzaXN0YW50SXRlbUZvcldlYlZpZXcK ICAgICByZXR1cm4gW3N1cGVyIGlucHV0QXNzaXN0YW50SXRlbV07CiB9CiAKLS0gKHZvaWQpX2Vu c3VyZUZvcm1BY2Nlc3NvcnlWaWV3Ci17Ci0gICAgaWYgKF9mb3JtQWNjZXNzb3J5VmlldykKLSAg ICAgICAgcmV0dXJuOwotCi0gICAgX2Zvcm1BY2Nlc3NvcnlWaWV3ID0gYWRvcHROUyhbW1VJV2Vi Rm9ybUFjY2Vzc29yeSBhbGxvY10gaW5pdFdpdGhJbnB1dEFzc2lzdGFudEl0ZW06c2VsZi5pbnB1 dEFzc2lzdGFudEl0ZW1dKTsKLSAgICBbX2Zvcm1BY2Nlc3NvcnlWaWV3IHNldERlbGVnYXRlOnNl bGZdOwotfQotCiAtIChVSVZpZXcgKilpbnB1dEFjY2Vzc29yeVZpZXcKIHsKICAgICBpZiAoIVtz ZWxmIHJlcXVpcmVzQWNjZXNzb3J5Vmlld10pCkBAIC0zNzgwLDggKzM3NzAsMTkgQEAgLSAodm9p ZClhY2Nlc3NvcnlBdXRvRmlsbAogICAgICAgICBbaW5wdXREZWxlZ2F0ZSBfd2ViVmlldzpfd2Vi VmlldyBhY2Nlc3NvcnlWaWV3Q3VzdG9tQnV0dG9uVGFwcGVkSW5Gb3JtSW5wdXRTZXNzaW9uOl9m b3JtSW5wdXRTZXNzaW9uLmdldCgpXTsKIH0KIAorLSAoVUlXZWJGb3JtQWNjZXNzb3J5ICopZm9y bUFjY2Vzc29yeVZpZXcKK3sKKyAgICBpZiAoX2Zvcm1BY2Nlc3NvcnlWaWV3KQorICAgICAgICBy ZXR1cm4gX2Zvcm1BY2Nlc3NvcnlWaWV3LmdldCgpOworICAgIF9mb3JtQWNjZXNzb3J5VmlldyA9 IGFkb3B0TlMoW1tVSVdlYkZvcm1BY2Nlc3NvcnkgYWxsb2NdIGluaXRXaXRoSW5wdXRBc3Npc3Rh bnRJdGVtOnNlbGYuaW5wdXRBc3Npc3RhbnRJdGVtXSk7CisgICAgW19mb3JtQWNjZXNzb3J5Vmll dyBzZXREZWxlZ2F0ZTpzZWxmXTsKKyAgICByZXR1cm4gX2Zvcm1BY2Nlc3NvcnlWaWV3LmdldCgp OworfQorCiAtICh2b2lkKV91cGRhdGVBY2Nlc3NvcnkKIHsKKyAgICBbc2VsZiBmb3JtQWNjZXNz b3J5Vmlld107IC8vIENyZWF0ZXMgb25lIGlmIG5lZWRlZC4KKwogICAgIFtfZm9ybUFjY2Vzc29y eVZpZXcgc2V0TmV4dEVuYWJsZWQ6X2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uaGFzTmV4dE5v ZGVdOwogICAgIFtfZm9ybUFjY2Vzc29yeVZpZXcgc2V0UHJldmlvdXNFbmFibGVkOl9mb2N1c2Vk RWxlbWVudEluZm9ybWF0aW9uLmhhc1ByZXZpb3VzTm9kZV07CiAKQEAgLTQ3OTgsMTIgKzQ3OTks NiBAQCAtIChWZWN0b3I8V2ViS2l0OjpPcHRpb25JdGVtPiYpZm9jdXNlZFNlbGVjdEVsZW1lbnRP cHRpb25zCiAgICAgcmV0dXJuIF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLnNlbGVjdE9wdGlv bnM7CiB9CiAKLS0gKFVJV2ViRm9ybUFjY2Vzc29yeSAqKWZvcm1BY2Nlc3NvcnlWaWV3Ci17Ci0g ICAgW3NlbGYgX2Vuc3VyZUZvcm1BY2Nlc3NvcnlWaWV3XTsKLSAgICByZXR1cm4gX2Zvcm1BY2Nl c3NvcnlWaWV3LmdldCgpOwotfQotCiBzdGF0aWMgYm9vbCBzaG91bGREZWZlclpvb21pbmdUb1Nl bGVjdGlvbldoZW5SZXZlYWxpbmdGb2N1c2VkRWxlbWVudChXZWJLaXQ6OklucHV0VHlwZSB0eXBl KQogewogICAgIHN3aXRjaCAodHlwZSkgewpAQCAtNDk4OSw3ICs0OTg0LDYgQEAgLSAodm9pZClf ZWxlbWVudERpZEZvY3VzOihjb25zdCBXZWJLaXQ6OkZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24m KWluZm9ybWF0aW9uIHUKICAgICBpZiAoIXNob3VsZERlZmVyWm9vbWluZ1RvU2VsZWN0aW9uV2hl blJldmVhbGluZ0ZvY3VzZWRFbGVtZW50KF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmVsZW1l bnRUeXBlKSkKICAgICAgICAgW3NlbGYgX3pvb21Ub1JldmVhbEZvY3VzZWRFbGVtZW50XTsKIAot ICAgIFtzZWxmIF9lbnN1cmVGb3JtQWNjZXNzb3J5Vmlld107CiAgICAgW3NlbGYgX3VwZGF0ZUFj Y2Vzc29yeV07CiAKICNpZiBQTEFURk9STShXQVRDSE9TKQo= 365573 2019-03-21 11:14:01 -0700 2019-03-21 11:14:01 -0700 To Land bug-196021-20190321111401.patch text/plain 5159 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzMzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDk4ODkzMmU3ODIzMzdiNGRl MWYwZTA0MGU5NTZlMTViNmYwMDA4N2EuLmRmOTM0OGRjODUwZmNkNzg4NTMxZWZiYzAwZjVmMzZk NGM4Y2NiY2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTktMDMtMjEgIERhbmllbCBC YXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIElubGluZSAtX2Vuc3Vy ZUZvcm1BY2Nlc3NvcnlWaWV3IGludG8gLWZvcm1BY2Nlc3NvcnlWaWV3IGFuZCBoYXZlIC1fdXBk YXRlQWNjZXNzb3J5IGVuc3VyZSB3ZSBoYXZlIGEgZm9ybSBhY2Nlc3NvcnkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NjAyMQorCisgICAgICAgIFJl dmlld2VkIGJ5IFdlbnNvbiBIc2llaC4KKworICAgICAgICBFdmVyeSBjYWxsZXIgb2YgLV9lbnN1 cmVGb3JtQWNjZXNzb3J5VmlldywgZXhjZXB0IC1mb3JtQWNjZXNzb3J5VmlldywgaW1tZWRpYXRl bHkgZm9sbG93cyB0aGUgY2FsbAorICAgICAgICB3aXRoIGEgY2FsbCB0byAtX3VwZGF0ZUFjY2Vz c29yeS4gTGV0J3MganVzdCBoYXZlIC1fdXBkYXRlQWNjZXNzb3J5IGVuc3VyZSB3ZSBoYXZlIGEg Zm9ybSBhY2Nlc3NvcnkKKyAgICAgICAgdmlldyBhbmQgaW5saW5lIHRoZSBpbXBsZW1lbnRhdGlv biBvZiAtX2Vuc3VyZUZvcm1BY2Nlc3NvcnlWaWV3IGludG8gLWZvcm1BY2Nlc3NvcnlWaWV3IHNv IHdlIGNhbgorICAgICAgICByZW1vdmUgb25lIG1ldGhvZC4KKworICAgICAgICAqIFVJUHJvY2Vz cy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRW aWV3IGlucHV0Vmlld10pOiBSZW1vdmUgY2FsbCB0byAtX2Vuc3VyZUZvcm1BY2Nlc3NvcnlWaWV3 LCAtX3VwZGF0ZUFjY2Vzc29yeSB3aWxsIGRvCisgICAgICAgIHRoZSBlcXVpdmFsZW50IHdvcmsg Zm9yIHVzLgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IGZvcm1BY2Nlc3NvcnlWaWV3XSk6IE1v dmVkIGltcGxlbWVudGF0aW9uIG9mIC1fZW5zdXJlRm9ybUFjY2Vzc29yeVZpZXcgaW50byBoZXJl LgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IF91cGRhdGVBY2Nlc3NvcnldKTogQ2FsbCBzZWxm LmZvcm1BY2Nlc3NvcnlWaWV3IHRvIGVuc3VyZSB3ZSBoYXZlIGEgZm9ybSBhY2Nlc3Nvcnkgdmll dy4KKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfZWxlbWVudERpZEZvY3VzOnVzZXJJc0ludGVy YWN0aW5nOmJsdXJQcmV2aW91c05vZGU6Y2hhbmdpbmdBY3Rpdml0eVN0YXRlOnVzZXJPYmplY3Q6 XSk6CisgICAgICAgIFJlbW92ZSBjYWxsIHRvIC1fZW5zdXJlRm9ybUFjY2Vzc29yeVZpZXcsIC1f dXBkYXRlQWNjZXNzb3J5IHdpbGwgZG8KKyAgICAgICAgdGhlIGVxdWl2YWxlbnQgd29yayBmb3Ig dXMuCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2Vuc3VyZUZvcm1BY2Nlc3NvcnlWaWV3XSk6 IERlbGV0ZWQuCisKIDIwMTktMDMtMjEgIFNoYXduIFJvYmVydHMgIDxzcm9iZXJ0c0BhcHBsZS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjI0MzI1MC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9u Lm1tCmluZGV4IGQ1OGM0Njc1YTg5YzY4ZTYyZjg3MGM3MzliYjE2MjA2NGUwNGRiOTkuLmVkZDEz ZDFkMWI2YjRmOWUxMzM5NWFlYTYwYmVlMjFjYzk0ODgxNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQpAQCAt MTY2NSw3ICsxNjY1LDYgQEAgLSAoVUlWaWV3ICopaW5wdXRWaWV3CiAgICAgICAgIC8vIEZvciBp bnN0YW5jZSwgb25lIHVzZSBjYXNlIHRoYXQgY3VycmVudGx5IHJlbGllcyBvbiB0aGlzIGRldGFp bCBpcyBhZGp1c3RpbmcgdGhlIHpvb20gc2NhbGUgYW5kIHZpZXdwb3J0IHVwb24KICAgICAgICAg Ly8gcm90YXRpb24sIHdoZW4gYSBzZWxlY3QgZWxlbWVudCBpcyBmb2N1c2VkLiBTZWUgPGh0dHBz Oi8vd2Via2l0Lm9yZy9iLzE5Mjg3OD4gZm9yIG1vcmUgaW5mb3JtYXRpb24uCiAgICAgICAgIFtz ZWxmIF96b29tVG9SZXZlYWxGb2N1c2VkRWxlbWVudF07Ci0gICAgICAgIFtzZWxmIF9lbnN1cmVG b3JtQWNjZXNzb3J5Vmlld107CiAgICAgICAgIFtzZWxmIF91cGRhdGVBY2Nlc3NvcnldOwogICAg IH0KIApAQCAtMjQ3NiwxNSArMjQ3NSw2IEBAIC0gKFVJVGV4dElucHV0QXNzaXN0YW50SXRlbSAq KWlucHV0QXNzaXN0YW50SXRlbUZvcldlYlZpZXcKICAgICByZXR1cm4gW3N1cGVyIGlucHV0QXNz aXN0YW50SXRlbV07CiB9CiAKLS0gKHZvaWQpX2Vuc3VyZUZvcm1BY2Nlc3NvcnlWaWV3Ci17Ci0g ICAgaWYgKF9mb3JtQWNjZXNzb3J5VmlldykKLSAgICAgICAgcmV0dXJuOwotCi0gICAgX2Zvcm1B Y2Nlc3NvcnlWaWV3ID0gYWRvcHROUyhbW1VJV2ViRm9ybUFjY2Vzc29yeSBhbGxvY10gaW5pdFdp dGhJbnB1dEFzc2lzdGFudEl0ZW06c2VsZi5pbnB1dEFzc2lzdGFudEl0ZW1dKTsKLSAgICBbX2Zv cm1BY2Nlc3NvcnlWaWV3IHNldERlbGVnYXRlOnNlbGZdOwotfQotCiAtIChVSVZpZXcgKilpbnB1 dEFjY2Vzc29yeVZpZXcKIHsKICAgICBpZiAoIVtzZWxmIHJlcXVpcmVzQWNjZXNzb3J5Vmlld10p CkBAIC0zNzg0LDEzICszNzc0LDI0IEBAIC0gKHZvaWQpYWNjZXNzb3J5QXV0b0ZpbGwKICAgICAg ICAgW2lucHV0RGVsZWdhdGUgX3dlYlZpZXc6X3dlYlZpZXcgYWNjZXNzb3J5Vmlld0N1c3RvbUJ1 dHRvblRhcHBlZEluRm9ybUlucHV0U2Vzc2lvbjpfZm9ybUlucHV0U2Vzc2lvbi5nZXQoKV07CiB9 CiAKKy0gKFVJV2ViRm9ybUFjY2Vzc29yeSAqKWZvcm1BY2Nlc3NvcnlWaWV3Cit7CisgICAgaWYg KF9mb3JtQWNjZXNzb3J5VmlldykKKyAgICAgICAgcmV0dXJuIF9mb3JtQWNjZXNzb3J5Vmlldy5n ZXQoKTsKKyAgICBfZm9ybUFjY2Vzc29yeVZpZXcgPSBhZG9wdE5TKFtbVUlXZWJGb3JtQWNjZXNz b3J5IGFsbG9jXSBpbml0V2l0aElucHV0QXNzaXN0YW50SXRlbTpzZWxmLmlucHV0QXNzaXN0YW50 SXRlbV0pOworICAgIFtfZm9ybUFjY2Vzc29yeVZpZXcgc2V0RGVsZWdhdGU6c2VsZl07CisgICAg cmV0dXJuIF9mb3JtQWNjZXNzb3J5Vmlldy5nZXQoKTsKK30KKwogLSAodm9pZClfdXBkYXRlQWNj ZXNzb3J5CiB7Ci0gICAgW19mb3JtQWNjZXNzb3J5VmlldyBzZXROZXh0RW5hYmxlZDpfZm9jdXNl ZEVsZW1lbnRJbmZvcm1hdGlvbi5oYXNOZXh0Tm9kZV07Ci0gICAgW19mb3JtQWNjZXNzb3J5Vmll dyBzZXRQcmV2aW91c0VuYWJsZWQ6X2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uaGFzUHJldmlv dXNOb2RlXTsKKyAgICBhdXRvKiBhY2Nlc3NvcnlWaWV3ID0gc2VsZi5mb3JtQWNjZXNzb3J5Vmll dzsgLy8gQ3JlYXRlcyBvbmUsIGlmIG5lZWRlZC4KKworICAgIFthY2Nlc3NvcnlWaWV3IHNldE5l eHRFbmFibGVkOl9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmhhc05leHROb2RlXTsKKyAgICBb YWNjZXNzb3J5VmlldyBzZXRQcmV2aW91c0VuYWJsZWQ6X2ZvY3VzZWRFbGVtZW50SW5mb3JtYXRp b24uaGFzUHJldmlvdXNOb2RlXTsKIAogICAgIGlmIChjdXJyZW50VXNlckludGVyZmFjZUlkaW9t SXNQYWQoKSkgewotICAgICAgICBbX2Zvcm1BY2Nlc3NvcnlWaWV3IHNldENsZWFyVmlzaWJsZTpO T107CisgICAgICAgIFthY2Nlc3NvcnlWaWV3IHNldENsZWFyVmlzaWJsZTpOT107CiAgICAgICAg IHJldHVybjsKICAgICB9CiAKQEAgLTM3OTksMTAgKzM4MDAsMTAgQEAgLSAodm9pZClfdXBkYXRl QWNjZXNzb3J5CiAgICAgY2FzZSBXZWJLaXQ6OklucHV0VHlwZTo6TW9udGg6CiAgICAgY2FzZSBX ZWJLaXQ6OklucHV0VHlwZTo6RGF0ZVRpbWVMb2NhbDoKICAgICBjYXNlIFdlYktpdDo6SW5wdXRU eXBlOjpUaW1lOgotICAgICAgICBbX2Zvcm1BY2Nlc3NvcnlWaWV3IHNldENsZWFyVmlzaWJsZTpZ RVNdOworICAgICAgICBbYWNjZXNzb3J5VmlldyBzZXRDbGVhclZpc2libGU6WUVTXTsKICAgICAg ICAgcmV0dXJuOwogICAgIGRlZmF1bHQ6Ci0gICAgICAgIFtfZm9ybUFjY2Vzc29yeVZpZXcgc2V0 Q2xlYXJWaXNpYmxlOk5PXTsKKyAgICAgICAgW2FjY2Vzc29yeVZpZXcgc2V0Q2xlYXJWaXNpYmxl Ok5PXTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIH0KQEAgLTQ3OTUsMTIgKzQ3OTYsNiBAQCAt IChWZWN0b3I8V2ViS2l0OjpPcHRpb25JdGVtPiYpZm9jdXNlZFNlbGVjdEVsZW1lbnRPcHRpb25z CiAgICAgcmV0dXJuIF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLnNlbGVjdE9wdGlvbnM7CiB9 CiAKLS0gKFVJV2ViRm9ybUFjY2Vzc29yeSAqKWZvcm1BY2Nlc3NvcnlWaWV3Ci17Ci0gICAgW3Nl bGYgX2Vuc3VyZUZvcm1BY2Nlc3NvcnlWaWV3XTsKLSAgICByZXR1cm4gX2Zvcm1BY2Nlc3NvcnlW aWV3LmdldCgpOwotfQotCiBzdGF0aWMgYm9vbCBzaG91bGREZWZlclpvb21pbmdUb1NlbGVjdGlv bldoZW5SZXZlYWxpbmdGb2N1c2VkRWxlbWVudChXZWJLaXQ6OklucHV0VHlwZSB0eXBlKQogewog ICAgIHN3aXRjaCAodHlwZSkgewpAQCAtNDk4Niw3ICs0OTgxLDYgQEAgLSAodm9pZClfZWxlbWVu dERpZEZvY3VzOihjb25zdCBXZWJLaXQ6OkZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24mKWluZm9y bWF0aW9uIHUKICAgICBpZiAoIXNob3VsZERlZmVyWm9vbWluZ1RvU2VsZWN0aW9uV2hlblJldmVh bGluZ0ZvY3VzZWRFbGVtZW50KF9mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmVsZW1lbnRUeXBl KSkKICAgICAgICAgW3NlbGYgX3pvb21Ub1JldmVhbEZvY3VzZWRFbGVtZW50XTsKIAotICAgIFtz ZWxmIF9lbnN1cmVGb3JtQWNjZXNzb3J5Vmlld107CiAgICAgW3NlbGYgX3VwZGF0ZUFjY2Vzc29y eV07CiAKICNpZiBQTEFURk9STShXQVRDSE9TKQo=