146702 2015-07-07 16:26:25 -0700 Add actions to image previews 2015-07-08 11:00:38 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin commit-queue enrica sam thorton yongjun_zhang oldest_to_newest 1107605 0 bdakin 2015-07-07 16:26:25 -0700 Add actions to image previews <rdar://problem/21642654> 1107609 1 256332 bdakin 2015-07-07 16:35:37 -0700 Created attachment 256332 Patch 1107610 2 commit-queue 2015-07-07 16:38:27 -0700 Attachment 256332 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/WKImagePreviewViewController.mm:31: Alphabetical sorting problem. [build/include_order] [4] ERROR: Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm:309: The parameter name "!" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1107623 3 256337 bdakin 2015-07-07 17:33:51 -0700 Created attachment 256337 Patch 1107624 4 commit-queue 2015-07-07 17:35:56 -0700 Attachment 256337 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm:309: The parameter name "!" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1107797 5 256337 yongjun_zhang 2015-07-08 10:43:36 -0700 Comment on attachment 256337 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256337&action=review > Source/WebKit2/UIProcess/WKImagePreviewViewController.h:38 > + _WKActivatedElementInfo *_activatedElementInfo; I think we should retain the _activeElementInfo. > Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm:298 > + NSURL *targetURL = [NSURL URLWithString:positionInformation.url]; Nit: Could we use _web_URLWithWTFString: here? The patch looks good to me, I will let a WebKit reviewer to comment. 1107799 6 bdakin 2015-07-08 10:44:31 -0700 (In reply to comment #5) > Comment on attachment 256337 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=256337&action=review > > > Source/WebKit2/UIProcess/WKImagePreviewViewController.h:38 > > + _WKActivatedElementInfo *_activatedElementInfo; > > I think we should retain the _activeElementInfo. > Will do. > > Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm:298 > > + NSURL *targetURL = [NSURL URLWithString:positionInformation.url]; > > Nit: Could we use _web_URLWithWTFString: here? > Yes! > The patch looks good to me, I will let a WebKit reviewer to comment. 1107806 7 bdakin 2015-07-08 11:00:38 -0700 Thanks all! http://trac.webkit.org/changeset/186515 256332 2015-07-07 16:35:37 -0700 2015-07-07 17:33:51 -0700 Patch for-review.txt text/plain 9817 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NjQ3NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE1LTA3LTA3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYWN0aW9ucyB0byBpbWFnZSBw cmV2aWV3cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ2NzAyCisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzIxNjQyNjU0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZCBhbiBhcnJheSBvZiBhY3Rpb25zIGFuZCBfV0tBY3RpdmF0ZWRFbGVtZW50SW5m byBpbiBvcmRlciB0byBwcm9wZXJseSBpbnZva2UgCisgICAgICAgIHRoZSBhY3Rpb25zLgorICAg ICAgICAqIFVJUHJvY2Vzcy9XS0ltYWdlUHJldmlld1ZpZXdDb250cm9sbGVyLmg6CisgICAgICAg ICogVUlQcm9jZXNzL1dLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIubW06CisgICAgICAgICgt W1dLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgbG9hZFZpZXddKToKKyAgICAgICAgKC1bV0tJ bWFnZVByZXZpZXdWaWV3Q29udHJvbGxlciBpbml0V2l0aENHSW1hZ2U6ZGVmYXVsdEFjdGlvbnM6 ZWxlbWVudEluZm86XSk6CisgICAgICAgIChfc2NhbGVTaXplV2l0aGluU2l6ZSk6CisgICAgICAg ICgtW1dLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgaW5pdFdpdGhDR0ltYWdlOl0pOiBEZWxl dGVkLgorCisgICAgICAgIFJlLWZhY3RvciBkZWZhdWx0QWN0aW9uc0ZvckltYWdlU2hlZXQgaW50 byBhIHN0YW5kLWFsb25lIGZ1bmN0aW9uIHNvIHRoYXQgaXQgY2FuIAorICAgICAgICBiZSBpbnZv a2VkIGZvciBwcmV2aWV3cyBhcyB3ZWxsIGFzIGZvciB0aGUgYWN0aW9uIHNoZWV0LgorICAgICAg ICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbToKKyAgICAgICAgKC1bV0tBY3Rp b25TaGVldEFzc2lzdGFudCBzaG93SW1hZ2VTaGVldF0pOgorICAgICAgICAoLVtXS0FjdGlvblNo ZWV0QXNzaXN0YW50IGRlZmF1bHRBY3Rpb25zRm9yTGlua1NoZWV0XSk6CisgICAgICAgICgtW1dL QWN0aW9uU2hlZXRBc3Npc3RhbnQgZGVmYXVsdEFjdGlvbnNGb3JJbWFnZVNoZWV0XSk6CisgICAg ICAgICgtW1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQgc2hvd0xpbmtTaGVldF0pOgorCisgICAgICAg IFdLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgaW5pdGlhbGl6ZXIgbm93IHRha2VzIHRoZSBk ZWZhdWx0IGFjdGlvbnMgYW5kIAorICAgICAgICBfV0tBY3RpdmF0ZWRFbGVtZW50SW5mby4KKyAg ICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBwcmV2aWV3Vmlld0NvbnRyb2xsZXJGb3JQb3NpdGlvbjppblNv dXJjZVZpZXc6XSk6CisKIDIwMTUtMDctMDcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KIAogICAgICAgICBNYWtlIHN1cmUgdG8gcmVtb3ZlIHRoZSBkb3dubG9hZCBtZXNz YWdlIHJlY2VpdmVyIGJlZm9yZSBmcmVlaW5nIGl0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV0tJbWFnZVByZXZpZXdWaWV3Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XS0ltYWdlUHJldmlld1ZpZXdDb250cm9sbGVyLmgJKHJldmlz aW9uIDE4NjM4MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XS0ltYWdlUHJldmlld1Zp ZXdDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTI5LDkgKzI5LDE2IEBACiAKICNpbXBv cnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAotQGludGVyZmFjZSBXS0ltYWdlUHJldmlld1ZpZXdDb250 cm9sbGVyIDogVUlWaWV3Q29udHJvbGxlcgorQGNsYXNzIF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZv OworQGNsYXNzIF9XS0VsZW1lbnRBY3Rpb247CiAKLS0gKGlkKWluaXRXaXRoQ0dJbWFnZTooUmV0 YWluUHRyPENHSW1hZ2VSZWY+KWltYWdlOworQGludGVyZmFjZSBXS0ltYWdlUHJldmlld1ZpZXdD b250cm9sbGVyIDogVUlWaWV3Q29udHJvbGxlciB7CitAcHJpdmF0ZQorICAgIFJldGFpblB0cjxO U0FycmF5PiBfaW1hZ2VBY3Rpb25zOworICAgIF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvICpfYWN0 aXZhdGVkRWxlbWVudEluZm87Cit9CisKKy0gKGlkKWluaXRXaXRoQ0dJbWFnZTooUmV0YWluUHRy PENHSW1hZ2VSZWY+KWltYWdlIGRlZmF1bHRBY3Rpb25zOihSZXRhaW5QdHI8TlNBcnJheT4pYWN0 aW9ucyBlbGVtZW50SW5mbzooX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gKillbGVtZW50SW5mbzsK IEBlbmQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKElPUykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XS0ltYWdlUHJldmlld1ZpZXdDb250cm9sbGVyLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XS0ltYWdlUHJldmlld1ZpZXdDb250cm9sbGVyLm1tCShy ZXZpc2lvbiAxODYzODApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV0tJbWFnZVByZXZp ZXdWaWV3Q29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMjYsNiArMjYsOSBAQAogI2lt cG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJXS0ltYWdlUHJldmlld1ZpZXdDb250cm9sbGVyLmgi CiAKKyNpbXBvcnQgPFVJS2l0U1BJLmg+CisjaW1wb3J0IDxfV0tFbGVtZW50QWN0aW9uLmg+CisK ICNpbXBvcnQgPFdlYkNvcmUvSW50U2l6ZS5oPgogCiAjaWYgUExBVEZPUk0oSU9TKQpAQCAtNDIs NyArNDUsNyBAQCAtICh2b2lkKWxvYWRWaWV3CiAgICAgW3NlbGYudmlldyBhZGRTdWJ2aWV3Ol9p bWFnZVZpZXcuZ2V0KCldOwogfQogCi0tIChpZClpbml0V2l0aENHSW1hZ2U6KFJldGFpblB0cjxD R0ltYWdlUmVmPilpbWFnZQorLSAoaWQpaW5pdFdpdGhDR0ltYWdlOihSZXRhaW5QdHI8Q0dJbWFn ZVJlZj4paW1hZ2UgZGVmYXVsdEFjdGlvbnM6KFJldGFpblB0cjxOU0FycmF5PilhY3Rpb25zIGVs ZW1lbnRJbmZvOihfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZvCiB7CiAgICAg c2VsZiA9IFtzdXBlciBpbml0V2l0aE5pYk5hbWU6bmlsIGJ1bmRsZTpuaWxdOwogICAgIGlmICgh c2VsZikKQEAgLTU5LDYgKzYyLDkgQEAgLSAoaWQpaW5pdFdpdGhDR0ltYWdlOihSZXRhaW5QdHI8 Q0dJbWFnZQogICAgIFtfaW1hZ2VWaWV3IHNldEZyYW1lOkNHUmVjdE1ha2UoW19pbWFnZVZpZXcg ZnJhbWVdLm9yaWdpbi54LCBbX2ltYWdlVmlldyBmcmFtZV0ub3JpZ2luLnksIGltYWdlU2l6ZS53 aWR0aCwgaW1hZ2VTaXplLmhlaWdodCldOwogICAgIFtzZWxmIHNldFByZWZlcnJlZENvbnRlbnRT aXplOmltYWdlU2l6ZV07CiAKKyAgICBfaW1hZ2VBY3Rpb25zID0gYWN0aW9uczsKKyAgICBfYWN0 aXZhdGVkRWxlbWVudEluZm8gPSBlbGVtZW50SW5mbzsKKwogICAgIHJldHVybiBzZWxmOwogfQog CkBAIC04Niw2ICs5Miw4IEBAIHN0YXRpYyBDR1NpemUgX3NjYWxlU2l6ZVdpdGhpblNpemUoQ0dT aXoKICAgICByZXR1cm4gc2l6ZTsKIH0KIAorI2ltcG9ydCA8V2ViS2l0QWRkaXRpb25zL1dLSW1h Z2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIubW0+CisKIEBlbmQKIAogI2VuZGlmCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3Rh bnQuaAkocmV2aXNpb24gMTg2MzgwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X S0FjdGlvblNoZWV0QXNzaXN0YW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTYzLDYgKzYzLDcgQEAg c3RydWN0IEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uOwogLSAodm9pZCljbGVhbnVw U2hlZXQ7CiAtICh2b2lkKXVwZGF0ZVNoZWV0UG9zaXRpb247CiAtIChSZXRhaW5QdHI8TlNBcnJh eT4pZGVmYXVsdEFjdGlvbnNGb3JMaW5rU2hlZXQ7CistIChSZXRhaW5QdHI8TlNBcnJheT4pZGVm YXVsdEFjdGlvbnNGb3JJbWFnZVNoZWV0OwogQGVuZAogCiAjZW5kaWYgLy8gUExBVEZPUk0oSU9T KQpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0 YW50Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tBY3Rp b25TaGVldEFzc2lzdGFudC5tbQkocmV2aXNpb24gMTg2MzgwKQorKysgU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCSh3b3JraW5nIGNvcHkpCkBA IC0yNDUsMjEgKzI0NSw5IEBAIC0gKHZvaWQpc2hvd0ltYWdlU2hlZXQKIAogICAgIGNvbnN0IGF1 dG8mIHBvc2l0aW9uSW5mb3JtYXRpb24gPSBbZGVsZWdhdGUgcG9zaXRpb25JbmZvcm1hdGlvbkZv ckFjdGlvblNoZWV0QXNzaXN0YW50OnNlbGZdOwogCi0gICAgTlNVUkwgKnRhcmdldFVSTCA9IFtO U1VSTCBVUkxXaXRoU3RyaW5nOnBvc2l0aW9uSW5mb3JtYXRpb24udXJsXTsKLSAgICBhdXRvIGRl ZmF1bHRBY3Rpb25zID0gYWRvcHROUyhbW05TTXV0YWJsZUFycmF5IGFsbG9jXSBpbml0XSk7Ci0g ICAgaWYgKCFwb3NpdGlvbkluZm9ybWF0aW9uLnVybC5pc0VtcHR5KCkpCi0gICAgICAgIFtkZWZh dWx0QWN0aW9ucyBhZGRPYmplY3Q6W19XS0VsZW1lbnRBY3Rpb24gZWxlbWVudEFjdGlvbldpdGhU eXBlOl9XS0VsZW1lbnRBY3Rpb25UeXBlT3Blbl1dOwotI2lmIEhBVkUoU0FGQVJJX1NFUlZJQ0VT X0ZSQU1FV09SSykKLSAgICBpZiAoW2dldFNTUmVhZGluZ0xpc3RDbGFzcygpIHN1cHBvcnRzVVJM OnRhcmdldFVSTF0pCi0gICAgICAgIFtkZWZhdWx0QWN0aW9ucyBhZGRPYmplY3Q6W19XS0VsZW1l bnRBY3Rpb24gZWxlbWVudEFjdGlvbldpdGhUeXBlOl9XS0VsZW1lbnRBY3Rpb25UeXBlQWRkVG9S ZWFkaW5nTGlzdF1dOwotI2VuZGlmCi0gICAgaWYgKFRDQ0FjY2Vzc1ByZWZsaWdodChnZXRrVEND U2VydmljZVBob3RvcygpLCBOVUxMKSAhPSBrVENDQWNjZXNzUHJlZmxpZ2h0RGVuaWVkKQotICAg ICAgICBbZGVmYXVsdEFjdGlvbnMgYWRkT2JqZWN0OltfV0tFbGVtZW50QWN0aW9uIGVsZW1lbnRB Y3Rpb25XaXRoVHlwZTpfV0tFbGVtZW50QWN0aW9uVHlwZVNhdmVJbWFnZV1dOwotICAgIGlmICgh dGFyZ2V0VVJMLnNjaGVtZS5sZW5ndGggfHwgW3RhcmdldFVSTC5zY2hlbWUgY2FzZUluc2Vuc2l0 aXZlQ29tcGFyZTpAImphdmFzY3JpcHQiXSAhPSBOU09yZGVyZWRTYW1lKQotICAgICAgICBbZGVm YXVsdEFjdGlvbnMgYWRkT2JqZWN0OltfV0tFbGVtZW50QWN0aW9uIGVsZW1lbnRBY3Rpb25XaXRo VHlwZTpfV0tFbGVtZW50QWN0aW9uVHlwZUNvcHldXTsKLQotICAgIGF1dG8gZWxlbWVudEluZm8g PSBhZG9wdE5TKFtbX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gYWxsb2NdIF9pbml0V2l0aFR5cGU6 X1dLQWN0aXZhdGVkRWxlbWVudFR5cGVJbWFnZQotICAgICAgICBVUkw6dGFyZ2V0VVJMIGxvY2F0 aW9uOnBvc2l0aW9uSW5mb3JtYXRpb24ucG9pbnQgdGl0bGU6cG9zaXRpb25JbmZvcm1hdGlvbi50 aXRsZSByZWN0OnBvc2l0aW9uSW5mb3JtYXRpb24uYm91bmRzIGltYWdlOnBvc2l0aW9uSW5mb3Jt YXRpb24uaW1hZ2UuZ2V0KCldKTsKKyAgICBOU1VSTCAqdGFyZ2V0VVJMID0gW05TVVJMIF93ZWJf VVJMV2l0aFdURlN0cmluZzpwb3NpdGlvbkluZm9ybWF0aW9uLnVybF07CisgICAgYXV0byBkZWZh dWx0QWN0aW9ucyA9IFtzZWxmIGRlZmF1bHRBY3Rpb25zRm9ySW1hZ2VTaGVldF07CisgICAgYXV0 byBlbGVtZW50SW5mbyA9IGFkb3B0TlMoW1tfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBhbGxvY10g X2luaXRXaXRoVHlwZTpfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZUltYWdlIFVSTDp0YXJnZXRVUkwg bG9jYXRpb246cG9zaXRpb25JbmZvcm1hdGlvbi5wb2ludCB0aXRsZTpwb3NpdGlvbkluZm9ybWF0 aW9uLnRpdGxlIHJlY3Q6cG9zaXRpb25JbmZvcm1hdGlvbi5ib3VuZHMgaW1hZ2U6cG9zaXRpb25J bmZvcm1hdGlvbi5pbWFnZS5nZXQoKV0pOwogCiAgICAgUmV0YWluUHRyPE5TQXJyYXk+IGFjdGlv bnMgPSBbZGVsZWdhdGUgYWN0aW9uU2hlZXRBc3Npc3RhbnQ6c2VsZiBkZWNpZGVBY3Rpb25zRm9y RWxlbWVudDplbGVtZW50SW5mby5nZXQoKSBkZWZhdWx0QWN0aW9uczpXVEY6Om1vdmUoZGVmYXVs dEFjdGlvbnMpXTsKIApAQCAtMzAwLDYgKzI4OCwzMCBAQCAtIChSZXRhaW5QdHI8TlNBcnJheT4p ZGVmYXVsdEFjdGlvbnNGb3JMCiAgICAgcmV0dXJuIGRlZmF1bHRBY3Rpb25zOwogfQogCistIChS ZXRhaW5QdHI8TlNBcnJheT4pZGVmYXVsdEFjdGlvbnNGb3JJbWFnZVNoZWV0Cit7CisgICAgYXV0 byBkZWxlZ2F0ZSA9IF9kZWxlZ2F0ZS5nZXQoKTsKKyAgICBpZiAoIWRlbGVnYXRlKQorICAgICAg ICByZXR1cm4gbmlsOworCisgICAgY29uc3QgYXV0byYgcG9zaXRpb25JbmZvcm1hdGlvbiA9IFtk ZWxlZ2F0ZSBwb3NpdGlvbkluZm9ybWF0aW9uRm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6c2VsZl07 CisgICAgTlNVUkwgKnRhcmdldFVSTCA9IFtOU1VSTCBVUkxXaXRoU3RyaW5nOnBvc2l0aW9uSW5m b3JtYXRpb24udXJsXTsKKworICAgIGF1dG8gZGVmYXVsdEFjdGlvbnMgPSBhZG9wdE5TKFtbTlNN dXRhYmxlQXJyYXkgYWxsb2NdIGluaXRdKTsKKyAgICBpZiAoIXBvc2l0aW9uSW5mb3JtYXRpb24u dXJsLmlzRW1wdHkoKSkKKyAgICAgICAgW2RlZmF1bHRBY3Rpb25zIGFkZE9iamVjdDpbX1dLRWxl bWVudEFjdGlvbiBfZWxlbWVudEFjdGlvbldpdGhUeXBlOl9XS0VsZW1lbnRBY3Rpb25UeXBlT3Bl biBhc3Npc3RhbnQ6c2VsZl1dOworI2lmIEhBVkUoU0FGQVJJX1NFUlZJQ0VTX0ZSQU1FV09SSykK KyAgICBpZiAoW2dldFNTUmVhZGluZ0xpc3RDbGFzcygpIHN1cHBvcnRzVVJMOnRhcmdldFVSTF0p CisgICAgICAgIFtkZWZhdWx0QWN0aW9ucyBhZGRPYmplY3Q6W19XS0VsZW1lbnRBY3Rpb24gX2Vs ZW1lbnRBY3Rpb25XaXRoVHlwZTpfV0tFbGVtZW50QWN0aW9uVHlwZUFkZFRvUmVhZGluZ0xpc3Qg YXNzaXN0YW50OnNlbGZdXTsKKyNlbmRpZgorICAgIGlmIChUQ0NBY2Nlc3NQcmVmbGlnaHQoZ2V0 a1RDQ1NlcnZpY2VQaG90b3MoKSwgTlVMTCkgIT0ga1RDQ0FjY2Vzc1ByZWZsaWdodERlbmllZCkK KyAgICAgICAgW2RlZmF1bHRBY3Rpb25zIGFkZE9iamVjdDpbX1dLRWxlbWVudEFjdGlvbiBfZWxl bWVudEFjdGlvbldpdGhUeXBlOl9XS0VsZW1lbnRBY3Rpb25UeXBlU2F2ZUltYWdlIGFzc2lzdGFu dDpzZWxmXV07CisgICAgaWYgKCF0YXJnZXRVUkwuc2NoZW1lLmxlbmd0aCB8fCBbdGFyZ2V0VVJM LnNjaGVtZSBjYXNlSW5zZW5zaXRpdmVDb21wYXJlOkAiamF2YXNjcmlwdCJdICE9IE5TT3JkZXJl ZFNhbWUpCisgICAgICAgIFtkZWZhdWx0QWN0aW9ucyBhZGRPYmplY3Q6W19XS0VsZW1lbnRBY3Rp b24gX2VsZW1lbnRBY3Rpb25XaXRoVHlwZTpfV0tFbGVtZW50QWN0aW9uVHlwZUNvcHkgYXNzaXN0 YW50OnNlbGZdXTsKKworICAgIHJldHVybiBkZWZhdWx0QWN0aW9uczsKK30KKwogLSAodm9pZClz aG93TGlua1NoZWV0CiB7CiAgICAgQVNTRVJUKCFfaW50ZXJhY3Rpb25TaGVldCk7CkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJ bnRlcmFjdGlvbi5tbQkocmV2aXNpb24gMTg2MzgwKQorKysgU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0JKHdvcmtpbmcgY29weSkKQEAgLTMy NDUsOSArMzI0NSwxMiBAQCAtIChVSVZpZXdDb250cm9sbGVyICopcHJldmlld1ZpZXdDb250cm9s CiAgICAgICAgIGlmIChhYnNvbHV0ZUltYWdlVVJMLmlzRW1wdHkoKSB8fCAhKFdlYkNvcmU6OnBy b3RvY29sSXNJbkhUVFBGYW1pbHkoYWJzb2x1dGVJbWFnZVVSTCkgfHwgV2ViQ29yZTo6cHJvdG9j b2xJcyhhYnNvbHV0ZUltYWdlVVJMLCAiZGF0YSIpKSkKICAgICAgICAgICAgIHJldHVybiBuaWw7 CiAgICAgICAgIF9wcmV2aWV3VHlwZSA9IFByZXZpZXdFbGVtZW50VHlwZTo6SW1hZ2U7CisgICAg ICAgIE5TVVJMICp0YXJnZXRVUkwgPSBbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOl9wb3Np dGlvbkluZm9ybWF0aW9uLmltYWdlVVJMXTsKICAgICAgICAgaWYgKFt1aURlbGVnYXRlIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6d2lsbFByZXZpZXdJbWFnZVdpdGhVUkw6 KV0pCi0gICAgICAgICAgICBbdWlEZWxlZ2F0ZSBfd2ViVmlldzpfd2ViVmlldyB3aWxsUHJldmll d0ltYWdlV2l0aFVSTDpbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOl9wb3NpdGlvbkluZm9y bWF0aW9uLmltYWdlVVJMXV07Ci0gICAgICAgIHJldHVybiBbW1tXS0ltYWdlUHJldmlld1ZpZXdD b250cm9sbGVyIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1h Z2UtPm1ha2VDR0ltYWdlQ29weSgpXSBhdXRvcmVsZWFzZV07CisgICAgICAgICAgICBbdWlEZWxl Z2F0ZSBfd2ViVmlldzpfd2ViVmlldyB3aWxsUHJldmlld0ltYWdlV2l0aFVSTDp0YXJnZXRVUkxd OworICAgICAgICBSZXRhaW5QdHI8X1dLQWN0aXZhdGVkRWxlbWVudEluZm8+IGVsZW1lbnRJbmZv ID0gYWRvcHROUyhbW19XS0FjdGl2YXRlZEVsZW1lbnRJbmZvIGFsbG9jXSBfaW5pdFdpdGhUeXBl Ol9XS0FjdGl2YXRlZEVsZW1lbnRUeXBlSW1hZ2UgVVJMOnRhcmdldFVSTCBsb2NhdGlvbjpfcG9z aXRpb25JbmZvcm1hdGlvbi5wb2ludCB0aXRsZTpfcG9zaXRpb25JbmZvcm1hdGlvbi50aXRsZSBy ZWN0Ol9wb3NpdGlvbkluZm9ybWF0aW9uLmJvdW5kcyBpbWFnZTpfcG9zaXRpb25JbmZvcm1hdGlv bi5pbWFnZS5nZXQoKV0pOworICAgICAgICBfcGFnZS0+c3RhcnRJbnRlcmFjdGlvbldpdGhFbGVt ZW50QXRQb3NpdGlvbihfcG9zaXRpb25JbmZvcm1hdGlvbi5wb2ludCk7CisgICAgICAgIHJldHVy biBbW1tXS0ltYWdlUHJldmlld1ZpZXdDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aENHSW1hZ2U6 X3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2UtPm1ha2VDR0ltYWdlQ29weSgpIGRlZmF1bHRBY3Rp b25zOltfYWN0aW9uU2hlZXRBc3Npc3RhbnQgZGVmYXVsdEFjdGlvbnNGb3JJbWFnZVNoZWV0XSBl bGVtZW50SW5mbzplbGVtZW50SW5mby5nZXQoKV0gYXV0b3JlbGVhc2VdOwogICAgIH0KIAogICAg IHJldHVybiBuaWw7Cg== 256337 2015-07-07 17:33:51 -0700 2015-07-08 10:50:58 -0700 Patch for-review-2.txt text/plain 10011 bdakin SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NjQ3NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM1IEBACisyMDE1LTA3LTA3ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYWN0aW9ucyB0byBpbWFnZSBw cmV2aWV3cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ2NzAyCisgICAgICAgIC1hbmQgY29ycmVzcG9uZGluZy0KKyAgICAgICAgPHJkYXI6Ly9wcm9i bGVtLzIxNjQyNjU0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZCBhbiBhcnJheSBvZiBhY3Rpb25zIGFuZCBfV0tBY3RpdmF0ZWRFbGVtZW50SW5m byBpbiBvcmRlciB0byBwcm9wZXJseSBpbnZva2UgCisgICAgICAgIHRoZSBhY3Rpb25zLgorICAg ICAgICAqIFVJUHJvY2Vzcy9XS0ltYWdlUHJldmlld1ZpZXdDb250cm9sbGVyLmg6CisgICAgICAg ICogVUlQcm9jZXNzL1dLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIubW06CisgICAgICAgICgt W1dLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgbG9hZFZpZXddKToKKyAgICAgICAgKC1bV0tJ bWFnZVByZXZpZXdWaWV3Q29udHJvbGxlciBpbml0V2l0aENHSW1hZ2U6ZGVmYXVsdEFjdGlvbnM6 ZWxlbWVudEluZm86XSk6CisgICAgICAgIChfc2NhbGVTaXplV2l0aGluU2l6ZSk6CisgICAgICAg ICgtW1dLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgaW5pdFdpdGhDR0ltYWdlOl0pOiBEZWxl dGVkLgorCisgICAgICAgIFJlLWZhY3RvciBkZWZhdWx0QWN0aW9uc0ZvckltYWdlU2hlZXQgaW50 byBhIHN0YW5kLWFsb25lIGZ1bmN0aW9uIHNvIHRoYXQgaXQgY2FuIAorICAgICAgICBiZSBpbnZv a2VkIGZvciBwcmV2aWV3cyBhcyB3ZWxsIGFzIGZvciB0aGUgYWN0aW9uIHNoZWV0LgorICAgICAg ICAqIFVJUHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9pb3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5tbToKKyAgICAgICAgKC1bV0tBY3Rp b25TaGVldEFzc2lzdGFudCBzaG93SW1hZ2VTaGVldF0pOgorICAgICAgICAoLVtXS0FjdGlvblNo ZWV0QXNzaXN0YW50IGRlZmF1bHRBY3Rpb25zRm9yTGlua1NoZWV0XSk6CisgICAgICAgICgtW1dL QWN0aW9uU2hlZXRBc3Npc3RhbnQgZGVmYXVsdEFjdGlvbnNGb3JJbWFnZVNoZWV0XSk6CisgICAg ICAgICgtW1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQgc2hvd0xpbmtTaGVldF0pOgorCisgICAgICAg IFdLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgaW5pdGlhbGl6ZXIgbm93IHRha2VzIHRoZSBk ZWZhdWx0IGFjdGlvbnMgYW5kIAorICAgICAgICBfV0tBY3RpdmF0ZWRFbGVtZW50SW5mby4KKyAg ICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5tbToKKyAgICAg ICAgKC1bV0tDb250ZW50VmlldyBwcmV2aWV3Vmlld0NvbnRyb2xsZXJGb3JQb3NpdGlvbjppblNv dXJjZVZpZXc6XSk6CisKIDIwMTUtMDctMDcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KIAogICAgICAgICBNYWtlIHN1cmUgdG8gcmVtb3ZlIHRoZSBkb3dubG9hZCBtZXNz YWdlIHJlY2VpdmVyIGJlZm9yZSBmcmVlaW5nIGl0CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV0tJbWFnZVByZXZpZXdWaWV3Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XS0ltYWdlUHJldmlld1ZpZXdDb250cm9sbGVyLmgJKHJldmlz aW9uIDE4NjM4MCkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XS0ltYWdlUHJldmlld1Zp ZXdDb250cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTI5LDkgKzI5LDE2IEBACiAKICNpbXBv cnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAotQGludGVyZmFjZSBXS0ltYWdlUHJldmlld1ZpZXdDb250 cm9sbGVyIDogVUlWaWV3Q29udHJvbGxlcgorQGNsYXNzIF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZv OworQGNsYXNzIF9XS0VsZW1lbnRBY3Rpb247CiAKLS0gKGlkKWluaXRXaXRoQ0dJbWFnZTooUmV0 YWluUHRyPENHSW1hZ2VSZWY+KWltYWdlOworQGludGVyZmFjZSBXS0ltYWdlUHJldmlld1ZpZXdD b250cm9sbGVyIDogVUlWaWV3Q29udHJvbGxlciB7CitAcHJpdmF0ZQorICAgIFJldGFpblB0cjxO U0FycmF5PiBfaW1hZ2VBY3Rpb25zOworICAgIF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvICpfYWN0 aXZhdGVkRWxlbWVudEluZm87Cit9CisKKy0gKGlkKWluaXRXaXRoQ0dJbWFnZTooUmV0YWluUHRy PENHSW1hZ2VSZWY+KWltYWdlIGRlZmF1bHRBY3Rpb25zOihSZXRhaW5QdHI8TlNBcnJheT4pYWN0 aW9ucyBlbGVtZW50SW5mbzooX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gKillbGVtZW50SW5mbzsK IEBlbmQKIAogI2VuZGlmIC8vIFBMQVRGT1JNKElPUykKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XS0ltYWdlUHJldmlld1ZpZXdDb250cm9sbGVyLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XS0ltYWdlUHJldmlld1ZpZXdDb250cm9sbGVyLm1tCShy ZXZpc2lvbiAxODYzODApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV0tJbWFnZVByZXZp ZXdWaWV3Q29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtMjYsMTAgKzI2LDEyIEBACiAj aW1wb3J0ICJjb25maWcuaCIKICNpbXBvcnQgIldLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIu aCIKIAotI2ltcG9ydCA8V2ViQ29yZS9JbnRTaXplLmg+Ci0KICNpZiBQTEFURk9STShJT1MpCiAK KyNpbXBvcnQgPFVJS2l0U1BJLmg+CisjaW1wb3J0IDxXZWJDb3JlL0ludFNpemUuaD4KKyNpbXBv cnQgPF9XS0VsZW1lbnRBY3Rpb24uaD4KKwogQGltcGxlbWVudGF0aW9uIFdLSW1hZ2VQcmV2aWV3 Vmlld0NvbnRyb2xsZXIgewogICAgIFJldGFpblB0cjxDR0ltYWdlUmVmPiBfaW1hZ2U7CiAgICAg UmV0YWluUHRyPFVJSW1hZ2VWaWV3PiBfaW1hZ2VWaWV3OwpAQCAtNDIsNyArNDQsNyBAQCAtICh2 b2lkKWxvYWRWaWV3CiAgICAgW3NlbGYudmlldyBhZGRTdWJ2aWV3Ol9pbWFnZVZpZXcuZ2V0KCld OwogfQogCi0tIChpZClpbml0V2l0aENHSW1hZ2U6KFJldGFpblB0cjxDR0ltYWdlUmVmPilpbWFn ZQorLSAoaWQpaW5pdFdpdGhDR0ltYWdlOihSZXRhaW5QdHI8Q0dJbWFnZVJlZj4paW1hZ2UgZGVm YXVsdEFjdGlvbnM6KFJldGFpblB0cjxOU0FycmF5PilhY3Rpb25zIGVsZW1lbnRJbmZvOihfV0tB Y3RpdmF0ZWRFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZvCiB7CiAgICAgc2VsZiA9IFtzdXBlciBp bml0V2l0aE5pYk5hbWU6bmlsIGJ1bmRsZTpuaWxdOwogICAgIGlmICghc2VsZikKQEAgLTU5LDYg KzYxLDkgQEAgLSAoaWQpaW5pdFdpdGhDR0ltYWdlOihSZXRhaW5QdHI8Q0dJbWFnZQogICAgIFtf aW1hZ2VWaWV3IHNldEZyYW1lOkNHUmVjdE1ha2UoW19pbWFnZVZpZXcgZnJhbWVdLm9yaWdpbi54 LCBbX2ltYWdlVmlldyBmcmFtZV0ub3JpZ2luLnksIGltYWdlU2l6ZS53aWR0aCwgaW1hZ2VTaXpl LmhlaWdodCldOwogICAgIFtzZWxmIHNldFByZWZlcnJlZENvbnRlbnRTaXplOmltYWdlU2l6ZV07 CiAKKyAgICBfaW1hZ2VBY3Rpb25zID0gYWN0aW9uczsKKyAgICBfYWN0aXZhdGVkRWxlbWVudElu Zm8gPSBlbGVtZW50SW5mbzsKKwogICAgIHJldHVybiBzZWxmOwogfQogCkBAIC04Niw2ICs5MSwx MCBAQCBzdGF0aWMgQ0dTaXplIF9zY2FsZVNpemVXaXRoaW5TaXplKENHU2l6CiAgICAgcmV0dXJu IHNpemU7CiB9CiAKKyNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQorI2ltcG9ydCA8V2ViS2l0 QWRkaXRpb25zL1dLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIubW0+CisjZW5kaWYKKwogQGVu ZAogCiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tBY3Rpb25T aGVldEFzc2lzdGFudC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9p b3MvV0tBY3Rpb25TaGVldEFzc2lzdGFudC5oCShyZXZpc2lvbiAxODYzODApCisrKyBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQuaAkod29ya2luZyBj b3B5KQpAQCAtNjMsNiArNjMsNyBAQCBzdHJ1Y3QgSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9z aXRpb247CiAtICh2b2lkKWNsZWFudXBTaGVldDsKIC0gKHZvaWQpdXBkYXRlU2hlZXRQb3NpdGlv bjsKIC0gKFJldGFpblB0cjxOU0FycmF5PilkZWZhdWx0QWN0aW9uc0ZvckxpbmtTaGVldDsKKy0g KFJldGFpblB0cjxOU0FycmF5PilkZWZhdWx0QWN0aW9uc0ZvckltYWdlU2hlZXQ7CiBAZW5kCiAK ICNlbmRpZiAvLyBQTEFURk9STShJT1MpCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv aW9zL1dLQWN0aW9uU2hlZXRBc3Npc3RhbnQubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL2lvcy9XS0FjdGlvblNoZWV0QXNzaXN0YW50Lm1tCShyZXZpc2lvbiAxODYz ODApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQWN0aW9uU2hlZXRBc3Npc3Rh bnQubW0JKHdvcmtpbmcgY29weSkKQEAgLTI0NSwyMSArMjQ1LDkgQEAgLSAodm9pZClzaG93SW1h Z2VTaGVldAogCiAgICAgY29uc3QgYXV0byYgcG9zaXRpb25JbmZvcm1hdGlvbiA9IFtkZWxlZ2F0 ZSBwb3NpdGlvbkluZm9ybWF0aW9uRm9yQWN0aW9uU2hlZXRBc3Npc3RhbnQ6c2VsZl07CiAKLSAg ICBOU1VSTCAqdGFyZ2V0VVJMID0gW05TVVJMIFVSTFdpdGhTdHJpbmc6cG9zaXRpb25JbmZvcm1h dGlvbi51cmxdOwotICAgIGF1dG8gZGVmYXVsdEFjdGlvbnMgPSBhZG9wdE5TKFtbTlNNdXRhYmxl QXJyYXkgYWxsb2NdIGluaXRdKTsKLSAgICBpZiAoIXBvc2l0aW9uSW5mb3JtYXRpb24udXJsLmlz RW1wdHkoKSkKLSAgICAgICAgW2RlZmF1bHRBY3Rpb25zIGFkZE9iamVjdDpbX1dLRWxlbWVudEFj dGlvbiBlbGVtZW50QWN0aW9uV2l0aFR5cGU6X1dLRWxlbWVudEFjdGlvblR5cGVPcGVuXV07Ci0j aWYgSEFWRShTQUZBUklfU0VSVklDRVNfRlJBTUVXT1JLKQotICAgIGlmIChbZ2V0U1NSZWFkaW5n TGlzdENsYXNzKCkgc3VwcG9ydHNVUkw6dGFyZ2V0VVJMXSkKLSAgICAgICAgW2RlZmF1bHRBY3Rp b25zIGFkZE9iamVjdDpbX1dLRWxlbWVudEFjdGlvbiBlbGVtZW50QWN0aW9uV2l0aFR5cGU6X1dL RWxlbWVudEFjdGlvblR5cGVBZGRUb1JlYWRpbmdMaXN0XV07Ci0jZW5kaWYKLSAgICBpZiAoVEND QWNjZXNzUHJlZmxpZ2h0KGdldGtUQ0NTZXJ2aWNlUGhvdG9zKCksIE5VTEwpICE9IGtUQ0NBY2Nl c3NQcmVmbGlnaHREZW5pZWQpCi0gICAgICAgIFtkZWZhdWx0QWN0aW9ucyBhZGRPYmplY3Q6W19X S0VsZW1lbnRBY3Rpb24gZWxlbWVudEFjdGlvbldpdGhUeXBlOl9XS0VsZW1lbnRBY3Rpb25UeXBl U2F2ZUltYWdlXV07Ci0gICAgaWYgKCF0YXJnZXRVUkwuc2NoZW1lLmxlbmd0aCB8fCBbdGFyZ2V0 VVJMLnNjaGVtZSBjYXNlSW5zZW5zaXRpdmVDb21wYXJlOkAiamF2YXNjcmlwdCJdICE9IE5TT3Jk ZXJlZFNhbWUpCi0gICAgICAgIFtkZWZhdWx0QWN0aW9ucyBhZGRPYmplY3Q6W19XS0VsZW1lbnRB Y3Rpb24gZWxlbWVudEFjdGlvbldpdGhUeXBlOl9XS0VsZW1lbnRBY3Rpb25UeXBlQ29weV1dOwot Ci0gICAgYXV0byBlbGVtZW50SW5mbyA9IGFkb3B0TlMoW1tfV0tBY3RpdmF0ZWRFbGVtZW50SW5m byBhbGxvY10gX2luaXRXaXRoVHlwZTpfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZUltYWdlCi0gICAg ICAgIFVSTDp0YXJnZXRVUkwgbG9jYXRpb246cG9zaXRpb25JbmZvcm1hdGlvbi5wb2ludCB0aXRs ZTpwb3NpdGlvbkluZm9ybWF0aW9uLnRpdGxlIHJlY3Q6cG9zaXRpb25JbmZvcm1hdGlvbi5ib3Vu ZHMgaW1hZ2U6cG9zaXRpb25JbmZvcm1hdGlvbi5pbWFnZS5nZXQoKV0pOworICAgIE5TVVJMICp0 YXJnZXRVUkwgPSBbTlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOnBvc2l0aW9uSW5mb3JtYXRp b24udXJsXTsKKyAgICBhdXRvIGRlZmF1bHRBY3Rpb25zID0gW3NlbGYgZGVmYXVsdEFjdGlvbnNG b3JJbWFnZVNoZWV0XTsKKyAgICBhdXRvIGVsZW1lbnRJbmZvID0gYWRvcHROUyhbW19XS0FjdGl2 YXRlZEVsZW1lbnRJbmZvIGFsbG9jXSBfaW5pdFdpdGhUeXBlOl9XS0FjdGl2YXRlZEVsZW1lbnRU eXBlSW1hZ2UgVVJMOnRhcmdldFVSTCBsb2NhdGlvbjpwb3NpdGlvbkluZm9ybWF0aW9uLnBvaW50 IHRpdGxlOnBvc2l0aW9uSW5mb3JtYXRpb24udGl0bGUgcmVjdDpwb3NpdGlvbkluZm9ybWF0aW9u LmJvdW5kcyBpbWFnZTpwb3NpdGlvbkluZm9ybWF0aW9uLmltYWdlLmdldCgpXSk7CiAKICAgICBS ZXRhaW5QdHI8TlNBcnJheT4gYWN0aW9ucyA9IFtkZWxlZ2F0ZSBhY3Rpb25TaGVldEFzc2lzdGFu dDpzZWxmIGRlY2lkZUFjdGlvbnNGb3JFbGVtZW50OmVsZW1lbnRJbmZvLmdldCgpIGRlZmF1bHRB Y3Rpb25zOldURjo6bW92ZShkZWZhdWx0QWN0aW9ucyldOwogCkBAIC0zMDAsNiArMjg4LDMwIEBA IC0gKFJldGFpblB0cjxOU0FycmF5PilkZWZhdWx0QWN0aW9uc0ZvckwKICAgICByZXR1cm4gZGVm YXVsdEFjdGlvbnM7CiB9CiAKKy0gKFJldGFpblB0cjxOU0FycmF5PilkZWZhdWx0QWN0aW9uc0Zv ckltYWdlU2hlZXQKK3sKKyAgICBhdXRvIGRlbGVnYXRlID0gX2RlbGVnYXRlLmdldCgpOworICAg IGlmICghZGVsZWdhdGUpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAgICBjb25zdCBhdXRvJiBw b3NpdGlvbkluZm9ybWF0aW9uID0gW2RlbGVnYXRlIHBvc2l0aW9uSW5mb3JtYXRpb25Gb3JBY3Rp b25TaGVldEFzc2lzdGFudDpzZWxmXTsKKyAgICBOU1VSTCAqdGFyZ2V0VVJMID0gW05TVVJMIFVS TFdpdGhTdHJpbmc6cG9zaXRpb25JbmZvcm1hdGlvbi51cmxdOworCisgICAgYXV0byBkZWZhdWx0 QWN0aW9ucyA9IGFkb3B0TlMoW1tOU011dGFibGVBcnJheSBhbGxvY10gaW5pdF0pOworICAgIGlm ICghcG9zaXRpb25JbmZvcm1hdGlvbi51cmwuaXNFbXB0eSgpKQorICAgICAgICBbZGVmYXVsdEFj dGlvbnMgYWRkT2JqZWN0OltfV0tFbGVtZW50QWN0aW9uIF9lbGVtZW50QWN0aW9uV2l0aFR5cGU6 X1dLRWxlbWVudEFjdGlvblR5cGVPcGVuIGFzc2lzdGFudDpzZWxmXV07CisjaWYgSEFWRShTQUZB UklfU0VSVklDRVNfRlJBTUVXT1JLKQorICAgIGlmIChbZ2V0U1NSZWFkaW5nTGlzdENsYXNzKCkg c3VwcG9ydHNVUkw6dGFyZ2V0VVJMXSkKKyAgICAgICAgW2RlZmF1bHRBY3Rpb25zIGFkZE9iamVj dDpbX1dLRWxlbWVudEFjdGlvbiBfZWxlbWVudEFjdGlvbldpdGhUeXBlOl9XS0VsZW1lbnRBY3Rp b25UeXBlQWRkVG9SZWFkaW5nTGlzdCBhc3Npc3RhbnQ6c2VsZl1dOworI2VuZGlmCisgICAgaWYg KFRDQ0FjY2Vzc1ByZWZsaWdodChnZXRrVENDU2VydmljZVBob3RvcygpLCBOVUxMKSAhPSBrVEND QWNjZXNzUHJlZmxpZ2h0RGVuaWVkKQorICAgICAgICBbZGVmYXVsdEFjdGlvbnMgYWRkT2JqZWN0 OltfV0tFbGVtZW50QWN0aW9uIF9lbGVtZW50QWN0aW9uV2l0aFR5cGU6X1dLRWxlbWVudEFjdGlv blR5cGVTYXZlSW1hZ2UgYXNzaXN0YW50OnNlbGZdXTsKKyAgICBpZiAoIXRhcmdldFVSTC5zY2hl bWUubGVuZ3RoIHx8IFt0YXJnZXRVUkwuc2NoZW1lIGNhc2VJbnNlbnNpdGl2ZUNvbXBhcmU6QCJq YXZhc2NyaXB0Il0gIT0gTlNPcmRlcmVkU2FtZSkKKyAgICAgICAgW2RlZmF1bHRBY3Rpb25zIGFk ZE9iamVjdDpbX1dLRWxlbWVudEFjdGlvbiBfZWxlbWVudEFjdGlvbldpdGhUeXBlOl9XS0VsZW1l bnRBY3Rpb25UeXBlQ29weSBhc3Npc3RhbnQ6c2VsZl1dOworCisgICAgcmV0dXJuIGRlZmF1bHRB Y3Rpb25zOworfQorCiAtICh2b2lkKXNob3dMaW5rU2hlZXQKIHsKICAgICBBU1NFUlQoIV9pbnRl cmFjdGlvblNoZWV0KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250 ZW50Vmlld0ludGVyYWN0aW9uLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCShyZXZpc2lvbiAxODYzODApCisr KyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bQkod29ya2luZyBjb3B5KQpAQCAtMzI0NSw5ICszMjQ1LDEyIEBAIC0gKFVJVmlld0NvbnRyb2xs ZXIgKilwcmV2aWV3Vmlld0NvbnRyb2wKICAgICAgICAgaWYgKGFic29sdXRlSW1hZ2VVUkwuaXNF bXB0eSgpIHx8ICEoV2ViQ29yZTo6cHJvdG9jb2xJc0luSFRUUEZhbWlseShhYnNvbHV0ZUltYWdl VVJMKSB8fCBXZWJDb3JlOjpwcm90b2NvbElzKGFic29sdXRlSW1hZ2VVUkwsICJkYXRhIikpKQog ICAgICAgICAgICAgcmV0dXJuIG5pbDsKICAgICAgICAgX3ByZXZpZXdUeXBlID0gUHJldmlld0Vs ZW1lbnRUeXBlOjpJbWFnZTsKKyAgICAgICAgTlNVUkwgKnRhcmdldFVSTCA9IFtOU1VSTCBfd2Vi X1VSTFdpdGhXVEZTdHJpbmc6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2VVUkxdOwogICAgICAg ICBpZiAoW3VpRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzp3 aWxsUHJldmlld0ltYWdlV2l0aFVSTDopXSkKLSAgICAgICAgICAgIFt1aURlbGVnYXRlIF93ZWJW aWV3Ol93ZWJWaWV3IHdpbGxQcmV2aWV3SW1hZ2VXaXRoVVJMOltOU1VSTCBfd2ViX1VSTFdpdGhX VEZTdHJpbmc6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2VVUkxdXTsKLSAgICAgICAgcmV0dXJu IFtbW1dLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoQ0dJbWFnZTpf cG9zaXRpb25JbmZvcm1hdGlvbi5pbWFnZS0+bWFrZUNHSW1hZ2VDb3B5KCldIGF1dG9yZWxlYXNl XTsKKyAgICAgICAgICAgIFt1aURlbGVnYXRlIF93ZWJWaWV3Ol93ZWJWaWV3IHdpbGxQcmV2aWV3 SW1hZ2VXaXRoVVJMOnRhcmdldFVSTF07CisgICAgICAgIFJldGFpblB0cjxfV0tBY3RpdmF0ZWRF bGVtZW50SW5mbz4gZWxlbWVudEluZm8gPSBhZG9wdE5TKFtbX1dLQWN0aXZhdGVkRWxlbWVudElu Zm8gYWxsb2NdIF9pbml0V2l0aFR5cGU6X1dLQWN0aXZhdGVkRWxlbWVudFR5cGVJbWFnZSBVUkw6 dGFyZ2V0VVJMIGxvY2F0aW9uOl9wb3NpdGlvbkluZm9ybWF0aW9uLnBvaW50IHRpdGxlOl9wb3Np dGlvbkluZm9ybWF0aW9uLnRpdGxlIHJlY3Q6X3Bvc2l0aW9uSW5mb3JtYXRpb24uYm91bmRzIGlt YWdlOl9wb3NpdGlvbkluZm9ybWF0aW9uLmltYWdlLmdldCgpXSk7CisgICAgICAgIF9wYWdlLT5z dGFydEludGVyYWN0aW9uV2l0aEVsZW1lbnRBdFBvc2l0aW9uKF9wb3NpdGlvbkluZm9ybWF0aW9u LnBvaW50KTsKKyAgICAgICAgcmV0dXJuIFtbW1dLSW1hZ2VQcmV2aWV3Vmlld0NvbnRyb2xsZXIg YWxsb2NdIGluaXRXaXRoQ0dJbWFnZTpfcG9zaXRpb25JbmZvcm1hdGlvbi5pbWFnZS0+bWFrZUNH SW1hZ2VDb3B5KCkgZGVmYXVsdEFjdGlvbnM6W19hY3Rpb25TaGVldEFzc2lzdGFudCBkZWZhdWx0 QWN0aW9uc0ZvckltYWdlU2hlZXRdIGVsZW1lbnRJbmZvOmVsZW1lbnRJbmZvLmdldCgpXSBhdXRv cmVsZWFzZV07CiAgICAgfQogCiAgICAgcmV0dXJuIG5pbDsK