200909 2019-08-19 20:04:44 -0700 REGRESSION: Open in New Tab is missing from context menu 2019-08-20 09:10:53 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino simon.fraser webkit-bug-importer oldest_to_newest 1562902 0 dino 2019-08-19 20:04:44 -0700 REGRESSION: Open in New Tab is missing from context menu 1562905 1 376736 dino 2019-08-19 20:08:30 -0700 Created attachment 376736 Patch 1562906 2 dino 2019-08-19 20:09:34 -0700 <rdar://problem/54476169> 1562909 3 376736 simon.fraser 2019-08-19 20:23:04 -0700 Comment on attachment 376736 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376736&action=review > Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:7724 > + // even though they haven't moved to the new API. The 'they' is ambiguous. Does it refer to MobileSafari, or to the methods? > Tools/TestWebKitAPI/Tests/WebKitCocoa/ContextMenus.mm:50 > + static auto window = adoptNS([[UIWindow alloc] initWithFrame:NSMakeRect(0, 0, 800, 600)]); > + static auto driver = adoptNS([TestContextMenuDriver new]); > + static auto uiDelegate = adoptNS((NSObject<WKUIDelegate> *)[delegateClass new]); > + static auto configuration = adoptNS([WKWebViewConfiguration new]); These statics are weird. Is this just to extend lifetime? Can we just retain something and release it when the test is complete? > Tools/TestWebKitAPI/Tests/WebKitCocoa/ContextMenus.mm:143 > + return previewActions; Could this be written as: return @[ [UIPreviewAction actionWithTitle:@"Action" style:UIPreviewActionStyleDefault handler:^(UIPreviewAction *, UIViewController *) { }]; ]; 1563081 4 376736 dino 2019-08-20 09:10:00 -0700 Comment on attachment 376736 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376736&action=review >> Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:7724 >> + // even though they haven't moved to the new API. > > The 'they' is ambiguous. Does it refer to MobileSafari, or to the methods? Clarified. >> Tools/TestWebKitAPI/Tests/WebKitCocoa/ContextMenus.mm:50 >> + static auto configuration = adoptNS([WKWebViewConfiguration new]); > > These statics are weird. Is this just to extend lifetime? Can we just retain something and release it when the test is complete? The issue is this is a helper function that is creating the state for the actual tests. So the variables have to exist somewhere, and it would be annoying to pass them in and out. The statics could live globally, but that isn't much different. >> Tools/TestWebKitAPI/Tests/WebKitCocoa/ContextMenus.mm:143 >> + return previewActions; > > Could this be written as: > return @[ > [UIPreviewAction actionWithTitle:@"Action" style:UIPreviewActionStyleDefault handler:^(UIPreviewAction *, UIViewController *) { }]; > ]; Yes. 1563082 5 dino 2019-08-20 09:10:53 -0700 Committed r248900: <https://trac.webkit.org/changeset/248900> 376736 2019-08-19 20:08:30 -0700 2019-08-19 20:23:04 -0700 Patch bug-200909-20190819200829.patch text/plain 11659 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ4NzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGZkNWVlN2EyNjZjOTFjZWM3 NmZmNzMxOTYxMzU2YTAxM2E2ZWJkZmUuLjJlZjI0MDRkMDcwMzBjMDZlOGFlZDBiY2ZkYjliZTBm ZmI5NDI0ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDgtMTkgIERlYW4gSmFj a3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046IE9wZW4gaW4gTmV3 IFRhYiBpcyBtaXNzaW5nIGZyb20gY29udGV4dCBtZW51CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDA5MDkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt LzU0NDc2MTY5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIERvbid0IGFzc3VtZSB0aGUgbmV3IEFQSSBpZiB3ZWJWaWV3OmNvbnRleHRNZW51V2lsbFBy ZXNlbnRGb3JFbGVtZW50OgorICAgICAgICBpcyBpbXBsZW1lbnRlZC4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAobmVlZHNE ZXByZWNhdGVkUHJldmlld0FQSSk6CisKIDIwMTktMDgtMTUgIFNpaHVpIExpdSAgPHNpaHVpX2xp dUBhcHBsZS5jb20+CiAKICAgICAgICAgU29tZSBpbXByb3ZlbWVudHMgb24gd2ViIHN0b3JhZ2UK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50 ZXJhY3Rpb24ubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0lu dGVyYWN0aW9uLm1tCmluZGV4IGNlYWZkMTYzMmFiMzNmZTI4OGQ3ODhkYTcyYzgyMjE3YjRjMGRi MWIuLmMyZDE4OTY1YzRkMmZlYjRlMDBlM2FiOGYxZTJjZjQxOGRiNDU1OGYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlv bi5tbQpAQCAtNzcxOSw4ICs3NzE5LDkgQEAgc3RhdGljIE5TU3RyaW5nICpwcmV2aWV3SWRlbnRp ZmllckZvckVsZW1lbnRBY3Rpb24oX1dLRWxlbWVudEFjdGlvbiAqYWN0aW9uKQogc3RhdGljIGJv b2wgbmVlZHNEZXByZWNhdGVkUHJldmlld0FQSShpZDxXS1VJRGVsZWdhdGU+IGRlbGVnYXRlKQog ewogICAgIC8vIEZJWE1FOiBSZXBsYWNlIHRoZXNlIHdpdGggYm9vbGVhbnMgaW4gVUlEZWxlZ2F0 ZS5oLgotICAgIC8vIE5vdGUgdGhhdCB3ZSBleHBsaWNpdGx5IGRvIG5vdCB0ZXN0IGZvciBAc2Vs ZWN0b3IoX3dlYlZpZXc6Y29udGV4dE1lbnVEaWRFbmRGb3JFbGVtZW50Oikgc2luY2UKLSAgICAv LyB0aGF0J3MgdXNlZCBieSBNb2JpbGVTYWZhcmkgdG8gY2xlYW4gdXAgc3RhdGUgZXZlbiB0aG91 Z2ggdGhleSBoYXZlbid0IG1vdmVkIHRvIHRoZSBuZXcgQVBJLgorICAgIC8vIE5vdGUgdGhhdCB3 ZSBleHBsaWNpdGx5IGRvIG5vdCB0ZXN0IGZvciBAc2VsZWN0b3IoX3dlYlZpZXc6Y29udGV4dE1l bnVEaWRFbmRGb3JFbGVtZW50OikKKyAgICAvLyBhbmQgQHNlbGVjdG9yKHdlYlZpZXc6Y29udGV4 dE1lbnVXaWxsUHJlc2VudEZvckVsZW1lbnQpIHNpbmNlIHRoZXkgYXJlIHVzZWQgYnkgTW9iaWxl U2FmYXJpIHRvIGNsZWFuIHVwIHN0YXRlCisgICAgLy8gZXZlbiB0aG91Z2ggdGhleSBoYXZlbid0 IG1vdmVkIHRvIHRoZSBuZXcgQVBJLgogCiAgICAgcmV0dXJuIGRlbGVnYXRlCiAgICAgJiYgIVtk ZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF93ZWJWaWV3OmNvbnRleHRNZW51 Q29uZmlndXJhdGlvbkZvckVsZW1lbnQ6Y29tcGxldGlvbkhhbmRsZXI6KV0KQEAgLTc3MjgsNyAr NzcyOSw2IEBAIHN0YXRpYyBib29sIG5lZWRzRGVwcmVjYXRlZFByZXZpZXdBUEkoaWQ8V0tVSURl bGVnYXRlPiBkZWxlZ2F0ZSkKICAgICAmJiAhW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpA c2VsZWN0b3IoX3dlYlZpZXc6Y29udGV4dE1lbnVGb3JFbGVtZW50OndpbGxDb21taXRXaXRoQW5p bWF0b3I6KV0KICAgICAmJiAhW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Io d2ViVmlldzpjb250ZXh0TWVudUZvckVsZW1lbnQ6d2lsbENvbW1pdFdpdGhBbmltYXRvcjopXQog ICAgICYmICFbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihfd2ViVmlldzpj b250ZXh0TWVudVdpbGxQcmVzZW50Rm9yRWxlbWVudDopXQotICAgICYmICFbZGVsZWdhdGUgcmVz cG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcih3ZWJWaWV3OmNvbnRleHRNZW51V2lsbFByZXNlbnRG b3JFbGVtZW50OildCiAgICAgJiYgIVtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVj dG9yKHdlYlZpZXc6Y29udGV4dE1lbnVEaWRFbmRGb3JFbGVtZW50OildCiAgICAgJiYgKFtkZWxl Z2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHdlYlZpZXc6c2hvdWxkUHJldmlld0Vs ZW1lbnQ6KV0KICAgICAgICAgfHwgW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0 b3Iod2ViVmlldzpwcmV2aWV3aW5nVmlld0NvbnRyb2xsZXJGb3JFbGVtZW50OmRlZmF1bHRBY3Rp b25zOildCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggZTdmYmI2YTI3OTg4ZGI5OGZjODE4MTVmMGU2YmNhM2VjZDEyMzEwNC4uYTBlMTI0N2MxNTRk ZDY5ZWZkNmZiOTBkNTgxZTRhNTM3N2Q5NmVlNiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9n CisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE5LTA4LTE5ICBEZWFu IEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OOiBPcGVuIGlu IE5ldyBUYWIgaXMgbWlzc2luZyBmcm9tIGNvbnRleHQgbWVudQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwOTA5CisgICAgICAgIDxyZGFyOi8vcHJv YmxlbS81NDQ3NjE2OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGQgYSBuZXcgdGVzdCB0aGF0IHJ1bnMgdGhyb3VnaCB0aGUgbGVnYWN5IGNvbnRl eHQgbWVudQorICAgICAgICBmbG93LCBhbmQgdmVyaWZpZXMgdGhhdCBpdCB3aWxsIGJlIGNhbGxl ZCBpZiB0aGVyZSBhcmVuJ3QKKyAgICAgICAgYXBwcm9wcmlhdGUgZGVsZWdhdGVzIGZvciB0aGUg bmV3IEFQSS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvQ29u dGV4dE1lbnVzLm1tOgorICAgICAgICAoY29udGV4dE1lbnVXZWJWaWV3RHJpdmVyKToKKyAgICAg ICAgKC1bVGVzdENvbnRleHRNZW51VUlEZWxlZ2F0ZSB3ZWJWaWV3OmNvbnRleHRNZW51Q29uZmln dXJhdGlvbkZvckVsZW1lbnQ6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgIChURVNUKToK KyAgICAgICAgKC1bTGVnYWN5UHJldmlld1ZpZXdDb250cm9sbGVyIHByZXZpZXdBY3Rpb25JdGVt c10pOgorICAgICAgICAoLVtMZWdhY3lDb250ZXh0TWVudVVJRGVsZWdhdGUgd2ViVmlldzpzaG91 bGRQcmV2aWV3RWxlbWVudDpdKToKKyAgICAgICAgKC1bTGVnYWN5Q29udGV4dE1lbnVVSURlbGVn YXRlIHdlYlZpZXc6cHJldmlld2luZ1ZpZXdDb250cm9sbGVyRm9yRWxlbWVudDpkZWZhdWx0QWN0 aW9uczpdKToKKyAgICAgICAgKC1bTGVnYWN5Q29udGV4dE1lbnVVSURlbGVnYXRlIHdlYlZpZXc6 Y29udGV4dE1lbnVXaWxsUHJlc2VudEZvckVsZW1lbnQ6XSk6CisgICAgICAgICgtW0xlZ2FjeUNv bnRleHRNZW51VUlEZWxlZ2F0ZSBfd2ViVmlldzpjb250ZXh0TWVudURpZEVuZEZvckVsZW1lbnQ6 XSk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0Q29udGV4dE1lbnVEcml2ZXIu aDoKKwogMjAxOS0wOC0xNSAgU2lodWkgTGl1ICA8c2lodWlfbGl1QGFwcGxlLmNvbT4KIAogICAg ICAgICBTb21lIGltcHJvdmVtZW50cyBvbiB3ZWIgc3RvcmFnZQpkaWZmIC0tZ2l0IGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Db250ZXh0TWVudXMubW0gYi9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0NvbnRleHRNZW51cy5tbQppbmRleCAyNDc1 M2M2YzZkZWFhMWU1Mjg1MzZhMDIwZjlhMjQ4NWEwMDAzNDRhLi42ZTVhM2Y1OTg4ZTQwNjUzMzE2 NmU0NTRjZTE4YjU3YzlhODFhMzU5IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL0NvbnRleHRNZW51cy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL0NvbnRleHRNZW51cy5tbQpAQCAtMzcsOCArMzcsMjYgQEAKIHN0 YXRpYyBib29sIGNvbnRleHRNZW51UmVxdWVzdGVkOwogc3RhdGljIGJvb2wgd2lsbFByZXNlbnRD YWxsZWQ7CiBzdGF0aWMgYm9vbCB3aWxsQ29tbWl0Q2FsbGVkOworc3RhdGljIGJvb2wgcHJldmll d2luZ1ZpZXdDb250cm9sbGVyQ2FsbGVkOworc3RhdGljIGJvb2wgcHJldmlld0FjdGlvbkl0ZW1z Q2FsbGVkOwogc3RhdGljIGJvb2wgZGlkRW5kQ2FsbGVkOwotc3RhdGljIFJldGFpblB0cjxOU1VS TD4gc2ltcGxlVVJMOworc3RhdGljIFJldGFpblB0cjxOU1VSTD4gbGlua1VSTDsKKworc3RhdGlj IFJldGFpblB0cjxUZXN0Q29udGV4dE1lbnVEcml2ZXI+IGNvbnRleHRNZW51V2ViVmlld0RyaXZl cihDbGFzcyBkZWxlZ2F0ZUNsYXNzKQoreworICAgIHN0YXRpYyBhdXRvIHdpbmRvdyA9IGFkb3B0 TlMoW1tVSVdpbmRvdyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwg NjAwKV0pOworICAgIHN0YXRpYyBhdXRvIGRyaXZlciA9IGFkb3B0TlMoW1Rlc3RDb250ZXh0TWVu dURyaXZlciBuZXddKTsKKyAgICBzdGF0aWMgYXV0byB1aURlbGVnYXRlID0gYWRvcHROUygoTlNP YmplY3Q8V0tVSURlbGVnYXRlPiAqKVtkZWxlZ2F0ZUNsYXNzIG5ld10pOworICAgIHN0YXRpYyBh dXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtXS1dlYlZpZXdDb25maWd1cmF0aW9uIG5ld10p OworICAgIFtjb25maWd1cmF0aW9uIF9zZXRDbGlja0ludGVyYWN0aW9uRHJpdmVyRm9yVGVzdGlu Zzpkcml2ZXIuZ2V0KCldOworICAgIHN0YXRpYyBhdXRvIHdlYlZpZXdDb250cm9sbGVyID0gYWRv cHROUyhbW1Rlc3RXS1dlYlZpZXdDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aEZyYW1lOkNHUmVj dE1ha2UoMCwgMCwgMjAwLCAyMDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0p OworICAgIFRlc3RXS1dlYlZpZXcgKndlYlZpZXcgPSBbd2ViVmlld0NvbnRyb2xsZXIgd2ViVmll d107CisgICAgW3dpbmRvdyBhZGRTdWJ2aWV3OndlYlZpZXddOworICAgIFt3ZWJWaWV3IHNldFVJ RGVsZWdhdGU6dWlEZWxlZ2F0ZS5nZXQoKV07CisgICAgbGlua1VSTCA9IFtOU1VSTCBVUkxXaXRo U3RyaW5nOkAiaHR0cDovLzEyNy4wLjAuMS8iXTsKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5 TG9hZEhUTUxTdHJpbmc6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCI8YSBocmVmPSclQCc+ VGhpcyBpcyBhIGxpbms8L2E+IiwgbGlua1VSTC5nZXQoKV1dOworICAgIHJldHVybiBkcml2ZXI7 Cit9CiAKIEBpbnRlcmZhY2UgVGVzdENvbnRleHRNZW51VUlEZWxlZ2F0ZSA6IE5TT2JqZWN0IDxX S1VJRGVsZWdhdGU+CiBAZW5kCkBAIC00Nyw3ICs2NSw3IEBAIHN0YXRpYyBSZXRhaW5QdHI8TlNV Ukw+IHNpbXBsZVVSTDsKIAogLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IGNv bnRleHRNZW51Q29uZmlndXJhdGlvbkZvckVsZW1lbnQ6KFdLQ29udGV4dE1lbnVFbGVtZW50SW5m byAqKWVsZW1lbnRJbmZvIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkKF4pKFVJQ29udGV4dE1lbnVD b25maWd1cmF0aW9uICogX051bGxhYmxlKSljb21wbGV0aW9uSGFuZGxlcgogewotICAgIEVYUEVD VF9UUlVFKFtlbGVtZW50SW5mby5saW5rVVJMLmFic29sdXRlU3RyaW5nIGlzRXF1YWxUb1N0cmlu Zzpbc2ltcGxlVVJMIGFic29sdXRlU3RyaW5nXV0pOworICAgIEVYUEVDVF9UUlVFKFtlbGVtZW50 SW5mby5saW5rVVJMLmFic29sdXRlU3RyaW5nIGlzRXF1YWxUb1N0cmluZzpbbGlua1VSTCBhYnNv bHV0ZVN0cmluZ11dKTsKICAgICBjb250ZXh0TWVudVJlcXVlc3RlZCA9IHRydWU7CiAgICAgVUlD b250ZXh0TWVudUNvbnRlbnRQcmV2aWV3UHJvdmlkZXIgcHJldmlld1Byb3ZpZGVyID0gXlVJVmll d0NvbnRyb2xsZXIgKiAoKQogICAgIHsKQEAgLTc3LDI1ICs5NSw5IEBAIHN0YXRpYyBSZXRhaW5Q dHI8TlNVUkw+IHNpbXBsZVVSTDsKIAogQGVuZAogCi1zdGF0aWMgUmV0YWluUHRyPFRlc3RDb250 ZXh0TWVudURyaXZlcj4gY29udGV4dE1lbnVXZWJWaWV3RHJpdmVyKCkKLXsKLSAgICBzdGF0aWMg YXV0byB3aW5kb3cgPSBhZG9wdE5TKFtbVUlXaW5kb3cgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNN YWtlUmVjdCgwLCAwLCA4MDAsIDYwMCldKTsKLSAgICBzdGF0aWMgYXV0byBkcml2ZXIgPSBhZG9w dE5TKFtUZXN0Q29udGV4dE1lbnVEcml2ZXIgbmV3XSk7Ci0gICAgc3RhdGljIGF1dG8gdWlEZWxl Z2F0ZSA9IGFkb3B0TlMoW1Rlc3RDb250ZXh0TWVudVVJRGVsZWdhdGUgbmV3XSk7Ci0gICAgc3Rh dGljIGF1dG8gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24g bmV3XSk7Ci0gICAgW2NvbmZpZ3VyYXRpb24gX3NldENsaWNrSW50ZXJhY3Rpb25Ecml2ZXJGb3JU ZXN0aW5nOihpZDxfVUlDbGlja0ludGVyYWN0aW9uRHJpdmluZz4pZHJpdmVyLmdldCgpXTsKLSAg ICBzdGF0aWMgYXV0byB3ZWJWaWV3Q29udHJvbGxlciA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3 Q29udHJvbGxlciBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RNYWtlKDAsIDAsIDIwMCwgMjAw KSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKLSAgICBUZXN0V0tXZWJWaWV3 ICp3ZWJWaWV3ID0gW3dlYlZpZXdDb250cm9sbGVyIHdlYlZpZXddOwotICAgIFt3aW5kb3cgYWRk U3Vidmlldzp3ZWJWaWV3XTsKLSAgICBbd2ViVmlldyBzZXRVSURlbGVnYXRlOnVpRGVsZWdhdGUu Z2V0KCldOwotICAgIHNpbXBsZVVSTCA9IFtbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gVVJMRm9yUmVz b3VyY2U6QCJzaW1wbGUiIHdpdGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJlY3Rvcnk6QCJUZXN0 V2ViS2l0QVBJLnJlc291cmNlcyJdOwotICAgIFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkSFRN TFN0cmluZzpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIjxhIGhyZWY9JyVAJz5UaGlzIGlz IGEgbGluazwvYT4iLCBzaW1wbGVVUkwuZ2V0KCldXTsKLSAgICByZXR1cm4gZHJpdmVyOwotfQot CiBURVNUKFdlYktpdCwgQ29udGV4dE1lbnVDbGljaykKIHsKLSAgICBhdXRvIGRyaXZlciA9IGNv bnRleHRNZW51V2ViVmlld0RyaXZlcigpOworICAgIGF1dG8gZHJpdmVyID0gY29udGV4dE1lbnVX ZWJWaWV3RHJpdmVyKFtUZXN0Q29udGV4dE1lbnVVSURlbGVnYXRlIGNsYXNzXSk7CiAgICAgW2Ry aXZlciBiZWdpbjpeKEJPT0wgcmVzdWx0KSB7CiAgICAgICAgIEVYUEVDVF9UUlVFKHJlc3VsdCk7 CiAgICAgICAgIFtkcml2ZXIgY2xpY2tEb3duXTsKQEAgLTExMCw3ICsxMTIsNyBAQCBURVNUKFdl YktpdCwgQ29udGV4dE1lbnVDbGljaykKIAogVEVTVChXZWJLaXQsIENvbnRleHRNZW51RW5kKQog ewotICAgIGF1dG8gZHJpdmVyID0gY29udGV4dE1lbnVXZWJWaWV3RHJpdmVyKCk7CisgICAgYXV0 byBkcml2ZXIgPSBjb250ZXh0TWVudVdlYlZpZXdEcml2ZXIoW1Rlc3RDb250ZXh0TWVudVVJRGVs ZWdhdGUgY2xhc3NdKTsKICAgICBbZHJpdmVyIGJlZ2luOl4oQk9PTCByZXN1bHQpIHsKICAgICAg ICAgRVhQRUNUX1RSVUUocmVzdWx0KTsKICAgICAgICAgW2RyaXZlciBlbmRdOwpAQCAtMTIxLDQg KzEyMyw3NSBAQCBURVNUKFdlYktpdCwgQ29udGV4dE1lbnVFbmQpCiAgICAgRVhQRUNUX0ZBTFNF KHdpbGxDb21taXRDYWxsZWQpOwogICAgIEVYUEVDVF9UUlVFKGRpZEVuZENhbGxlZCk7CiB9CisK KyNwcmFnbWEgY2xhbmcgZGlhZ25vc3RpYyBwdXNoCisjcHJhZ21hIGNsYW5nIGRpYWdub3N0aWMg aWdub3JlZCAiLVdkZXByZWNhdGVkLWRlY2xhcmF0aW9ucyIKKyNwcmFnbWEgY2xhbmcgZGlhZ25v c3RpYyBpZ25vcmVkICItV2RlcHJlY2F0ZWQtaW1wbGVtZW50YXRpb25zIgorCitAaW50ZXJmYWNl IExlZ2FjeVByZXZpZXdWaWV3Q29udHJvbGxlciA6IFVJVmlld0NvbnRyb2xsZXIKK0BlbmQKKwor QGltcGxlbWVudGF0aW9uIExlZ2FjeVByZXZpZXdWaWV3Q29udHJvbGxlcgorCistIChOU0FycmF5 PFVJUHJldmlld0FjdGlvbiAqPiAqKXByZXZpZXdBY3Rpb25JdGVtcworeworICAgIHByZXZpZXdB Y3Rpb25JdGVtc0NhbGxlZCA9IHRydWU7CisgICAgTlNNdXRhYmxlQXJyYXk8VUlQcmV2aWV3QWN0 aW9uICo+ICpwcmV2aWV3QWN0aW9ucyA9IFtOU011dGFibGVBcnJheSBhcnJheV07CisgICAgVUlQ cmV2aWV3QWN0aW9uICpwcmV2aWV3QWN0aW9uID0gW1VJUHJldmlld0FjdGlvbiBhY3Rpb25XaXRo VGl0bGU6QCJBY3Rpb24iIHN0eWxlOlVJUHJldmlld0FjdGlvblN0eWxlRGVmYXVsdCBoYW5kbGVy Ol4oVUlQcmV2aWV3QWN0aW9uICosIFVJVmlld0NvbnRyb2xsZXIgKikgeyB9XTsKKyAgICBbcHJl dmlld0FjdGlvbnMgYWRkT2JqZWN0OnByZXZpZXdBY3Rpb25dOworCisgICAgcmV0dXJuIHByZXZp ZXdBY3Rpb25zOworfQorCitAZW5kCisKK0BpbnRlcmZhY2UgTGVnYWN5Q29udGV4dE1lbnVVSURl bGVnYXRlIDogTlNPYmplY3QgPFdLVUlEZWxlZ2F0ZT4KK0BlbmQKKworQGltcGxlbWVudGF0aW9u IExlZ2FjeUNvbnRleHRNZW51VUlEZWxlZ2F0ZQorCistIChCT09MKXdlYlZpZXc6KFdLV2ViVmll dyAqKXdlYlZpZXcgc2hvdWxkUHJldmlld0VsZW1lbnQ6KFdLUHJldmlld0VsZW1lbnRJbmZvICop ZWxlbWVudEluZm8KK3sKKyAgICBFWFBFQ1RfVFJVRShbZWxlbWVudEluZm8ubGlua1VSTC5hYnNv bHV0ZVN0cmluZyBpc0VxdWFsVG9TdHJpbmc6W2xpbmtVUkwgYWJzb2x1dGVTdHJpbmddXSk7Cisg ICAgY29udGV4dE1lbnVSZXF1ZXN0ZWQgPSB0cnVlOworICAgIHJldHVybiBZRVM7Cit9CisKKy0g KFVJVmlld0NvbnRyb2xsZXIgKil3ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3IHByZXZpZXdp bmdWaWV3Q29udHJvbGxlckZvckVsZW1lbnQ6KFdLUHJldmlld0VsZW1lbnRJbmZvICopZWxlbWVu dEluZm8gZGVmYXVsdEFjdGlvbnM6KE5TQXJyYXk8aWQgPFdLUHJldmlld0FjdGlvbkl0ZW0+PiAq KXByZXZpZXdBY3Rpb25zCit7CisgICAgRVhQRUNUX1RSVUUocHJldmlld0FjdGlvbnMuY291bnQp OworICAgIHByZXZpZXdpbmdWaWV3Q29udHJvbGxlckNhbGxlZCA9IHRydWU7CisgICAgcmV0dXJu IFtMZWdhY3lQcmV2aWV3Vmlld0NvbnRyb2xsZXIgbmV3XTsKK30KKworLyogRXZlbiB0aG91Z2gg dGhpcyBpcyBub24tbGVnYWN5IEFQSSwgaXQgc2hvdWxkIG5vdCBiZSBlbm91Z2ggdG8gdHJpZ2dl ciB0aGUgbm9uLWxlZ2FjeSBmbG93LiAqLworLSAodm9pZCl3ZWJWaWV3OihXS1dlYlZpZXcgKil3 ZWJWaWV3IGNvbnRleHRNZW51V2lsbFByZXNlbnRGb3JFbGVtZW50OihXS0NvbnRleHRNZW51RWxl bWVudEluZm8gKillbGVtZW50SW5mbworeworICAgIHdpbGxQcmVzZW50Q2FsbGVkID0gdHJ1ZTsK K30KKworLyogRXZlbiB0aG91Z2ggdGhpcyBpcyBub24tbGVnYWN5IEFQSSwgaXQgc2hvdWxkIG5v dCBiZSBlbm91Z2ggdG8gdHJpZ2dlciB0aGUgbm9uLWxlZ2FjeSBmbG93LiAqLworLSAodm9pZClf d2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyBjb250ZXh0TWVudURpZEVuZEZvckVsZW1lbnQ6 KFdLQ29udGV4dE1lbnVFbGVtZW50SW5mbyAqKWVsZW1lbnRJbmZvCit7Cit9CisKK0BlbmQKKwor VEVTVChXZWJLaXQsIENvbnRleHRNZW51TGVnYWN5KQoreworICAgIGF1dG8gZHJpdmVyID0gY29u dGV4dE1lbnVXZWJWaWV3RHJpdmVyKFtMZWdhY3lDb250ZXh0TWVudVVJRGVsZWdhdGUgY2xhc3Nd KTsKKyAgICBbZHJpdmVyIGJlZ2luOl4oQk9PTCByZXN1bHQpIHsKKyAgICAgICAgRVhQRUNUX1RS VUUocmVzdWx0KTsKKyAgICAgICAgW2RyaXZlciBjbGlja0Rvd25dOworICAgICAgICBbZHJpdmVy IGNsaWNrVXBdOworICAgIH1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcHJldmll d0FjdGlvbkl0ZW1zQ2FsbGVkKTsKKyAgICBFWFBFQ1RfVFJVRShjb250ZXh0TWVudVJlcXVlc3Rl ZCk7CisgICAgRVhQRUNUX1RSVUUocHJldmlld2luZ1ZpZXdDb250cm9sbGVyQ2FsbGVkKTsKKyAg ICBFWFBFQ1RfVFJVRSh3aWxsUHJlc2VudENhbGxlZCk7Cit9CisKKyNwcmFnbWEgY2xhbmcgZGlh Z25vc3RpYyBwb3AKKworCiAjZW5kaWYgLy8gUExBVEZPUk0oSU9TKSAmJiBVU0UoVUlDT05URVhU TUVOVSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29jb2EvVGVzdENvbnRleHRN ZW51RHJpdmVyLmggYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL1Rlc3RDb250ZXh0TWVudURy aXZlci5oCmluZGV4IDI1YTUyY2I4OTJmN2MzZDFiNDBhYzhjNDQ3OTcxZjg3NDI3NTNhNWYuLjNi NTkyMGE3NDI4NTFhYjk0MTNkZDNjNjg1NDIyYzEyYTA3NTM0MWYgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvY29jb2EvVGVzdENvbnRleHRNZW51RHJpdmVyLmgKKysrIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9jb2NvYS9UZXN0Q29udGV4dE1lbnVEcml2ZXIuaApAQCAtMzAsMTUgKzMw LDE4IEBACiAjaWYgUExBVEZPUk0oSU9TKSAmJiBVU0UoVUlDT05URVhUTUVOVSkKIAogQHByb3Rv Y29sIF9VSUNsaWNrSW50ZXJhY3Rpb25Ecml2ZXJEZWxlZ2F0ZTsKLUBwcm90b2NvbCBfVUlDbGlj a0ludGVyYWN0aW9uRHJpdmluZzsKK0Bwcm90b2NvbCBfVUlDbGlja0ludGVyYWN0aW9uRHJpdmlu ZyA8TlNPYmplY3Q+CitAcHJvcGVydHkgKG5vbmF0b21pYywgd2VhaykgaWQ8X1VJQ2xpY2tJbnRl cmFjdGlvbkRyaXZlckRlbGVnYXRlPiBkZWxlZ2F0ZTsKK0BlbmQKIAotQGludGVyZmFjZSBUZXN0 Q29udGV4dE1lbnVEcml2ZXIgOiBOU09iamVjdCB7CitAaW50ZXJmYWNlIFRlc3RDb250ZXh0TWVu dURyaXZlciA6IE5TT2JqZWN0IDxfVUlDbGlja0ludGVyYWN0aW9uRHJpdmluZz4gewogICAgIFdl YWtPYmpDUHRyPGlkPF9VSUNsaWNrSW50ZXJhY3Rpb25Ecml2ZXJEZWxlZ2F0ZT4+IF9kZWxlZ2F0 ZTsKICAgICBXZWFrT2JqQ1B0cjxVSVZpZXc+IF92aWV3OwogICAgIENHRmxvYXQgX2FsbG93YWJs ZU1vdmVtZW50OwogICAgIFJldGFpblB0cjxVSUdlc3R1cmVSZWNvZ25pemVyPiBfcHJpbWFyeUdl c3R1cmVSZWNvZ25pemVyOwogICAgIE5TVGltZUludGVydmFsIF90b3VjaER1cmF0aW9uOwogfQor CiAtICh2b2lkKWJlZ2luOih2b2lkKF4pKEJPT0wpKWNvbXBsZXRpb25IYW5kbGVyOwogLSAodm9p ZCljbGlja0Rvd247CiAtICh2b2lkKWNsaWNrVXA7Cg==