134051 2014-06-18 17:13:53 -0700 [Cocoa] Modernize one-method authentication 2014-06-18 17:31:33 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz commit-queue oldest_to_newest 1016598 0 mitz 2014-06-18 17:13:53 -0700 [Cocoa] Modernize one-method authentication 1016600 1 233342 mitz 2014-06-18 17:19:54 -0700 Created attachment 233342 Add -_webView:didReceiveAuthenticationChallenge:completionHandler: 1016603 2 commit-queue 2014-06-18 17:22:24 -0700 Attachment 233342 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/Cocoa/NavigationState.mm:616: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 1 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1016605 3 233342 andersca 2014-06-18 17:24:23 -0700 Comment on attachment 233342 Add -_webView:didReceiveAuthenticationChallenge:completionHandler: View in context: https://bugs.webkit.org/attachment.cgi?id=233342&action=review > Source/WebKit2/UIProcess/Cocoa/NavigationState.mm:640 > + [NSException raise:NSInvalidArgumentException format:@"Invalid NSURLSessionAuthChallengeDisposition (%ld)", (long)disposition]; I think you should call checker->didCallCompletionHandler() before raising the exception here, otherwise you'll get another exception when the completionHandler is released. 1016610 4 mitz 2014-06-18 17:31:33 -0700 Committed <http://trac.webkit.org/r170137>. 233342 2014-06-18 17:19:54 -0700 2014-06-18 17:24:23 -0700 Add -_webView:didReceiveAuthenticationChallenge:completionHandler: bug-134051-20140618171932.patch text/plain 10098 mitz SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MDEzNCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDE0LTA2LTE4ICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBNb2Rlcm5pemUgb25l LW1ldGhvZCBhdXRoZW50aWNhdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM0MDUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgSW5zdGVhZCBvZiBhbiBOU1VSTENvbm5lY3Rpb24tc3R5bGUgZGVsZWdh dGUgbWV0aG9kIHRoYXQgdGFrZXMgYSBjaGFsbGVuZ2UgYW5kIHJlc3BvbmRzIHRvCisgICAgICAg IGl0cyBzZW5kZXIsIHByb3ZpZGUgYW4gTlNVUkxTZXNzaW9uLXN0eWxlIG1ldGhvZCB0aGF0IHRh a2VzIGEgY2hhbGxlbmdlIGFuZCBhIGNvbXBsZXRpb24KKyAgICAgICAgaGFuZGxlci4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZpZ2F0aW9uRGVsZWdhdGVQcml2YXRlLmg6 IERlY2xhcmVkIG5ldyBkZWxlZ2F0ZSBtZXRob2QsIHJlcGxhY2luZworICAgICAgICBvbGQgdW51 c2VkIG1ldGhvZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLmg6 IFJlbmFtZWQgZmxhZyBpbiBtX25hdmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMgc3RydWN0LgorICAg ICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9OYXZpZ2F0aW9uU3RhdGUubW06CisgICAgICAgIChXZWJL aXQ6Ok5hdmlnYXRpb25TdGF0ZTo6c2V0TmF2aWdhdGlvbkRlbGVnYXRlKTogQ2hlY2sgZm9yIG5l dyBkZWxlZ2F0ZSBtZXRob2QgYW5kIHVwZGF0ZQorICAgICAgICBuZXcgZmxhZy4KKworICAgICAg ICAoV2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6OkxvYWRlckNsaWVudDo6Y2FuQXV0aGVudGljYXRl QWdhaW5zdFByb3RlY3Rpb25TcGFjZUluRnJhbWUpOiBJZgorICAgICAgICB0aGUgZGVsZWdhdGUg aW1wbGVtZW50cyB0aGUgbmV3IG1ldGhvZCwgcmV0dXJuIHRydWUgKGlmIGl0IGNhbm5vdCBoYW5k bGUgdGhlIHByb3RlY3Rpb24KKyAgICAgICAgc3BhY2UsIGl0IGNhbiByZWplY3QgaXQgdGhyb3Vn aCB0aGUgY29tcGxldGlvbiBoYW5kbGVyKSwgZXhjZXB0IGZvciBzZXJ2ZXItdHJ1c3QKKyAgICAg ICAgYXV0aGVudGljYXRpb24sIHdoaWNoIGlzIG5vdCBzdXBwb3J0ZWQgeWV0LgorICAgICAgICAo V2ViS2l0OjpOYXZpZ2F0aW9uU3RhdGU6OkxvYWRlckNsaWVudDo6ZGlkUmVjZWl2ZUF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlSW5GcmFtZSk6IElmIHRoZQorICAgICAgICBkZWxlZ2F0ZSBpbXBsZW1l bnRzIHRoZSBuZXcgbWV0aG9kLCBjYWxsIGl0LCBwYXNzaW5nIGEgY29tcGxldGlvbiBoYW5kbGVy IHRoYXQgY2FsbHMgdGhlCisgICAgICAgIHJpZ2h0IEF1dGhlbnRpY2F0aW9uRGVjaXNpb25MaXN0 ZW5lciBmdW5jdGlvbiBiYXNlZCBvbiBpdHMgZGlzcG9zaXRpb24gYW5kIGNyZWRlbnRpYWwKKyAg ICAgICAgcGFyYW1ldGVycy4KKwogMjAxNC0wNi0xOCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJz Y2FAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2UgRnJhbWVMb2FkVHlwZSBhIHN0cm9uZ2x5IHR5 cGVkIGVudW0KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tOYXZp Z2F0aW9uRGVsZWdhdGVQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGUuaAkocmV2aXNpb24g MTcwMTAwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS05hdmlnYXRp b25EZWxlZ2F0ZVByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNDQsNyArNDQsNyBAQCBzdGF0 aWMgY29uc3QgV0tOYXZpZ2F0aW9uUmVzcG9uc2VQb2xpY3kgCiAKIC0gKHZvaWQpX3dlYlZpZXc6 KFdLV2ViVmlldyAqKXdlYlZpZXcgcmVuZGVyaW5nUHJvZ3Jlc3NEaWRDaGFuZ2U6KF9XS1JlbmRl cmluZ1Byb2dyZXNzRXZlbnRzKXByb2dyZXNzRXZlbnRzOwogCi0tICh2b2lkKV93ZWJWaWV3OihX S1dlYlZpZXcgKil3ZWJWaWV3IHdpbGxTZW5kUmVxdWVzdEZvckF1dGhlbnRpY2F0aW9uQ2hhbGxl bmdlOihOU1VSTEF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlICopY2hhbGxlbmdlOworLSAodm9pZClf d2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFs bGVuZ2U6KE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKiljaGFsbGVuZ2UgY29tcGxldGlv bkhhbmRsZXI6KHZvaWQgKF4pKE5TVVJMU2Vzc2lvbkF1dGhDaGFsbGVuZ2VEaXNwb3NpdGlvbiBk aXNwb3NpdGlvbiwgTlNVUkxDcmVkZW50aWFsICpjcmVkZW50aWFsKSljb21wbGV0aW9uSGFuZGxl cjsKIC0gKEJPT0wpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgY2FuQXV0aGVudGljYXRl QWdhaW5zdFByb3RlY3Rpb25TcGFjZTooTlNVUkxQcm90ZWN0aW9uU3BhY2UgKilwcm90ZWN0aW9u U3BhY2U7CiAtICh2b2lkKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRpZFJlY2VpdmVB dXRoZW50aWNhdGlvbkNoYWxsZW5nZTooTlNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSAqKWNo YWxsZW5nZTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRp b25TdGF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9O YXZpZ2F0aW9uU3RhdGUuaAkocmV2aXNpb24gMTcwMTAxKQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNDgsNyAr MTQ4LDcgQEAgcHJpdmF0ZToKICAgICAgICAgYm9vbCB3ZWJWaWV3RGlkRmFpbE5hdmlnYXRpb25X aXRoRXJyb3IgOiAxOwogCiAgICAgICAgIGJvb2wgd2ViVmlld1JlbmRlcmluZ1Byb2dyZXNzRGlk Q2hhbmdlIDogMTsKLSAgICAgICAgYm9vbCB3ZWJWaWV3V2lsbFNlbmRSZXF1ZXN0Rm9yQXV0aGVu dGljYXRpb25DaGFsbGVuZ2UgOiAxOworICAgICAgICBib29sIHdlYlZpZXdEaWRSZWNlaXZlQXV0 aGVudGljYXRpb25DaGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlciA6IDE7CiAgICAgICAgIGJvb2wg d2ViVmlld0NhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2UgOiAxOwogICAgICAg ICBib29sIHdlYlZpZXdEaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgOiAxOwogICAg ICAgICBib29sIHdlYlZpZXdXZWJQcm9jZXNzRGlkQ3Jhc2ggOiAxOwpJbmRleDogU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0NvY29hL05hdmlnYXRpb25TdGF0ZS5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0YXRlLm1tCShyZXZpc2lv biAxNzAxMDEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29jb2EvTmF2aWdhdGlvblN0 YXRlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yOCwxMSArMjgsMTEgQEAKIAogI2lmIFdLX0FQSV9F TkFCTEVECiAKLSNpbXBvcnQgIl9XS0Vycm9yUmVjb3ZlcnlBdHRlbXB0aW5nLmgiCi0jaW1wb3J0 ICJfV0tGcmFtZUhhbmRsZUludGVybmFsLmgiCiAjaW1wb3J0ICJBUElOYXZpZ2F0aW9uRGF0YS5o IgotI2ltcG9ydCAiQVBJVVJMLmgiCiAjaW1wb3J0ICJBUElTdHJpbmcuaCIKKyNpbXBvcnQgIkFQ SVVSTC5oIgorI2ltcG9ydCAiQXV0aGVudGljYXRpb25EZWNpc2lvbkxpc3RlbmVyLmgiCisjaW1w b3J0ICJDb21wbGV0aW9uSGFuZGxlckNhbGxDaGVja2VyLmgiCiAjaW1wb3J0ICJOYXZpZ2F0aW9u QWN0aW9uRGF0YS5oIgogI2ltcG9ydCAiUGFnZUxvYWRTdGF0ZS5oIgogI2ltcG9ydCAiV0tCYWNr Rm9yd2FyZExpc3RJbnRlcm5hbC5oIgpAQCAtNDksOSArNDksMTMgQEAKICNpbXBvcnQgIldLTmF2 aWdhdGlvblJlc3BvbnNlSW50ZXJuYWwuaCIKICNpbXBvcnQgIldLUmVsb2FkRnJhbWVFcnJvclJl Y292ZXJ5QXR0ZW1wdGVyLmgiCiAjaW1wb3J0ICJXS1dlYlZpZXdJbnRlcm5hbC5oIgorI2ltcG9y dCAiV2ViQ3JlZGVudGlhbC5oIgogI2ltcG9ydCAiV2ViRnJhbWVQcm94eS5oIgogI2ltcG9ydCAi V2ViUGFnZVByb3h5LmgiCiAjaW1wb3J0ICJXZWJQcm9jZXNzUHJveHkuaCIKKyNpbXBvcnQgIl9X S0Vycm9yUmVjb3ZlcnlBdHRlbXB0aW5nLmgiCisjaW1wb3J0ICJfV0tGcmFtZUhhbmRsZUludGVy bmFsLmgiCisjaW1wb3J0IDxXZWJDb3JlL0F1dGhlbnRpY2F0aW9uTWFjLmg+CiAjaW1wb3J0IDx3 dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAogI2lmIFVTRShRVUlDS19MT09LKQpAQCAtMTI2LDcgKzEz MCw3IEBAIHZvaWQgTmF2aWdhdGlvblN0YXRlOjpzZXROYXZpZ2F0aW9uRGVsZWcKICAgICBtX25h dmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld05hdmlnYXRpb25EaWRGYWlsUHJvdmlzaW9u YWxMb2FkSW5TdWJmcmFtZVdpdGhFcnJvciA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKF93ZWJWaWV3Om5hdmlnYXRpb246ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEluU3Vi ZnJhbWU6d2l0aEVycm9yOildOwogICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJW aWV3TmF2aWdhdGlvbkRpZEZpbmlzaERvY3VtZW50TG9hZCA9IFtkZWxlZ2F0ZSByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3Om5hdmlnYXRpb25EaWRGaW5pc2hEb2N1bWVudExv YWQ6KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdSZW5kZXJpbmdQ cm9ncmVzc0RpZENoYW5nZSA9IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9y KF93ZWJWaWV3OnJlbmRlcmluZ1Byb2dyZXNzRGlkQ2hhbmdlOildOwotICAgIG1fbmF2aWdhdGlv bkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3V2lsbFNlbmRSZXF1ZXN0Rm9yQXV0aGVudGljYXRpb25D aGFsbGVuZ2UgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmll dzp3aWxsU2VuZFJlcXVlc3RGb3JBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTopXTsKKyAgICBtX25h dmlnYXRpb25EZWxlZ2F0ZU1ldGhvZHMud2ViVmlld0RpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNo YWxsZW5nZUNvbXBsZXRpb25IYW5kbGVyID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpA c2VsZWN0b3IoX3dlYlZpZXc6ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlOmNvbXBs ZXRpb25IYW5kbGVyOildOwogICAgIG1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3 Q2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFjZSA9IFtkZWxlZ2F0ZSByZXNwb25k c1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmNhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90 ZWN0aW9uU3BhY2U6KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdE aWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1Nl bGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpkaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVu Z2U6KV07CiAgICAgbV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdXZWJQcm9jZXNz RGlkQ3Jhc2ggPSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmll d1dlYlByb2Nlc3NEaWRDcmFzaDopXTsKQEAgLTU4Myw4ICs1ODcsOCBAQCB2b2lkIE5hdmlnYXRp b25TdGF0ZTo6TG9hZGVyQ2xpZW50OjpkaWRMCiAKIGJvb2wgTmF2aWdhdGlvblN0YXRlOjpMb2Fk ZXJDbGllbnQ6OmNhbkF1dGhlbnRpY2F0ZUFnYWluc3RQcm90ZWN0aW9uU3BhY2VJbkZyYW1lKFdl YktpdDo6V2ViUGFnZVByb3h5KiwgV2ViS2l0OjpXZWJGcmFtZVByb3h5KiwgV2ViS2l0OjpXZWJQ cm90ZWN0aW9uU3BhY2UqIHByb3RlY3Rpb25TcGFjZSkKIHsKLSAgICBpZiAobV9uYXZpZ2F0aW9u U3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2RzLndlYlZpZXdXaWxsU2VuZFJlcXVlc3RG b3JBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSkKLSAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYg KG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRlTWV0aG9kcy53ZWJWaWV3RGlk UmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlQ29tcGxldGlvbkhhbmRsZXIpCisgICAgICAg IHJldHVybiBwcm90ZWN0aW9uU3BhY2UtPmF1dGhlbnRpY2F0aW9uU2NoZW1lKCkgIT0gV2ViQ29y ZTo6UHJvdGVjdGlvblNwYWNlQXV0aGVudGljYXRpb25TY2hlbWVTZXJ2ZXJUcnVzdEV2YWx1YXRp b25SZXF1ZXN0ZWQ7CiAKICAgICBpZiAoIW1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRl bGVnYXRlTWV0aG9kcy53ZWJWaWV3Q2FuQXV0aGVudGljYXRlQWdhaW5zdFByb3RlY3Rpb25TcGFj ZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtNTk2LDE0ICs2MDAsNDkgQEAgYm9vbCBOYXZp Z2F0aW9uU3RhdGU6OkxvYWRlckNsaWVudDo6Y2FuQQogICAgIHJldHVybiBbc3RhdGljX2Nhc3Q8 aWQgPFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0ZT4+KG5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQo KSkgX3dlYlZpZXc6bV9uYXZpZ2F0aW9uU3RhdGUubV93ZWJWaWV3IGNhbkF1dGhlbnRpY2F0ZUFn YWluc3RQcm90ZWN0aW9uU3BhY2U6d3JhcHBlcigqcHJvdGVjdGlvblNwYWNlKV07CiB9CiAKLXZv aWQgTmF2aWdhdGlvblN0YXRlOjpMb2FkZXJDbGllbnQ6OmRpZFJlY2VpdmVBdXRoZW50aWNhdGlv bkNoYWxsZW5nZUluRnJhbWUoV2ViS2l0OjpXZWJQYWdlUHJveHkqLCBXZWJLaXQ6OldlYkZyYW1l UHJveHkqLCBXZWJLaXQ6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlUHJveHkqIGF1dGhlbnRpY2F0 aW9uQ2hhbGxlbmdlKQordm9pZCBOYXZpZ2F0aW9uU3RhdGU6OkxvYWRlckNsaWVudDo6ZGlkUmVj ZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlSW5GcmFtZShXZWJQYWdlUHJveHkqLCBXZWJGcmFt ZVByb3h5KiwgQXV0aGVudGljYXRpb25DaGFsbGVuZ2VQcm94eSogYXV0aGVudGljYXRpb25DaGFs bGVuZ2UpCiB7Ci0gICAgaWYgKG1fbmF2aWdhdGlvblN0YXRlLm1fbmF2aWdhdGlvbkRlbGVnYXRl TWV0aG9kcy53ZWJWaWV3V2lsbFNlbmRSZXF1ZXN0Rm9yQXV0aGVudGljYXRpb25DaGFsbGVuZ2Up IHsKKyAgICBpZiAobV9uYXZpZ2F0aW9uU3RhdGUubV9uYXZpZ2F0aW9uRGVsZWdhdGVNZXRob2Rz LndlYlZpZXdEaWRSZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxl cikgeworICAgICAgICBBU1NFUlQoYXV0aGVudGljYXRpb25DaGFsbGVuZ2UtPnByb3RlY3Rpb25T cGFjZSgpLT5hdXRoZW50aWNhdGlvblNjaGVtZSgpICE9IFdlYkNvcmU6OlByb3RlY3Rpb25TcGFj ZUF1dGhlbnRpY2F0aW9uU2NoZW1lU2VydmVyVHJ1c3RFdmFsdWF0aW9uUmVxdWVzdGVkKTsKICAg ICAgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBtX25hdmlnYXRpb25TdGF0ZS5tX25hdmln YXRpb25EZWxlZ2F0ZS5nZXQoKTsKLSAgICAgICAgaWYgKCFuYXZpZ2F0aW9uRGVsZWdhdGUpCisg ICAgICAgIGlmICghbmF2aWdhdGlvbkRlbGVnYXRlKSB7CisgICAgICAgICAgICBhdXRoZW50aWNh dGlvbkNoYWxsZW5nZS0+bGlzdGVuZXIoKS0+cGVyZm9ybURlZmF1bHRIYW5kbGluZygpOwogICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICB9CiAKLSAgICAgICAgW3N0YXRpY19jYXN0PGlkIDxX S05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGU+PihuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCkpIF93 ZWJWaWV3Om1fbmF2aWdhdGlvblN0YXRlLm1fd2ViVmlldyB3aWxsU2VuZFJlcXVlc3RGb3JBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZTp3cmFwcGVyKCphdXRoZW50aWNhdGlvbkNoYWxsZW5nZSldOwor ICAgICAgICBSZWZQdHI8QXV0aGVudGljYXRpb25DaGFsbGVuZ2VQcm94eT4gY2hhbGxlbmdlID0g YXV0aGVudGljYXRpb25DaGFsbGVuZ2U7CisgICAgICAgIFJlZlB0cjxDb21wbGV0aW9uSGFuZGxl ckNhbGxDaGVja2VyPiBjaGVja2VyID0gQ29tcGxldGlvbkhhbmRsZXJDYWxsQ2hlY2tlcjo6Y3Jl YXRlKG5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKSwgQHNlbGVjdG9yKF93ZWJWaWV3OmRpZFJlY2Vp dmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTpjb21wbGV0aW9uSGFuZGxlcjopKTsKKyAgICAgICAg W3N0YXRpY19jYXN0PGlkIDxXS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGU+PihuYXZpZ2F0aW9u RGVsZWdhdGUuZ2V0KCkpIF93ZWJWaWV3Om1fbmF2aWdhdGlvblN0YXRlLm1fd2ViVmlldyBkaWRS ZWNlaXZlQXV0aGVudGljYXRpb25DaGFsbGVuZ2U6d3JhcHBlcigqYXV0aGVudGljYXRpb25DaGFs bGVuZ2UpCisgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlcjpbY2hhbGxlbmdlLCBjaGVja2Vy XShOU1VSTFNlc3Npb25BdXRoQ2hhbGxlbmdlRGlzcG9zaXRpb24gZGlzcG9zaXRpb24sIE5TVVJM Q3JlZGVudGlhbCAqY3JlZGVudGlhbCkgeworICAgICAgICAgICAgICAgIHN3aXRjaCAoZGlzcG9z aXRpb24pIHsKKyAgICAgICAgICAgICAgICBjYXNlIE5TVVJMU2Vzc2lvbkF1dGhDaGFsbGVuZ2VV c2VDcmVkZW50aWFsOiB7CisgICAgICAgICAgICAgICAgICAgIFJlZlB0cjxXZWJDcmVkZW50aWFs PiB3ZWJDcmVkZW50aWFsOworICAgICAgICAgICAgICAgICAgICBpZiAoY3JlZGVudGlhbCkKKyAg ICAgICAgICAgICAgICAgICAgICAgIHdlYkNyZWRlbnRpYWwgPSBXZWJDcmVkZW50aWFsOjpjcmVh dGUoV2ViQ29yZTo6Y29yZShjcmVkZW50aWFsKSk7CisKKyAgICAgICAgICAgICAgICAgICAgY2hh bGxlbmdlLT5saXN0ZW5lcigpLT51c2VDcmVkZW50aWFsKHdlYkNyZWRlbnRpYWwuZ2V0KCkpOwor ICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgICAgICB9CisKKyAgICAgICAg ICAgICAgICBjYXNlIE5TVVJMU2Vzc2lvbkF1dGhDaGFsbGVuZ2VQZXJmb3JtRGVmYXVsdEhhbmRs aW5nOgorICAgICAgICAgICAgICAgICAgICBjaGFsbGVuZ2UtPmxpc3RlbmVyKCktPnBlcmZvcm1E ZWZhdWx0SGFuZGxpbmcoKTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAg ICAgICAgICBjYXNlIE5TVVJMU2Vzc2lvbkF1dGhDaGFsbGVuZ2VDYW5jZWxBdXRoZW50aWNhdGlv bkNoYWxsZW5nZToKKyAgICAgICAgICAgICAgICAgICAgY2hhbGxlbmdlLT5saXN0ZW5lcigpLT5j YW5jZWwoKTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICBj YXNlIE5TVVJMU2Vzc2lvbkF1dGhDaGFsbGVuZ2VSZWplY3RQcm90ZWN0aW9uU3BhY2U6CisgICAg ICAgICAgICAgICAgICAgIGNoYWxsZW5nZS0+bGlzdGVuZXIoKS0+cmVqZWN0UHJvdGVjdGlvblNw YWNlQW5kQ29udGludWUoKTsKKyAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisKKyAgICAgICAg ICAgICAgICBkZWZhdWx0OgorICAgICAgICAgICAgICAgICAgICBbTlNFeGNlcHRpb24gcmFpc2U6 TlNJbnZhbGlkQXJndW1lbnRFeGNlcHRpb24gZm9ybWF0OkAiSW52YWxpZCBOU1VSTFNlc3Npb25B dXRoQ2hhbGxlbmdlRGlzcG9zaXRpb24gKCVsZCkiLCAobG9uZylkaXNwb3NpdGlvbl07CisgICAg ICAgICAgICAgICAgfQorCisgICAgICAgICAgICAgICAgY2hlY2tlci0+ZGlkQ2FsbENvbXBsZXRp b25IYW5kbGVyKCk7CisgICAgICAgICAgICB9CisgICAgICAgIF07CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAK