147173 2015-07-21 16:38:57 -0700 Animated images should animate in previews 2015-07-22 12:17:00 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin webkit-unassigned bdakin mitz thorton yongjun_zhang oldest_to_newest 1111121 0 bdakin 2015-07-21 16:38:57 -0700 Animated images should animate in previews rdar://problem/21637698 1111132 1 257219 bdakin 2015-07-21 17:04:55 -0700 Created attachment 257219 Patch 1111136 2 257219 mitz 2015-07-21 17:14:48 -0700 Comment on attachment 257219 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257219&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h:69 > +- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForAnimatedImageAtURL:(NSURL *)url defaultActions:(NSArray *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo imageSize:(CGSize)imageSize WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA); This (and some of the earlier-added) NSArray * argument should be a WK_ARRAY() of the appropriate type. > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:3288 > + RetainPtr<NSArray> actions = [_actionSheetAssistant defaultActionsForImageSheet:elementInfo.get()]; Why get the actions and change _previewType outside the below if? 1111362 3 bdakin 2015-07-22 11:46:05 -0700 (In reply to comment #2) > Comment on attachment 257219 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=257219&action=review > > > Source/WebKit2/UIProcess/API/Cocoa/WKUIDelegatePrivate.h:69 > > +- (UIViewController *)_webView:(WKWebView *)webView previewViewControllerForAnimatedImageAtURL:(NSURL *)url defaultActions:(NSArray *)actions elementInfo:(_WKActivatedElementInfo *)elementInfo imageSize:(CGSize)imageSize WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA); > > This (and some of the earlier-added) NSArray * argument should be a > WK_ARRAY() of the appropriate type. > Fixed this and the earlier-added arguments! > > Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm:3288 > > + RetainPtr<NSArray> actions = [_actionSheetAssistant defaultActionsForImageSheet:elementInfo.get()]; > > Why get the actions and change _previewType outside the below if? No good reason! Fixed. Thanks Dan! 1111377 4 bdakin 2015-07-22 12:17:00 -0700 http://trac.webkit.org/changeset/187173 257219 2015-07-21 17:04:55 -0700 2015-07-21 17:14:48 -0700 Patch for-review-os.txt text/plain 9586 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4NzEzNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE1LTA3LTIxICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBBbmltYXRlZCBpbWFnZXMgc2hvdWxk IGFuaW1hdGUgaW4gcHJldmlld3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE0NzE3MworICAgICAgICAtYW5kIGNvcnJlc3BvbmRpbmctCisgICAgICAg IHJkYXI6Ly9wcm9ibGVtLzIxNjM3Njk4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTmV3IHZpcnR1YWwgZnVuY3Rpb24gdG8gaW5kaWNhdGUgd2hldGhl ciBvciBub3QgdGhlIGltYWdlIGlzIGFuaW1hdGVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL0JpdG1hcEltYWdlLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2UuaDoK KyAgICAgICAgKFdlYkNvcmU6OkltYWdlOjppc0FuaW1hdGVkKToKKwogMjAxNS0wNy0yMSAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgYSBsb2dn aW5nIGNoYW5uZWwgZm9yIExheW91dCwgcmVtb3ZlIHRoZSBMaXZlQ29ubmVjdCBjaGFubmVsCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJbWFnZS5oCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmgJ KHJldmlzaW9uIDE4NzEwOSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0Jp dG1hcEltYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTE3OCw2ICsxNzgsOCBAQCBwdWJsaWM6CiAg ICAgdmlydHVhbCBJbWFnZU9yaWVudGF0aW9uIG9yaWVudGF0aW9uRm9yQ3VycmVudEZyYW1lKCkg b3ZlcnJpZGUgeyByZXR1cm4gZnJhbWVPcmllbnRhdGlvbkF0SW5kZXgoY3VycmVudEZyYW1lKCkp OyB9CiAKICAgICB2aXJ0dWFsIGJvb2wgY3VycmVudEZyYW1lS25vd25Ub0JlT3BhcXVlKCkgb3Zl cnJpZGU7CisKKyAgICB2aXJ0dWFsIGJvb2wgaXNBbmltYXRlZCgpIG92ZXJyaWRlIHsgcmV0dXJu IG1fZnJhbWVDb3VudCA+IDE7IH0KICAgICAKICAgICBib29sIGNhbkFuaW1hdGUoKTsKIApJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZS5oCShyZXZpc2lvbiAxODcx MDkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZS5oCSh3b3JraW5n IGNvcHkpCkBAIC04NSw2ICs4NSw4IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgaXNQREZE b2N1bWVudEltYWdlKCkgY29uc3QgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wg Y3VycmVudEZyYW1lS25vd25Ub0JlT3BhcXVlKCkgPSAwOwogCisgICAgV0VCQ09SRV9FWFBPUlQg dmlydHVhbCBib29sIGlzQW5pbWF0ZWQoKSB7IHJldHVybiBmYWxzZTsgfQorCiAgICAgLy8gRGVy aXZlZCBjbGFzc2VzIHNob3VsZCBvdmVycmlkZSB0aGlzIGlmIHRoZXkgY2FuIGFzc3VyZSB0aGF0 IAogICAgIC8vIHRoZSBpbWFnZSBjb250YWlucyBvbmx5IHJlc291cmNlcyBmcm9tIGl0cyBvd24g c2VjdXJpdHkgb3JpZ2luLgogICAgIHZpcnR1YWwgYm9vbCBoYXNTaW5nbGVTZWN1cml0eU9yaWdp bigpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCShyZXZpc2lvbiAxODcx MzYpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwzMCBAQAorMjAxNS0wNy0yMSAgQmV0aCBEYWtpbiAgPGJkYWtpbkBhcHBsZS5jb20+CisKKyAg ICAgICAgQW5pbWF0ZWQgaW1hZ2VzIHNob3VsZCBhbmltYXRlIGluIHByZXZpZXdzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDcxNzMKKyAgICAgICAg LWFuZCBjb3JyZXNwb25kaW5nLQorICAgICAgICByZGFyOi8vcHJvYmxlbS8yMTYzNzY5OAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEludGVyYWN0aW9u SW5mb3JtYXRpb25BdFBvc2l0aW9uIG5lZWRzIHRvIGtub3cgaWYgaXTigJlzIGFuIGFuaW1hdGVk IGltYWdlLgorICAgICAgICAqIFNoYXJlZC9JbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlv bi5jcHA6CisgICAgICAgIChXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9u OjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3Np dGlvbjo6ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0 UG9zaXRpb24uaDoKKworICAgICAgICBOZXcgZGVsZWdhdGUgbWV0aG9kIHRvIGNyZWF0ZSBhIGxp bmsgcHJldmlldyB2aWV3IGNvbnRyb2xsZXIgZm9yIGFuaW1hdGVkIAorICAgICAgICBpbWFnZXMu CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdhdGVQcml2YXRlLmg6CisK KyAgICAgICAgVHJlYXQgYW5pbWF0ZWQgaW1hZ2VzIG1vcmUgbGlrZSBsaW5rIHByZXZpZXdzLgor ICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAg ICAgICAoLVtXS0NvbnRlbnRWaWV3IHByZXZpZXdWaWV3Q29udHJvbGxlckZvclBvc2l0aW9uOmlu U291cmNlVmlldzpdKToKKworICAgICAgICBTZXQgaW5mby5pc0FuaW1hdGVkSW1hZ2UKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW06CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2U6OmdldFBvc2l0aW9uSW5mb3JtYXRpb24pOgorCiAyMDE1LTA3LTIxICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggdGhlIGJ1aWxkIGZv bGxvd2luZyA8aHR0cHM6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0LzE4NzEyOT4KSW5kZXg6 IFNvdXJjZS9XZWJLaXQyL1NoYXJlZC9JbnRlcmFjdGlvbkluZm9ybWF0aW9uQXRQb3NpdGlvbi5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL0ludGVyYWN0aW9uSW5mb3Jt YXRpb25BdFBvc2l0aW9uLmNwcAkocmV2aXNpb24gMTg3MTA5KQorKysgU291cmNlL1dlYktpdDIv U2hhcmVkL0ludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMzksNiArMzksNyBAQCB2b2lkIEludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9u OjplCiAgICAgZW5jb2RlciA8PCBpc1NlbGVjdGFibGU7CiAgICAgZW5jb2RlciA8PCBpc05lYXJN YXJrZWRUZXh0OwogICAgIGVuY29kZXIgPDwgdG91Y2hDYWxsb3V0RW5hYmxlZDsKKyAgICBlbmNv ZGVyIDw8IGlzQW5pbWF0ZWRJbWFnZTsKICAgICBlbmNvZGVyIDw8IGNsaWNrYWJsZUVsZW1lbnRO YW1lOwogICAgIGVuY29kZXIgPDwgdXJsOwogICAgIGVuY29kZXIgPDwgaW1hZ2VVUkw7CkBAIC02 OCw2ICs2OSw5IEBAIGJvb2wgSW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb246OmQKIAog ICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnRvdWNoQ2FsbG91dEVuYWJsZWQpKQogICAg ICAgICByZXR1cm4gZmFsc2U7CisKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5pc0Fu aW1hdGVkSW1hZ2UpKQorICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgCiAgICAgaWYgKCFkZWNv ZGVyLmRlY29kZShyZXN1bHQuY2xpY2thYmxlRWxlbWVudE5hbWUpKQogICAgICAgICByZXR1cm4g ZmFsc2U7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvSW50ZXJhY3Rpb25JbmZvcm1hdGlv bkF0UG9zaXRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvSW50ZXJh Y3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24uaAkocmV2aXNpb24gMTg3MTA5KQorKysgU291cmNl L1dlYktpdDIvU2hhcmVkL0ludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uLmgJKHdvcmtp bmcgY29weSkKQEAgLTQzLDYgKzQzLDcgQEAgc3RydWN0IEludGVyYWN0aW9uSW5mb3JtYXRpb25B dFBvc2l0aW9uIAogICAgIGJvb2wgaXNTZWxlY3RhYmxlIHsgZmFsc2UgfTsKICAgICBib29sIGlz TmVhck1hcmtlZFRleHQgeyBmYWxzZSB9OwogICAgIGJvb2wgdG91Y2hDYWxsb3V0RW5hYmxlZCB7 IHRydWUgfTsKKyAgICBib29sIGlzQW5pbWF0ZWRJbWFnZSB7IGZhbHNlIH07CiAgICAgU3RyaW5n IGNsaWNrYWJsZUVsZW1lbnROYW1lOwogICAgIFN0cmluZyB1cmw7CiAgICAgU3RyaW5nIGltYWdl VVJMOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1VJRGVsZWdh dGVQcml2YXRlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1VJRGVsZWdhdGVQcml2YXRlLmgJKHJldmlzaW9uIDE4NzEwOSkKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tVSURlbGVnYXRlUHJpdmF0ZS5oCSh3b3JraW5n IGNvcHkpCkBAIC02Niw2ICs2Niw3IEBAIHN0cnVjdCBVSUVkZ2VJbnNldHM7CiAtICh2b2lkKV93 ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGRpZERpc21pc3NQcmV2aWV3Vmlld0NvbnRyb2xs ZXI6KFVJVmlld0NvbnRyb2xsZXIgKilwcmV2aWV3ZWRWaWV3Q29udHJvbGxlcjsKIC0gKFVJRWRn ZUluc2V0cylfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBmaW5hbE9ic2N1cmVkSW5zZXRz Rm9yU2Nyb2xsVmlldzooVUlTY3JvbGxWaWV3ICopc2Nyb2xsVmlldyB3aXRoVmVsb2NpdHk6KENH UG9pbnQpdmVsb2NpdHkgdGFyZ2V0Q29udGVudE9mZnNldDooaW5vdXQgQ0dQb2ludCAqKXRhcmdl dENvbnRlbnRPZmZzZXQ7CiAtIChVSVZpZXdDb250cm9sbGVyICopX3dlYlZpZXc6KFdLV2ViVmll dyAqKXdlYlZpZXcgcHJldmlld1ZpZXdDb250cm9sbGVyRm9yVVJMOihOU1VSTCAqKXVybCBkZWZh dWx0QWN0aW9uczooTlNBcnJheSAqKWFjdGlvbnMgZWxlbWVudEluZm86KF9XS0FjdGl2YXRlZEVs ZW1lbnRJbmZvICopZWxlbWVudEluZm8gV0tfQVZBSUxBQkxFKFdLX01BQ19UQkEsIFdLX0lPU19U QkEpOworLSAoVUlWaWV3Q29udHJvbGxlciAqKV93ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3 IHByZXZpZXdWaWV3Q29udHJvbGxlckZvckFuaW1hdGVkSW1hZ2VBdFVSTDooTlNVUkwgKil1cmwg ZGVmYXVsdEFjdGlvbnM6KE5TQXJyYXkgKilhY3Rpb25zIGVsZW1lbnRJbmZvOihfV0tBY3RpdmF0 ZWRFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZvIGltYWdlU2l6ZTooQ0dTaXplKWltYWdlU2l6ZSBX S19BVkFJTEFCTEUoV0tfTUFDX1RCQSwgV0tfSU9TX1RCQSk7CiAjZW5kaWYKIAogQGVuZApJbmRl eDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24u bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRW aWV3SW50ZXJhY3Rpb24ubW0JKHJldmlzaW9uIDE4NzEwOSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCSh3b3JraW5nIGNvcHkpCkBA IC0zMjc3LDEyICszMjc3LDI0IEBAIC0gKFVJVmlld0NvbnRyb2xsZXIgKilwcmV2aWV3Vmlld0Nv bnRyb2wKICAgICAgICAgU3RyaW5nIGFic29sdXRlSW1hZ2VVUkwgPSBfcG9zaXRpb25JbmZvcm1h dGlvbi5pbWFnZVVSTDsKICAgICAgICAgaWYgKGFic29sdXRlSW1hZ2VVUkwuaXNFbXB0eSgpIHx8 ICEoV2ViQ29yZTo6cHJvdG9jb2xJc0luSFRUUEZhbWlseShhYnNvbHV0ZUltYWdlVVJMKSB8fCBX ZWJDb3JlOjpwcm90b2NvbElzKGFic29sdXRlSW1hZ2VVUkwsICJkYXRhIikpKQogICAgICAgICAg ICAgcmV0dXJuIG5pbDsKLSAgICAgICAgX3ByZXZpZXdUeXBlID0gUHJldmlld0VsZW1lbnRUeXBl OjpJbWFnZTsKKwogICAgICAgICBOU1VSTCAqdGFyZ2V0VVJMID0gW05TVVJMIF93ZWJfVVJMV2l0 aFdURlN0cmluZzpfcG9zaXRpb25JbmZvcm1hdGlvbi5pbWFnZVVSTF07Ci0gICAgICAgIGlmIChb dWlEZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OndpbGxQcmV2 aWV3SW1hZ2VXaXRoVVJMOildKQotICAgICAgICAgICAgW3VpRGVsZWdhdGUgX3dlYlZpZXc6X3dl YlZpZXcgd2lsbFByZXZpZXdJbWFnZVdpdGhVUkw6dGFyZ2V0VVJMXTsKICAgICAgICAgUmV0YWlu UHRyPF9XS0FjdGl2YXRlZEVsZW1lbnRJbmZvPiBlbGVtZW50SW5mbyA9IGFkb3B0TlMoW1tfV0tB Y3RpdmF0ZWRFbGVtZW50SW5mbyBhbGxvY10gX2luaXRXaXRoVHlwZTpfV0tBY3RpdmF0ZWRFbGVt ZW50VHlwZUltYWdlIFVSTDp0YXJnZXRVUkwgbG9jYXRpb246X3Bvc2l0aW9uSW5mb3JtYXRpb24u cG9pbnQgdGl0bGU6X3Bvc2l0aW9uSW5mb3JtYXRpb24udGl0bGUgcmVjdDpfcG9zaXRpb25JbmZv cm1hdGlvbi5ib3VuZHMgaW1hZ2U6X3Bvc2l0aW9uSW5mb3JtYXRpb24uaW1hZ2UuZ2V0KCldKTsK ICAgICAgICAgX3BhZ2UtPnN0YXJ0SW50ZXJhY3Rpb25XaXRoRWxlbWVudEF0UG9zaXRpb24oX3Bv c2l0aW9uSW5mb3JtYXRpb24ucG9pbnQpOworCisgICAgICAgIC8vIFRyZWF0IGFuaW1hdGVkIGlt YWdlcyBsaWtlIGEgbGluayBwcmV2aWV3CisgICAgICAgIGlmIChfcG9zaXRpb25JbmZvcm1hdGlv bi5pc0FuaW1hdGVkSW1hZ2UpIHsKKyAgICAgICAgICAgIF9wcmV2aWV3VHlwZSA9IFByZXZpZXdF bGVtZW50VHlwZTo6TGluazsKKyAgICAgICAgICAgIFJldGFpblB0cjxOU0FycmF5PiBhY3Rpb25z ID0gW19hY3Rpb25TaGVldEFzc2lzdGFudCBkZWZhdWx0QWN0aW9uc0ZvckltYWdlU2hlZXQ6ZWxl bWVudEluZm8uZ2V0KCldOworICAgICAgICAgICAgaWYgKFt1aURlbGVnYXRlIHJlc3BvbmRzVG9T ZWxlY3RvcjpAc2VsZWN0b3IoX3dlYlZpZXc6cHJldmlld1ZpZXdDb250cm9sbGVyRm9yQW5pbWF0 ZWRJbWFnZUF0VVJMOmRlZmF1bHRBY3Rpb25zOmVsZW1lbnRJbmZvOmltYWdlU2l6ZTopXSkgewor ICAgICAgICAgICAgICAgIF9oaWdobGlnaHRMb25nUHJlc3NDYW5DbGljayA9IE5POworICAgICAg ICAgICAgICAgIHJldHVybiBbdWlEZWxlZ2F0ZSBfd2ViVmlldzpfd2ViVmlldyBwcmV2aWV3Vmll d0NvbnRyb2xsZXJGb3JBbmltYXRlZEltYWdlQXRVUkw6dGFyZ2V0VVJMIGRlZmF1bHRBY3Rpb25z OmFjdGlvbnMuZ2V0KCkgZWxlbWVudEluZm86ZWxlbWVudEluZm8uZ2V0KCkgaW1hZ2VTaXplOl9w b3NpdGlvbkluZm9ybWF0aW9uLmltYWdlLT5zaXplKCldOworICAgICAgICAgICAgfQorICAgICAg ICB9CisKKyAgICAgICAgX3ByZXZpZXdUeXBlID0gUHJldmlld0VsZW1lbnRUeXBlOjpJbWFnZTsK KyAgICAgICAgaWYgKFt1aURlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX3dl YlZpZXc6d2lsbFByZXZpZXdJbWFnZVdpdGhVUkw6KV0pCisgICAgICAgICAgICBbdWlEZWxlZ2F0 ZSBfd2ViVmlldzpfd2ViVmlldyB3aWxsUHJldmlld0ltYWdlV2l0aFVSTDp0YXJnZXRVUkxdOwog ICAgICAgICByZXR1cm4gW1tbV0tJbWFnZVByZXZpZXdWaWV3Q29udHJvbGxlciBhbGxvY10gaW5p dFdpdGhDR0ltYWdlOl9wb3NpdGlvbkluZm9ybWF0aW9uLmltYWdlLT5tYWtlQ0dJbWFnZUNvcHko KSBkZWZhdWx0QWN0aW9uczpbX2FjdGlvblNoZWV0QXNzaXN0YW50IGRlZmF1bHRBY3Rpb25zRm9y SW1hZ2VTaGVldDplbGVtZW50SW5mby5nZXQoKV0gZWxlbWVudEluZm86ZWxlbWVudEluZm9dIGF1 dG9yZWxlYXNlXTsKICAgICB9CiAKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9pb3MvV2ViUGFnZUlPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0JKHJldmlzaW9uIDE4NzEwOSkKKysrIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtMjIwNyw2ICsyMjA3LDcgQEAgdm9pZCBXZWJQYWdlOjpnZXRQb3NpdGlvbklu Zm9ybWF0aW9uKGNvbgogICAgICAgICAgICAgICAgICAgICBpZiAocmVuZGVySW1hZ2UuY2FjaGVk SW1hZ2UoKSAmJiAhcmVuZGVySW1hZ2UuY2FjaGVkSW1hZ2UoKS0+ZXJyb3JPY2N1cnJlZCgpKSB7 CiAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvLmltYWdlVVJMID0gWyhOU1VSTCAqKWVsZW1l bnQtPmRvY3VtZW50KCkuY29tcGxldGVVUkwocmVuZGVySW1hZ2UuY2FjaGVkSW1hZ2UoKS0+dXJs KCkpIGFic29sdXRlU3RyaW5nXTsKICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChJbWFnZSog aW1hZ2UgPSByZW5kZXJJbWFnZS5jYWNoZWRJbWFnZSgpLT5pbWFnZUZvclJlbmRlcmVyKCZyZW5k ZXJJbWFnZSkpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmZvLmlzQW5pbWF0ZWRJ bWFnZSA9IGltYWdlLT5pc0FuaW1hdGVkKCk7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg RmxvYXRTaXplIHNjcmVlblNpemVJblBpeGVscyA9IHNjcmVlblNpemUoKTsKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBzY3JlZW5TaXplSW5QaXhlbHMuc2NhbGUoY29yZVBhZ2UoKS0+ZGV2 aWNlU2NhbGVGYWN0b3IoKSk7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgRmxvYXRTaXpl IHNjYWxlZFNpemUgPSBsYXJnZXN0UmVjdFdpdGhBc3BlY3RSYXRpb0luc2lkZVJlY3QoaW1hZ2Ut PnNpemUoKS53aWR0aCgpIC8gaW1hZ2UtPnNpemUoKS5oZWlnaHQoKSwgRmxvYXRSZWN0KDAsIDAs IHNjcmVlblNpemVJblBpeGVscy53aWR0aCgpLCBzY3JlZW5TaXplSW5QaXhlbHMuaGVpZ2h0KCkp KS5zaXplKCk7Cg==