155074 2016-03-05 16:23:33 -0800 Support preview on attachment elements 2016-03-06 19:44:47 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 enrica enrica sam thorton oldest_to_newest 1171304 0 enrica 2016-03-05 16:23:33 -0800 We want to be able to preview attachment elements, like we do for links and images. rdar://problem/24806079 1171307 1 273108 enrica 2016-03-05 16:28:35 -0800 Created attachment 273108 Patch 1171352 2 273117 enrica 2016-03-05 18:53:38 -0800 Created attachment 273117 Patch2 1171356 3 273117 sam 2016-03-05 19:01:41 -0800 Comment on attachment 273117 Patch2 View in context: https://bugs.webkit.org/attachment.cgi?id=273117&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h:76 > +- (NSUInteger)_webView:(WKWebView *)webView attachmentIndexElement:(_WKActivatedElementInfo *)element WK_AVAILABLE(NA, WK_IOS_TBA); This name is a bit awkward. I think something like, _webView:indexIntoAttachmentListForElement: or something like that. > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:3712 > + enum { UIPreviewItemTypeAttachment = 5 }; Even though I suggested this, it now makes me nervous. I think you should just use the 5 below with a comment, or pick a name that won't conflict with UIKit. 1171506 4 enrica 2016-03-06 19:30:01 -0800 (In reply to comment #3) > Comment on attachment 273117 [details] > Patch2 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=273117&action=review > > > Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h:76 > > +- (NSUInteger)_webView:(WKWebView *)webView attachmentIndexElement:(_WKActivatedElementInfo *)element WK_AVAILABLE(NA, WK_IOS_TBA); > > This name is a bit awkward. I think something like, > _webView:indexIntoAttachmentListForElement: or something like that. > I'll change it. > > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:3712 > > + enum { UIPreviewItemTypeAttachment = 5 }; > > Even though I suggested this, it now makes me nervous. I think you should > just use the 5 below with a comment, or pick a name that won't conflict with > UIKit. I agree with you, I'll use a different name for the enum. 1171509 5 enrica 2016-03-06 19:37:46 -0800 Committed revision 197656. 1171510 6 273117 mitz 2016-03-06 19:44:47 -0800 Comment on attachment 273117 Patch2 View in context: https://bugs.webkit.org/attachment.cgi?id=273117&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h:75 > +- (NSArray *)_attachmentListForWebView:(WKWebView *)webView WK_AVAILABLE(NA, WK_IOS_TBA); Can this be WK_ARRAY<> of a more specific type? 273108 2016-03-05 16:28:35 -0800 2016-03-05 18:53:38 -0800 Patch preview-attachments.txt text/plain 5810 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzYxOCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE2LTAzLTA1ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBwcmV2aWV3IG9u IGF0dGFjaG1lbnQgZWxlbWVudHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTUwNzQKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjQ4MDYwNzkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvd2luZyBw cmV2aWV3IHRvIHN0YXJ0IG9uIGF0dGFjaG1lbnQgZWxlbWVudHMuCisgICAgICAgIEFkZGluZyBh IHByaXZhdGUgVUlEZWxlZ2F0ZSBtZXRob2QgdG8gcHJvdmlkZSB0aGUgZGF0YSBmb3IgdGhlIHBy ZXZpZXcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLVUlEZWxlZ2F0ZVByaXZh dGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfaW50ZXJhY3Rpb25TaG91bGRCZWdpbkZyb21Q cmV2aWV3SXRlbUNvbnRyb2xsZXI6Zm9yUG9zaXRpb246XSk6CisgICAgICAgICgtW1dLQ29udGVu dFZpZXcgX2RhdGFGb3JQcmV2aWV3SXRlbUNvbnRyb2xsZXI6YXRQb3NpdGlvbjp0eXBlOl0pOgor CiAyMDE2LTAzLTA1ICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCiAg ICAgICAgIFtFUzZdIFN1cHBvcnQgUmVmbGVjdC5jb25zdHJ1Y3QKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0 ZS5oCShyZXZpc2lvbiAxOTc2MDUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLVUlEZWxlZ2F0ZVByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNzIsNiArNzIsOCBA QCBzdHJ1Y3QgVUlFZGdlSW5zZXRzOwogLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2Vi VmlldyBkaWREaXNtaXNzUHJldmlld1ZpZXdDb250cm9sbGVyOihVSVZpZXdDb250cm9sbGVyICop cHJldmlld2VkVmlld0NvbnRyb2xsZXIgY29tbWl0dGluZzooQk9PTCljb21taXR0aW5nIFdLX0FW QUlMQUJMRShOQSwgOV8wKTsKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcg ZGlkRGlzbWlzc1ByZXZpZXdWaWV3Q29udHJvbGxlcjooVUlWaWV3Q29udHJvbGxlciAqKXByZXZp ZXdlZFZpZXdDb250cm9sbGVyIFdLX0FWQUlMQUJMRShOQSwgOV8wKTsKIC0gKEJPT0wpX3dlYlZp ZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgc2hvd0N1c3RvbVNoZWV0Rm9yRWxlbWVudDooX1dLQWN0 aXZhdGVkRWxlbWVudEluZm8gKillbGVtZW50IFdLX0FWQUlMQUJMRShOQSwgV0tfSU9TX1RCQSk7 CistIChOU0FycmF5ICopX2F0dGFjaG1lbnRMaXN0Rm9yV2ViVmlldzooV0tXZWJWaWV3ICopd2Vi VmlldyBXS19BVkFJTEFCTEUoTkEsIFdLX0lPU19UQkEpOworLSAoTlNVSW50ZWdlcilfd2ViVmll dzooV0tXZWJWaWV3ICopd2ViVmlldyBfYXR0YWNobWVudEluZGV4RWxlbWVudDooX1dLQWN0aXZh dGVkRWxlbWVudEluZm8gKillbGVtZW50IFdLX0FWQUlMQUJMRShOQSwgV0tfSU9TX1RCQSk7CiAt IChVSUVkZ2VJbnNldHMpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgZmluYWxPYnNjdXJl ZEluc2V0c0ZvclNjcm9sbFZpZXc6KFVJU2Nyb2xsVmlldyAqKXNjcm9sbFZpZXcgd2l0aFZlbG9j aXR5OihDR1BvaW50KXZlbG9jaXR5IHRhcmdldENvbnRlbnRPZmZzZXQ6KGlub3V0IENHUG9pbnQg Kil0YXJnZXRDb250ZW50T2Zmc2V0IFdLX0FWQUlMQUJMRShOQSwgOV8wKTsKIC0gKFVJVmlld0Nv bnRyb2xsZXIgKilfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBwcmV2aWV3Vmlld0NvbnRy b2xsZXJGb3JVUkw6KE5TVVJMICopdXJsIGRlZmF1bHRBY3Rpb25zOihXS19BUlJBWShfV0tFbGVt ZW50QWN0aW9uICopICopYWN0aW9ucyBlbGVtZW50SW5mbzooX1dLQWN0aXZhdGVkRWxlbWVudElu Zm8gKillbGVtZW50SW5mbyBXS19BVkFJTEFCTEUoTkEsIDlfMCk7CiAtIChVSVZpZXdDb250cm9s bGVyICopX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgcHJldmlld1ZpZXdDb250cm9sbGVy Rm9yQW5pbWF0ZWRJbWFnZUF0VVJMOihOU1VSTCAqKXVybCBkZWZhdWx0QWN0aW9uczooV0tfQVJS QVkoX1dLRWxlbWVudEFjdGlvbiAqKSAqKWFjdGlvbnMgZWxlbWVudEluZm86KF9XS0FjdGl2YXRl ZEVsZW1lbnRJbmZvICopZWxlbWVudEluZm8gaW1hZ2VTaXplOihDR1NpemUpaW1hZ2VTaXplIFdL X0FWQUlMQUJMRShOQSwgOV8wKTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3Mv V0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCShyZXZpc2lvbiAxOTc2 MDUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFj dGlvbi5tbQkod29ya2luZyBjb3B5KQpAQCAtMzYzMiw3ICszNjMyLDcgQEAgLSAoQk9PTClfaW50 ZXJhY3Rpb25TaG91bGRCZWdpbkZyb21QcmV2aQogICAgICAgICByZXR1cm4gTk87CiAKICAgICBb c2VsZiBlbnN1cmVQb3NpdGlvbkluZm9ybWF0aW9uSXNVcFRvRGF0ZTpwb3NpdGlvbl07Ci0gICAg aWYgKCFfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0xpbmsgJiYgIV9wb3NpdGlvbkluZm9ybWF0aW9u LmlzSW1hZ2UpCisgICAgaWYgKCFfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0xpbmsgJiYgIV9wb3Np dGlvbkluZm9ybWF0aW9uLmlzSW1hZ2UgJiYgIV9wb3NpdGlvbkluZm9ybWF0aW9uLmlzQXR0YWNo bWVudCkKICAgICAgICAgcmV0dXJuIE5POwogICAgIAogICAgIFN0cmluZyBhYnNvbHV0ZUxpbmtV UkwgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi51cmw7CkBAIC0zNjYzLDYgKzM2NjMsOCBAQCAtIChO U0RpY3Rpb25hcnkgKilfZGF0YUZvclByZXZpZXdJdGVtQ29uCiAgICAgQk9PTCBjYW5TaG93SW1h Z2VQcmV2aWV3ID0gX3Bvc2l0aW9uSW5mb3JtYXRpb24uaXNJbWFnZSAmJiBzdXBwb3J0c0ltYWdl UHJldmlldzsKICAgICBCT09MIGNhblNob3dMaW5rUHJldmlldyA9IF9wb3NpdGlvbkluZm9ybWF0 aW9uLmlzTGluayB8fCBjYW5TaG93SW1hZ2VQcmV2aWV3OwogICAgIEJPT0wgdXNlSW1hZ2VVUkxG b3JMaW5rID0gTk87CisgICAgQk9PTCBzdXBwb3J0c0F0dGFjaG1lbnRQcmV2aWV3ID0gW3VpRGVs ZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfYXR0YWNobWVudExpc3RGb3JXZWJW aWV3OildICYmIFt1aURlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZp ZXc6X2F0dGFjaG1lbnRJbmRleEVsZW1lbnQ6KV07CisgICAgQk9PTCBjYW5TaG93QXR0YWNobWVu dFByZXZpZXcgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0F0dGFjaG1lbnQgJiYgc3VwcG9ydHNB dHRhY2htZW50UHJldmlldzsKIAogICAgIGlmIChjYW5TaG93SW1hZ2VQcmV2aWV3ICYmIF9wb3Np dGlvbkluZm9ybWF0aW9uLmlzQW5pbWF0ZWRJbWFnZSkgewogICAgICAgICBjYW5TaG93SW1hZ2VQ cmV2aWV3ID0gTk87CkBAIC0zNjcwLDcgKzM2NzIsNyBAQCAtIChOU0RpY3Rpb25hcnkgKilfZGF0 YUZvclByZXZpZXdJdGVtQ29uCiAgICAgICAgIHVzZUltYWdlVVJMRm9yTGluayA9IFlFUzsKICAg ICB9CiAKLSAgICBpZiAoIWNhblNob3dMaW5rUHJldmlldyAmJiAhY2FuU2hvd0ltYWdlUHJldmll dykKKyAgICBpZiAoIWNhblNob3dMaW5rUHJldmlldyAmJiAhY2FuU2hvd0ltYWdlUHJldmlldyAm JiAhY2FuU2hvd0F0dGFjaG1lbnRQcmV2aWV3KQogICAgICAgICByZXR1cm4gbmlsOwogCiAgICAg U3RyaW5nIGFic29sdXRlTGlua1VSTCA9IF9wb3NpdGlvbkluZm9ybWF0aW9uLnVybDsKQEAgLTM2 ODksNyArMzY5MSw2IEBAIC0gKE5TRGljdGlvbmFyeSAqKV9kYXRhRm9yUHJldmlld0l0ZW1Db24K ICAgICAgICAgICAgIGRhdGFGb3JQcmV2aWV3W1VJUHJldmlld0RhdGFMaW5rXSA9IFtOU1VSTCBf d2ViX1VSTFdpdGhXVEZTdHJpbmc6X3Bvc2l0aW9uSW5mb3JtYXRpb24udXJsXTsKICAgICAgICAg aWYgKF9wb3NpdGlvbkluZm9ybWF0aW9uLmlzRGF0YURldGVjdG9yTGluaykgewogICAgICAgICAg ICAgTlNEaWN0aW9uYXJ5ICpjb250ZXh0ID0gbmlsOwotICAgICAgICAgICAgaWQgPFdLVUlEZWxl Z2F0ZVByaXZhdGU+IHVpRGVsZWdhdGUgPSBzdGF0aWNfY2FzdDxpZCA8V0tVSURlbGVnYXRlUHJp dmF0ZT4+KFtfd2ViVmlldyBVSURlbGVnYXRlXSk7CiAgICAgICAgICAgICBpZiAoW3VpRGVsZWdh dGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfZGF0YURldGVjdGlvbkNvbnRleHRGb3JX ZWJWaWV3OildKQogICAgICAgICAgICAgICAgIGNvbnRleHQgPSBbdWlEZWxlZ2F0ZSBfZGF0YURl dGVjdGlvbkNvbnRleHRGb3JXZWJWaWV3Ol93ZWJWaWV3XTsKIApAQCAtMzcwNiw2ICszNzA3LDEx IEBAIC0gKE5TRGljdGlvbmFyeSAqKV9kYXRhRm9yUHJldmlld0l0ZW1Db24KICAgICB9IGVsc2Ug aWYgKGNhblNob3dJbWFnZVByZXZpZXcpIHsKICAgICAgICAgKnR5cGUgPSBVSVByZXZpZXdJdGVt VHlwZUltYWdlOwogICAgICAgICBkYXRhRm9yUHJldmlld1tVSVByZXZpZXdEYXRhTGlua10gPSBb TlNVUkwgX3dlYl9VUkxXaXRoV1RGU3RyaW5nOl9wb3NpdGlvbkluZm9ybWF0aW9uLmltYWdlVVJM XTsKKyAgICB9IGVsc2UgaWYgKGNhblNob3dBdHRhY2htZW50UHJldmlldykgeworICAgICAgICAq dHlwZSA9IFVJUHJldmlld0l0ZW1UeXBlQXR0YWNobWVudDsKKyAgICAgICAgY29uc3QgYXV0byYg ZWxlbWVudCA9IFtbX1dLQWN0aXZhdGVkRWxlbWVudEluZm8gYWxsb2NdIF9pbml0V2l0aFR5cGU6 X1dLQWN0aXZhdGVkRWxlbWVudFR5cGVBdHRhY2htZW50IFVSTDpbTlNVUkwgX3dlYl9VUkxXaXRo V1RGU3RyaW5nOl9wb3NpdGlvbkluZm9ybWF0aW9uLnVybF0gbG9jYXRpb246X3Bvc2l0aW9uSW5m b3JtYXRpb24ucG9pbnQgdGl0bGU6X3Bvc2l0aW9uSW5mb3JtYXRpb24udGl0bGUgcmVjdDpfcG9z aXRpb25JbmZvcm1hdGlvbi5ib3VuZHMgaW1hZ2U6bmlsXTsKKyAgICAgICAgZGF0YUZvclByZXZp ZXdbVUlQcmV2aWV3RGF0YUF0dGFjaG1lbnRMaXN0XSA9IFt1aURlbGVnYXRlIF9hdHRhY2htZW50 TGlzdEZvcldlYlZpZXc6X3dlYlZpZXddOworICAgICAgICBkYXRhRm9yUHJldmlld1tVSVByZXZp ZXdEYXRhQXR0YWNobWVudEluZGV4XSA9IFtOU051bWJlciBudW1iZXJXaXRoVW5zaWduZWRJbnRl Z2VyOlt1aURlbGVnYXRlIF93ZWJWaWV3Ol93ZWJWaWV3IF9hdHRhY2htZW50SW5kZXhFbGVtZW50 OmVsZW1lbnRdXTsKICAgICB9CiAgICAgCiAgICAgcmV0dXJuIGRhdGFGb3JQcmV2aWV3Owo= 273117 2016-03-05 18:53:38 -0800 2016-03-05 19:01:41 -0800 Patch2 preview-attachments.txt text/plain 5943 enrica SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzYxOCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDE2LTAzLTA1ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgU3VwcG9ydCBwcmV2aWV3IG9u IGF0dGFjaG1lbnQgZWxlbWVudHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNTUwNzQKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vMjQ4MDYwNzkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBbGxvd2luZyBw cmV2aWV3IHRvIHN0YXJ0IG9uIGF0dGFjaG1lbnQgZWxlbWVudHMuCisgICAgICAgIEFkZGluZyBh IHByaXZhdGUgVUlEZWxlZ2F0ZSBtZXRob2QgdG8gcHJvdmlkZSB0aGUgZGF0YSBmb3IgdGhlIHBy ZXZpZXcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLVUlEZWxlZ2F0ZVByaXZh dGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBfaW50ZXJhY3Rpb25TaG91bGRCZWdpbkZyb21Q cmV2aWV3SXRlbUNvbnRyb2xsZXI6Zm9yUG9zaXRpb246XSk6CisgICAgICAgICgtW1dLQ29udGVu dFZpZXcgX2RhdGFGb3JQcmV2aWV3SXRlbUNvbnRyb2xsZXI6YXRQb3NpdGlvbjp0eXBlOl0pOgor CiAyMDE2LTAzLTA1ICBZdXN1a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgogCiAg ICAgICAgIFtFUzZdIFN1cHBvcnQgUmVmbGVjdC5jb25zdHJ1Y3QKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0 ZS5oCShyZXZpc2lvbiAxOTc2MDUpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLVUlEZWxlZ2F0ZVByaXZhdGUuaAkod29ya2luZyBjb3B5KQpAQCAtNzIsNiArNzIsOCBA QCBzdHJ1Y3QgVUlFZGdlSW5zZXRzOwogLSAodm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2Vi VmlldyBkaWREaXNtaXNzUHJldmlld1ZpZXdDb250cm9sbGVyOihVSVZpZXdDb250cm9sbGVyICop cHJldmlld2VkVmlld0NvbnRyb2xsZXIgY29tbWl0dGluZzooQk9PTCljb21taXR0aW5nIFdLX0FW QUlMQUJMRShOQSwgOV8wKTsKIC0gKHZvaWQpX3dlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcg ZGlkRGlzbWlzc1ByZXZpZXdWaWV3Q29udHJvbGxlcjooVUlWaWV3Q29udHJvbGxlciAqKXByZXZp ZXdlZFZpZXdDb250cm9sbGVyIFdLX0FWQUlMQUJMRShOQSwgOV8wKTsKIC0gKEJPT0wpX3dlYlZp ZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgc2hvd0N1c3RvbVNoZWV0Rm9yRWxlbWVudDooX1dLQWN0 aXZhdGVkRWxlbWVudEluZm8gKillbGVtZW50IFdLX0FWQUlMQUJMRShOQSwgV0tfSU9TX1RCQSk7 CistIChOU0FycmF5ICopX2F0dGFjaG1lbnRMaXN0Rm9yV2ViVmlldzooV0tXZWJWaWV3ICopd2Vi VmlldyBXS19BVkFJTEFCTEUoTkEsIFdLX0lPU19UQkEpOworLSAoTlNVSW50ZWdlcilfd2ViVmll dzooV0tXZWJWaWV3ICopd2ViVmlldyBhdHRhY2htZW50SW5kZXhFbGVtZW50OihfV0tBY3RpdmF0 ZWRFbGVtZW50SW5mbyAqKWVsZW1lbnQgV0tfQVZBSUxBQkxFKE5BLCBXS19JT1NfVEJBKTsKIC0g KFVJRWRnZUluc2V0cylfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBmaW5hbE9ic2N1cmVk SW5zZXRzRm9yU2Nyb2xsVmlldzooVUlTY3JvbGxWaWV3ICopc2Nyb2xsVmlldyB3aXRoVmVsb2Np dHk6KENHUG9pbnQpdmVsb2NpdHkgdGFyZ2V0Q29udGVudE9mZnNldDooaW5vdXQgQ0dQb2ludCAq KXRhcmdldENvbnRlbnRPZmZzZXQgV0tfQVZBSUxBQkxFKE5BLCA5XzApOwogLSAoVUlWaWV3Q29u dHJvbGxlciAqKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHByZXZpZXdWaWV3Q29udHJv bGxlckZvclVSTDooTlNVUkwgKil1cmwgZGVmYXVsdEFjdGlvbnM6KFdLX0FSUkFZKF9XS0VsZW1l bnRBY3Rpb24gKikgKilhY3Rpb25zIGVsZW1lbnRJbmZvOihfV0tBY3RpdmF0ZWRFbGVtZW50SW5m byAqKWVsZW1lbnRJbmZvIFdLX0FWQUlMQUJMRShOQSwgOV8wKTsKIC0gKFVJVmlld0NvbnRyb2xs ZXIgKilfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBwcmV2aWV3Vmlld0NvbnRyb2xsZXJG b3JBbmltYXRlZEltYWdlQXRVUkw6KE5TVVJMICopdXJsIGRlZmF1bHRBY3Rpb25zOihXS19BUlJB WShfV0tFbGVtZW50QWN0aW9uICopICopYWN0aW9ucyBlbGVtZW50SW5mbzooX1dLQWN0aXZhdGVk RWxlbWVudEluZm8gKillbGVtZW50SW5mbyBpbWFnZVNpemU6KENHU2l6ZSlpbWFnZVNpemUgV0tf QVZBSUxBQkxFKE5BLCA5XzApOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0JKHJldmlzaW9uIDE5NzYw NSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0 aW9uLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zNjMyLDcgKzM2MzIsNyBAQCAtIChCT09MKV9pbnRl cmFjdGlvblNob3VsZEJlZ2luRnJvbVByZXZpCiAgICAgICAgIHJldHVybiBOTzsKIAogICAgIFtz ZWxmIGVuc3VyZVBvc2l0aW9uSW5mb3JtYXRpb25Jc1VwVG9EYXRlOnBvc2l0aW9uXTsKLSAgICBp ZiAoIV9wb3NpdGlvbkluZm9ybWF0aW9uLmlzTGluayAmJiAhX3Bvc2l0aW9uSW5mb3JtYXRpb24u aXNJbWFnZSkKKyAgICBpZiAoIV9wb3NpdGlvbkluZm9ybWF0aW9uLmlzTGluayAmJiAhX3Bvc2l0 aW9uSW5mb3JtYXRpb24uaXNJbWFnZSAmJiAhX3Bvc2l0aW9uSW5mb3JtYXRpb24uaXNBdHRhY2ht ZW50KQogICAgICAgICByZXR1cm4gTk87CiAgICAgCiAgICAgU3RyaW5nIGFic29sdXRlTGlua1VS TCA9IF9wb3NpdGlvbkluZm9ybWF0aW9uLnVybDsKQEAgLTM2NjMsNiArMzY2Myw4IEBAIC0gKE5T RGljdGlvbmFyeSAqKV9kYXRhRm9yUHJldmlld0l0ZW1Db24KICAgICBCT09MIGNhblNob3dJbWFn ZVByZXZpZXcgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0ltYWdlICYmIHN1cHBvcnRzSW1hZ2VQ cmV2aWV3OwogICAgIEJPT0wgY2FuU2hvd0xpbmtQcmV2aWV3ID0gX3Bvc2l0aW9uSW5mb3JtYXRp b24uaXNMaW5rIHx8IGNhblNob3dJbWFnZVByZXZpZXc7CiAgICAgQk9PTCB1c2VJbWFnZVVSTEZv ckxpbmsgPSBOTzsKKyAgICBCT09MIHN1cHBvcnRzQXR0YWNobWVudFByZXZpZXcgPSBbdWlEZWxl Z2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9hdHRhY2htZW50TGlzdEZvcldlYlZp ZXc6KV0gJiYgW3VpRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmll dzphdHRhY2htZW50SW5kZXhFbGVtZW50OildOworICAgIEJPT0wgY2FuU2hvd0F0dGFjaG1lbnRQ cmV2aWV3ID0gX3Bvc2l0aW9uSW5mb3JtYXRpb24uaXNBdHRhY2htZW50ICYmIHN1cHBvcnRzQXR0 YWNobWVudFByZXZpZXc7CiAKICAgICBpZiAoY2FuU2hvd0ltYWdlUHJldmlldyAmJiBfcG9zaXRp b25JbmZvcm1hdGlvbi5pc0FuaW1hdGVkSW1hZ2UpIHsKICAgICAgICAgY2FuU2hvd0ltYWdlUHJl dmlldyA9IE5POwpAQCAtMzY3MCw3ICszNjcyLDcgQEAgLSAoTlNEaWN0aW9uYXJ5ICopX2RhdGFG b3JQcmV2aWV3SXRlbUNvbgogICAgICAgICB1c2VJbWFnZVVSTEZvckxpbmsgPSBZRVM7CiAgICAg fQogCi0gICAgaWYgKCFjYW5TaG93TGlua1ByZXZpZXcgJiYgIWNhblNob3dJbWFnZVByZXZpZXcp CisgICAgaWYgKCFjYW5TaG93TGlua1ByZXZpZXcgJiYgIWNhblNob3dJbWFnZVByZXZpZXcgJiYg IWNhblNob3dBdHRhY2htZW50UHJldmlldykKICAgICAgICAgcmV0dXJuIG5pbDsKIAogICAgIFN0 cmluZyBhYnNvbHV0ZUxpbmtVUkwgPSBfcG9zaXRpb25JbmZvcm1hdGlvbi51cmw7CkBAIC0zNjg5 LDcgKzM2OTEsNiBAQCAtIChOU0RpY3Rpb25hcnkgKilfZGF0YUZvclByZXZpZXdJdGVtQ29uCiAg ICAgICAgICAgICBkYXRhRm9yUHJldmlld1tVSVByZXZpZXdEYXRhTGlua10gPSBbTlNVUkwgX3dl Yl9VUkxXaXRoV1RGU3RyaW5nOl9wb3NpdGlvbkluZm9ybWF0aW9uLnVybF07CiAgICAgICAgIGlm IChfcG9zaXRpb25JbmZvcm1hdGlvbi5pc0RhdGFEZXRlY3RvckxpbmspIHsKICAgICAgICAgICAg IE5TRGljdGlvbmFyeSAqY29udGV4dCA9IG5pbDsKLSAgICAgICAgICAgIGlkIDxXS1VJRGVsZWdh dGVQcml2YXRlPiB1aURlbGVnYXRlID0gc3RhdGljX2Nhc3Q8aWQgPFdLVUlEZWxlZ2F0ZVByaXZh dGU+PihbX3dlYlZpZXcgVUlEZWxlZ2F0ZV0pOwogICAgICAgICAgICAgaWYgKFt1aURlbGVnYXRl IHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX2RhdGFEZXRlY3Rpb25Db250ZXh0Rm9yV2Vi VmlldzopXSkKICAgICAgICAgICAgICAgICBjb250ZXh0ID0gW3VpRGVsZWdhdGUgX2RhdGFEZXRl Y3Rpb25Db250ZXh0Rm9yV2ViVmlldzpfd2ViVmlld107CiAKQEAgLTM3MDYsNiArMzcwNywxMyBA QCAtIChOU0RpY3Rpb25hcnkgKilfZGF0YUZvclByZXZpZXdJdGVtQ29uCiAgICAgfSBlbHNlIGlm IChjYW5TaG93SW1hZ2VQcmV2aWV3KSB7CiAgICAgICAgICp0eXBlID0gVUlQcmV2aWV3SXRlbVR5 cGVJbWFnZTsKICAgICAgICAgZGF0YUZvclByZXZpZXdbVUlQcmV2aWV3RGF0YUxpbmtdID0gW05T VVJMIF93ZWJfVVJMV2l0aFdURlN0cmluZzpfcG9zaXRpb25JbmZvcm1hdGlvbi5pbWFnZVVSTF07 CisgICAgfSBlbHNlIGlmIChjYW5TaG93QXR0YWNobWVudFByZXZpZXcpIHsKKyAgICAgICAgLy8g RklYTUU6IFNob3VsZCB1c2UgVUlLaXQgY29uc3RhbnRzLgorICAgICAgICBlbnVtIHsgVUlQcmV2 aWV3SXRlbVR5cGVBdHRhY2htZW50ID0gNSB9OworICAgICAgICAqdHlwZSA9IHN0YXRpY19jYXN0 PFVJUHJldmlld0l0ZW1UeXBlPihVSVByZXZpZXdJdGVtVHlwZUF0dGFjaG1lbnQpOworICAgICAg ICBjb25zdCBhdXRvJiBlbGVtZW50ID0gW1tfV0tBY3RpdmF0ZWRFbGVtZW50SW5mbyBhbGxvY10g X2luaXRXaXRoVHlwZTpfV0tBY3RpdmF0ZWRFbGVtZW50VHlwZUF0dGFjaG1lbnQgVVJMOltOU1VS TCBfd2ViX1VSTFdpdGhXVEZTdHJpbmc6X3Bvc2l0aW9uSW5mb3JtYXRpb24udXJsXSBsb2NhdGlv bjpfcG9zaXRpb25JbmZvcm1hdGlvbi5wb2ludCB0aXRsZTpfcG9zaXRpb25JbmZvcm1hdGlvbi50 aXRsZSByZWN0Ol9wb3NpdGlvbkluZm9ybWF0aW9uLmJvdW5kcyBpbWFnZTpuaWxdOworICAgICAg ICBkYXRhRm9yUHJldmlld1tAIlVJUHJldmlld0RhdGFBdHRhY2htZW50TGlzdCJdID0gW3VpRGVs ZWdhdGUgX2F0dGFjaG1lbnRMaXN0Rm9yV2ViVmlldzpfd2ViVmlld107CisgICAgICAgIGRhdGFG b3JQcmV2aWV3W0AiVUlQcmV2aWV3RGF0YUF0dGFjaG1lbnRJbmRleCJdID0gW05TTnVtYmVyIG51 bWJlcldpdGhVbnNpZ25lZEludGVnZXI6W3VpRGVsZWdhdGUgX3dlYlZpZXc6X3dlYlZpZXcgYXR0 YWNobWVudEluZGV4RWxlbWVudDplbGVtZW50XV07CiAgICAgfQogICAgIAogICAgIHJldHVybiBk YXRhRm9yUHJldmlldzsK