193831 2019-01-25 10:52:43 -0800 REGRESSION: Some USDz from 3rd party websites don't go directly to AR QL 2019-01-25 17:01:19 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dino dino cdumez ews-watchlist thorton webkit-bug-importer oldest_to_newest 1498318 0 dino 2019-01-25 10:52:43 -0800 REGRESSION: Some USDz from 3rd party websites don't go directly to AR QL 1498320 1 dino 2019-01-25 10:53:32 -0800 <rdar://problem/47399263> 1498323 2 360128 dino 2019-01-25 10:57:46 -0800 Created attachment 360128 Patch 1498326 3 360128 thorton 2019-01-25 10:59:51 -0800 Comment on attachment 360128 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=360128&action=review > Tools/ChangeLog:14 > +2019-01-25 Dean Jackson <dino@apple.com> Double changelog 1498328 4 ews-watchlist 2019-01-25 11:02:00 -0800 Attachment 360128 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1588: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1594: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1596: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1602: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 4 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1498365 5 360137 dino 2019-01-25 11:45:17 -0800 Created attachment 360137 Patch 1498367 6 ews-watchlist 2019-01-25 11:48:21 -0800 Attachment 360137 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1588: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1594: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1596: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1602: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 4 in 4 files If any of these errors are false positives, please file a bug against check-webkit-style. 1498479 7 360137 cdumez 2019-01-25 14:34:58 -0800 Comment on attachment 360137 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=360137&action=review > Source/WebKit/UIProcess/WebProcessPool.cpp:2201 > + if (navigation.shouldForceDownload()) I was thinking about this change instead: diff --git a/Source/WebKit/UIProcess/WebPageProxy.cpp b/Source/WebKit/UIProcess/WebPageProxy.cpp index e398cf7b73c..e8e1c27d1a4 100644 --- a/Source/WebKit/UIProcess/WebPageProxy.cpp +++ b/Source/WebKit/UIProcess/WebPageProxy.cpp @@ -2687,6 +2687,9 @@ void WebPageProxy::receivedNavigationPolicyDecision(WebPolicyAction policyAction changeWebsiteDataStore(policies->websiteDataStore()->websiteDataStore()); } + if (navigation && navigation->shouldForceDownload() && action == WebPolicyAction::Use) + action = WebPolicyAction::Download; + if (policyAction != WebPolicyAction::Use || !frame.isMainFrame() || !navigation) { receivedPolicyDecision(policyAction, navigation, WTFMove(data), WTFMove(sender)); return; @@ -2732,9 +2735,6 @@ void WebPageProxy::receivedPolicyDecision(WebPolicyAction action, API::Navigatio if (action == WebPolicyAction::Ignore) m_pageLoadState.clearPendingAPIRequestURL(transaction); - if (navigation && navigation->shouldForceDownload() && action == WebPolicyAction::Use) - action = WebPolicyAction::Download; - DownloadID downloadID = { }; if (action == WebPolicyAction::Download) { // Create a download proxy. Our code already takes care of not process-swapping if the policy is "Download". The issue is that shouldForceDownload() sets it to "Download" to late here. > Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1658 > + shouldConvertToDownload = true; I do not think this covers your change since this does not involve shouldForceDownload(). This causes the decidePolicyForNavigationResponse() to convert the load into a download. 1498577 8 360191 dino 2019-01-25 16:45:13 -0800 Created attachment 360191 Patch 1498579 9 ews-watchlist 2019-01-25 16:48:11 -0800 Attachment 360191 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1588: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1594: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1596: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] ERROR: Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1602: Multi-line string ("...") found. This lint script doesn't do well with such strings, and may give bogus warnings. They're ugly and unnecessary, and you should use concatenation instead". [readability/multiline_string] [5] Total errors found: 4 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1498580 10 360191 cdumez 2019-01-25 16:53:38 -0800 Comment on attachment 360191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=360191&action=review r=me with comments > Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:560 > +TEST(ProcessSwap, NoSwappingForTLDPlus2) No! this is not a Typo, I really meant eTLD+1. > Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1632 > + TestWebKitAPI::Util::sleep(1); How about 0.5? 1 seems long. Also, can you set didStartProvisionalLoad to false before clicking the link and make sure it is still false here? > Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1667 > + TestWebKitAPI::Util::sleep(1); same comments as above. > Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:3014 > +TEST(ProcessSwap, ProcessReUseTLDPlus2) Not a typo. 1498584 11 360191 dino 2019-01-25 16:58:34 -0800 Comment on attachment 360191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=360191&action=review >> Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:560 >> +TEST(ProcessSwap, NoSwappingForTLDPlus2) > > No! this is not a Typo, I really meant eTLD+1. OOPS! fixed. >> Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:1632 >> + TestWebKitAPI::Util::sleep(1); > > How about 0.5? 1 seems long. > > Also, can you set didStartProvisionalLoad to false before clicking the link and make sure it is still false here? Fixed. 1498585 12 dino 2019-01-25 17:01:19 -0800 Committed r240533: <https://trac.webkit.org/changeset/240533> 360128 2019-01-25 10:57:46 -0800 2019-01-25 11:45:16 -0800 Patch bug-193831-20190125105745.patch text/plain 7752 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMjQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE1YTQzMjE3ZTI5ZTEwM2E3 MmMyZWJmZWIwNmU4YzFlODY2ZmVmMzYuLjQ3YTFjN2EwYTU1NzFjNDYwYzZmNWI2OWZhZmFmNDA4 NjZkMDJmZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDEtMjUgIERlYW4gSmFj a3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046IFNvbWUgVVNEeiBm cm9tIDNyZCBwYXJ0eSB3ZWJzaXRlcyBkb24ndCBnbyBkaXJlY3RseSB0byBBUiBRTAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzODMxCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NzM5OTI2Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBIFN5c3RlbSBQcmV2aWV3ICg8YSByZWw9ImFyIj4pIGRpc3Bs YXlzIGluIGEgbW9kYWwgYW5kIGRvZXNuJ3QgdHJpZ2dlcgorICAgICAgICBhIG5hdmlnYXRpb24u IElmIHRoZSBsaW5rIHdhcyBjcm9zcyBvcmlnaW4sIGl0IHdhcyBjYXVzaW5nIGEgcHJvY2VzcyBz d2FwLAorICAgICAgICB3aGljaCBtZWFudCB0aGF0IHRoZSByZXNwb25zZSBkZWZhdWx0ZWQgYmFj ayB0byBhIG5hdmlnYXRpb24uCisKKyAgICAgICAgVGhlIGZpeCBpcyB0byBub3QgY2F1c2UgYSBQ U09OIHdoZW4gdGhlIG5hdmlnYXRpb24gaXMgYSBmb3JjZWQgZG93bmxvYWQuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRlcm5hbCk6CisKIDIwMTktMDEtMjEgIEJy ZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IG1l c3NhZ2UgaGFuZGxlcnMgZm9yIE5ldHdvcmtQcm9jZXNzLWJhc2VkIFJlc291cmNlTG9hZFN0YXRp c3RpY3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29s LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCAy M2M1OGZhOWQxMDU4ZGMwZTBjNWFmM2IzMWM2NzhmZTRjZmIyN2ZkLi5jMTlhMDlhYzM5YzM0ODli NWM4ZTZkMWI0MGFhOTgyMWU3YWI0NmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Bvb2wuY3BwCkBAIC0yMTk4LDYgKzIxOTgsOSBAQCB2b2lkIFdlYlByb2Nlc3NQb29s Ojpwcm9jZXNzRm9yTmF2aWdhdGlvbkludGVybmFsKFdlYlBhZ2VQcm94eSYgcGFnZSwgY29uc3Qg QVBJOgogICAgIGlmIChuYXZpZ2F0aW9uLnRyZWF0QXNTYW1lT3JpZ2luTmF2aWdhdGlvbigpKQog ICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIocGFnZS5wcm9jZXNzKCksIG51bGxwdHIs ICJUaGUgdHJlYXRBc1NhbWVPcmlnaW5OYXZpZ2F0aW9uIGZsYWcgaXMgc2V0Il9zKTsKIAorICAg IGlmIChuYXZpZ2F0aW9uLnNob3VsZEZvcmNlRG93bmxvYWQoKSkKKyAgICAgICAgcmV0dXJuIGNv bXBsZXRpb25IYW5kbGVyKHBhZ2UucHJvY2VzcygpLCBudWxscHRyLCAiTmF2aWdhdGlvbiBpcyBh IGZvcmNlZCBkb3dubG9hZCJfcyk7CisKICAgICBVUkwgc291cmNlVVJMOwogICAgIGlmIChwYWdl LmlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgJiYgIW5hdmln YXRpb24ucmVxdWVzdGVyT3JpZ2luKCkuaXNFbXB0eSgpKQogICAgICAgICBzb3VyY2VVUkwgPSBV UkwgeyBVUkwoKSwgbmF2aWdhdGlvbi5yZXF1ZXN0ZXJPcmlnaW4oKS50b1N0cmluZygpIH07CmRp ZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjBlM2Nj MmJiOWMwMGVjNWM1MTgwNWMxNGEzNTc0M2Q1NDRmMmYzMi4uNWZlMjVhOTUzZmIyNzQyOTliNDlj MmU0NTUxYjM0OTI3MGNjMTRmOSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTAxLTI1ICBEZWFuIEphY2tzb24g IDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OOiBTb21lIFVTRHogZnJvbSAz cmQgcGFydHkgd2Vic2l0ZXMgZG9uJ3QgZ28gZGlyZWN0bHkgdG8gQVIgUUwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzgzMQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNDczOTkyNjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVHdvIG5ldyB0ZXN0cyBmb3IgPGEgcmVsPSJhciI+IGxpbmtzLCB0aGF0 IHNob3VsZG4ndCB0cmlnZ2VyCisgICAgICAgIGEgcHJvY2VzcyBzd2FwLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5t bToKKworMjAxOS0wMS0yNSAgRGVhbiBKYWNrc29uICA8ZGlub0BhcHBsZS5jb20+CisKKyAgICAg ICAgUkVHUkVTU0lPTjogU29tZSBVU0R6IGZyb20gM3JkIHBhcnR5IHdlYnNpdGVzIGRvbid0IGdv IGRpcmVjdGx5IHRvIEFSIFFMCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTM4MzEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBP bk5hdmlnYXRpb24ubW06CisKIDIwMTktMDEtMjEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxl LmNvbT4KIAogICAgICAgICBbTEZDXVtGbG9hdHNdIFRha2UgZmxvYXQgdG9wIHBvc2l0aW9uIGlu dG8gYWNjb3VudCB3aGVuIGNvbXB1dGluZyBjb250YWluaW5nIGJsb2NrIGhlaWdodC4KZGlmZiAt LWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBP bk5hdmlnYXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1By b2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCmluZGV4IGZkYTQ2YTU5N2M4ZDNjMDNlM2QwNDgzNGRj MzFlYTYyNTBhMmUyMzAuLjExZTcwYTI0ZmE2YzQ0ZDk3Nzg0MDQ5M2M5MzI0MzUzN2RkYThjNzMg MTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vz c1N3YXBPbk5hdmlnYXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpAQCAtMTU3Nyw2ICsxNTc3LDk4IEBA IFRFU1QoUHJvY2Vzc1N3YXAsIENyb3NzU2l0ZURvd25sb2FkKQogICAgIGRvbmUgPSBmYWxzZTsK IH0KIAorI2lmIFVTRShTWVNURU1fUFJFVklFVykKKworc3RhdGljIGNvbnN0IGNoYXIqIHN5c3Rl bVByZXZpZXdTYW1lT3JpZ2luVGVzdEJ5dGVzID0gUiJQU09OUkVTT1VSQ0UoCis8Ym9keT4KKyAg ICA8YSBpZD0idGVzdExpbmsiIHJlbD0iYXIiIGhyZWY9InBzb246Ly93d3cud2Via2l0Lm9yZy93 aGF0ZXZlciI+CisgICAgICAgIDxpbWcgc3JjPSJodHRwOi8vd3d3LndlYmtpdC5vcmcvaW1hZ2Ui PgorICAgIDwvYT4KKzwvYm9keT4KKylQU09OUkVTT1VSQ0UiOworCitzdGF0aWMgY29uc3QgY2hh ciogc3lzdGVtUHJldmlld0Nyb3NzT3JpZ2luVGVzdEJ5dGVzID0gUiJQU09OUkVTT1VSQ0UoCis8 Ym9keT4KKyAgICA8YSBpZD0idGVzdExpbmsiIHJlbD0iYXIiIGhyZWY9InBzb246Ly93d3cuYXBw bGUuY29tL3doYXRldmVyIj4KKyAgICAgICAgPGltZyBzcmM9Imh0dHA6Ly93d3cud2Via2l0Lm9y Zy9pbWFnZSI+CisgICAgPC9hPgorPC9ib2R5PgorKVBTT05SRVNPVVJDRSI7CisKK1RFU1QoUHJv Y2Vzc1N3YXAsIFNhbWVPcmlnaW5TeXN0ZW1QcmV2aWV3KQoreworICAgIGF1dG8gcHJvY2Vzc1Bv b2xDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBh bGxvY10gaW5pdF0pOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNz U3dhcHNPbk5hdmlnYXRpb24gPSBZRVM7CisgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFkb3B0TlMo W1tXS1Byb2Nlc3NQb29sIGFsbG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnByb2Nlc3NQb29s Q29uZmlndXJhdGlvbi5nZXQoKV0pOworCisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9 IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dl YlZpZXdDb25maWd1cmF0aW9uIHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgpXTsKKyAg ICBhdXRvIGhhbmRsZXIgPSBhZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0pOworICAg IFtoYW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3Jn L21haW4uaHRtbCIgdG9EYXRhOnN5c3RlbVByZXZpZXdTYW1lT3JpZ2luVGVzdEJ5dGVzXTsKKyAg ICBbaGFuZGxlciBhZGRNYXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9y Zy93aGF0ZXZlciIgdG9EYXRhOiJGYWtlIFVTRFogZGF0YSJdOworICAgIFt3ZWJWaWV3Q29uZmln dXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAi cHNvbiJdOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10g aW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndl YlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUg PSBhZG9wdE5TKFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3 ZWJWaWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCldOwor CisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVS TDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwi XV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0 QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKyAgICBhdXRvIHBpZEFm dGVyRmlyc3RMb2FkID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIHNo b3VsZENvbnZlcnRUb0Rvd25sb2FkID0gdHJ1ZTsKKyAgICBbd2ViVmlldyBldmFsdWF0ZUphdmFT Y3JpcHQ6QCJ0ZXN0TGluay5jbGljaygpIiBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOworCisgICAg VGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZmYWlsZWQpOworICAgIGZhaWxlZCA9IGZhbHNlOwor ICAgIHNob3VsZENvbnZlcnRUb0Rvd25sb2FkID0gZmFsc2U7CisKKyAgICAvLyBXZSBzaG91bGQg c3RpbGwgYmUgb24gd2Via2l0Lm9yZy4KKyAgICBFWFBFQ1RfRVEocGlkQWZ0ZXJGaXJzdExvYWQs IFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl0pOworICAgIEVYUEVDVF9XS19TVFJFUShA InBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiLCBbW3dlYlZpZXcgVVJMXSBhYnNvbHV0 ZVN0cmluZ10pOworfQorCitURVNUKFByb2Nlc3NTd2FwLCBDcm9zc09yaWdpblN5c3RlbVByZXZp ZXcpCit7CisgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbX1dL UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgcHJvY2Vzc1Bvb2xD b25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fwc09uTmF2aWdhdGlvbiA9IFlFUzsKKyAgICBh dXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0 aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpXSk7CisKKyAgICBh dXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRp b24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bv b2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIGF1dG8gaGFuZGxlciA9IGFkb3B0TlMoW1tQU09O U2NoZW1lIGFsbG9jXSBpbml0XSk7CisgICAgW2hhbmRsZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJp bmc6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIiB0b0RhdGE6c3lzdGVtUHJldmll d0Nyb3NzT3JpZ2luVGVzdEJ5dGVzXTsKKyAgICBbaGFuZGxlciBhZGRNYXBwaW5nRnJvbVVSTFN0 cmluZzpAInBzb246Ly93d3cuYXBwbGUuY29tL3doYXRldmVyIiB0b0RhdGE6IkZha2UgVVNEWiBk YXRhIl07CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFu ZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJwc29uIl07CisKKyAgICBhdXRvIHdlYlZpZXcgPSBh ZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwg ODAwLCA2MDApIGNvbmZpZ3VyYXRpb246d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAg ICBhdXRvIG5hdmlnYXRpb25EZWxlZ2F0ZSA9IGFkb3B0TlMoW1tQU09OTmF2aWdhdGlvbkRlbGVn YXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOm5h dmlnYXRpb25EZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBb TlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjov L3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpy ZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9u ZSA9IGZhbHNlOworICAgIGF1dG8gcGlkQWZ0ZXJGaXJzdExvYWQgPSBbd2ViVmlldyBfd2ViUHJv Y2Vzc0lkZW50aWZpZXJdOworCisgICAgc2hvdWxkQ29udmVydFRvRG93bmxvYWQgPSB0cnVlOwor ICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRlc3RMaW5rLmNsaWNrKCkiIGNvbXBs ZXRpb25IYW5kbGVyOm5pbF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmZhaWxl ZCk7CisgICAgZmFpbGVkID0gZmFsc2U7CisgICAgc2hvdWxkQ29udmVydFRvRG93bmxvYWQgPSBm YWxzZTsKKworICAgIC8vIFdlIHNob3VsZCBzdGlsbCBiZSBvbiB3ZWJraXQub3JnLgorICAgIEVY UEVDVF9FUShwaWRBZnRlckZpcnN0TG9hZCwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVy XSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRt bCIsIFtbd2ViVmlldyBVUkxdIGFic29sdXRlU3RyaW5nXSk7Cit9CisKKyNlbmRpZgorCiBlbnVt IGNsYXNzIFNob3VsZEVuYWJsZVBTT04geyBObywgWWVzIH07CiBzdGF0aWMgdm9pZCBydW5DbGll bnRTaWRlUmVkaXJlY3RUZXN0KFNob3VsZEVuYWJsZVBTT04gc2hvdWxkRW5hYmxlUFNPTikKIHsK 360137 2019-01-25 11:45:17 -0800 2019-01-25 16:45:11 -0800 Patch bug-193831-20190125114517.patch text/plain 7454 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMjQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE1YTQzMjE3ZTI5ZTEwM2E3 MmMyZWJmZWIwNmU4YzFlODY2ZmVmMzYuLjQ3YTFjN2EwYTU1NzFjNDYwYzZmNWI2OWZhZmFmNDA4 NjZkMDJmZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDEtMjUgIERlYW4gSmFj a3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046IFNvbWUgVVNEeiBm cm9tIDNyZCBwYXJ0eSB3ZWJzaXRlcyBkb24ndCBnbyBkaXJlY3RseSB0byBBUiBRTAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzODMxCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NzM5OTI2Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBIFN5c3RlbSBQcmV2aWV3ICg8YSByZWw9ImFyIj4pIGRpc3Bs YXlzIGluIGEgbW9kYWwgYW5kIGRvZXNuJ3QgdHJpZ2dlcgorICAgICAgICBhIG5hdmlnYXRpb24u IElmIHRoZSBsaW5rIHdhcyBjcm9zcyBvcmlnaW4sIGl0IHdhcyBjYXVzaW5nIGEgcHJvY2VzcyBz d2FwLAorICAgICAgICB3aGljaCBtZWFudCB0aGF0IHRoZSByZXNwb25zZSBkZWZhdWx0ZWQgYmFj ayB0byBhIG5hdmlnYXRpb24uCisKKyAgICAgICAgVGhlIGZpeCBpcyB0byBub3QgY2F1c2UgYSBQ U09OIHdoZW4gdGhlIG5hdmlnYXRpb24gaXMgYSBmb3JjZWQgZG93bmxvYWQuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzUG9vbDo6cHJvY2Vzc0Zvck5hdmlnYXRpb25JbnRlcm5hbCk6CisKIDIwMTktMDEtMjEgIEJy ZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CiAKICAgICAgICAgSW1wbGVtZW50IG1l c3NhZ2UgaGFuZGxlcnMgZm9yIE5ldHdvcmtQcm9jZXNzLWJhc2VkIFJlc291cmNlTG9hZFN0YXRp c3RpY3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29s LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCAy M2M1OGZhOWQxMDU4ZGMwZTBjNWFmM2IzMWM2NzhmZTRjZmIyN2ZkLi5jMTlhMDlhYzM5YzM0ODli NWM4ZTZkMWI0MGFhOTgyMWU3YWI0NmJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi UHJvY2Vzc1Bvb2wuY3BwCkBAIC0yMTk4LDYgKzIxOTgsOSBAQCB2b2lkIFdlYlByb2Nlc3NQb29s Ojpwcm9jZXNzRm9yTmF2aWdhdGlvbkludGVybmFsKFdlYlBhZ2VQcm94eSYgcGFnZSwgY29uc3Qg QVBJOgogICAgIGlmIChuYXZpZ2F0aW9uLnRyZWF0QXNTYW1lT3JpZ2luTmF2aWdhdGlvbigpKQog ICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIocGFnZS5wcm9jZXNzKCksIG51bGxwdHIs ICJUaGUgdHJlYXRBc1NhbWVPcmlnaW5OYXZpZ2F0aW9uIGZsYWcgaXMgc2V0Il9zKTsKIAorICAg IGlmIChuYXZpZ2F0aW9uLnNob3VsZEZvcmNlRG93bmxvYWQoKSkKKyAgICAgICAgcmV0dXJuIGNv bXBsZXRpb25IYW5kbGVyKHBhZ2UucHJvY2VzcygpLCBudWxscHRyLCAiTmF2aWdhdGlvbiBpcyBh IGZvcmNlZCBkb3dubG9hZCJfcyk7CisKICAgICBVUkwgc291cmNlVVJMOwogICAgIGlmIChwYWdl LmlzUGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgJiYgIW5hdmln YXRpb24ucmVxdWVzdGVyT3JpZ2luKCkuaXNFbXB0eSgpKQogICAgICAgICBzb3VyY2VVUkwgPSBV UkwgeyBVUkwoKSwgbmF2aWdhdGlvbi5yZXF1ZXN0ZXJPcmlnaW4oKS50b1N0cmluZygpIH07CmRp ZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjBlM2Nj MmJiOWMwMGVjNWM1MTgwNWMxNGEzNTc0M2Q1NDRmMmYzMi4uMjgwNjU2OWZlZWY0ZjkyN2MwNGU5 YjJmZWJkZjFjZmY0NzAyZmI2YiAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTAxLTI1ICBEZWFuIEphY2tzb24g IDxkaW5vQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OOiBTb21lIFVTRHogZnJvbSAz cmQgcGFydHkgd2Vic2l0ZXMgZG9uJ3QgZ28gZGlyZWN0bHkgdG8gQVIgUUwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5MzgzMQorICAgICAgICA8cmRh cjovL3Byb2JsZW0vNDczOTkyNjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVHdvIG5ldyB0ZXN0cyBmb3IgPGEgcmVsPSJhciI+IGxpbmtzLCB0aGF0 IHNob3VsZG4ndCB0cmlnZ2VyCisgICAgICAgIGEgcHJvY2VzcyBzd2FwLgorCisgICAgICAgICog VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5t bToKKwogMjAxOS0wMS0yMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtMRkNdW0Zsb2F0c10gVGFrZSBmbG9hdCB0b3AgcG9zaXRpb24gaW50byBhY2NvdW50IHdo ZW4gY29tcHV0aW5nIGNvbnRhaW5pbmcgYmxvY2sgaGVpZ2h0LgpkaWZmIC0tZ2l0IGEvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5t bSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5h dmlnYXRpb24ubW0KaW5kZXggZmRhNDZhNTk3YzhkM2MwM2UzZDA0ODM0ZGMzMWVhNjI1MGEyZTIz MC4uMTFlNzBhMjRmYTZjNDRkOTc3ODQwNDkzYzkzMjQzNTM3ZGRhOGM3MyAxMDA2NDQKLS0tIGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdh dGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nl c3NTd2FwT25OYXZpZ2F0aW9uLm1tCkBAIC0xNTc3LDYgKzE1NzcsOTggQEAgVEVTVChQcm9jZXNz U3dhcCwgQ3Jvc3NTaXRlRG93bmxvYWQpCiAgICAgZG9uZSA9IGZhbHNlOwogfQogCisjaWYgVVNF KFNZU1RFTV9QUkVWSUVXKQorCitzdGF0aWMgY29uc3QgY2hhciogc3lzdGVtUHJldmlld1NhbWVP cmlnaW5UZXN0Qnl0ZXMgPSBSIlBTT05SRVNPVVJDRSgKKzxib2R5PgorICAgIDxhIGlkPSJ0ZXN0 TGluayIgcmVsPSJhciIgaHJlZj0icHNvbjovL3d3dy53ZWJraXQub3JnL3doYXRldmVyIj4KKyAg ICAgICAgPGltZyBzcmM9Imh0dHA6Ly93d3cud2Via2l0Lm9yZy9pbWFnZSI+CisgICAgPC9hPgor PC9ib2R5PgorKVBTT05SRVNPVVJDRSI7CisKK3N0YXRpYyBjb25zdCBjaGFyKiBzeXN0ZW1QcmV2 aWV3Q3Jvc3NPcmlnaW5UZXN0Qnl0ZXMgPSBSIlBTT05SRVNPVVJDRSgKKzxib2R5PgorICAgIDxh IGlkPSJ0ZXN0TGluayIgcmVsPSJhciIgaHJlZj0icHNvbjovL3d3dy5hcHBsZS5jb20vd2hhdGV2 ZXIiPgorICAgICAgICA8aW1nIHNyYz0iaHR0cDovL3d3dy53ZWJraXQub3JnL2ltYWdlIj4KKyAg ICA8L2E+Cis8L2JvZHk+CispUFNPTlJFU09VUkNFIjsKKworVEVTVChQcm9jZXNzU3dhcCwgU2Ft ZU9yaWdpblN5c3RlbVByZXZpZXcpCit7CisgICAgYXV0byBwcm9jZXNzUG9vbENvbmZpZ3VyYXRp b24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7 CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fwc09uTmF2aWdh dGlvbiA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dLUHJvY2Vzc1Bv b2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9u LmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dL V2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0NvbmZpZ3Vy YXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIGF1dG8gaGFuZGxl ciA9IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0XSk7CisgICAgW2hhbmRsZXIgYWRk TWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIiB0 b0RhdGE6c3lzdGVtUHJldmlld1NhbWVPcmlnaW5UZXN0Qnl0ZXNdOworICAgIFtoYW5kbGVyIGFk ZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL3doYXRldmVyIiB0 b0RhdGE6IkZha2UgVVNEWiBkYXRhIl07CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9uIHNldFVS TFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJwc29uIl07CisKKyAg ICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1l Ok5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246d2ViVmlld0NvbmZpZ3Vy YXRpb24uZ2V0KCldKTsKKyAgICBhdXRvIG5hdmlnYXRpb25EZWxlZ2F0ZSA9IGFkb3B0TlMoW1tQ U09OTmF2aWdhdGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXcgc2V0TmF2 aWdhdGlvbkRlbGVnYXRlOm5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBOU1VSTFJl cXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxX aXRoU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJdXTsKKyAgICBbd2Vi VmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1 bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworICAgIGF1dG8gcGlkQWZ0ZXJGaXJzdExvYWQg PSBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAgc2hvdWxkQ29udmVydFRv RG93bmxvYWQgPSB0cnVlOworICAgIFt3ZWJWaWV3IGV2YWx1YXRlSmF2YVNjcmlwdDpAInRlc3RM aW5rLmNsaWNrKCkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisKKyAgICBUZXN0V2ViS2l0QVBJ OjpVdGlsOjpydW4oJmZhaWxlZCk7CisgICAgZmFpbGVkID0gZmFsc2U7CisgICAgc2hvdWxkQ29u dmVydFRvRG93bmxvYWQgPSBmYWxzZTsKKworICAgIC8vIFdlIHNob3VsZCBzdGlsbCBiZSBvbiB3 ZWJraXQub3JnLgorICAgIEVYUEVDVF9FUShwaWRBZnRlckZpcnN0TG9hZCwgW3dlYlZpZXcgX3dl YlByb2Nlc3NJZGVudGlmaWVyXSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAicHNvbjovL3d3dy53 ZWJraXQub3JnL21haW4uaHRtbCIsIFtbd2ViVmlldyBVUkxdIGFic29sdXRlU3RyaW5nXSk7Cit9 CisKK1RFU1QoUHJvY2Vzc1N3YXAsIENyb3NzT3JpZ2luU3lzdGVtUHJldmlldykKK3sKKyAgICBh dXRvIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tfV0tQcm9jZXNzUG9vbENv bmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24u Z2V0KCkucHJvY2Vzc1N3YXBzT25OYXZpZ2F0aW9uID0gWUVTOworICAgIGF1dG8gcHJvY2Vzc1Bv b2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNzUG9vbCBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlv bjpwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKworICAgIGF1dG8gd2ViVmlld0Nv bmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5p dF0pOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9v bC5nZXQoKV07CisgICAgYXV0byBoYW5kbGVyID0gYWRvcHROUyhbW1BTT05TY2hlbWUgYWxsb2Nd IGluaXRdKTsKKyAgICBbaGFuZGxlciBhZGRNYXBwaW5nRnJvbVVSTFN0cmluZzpAInBzb246Ly93 d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiIHRvRGF0YTpzeXN0ZW1QcmV2aWV3Q3Jvc3NPcmlnaW5U ZXN0Qnl0ZXNdOworICAgIFtoYW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjov L3d3dy5hcHBsZS5jb20vd2hhdGV2ZXIiIHRvRGF0YToiRmFrZSBVU0RaIGRhdGEiXTsKKyAgICBb d2ViVmlld0NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZv clVSTFNjaGVtZTpAInBzb24iXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dl YlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29u ZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gbmF2aWdh dGlvbkRlbGVnYXRlID0gYWRvcHROUyhbW1BTT05OYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGlu aXRdKTsKKyAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6bmF2aWdhdGlvbkRlbGVn YXRlLmdldCgpXTsKKworICAgIE5TVVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3Qg cmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtpdC5v cmcvbWFpbi5odG1sIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworCisg ICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZkb25lKTsKKyAgICBkb25lID0gZmFsc2U7Cisg ICAgYXV0byBwaWRBZnRlckZpcnN0TG9hZCA9IFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmll cl07CisKKyAgICBzaG91bGRDb252ZXJ0VG9Eb3dubG9hZCA9IHRydWU7CisgICAgW3dlYlZpZXcg ZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsuY2xpY2soKSIgY29tcGxldGlvbkhhbmRsZXI6 bmlsXTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmFpbGVkKTsKKyAgICBmYWls ZWQgPSBmYWxzZTsKKyAgICBzaG91bGRDb252ZXJ0VG9Eb3dubG9hZCA9IGZhbHNlOworCisgICAg Ly8gV2Ugc2hvdWxkIHN0aWxsIGJlIG9uIHdlYmtpdC5vcmcuCisgICAgRVhQRUNUX0VRKHBpZEFm dGVyRmlyc3RMb2FkLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKKyAgICBFWFBF Q1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIiwgW1t3ZWJWaWV3 IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKK30KKworI2VuZGlmCisKIGVudW0gY2xhc3MgU2hvdWxk RW5hYmxlUFNPTiB7IE5vLCBZZXMgfTsKIHN0YXRpYyB2b2lkIHJ1bkNsaWVudFNpZGVSZWRpcmVj dFRlc3QoU2hvdWxkRW5hYmxlUFNPTiBzaG91bGRFbmFibGVQU09OKQogewo= 360191 2019-01-25 16:45:13 -0800 2019-01-25 16:53:38 -0800 Patch bug-193831-20190125164512.patch text/plain 9991 dino U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwNDk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDYzNjI4YTE2MDdiMjg2YzJi NDc2NjExYTE0OGQzMDVmMDE3MmQ0YTYuLmE4NDc5ZmE5MDA5MTk3MmZhNmQ3OTRhODUzOTllZGVj YWQ4YjNhZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTktMDEtMjUgIERlYW4gSmFj a3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAgICAgIFJFR1JFU1NJT046IFNvbWUgVVNEeiBm cm9tIDNyZCBwYXJ0eSB3ZWJzaXRlcyBkb24ndCBnbyBkaXJlY3RseSB0byBBUiBRTAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzODMxCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS80NzM5OTI2Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBIFN5c3RlbSBQcmV2aWV3ICg8YSByZWw9ImFyIj4pIGRpc3Bs YXlzIGluIGEgbW9kYWwgYW5kIGRvZXNuJ3QgdHJpZ2dlcgorICAgICAgICBhIG5hdmlnYXRpb24u IElmIHRoZSBsaW5rIHdhcyBjcm9zcyBvcmlnaW4sIGl0IHdhcyBjYXVzaW5nIGEgcHJvY2VzcyBz d2FwLAorICAgICAgICB3aGljaCBtZWFudCB0aGF0IHRoZSByZXNwb25zZSBkZWZhdWx0ZWQgYmFj ayB0byBhIG5hdmlnYXRpb24uCisKKyAgICAgICAgVGhlIGZpeCBpcyB0byBub3QgY2F1c2UgYSBQ U09OIHdoZW4gdGhlIG5hdmlnYXRpb24gaXMgYSBzeXN0ZW0gcHJldmlldy4KKworICAgICAgICAq IFVJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlvbi5oOgorICAgICAgICAoQVBJOjpOYXZpZ2F0aW9u OjpzaG91bGRGb3JjZURvd25sb2FkIGNvbnN0KTogVGhpcyBpcyBub3cganVzdCB0cmFja2luZwor ICAgICAgICB0aGUgImRvd25sb2FkIiBhdHRyaWJ1dGUsIGFuZCBub3QgaW5jbHVkaW5nIFN5c3Rl bSBQcmV2aWV3LgorICAgICAgICAoQVBJOjpOYXZpZ2F0aW9uOjppc1N5c3RlbVByZXZpZXcgY29u c3QpOiBOZXcgbWV0aG9kIHRvIGNoZWNrIGZvciBhCisgICAgICAgIG5hdmlnYXRpb24gdHJpZ2dl cmVkIGFzIGEgU3lzdGVtIFByZXZpZXcuCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHA6IE1vdmUgdGhlIGNvZGUgZnJvbSByZWNlaXZlZFBvbGljeURlY2lzaW9uIHRvCisgICAg ICAgIHJlY2VpdmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uLCBzbyB0aGF0IGRvd25sb2FkcyBh bmQgU3lzdGVtIFByZXZpZXdzIGFyZQorICAgICAgICBkZXRlY3RlZCBiZWZvcmUgd2UgZGVjaWRl IHRvIGNoYW5nZSBwcm9jZXNzLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlY2Vp dmVkTmF2aWdhdGlvblBvbGljeURlY2lzaW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5OjpyZWNlaXZlZFBvbGljeURlY2lzaW9uKToKKwogMjAxOS0wMS0yNSAgQnJlbnQgRnVsZ2hh bSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBBY3RpdmF0ZSB0aGUgV2ViUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1N0b3JlIGluIHRoZSBOZXR3b3JrUHJvY2VzcyBhbmQgZGVhY3RpdmF0 ZSBpdCBpbiB0aGUgVUlQcm9jZXNzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0FQSU5hdmlnYXRpb24uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElO YXZpZ2F0aW9uLmgKaW5kZXggYjE1MDMwZDRlNzEzMzFiOGFhOGMzMGEyNTM5OGI2YmU0ZWZjNjMy YS4uOGIwMDU0YTdmZDk1ZjNiMDNiZmQ2NTUwOTk5ZGQ4NTI5OGI3Mjk0MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSU5hdmlnYXRpb24uaAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJTmF2aWdhdGlvbi5oCkBAIC0xMDYsMTIgKzEwNiwxNCBA QCBwdWJsaWM6CiAKICAgICBib29sIHdhc1VzZXJJbml0aWF0ZWQoKSBjb25zdCB7IHJldHVybiAh IW1fbGFzdE5hdmlnYXRpb25BY3Rpb24udXNlckdlc3R1cmVUb2tlbklkZW50aWZpZXI7IH0KIAot ICAgIGJvb2wgc2hvdWxkRm9yY2VEb3dubG9hZCgpIGNvbnN0CisgICAgYm9vbCBzaG91bGRGb3Jj ZURvd25sb2FkKCkgY29uc3QgeyByZXR1cm4gIW1fbGFzdE5hdmlnYXRpb25BY3Rpb24uZG93bmxv YWRBdHRyaWJ1dGUuaXNOdWxsKCk7IH0KKworICAgIGJvb2wgaXNTeXN0ZW1QcmV2aWV3KCkgY29u c3QKICAgICB7CiAjaWYgVVNFKFNZU1RFTV9QUkVWSUVXKQotICAgICAgICByZXR1cm4gIW1fbGFz dE5hdmlnYXRpb25BY3Rpb24uZG93bmxvYWRBdHRyaWJ1dGUuaXNOdWxsKCkgfHwgY3VycmVudFJl cXVlc3QoKS5pc1N5c3RlbVByZXZpZXcoKTsKKyAgICAgICAgcmV0dXJuIGN1cnJlbnRSZXF1ZXN0 KCkuaXNTeXN0ZW1QcmV2aWV3KCk7CiAjZWxzZQotICAgICAgICByZXR1cm4gIW1fbGFzdE5hdmln YXRpb25BY3Rpb24uZG93bmxvYWRBdHRyaWJ1dGUuaXNOdWxsKCk7CisgICAgICAgIHJldHVybiBm YWxzZTsKICNlbmRpZgogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94 eS5jcHAKaW5kZXggYmRlYzgxYWM5MTc4YTI2OWI5MzNmNjNmYTM0OGMyZDZmMDA5NWU0Yy4uNThh MGYwNzRlMDU4M2Y4MDQ5MDZiZTkxZTkzMDY2ZTU5ZTBmNjdkMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0yNjg3LDYgKzI2ODcsOSBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6cmVjZWl2ZWROYXZpZ2F0aW9uUG9saWN5RGVjaXNpb24oUG9saWN5QWN0aW9uIHBv bGljeUFjdGlvbiwgQQogICAgICAgICAgICAgY2hhbmdlV2Vic2l0ZURhdGFTdG9yZShwb2xpY2ll cy0+d2Vic2l0ZURhdGFTdG9yZSgpLT53ZWJzaXRlRGF0YVN0b3JlKCkpOwogICAgIH0KIAorICAg IGlmIChwb2xpY3lBY3Rpb24gPT0gUG9saWN5QWN0aW9uOjpVc2UgJiYgbmF2aWdhdGlvbiAmJiAo bmF2aWdhdGlvbi0+aXNTeXN0ZW1QcmV2aWV3KCkgfHwgbmF2aWdhdGlvbi0+c2hvdWxkRm9yY2VE b3dubG9hZCgpKSkKKyAgICAgICAgcG9saWN5QWN0aW9uID0gUG9saWN5QWN0aW9uOjpEb3dubG9h ZDsKKwogICAgIGlmIChwb2xpY3lBY3Rpb24gIT0gUG9saWN5QWN0aW9uOjpVc2UgfHwgIWZyYW1l LmlzTWFpbkZyYW1lKCkgfHwgIW5hdmlnYXRpb24pIHsKICAgICAgICAgcmVjZWl2ZWRQb2xpY3lE ZWNpc2lvbihwb2xpY3lBY3Rpb24sIG5hdmlnYXRpb24sIFdURk1vdmUoZGF0YSksIFdURk1vdmUo c2VuZGVyKSk7CiAgICAgICAgIHJldHVybjsKQEAgLTI3MzIsOSArMjczNSw2IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpyZWNlaXZlZFBvbGljeURlY2lzaW9uKFBvbGljeUFjdGlvbiBhY3Rpb24sIEFQ STo6TmF2aWdhdGlvbioKICAgICBpZiAoYWN0aW9uID09IFBvbGljeUFjdGlvbjo6SWdub3JlKQog ICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuY2xlYXJQZW5kaW5nQVBJUmVxdWVzdFVSTCh0cmFuc2Fj dGlvbik7CiAKLSAgICBpZiAobmF2aWdhdGlvbiAmJiBuYXZpZ2F0aW9uLT5zaG91bGRGb3JjZURv d25sb2FkKCkgJiYgYWN0aW9uID09IFBvbGljeUFjdGlvbjo6VXNlKQotICAgICAgICBhY3Rpb24g PSBQb2xpY3lBY3Rpb246OkRvd25sb2FkOwotCiAgICAgRG93bmxvYWRJRCBkb3dubG9hZElEID0g eyB9OwogICAgIGlmIChhY3Rpb24gPT0gUG9saWN5QWN0aW9uOjpEb3dubG9hZCkgewogICAgICAg ICAvLyBDcmVhdGUgYSBkb3dubG9hZCBwcm94eS4KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxv ZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4NDkyMmQ3M2Q3MzI2OWM3YTAzNzc0MmI3ZjUyYTRh ZGZmNWY4NTZiLi45NWRhNzc1NGM3MjViMGRjNjkyYzhhZGNhMjA3NzA3YTk0ODZhNmU5IDEwMDY0 NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTYgQEAKKzIwMTktMDEtMjUgIERlYW4gSmFja3NvbiAgPGRpbm9AYXBwbGUuY29tPgorCisgICAg ICAgIFJFR1JFU1NJT046IFNvbWUgVVNEeiBmcm9tIDNyZCBwYXJ0eSB3ZWJzaXRlcyBkb24ndCBn byBkaXJlY3RseSB0byBBUiBRTAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTkzODMxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80NzM5OTI2Mz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUd28gbmV3IHRl c3RzIHRoYXQgZXhlcmNpc2UgY3Jvc3Mtb3JpZ2luIGFuZCBzYW1lLW9yaWdpbiBTeXN0ZW0KKyAg ICAgICAgUHJldmlld3MuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tOgorCiAyMDE5LTAxLTI1ICBCcmVudCBGdWxn aGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIEFjdGl2YXRlIHRoZSBXZWJSZXNv dXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUgaW4gdGhlIE5ldHdvcmtQcm9jZXNzIGFuZCBkZWFjdGl2 YXRlIGl0IGluIHRoZSBVSVByb2Nlc3MuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tIGIvVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpp bmRleCA5NGU5NjlkZDZjOTIyYzNiZWZkYTNiNzQwMTQyYjI3MDJjMjExZDM5Li5lMWQxNmVkZDE4 OWI1YmNlMmIxMWQyZDUyYTdmYzNlYmZjYWI0NjExIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCisrKyBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmln YXRpb24ubW0KQEAgLTU1Nyw3ICs1NTcsNyBAQCBURVNUKFByb2Nlc3NTd2FwLCBLaWxsV2ViQ29u dGVudFByb2Nlc3NBZnRlclNlcnZlclJlZGlyZWN0UG9saWN5RGVjaXNpb24pCiAgICAgZG9uZSA9 IGZhbHNlOwogfQogCi1URVNUKFByb2Nlc3NTd2FwLCBOb1N3YXBwaW5nRm9yZVRMRFBsdXMyKQor VEVTVChQcm9jZXNzU3dhcCwgTm9Td2FwcGluZ0ZvclRMRFBsdXMyKQogewogICAgIGF1dG8gcHJv Y2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJh dGlvbiBhbGxvY10gaW5pdF0pOwogICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5w cm9jZXNzU3dhcHNPbk5hdmlnYXRpb24gPSBZRVM7CkBAIC0xNTgzLDYgKzE1ODMsOTYgQEAgVEVT VChQcm9jZXNzU3dhcCwgQ3Jvc3NTaXRlRG93bmxvYWQpCiAgICAgZG9uZSA9IGZhbHNlOwogfQog CisjaWYgVVNFKFNZU1RFTV9QUkVWSUVXKQorCitzdGF0aWMgY29uc3QgY2hhciogc3lzdGVtUHJl dmlld1NhbWVPcmlnaW5UZXN0Qnl0ZXMgPSBSIlBTT05SRVNPVVJDRSgKKzxib2R5PgorICAgIDxh IGlkPSJ0ZXN0TGluayIgcmVsPSJhciIgaHJlZj0icHNvbjovL3d3dy53ZWJraXQub3JnL3doYXRl dmVyIj4KKyAgICAgICAgPGltZyBzcmM9Imh0dHA6Ly93d3cud2Via2l0Lm9yZy9pbWFnZSI+Cisg ICAgPC9hPgorPC9ib2R5PgorKVBTT05SRVNPVVJDRSI7CisKK3N0YXRpYyBjb25zdCBjaGFyKiBz eXN0ZW1QcmV2aWV3Q3Jvc3NPcmlnaW5UZXN0Qnl0ZXMgPSBSIlBTT05SRVNPVVJDRSgKKzxib2R5 PgorICAgIDxhIGlkPSJ0ZXN0TGluayIgcmVsPSJhciIgaHJlZj0icHNvbjovL3d3dy5hcHBsZS5j b20vd2hhdGV2ZXIiPgorICAgICAgICA8aW1nIHNyYz0iaHR0cDovL3d3dy53ZWJraXQub3JnL2lt YWdlIj4KKyAgICA8L2E+Cis8L2JvZHk+CispUFNPTlJFU09VUkNFIjsKKworVEVTVChQcm9jZXNz U3dhcCwgU2FtZU9yaWdpblN5c3RlbVByZXZpZXcpCit7CisgICAgYXV0byBwcm9jZXNzUG9vbENv bmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uIGFsbG9j XSBpbml0XSk7CisgICAgcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmdldCgpLnByb2Nlc3NTd2Fw c09uTmF2aWdhdGlvbiA9IFlFUzsKKyAgICBhdXRvIHByb2Nlc3NQb29sID0gYWRvcHROUyhbW1dL UHJvY2Vzc1Bvb2wgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRpb246cHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uLmdldCgpXSk7CisKKyAgICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRv cHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmll d0NvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworICAgIGF1 dG8gaGFuZGxlciA9IGFkb3B0TlMoW1tQU09OU2NoZW1lIGFsbG9jXSBpbml0XSk7CisgICAgW2hh bmRsZXIgYWRkTWFwcGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFp bi5odG1sIiB0b0RhdGE6c3lzdGVtUHJldmlld1NhbWVPcmlnaW5UZXN0Qnl0ZXNdOworICAgIFto YW5kbGVyIGFkZE1hcHBpbmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL3do YXRldmVyIiB0b0RhdGE6IkZha2UgVVNEWiBkYXRhIl07CisgICAgW3dlYlZpZXdDb25maWd1cmF0 aW9uIHNldFVSTFNjaGVtZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBmb3JVUkxTY2hlbWU6QCJwc29u Il07CisKKyAgICBbd2ViVmlld0NvbmZpZ3VyYXRpb24gX3NldFN5c3RlbVByZXZpZXdFbmFibGVk OllFU107CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBp bml0V2l0aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246d2Vi Vmlld0NvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICBhdXRvIG5hdmlnYXRpb25EZWxlZ2F0ZSA9 IGFkb3B0TlMoW1tQU09OTmF2aWdhdGlvbkRlbGVnYXRlIGFsbG9jXSBpbml0XSk7CisgICAgW3dl YlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOm5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKV07CisK KyAgICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJM OltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCJd XTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRB UEk6OlV0aWw6OnJ1bigmZG9uZSk7CisgICAgZG9uZSA9IGZhbHNlOworICAgIGF1dG8gcGlkQWZ0 ZXJGaXJzdExvYWQgPSBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworCisgICAgW3dl YlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OkAidGVzdExpbmsuY2xpY2soKSIgY29tcGxldGlvbkhh bmRsZXI6bmlsXTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnNsZWVwKDEpOworCisgICAg Ly8gV2Ugc2hvdWxkIHN0aWxsIGJlIG9uIHdlYmtpdC5vcmcuCisgICAgRVhQRUNUX0VRKHBpZEFm dGVyRmlyc3RMb2FkLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdKTsKKyAgICBFWFBF Q1RfV0tfU1RSRVEoQCJwc29uOi8vd3d3LndlYmtpdC5vcmcvbWFpbi5odG1sIiwgW1t3ZWJWaWV3 IFVSTF0gYWJzb2x1dGVTdHJpbmddKTsKK30KKworVEVTVChQcm9jZXNzU3dhcCwgQ3Jvc3NPcmln aW5TeXN0ZW1QcmV2aWV3KQoreworICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0g YWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAg IHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNzU3dhcHNPbk5hdmlnYXRpb24g PSBZRVM7CisgICAgYXV0byBwcm9jZXNzUG9vbCA9IGFkb3B0TlMoW1tXS1Byb2Nlc3NQb29sIGFs bG9jXSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOnByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQo KV0pOworCisgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZp ZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW3dlYlZpZXdDb25maWd1cmF0aW9u IHNldFByb2Nlc3NQb29sOnByb2Nlc3NQb29sLmdldCgpXTsKKyAgICBhdXRvIGhhbmRsZXIgPSBh ZG9wdE5TKFtbUFNPTlNjaGVtZSBhbGxvY10gaW5pdF0pOworICAgIFtoYW5kbGVyIGFkZE1hcHBp bmdGcm9tVVJMU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCIgdG9EYXRh OnN5c3RlbVByZXZpZXdDcm9zc09yaWdpblRlc3RCeXRlc107CisgICAgW2hhbmRsZXIgYWRkTWFw cGluZ0Zyb21VUkxTdHJpbmc6QCJwc29uOi8vd3d3LmFwcGxlLmNvbS93aGF0ZXZlciIgdG9EYXRh OiJGYWtlIFVTRFogZGF0YSJdOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlvbiBzZXRVUkxTY2hl bWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAicHNvbiJdOworCisgICAgW3dl YlZpZXdDb25maWd1cmF0aW9uIF9zZXRTeXN0ZW1QcmV2aWV3RW5hYmxlZDpZRVNdOworCisgICAg YXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpO U01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0 aW9uLmdldCgpXSk7CisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbUFNP Tk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3IHNldE5hdmln YXRpb25EZWxlZ2F0ZTpuYXZpZ2F0aW9uRGVsZWdhdGUuZ2V0KCldOworCisgICAgTlNVUkxSZXF1 ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwgVVJMV2l0 aFN0cmluZzpAInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluLmh0bWwiXV07CisgICAgW3dlYlZp ZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4o JmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKyAgICBhdXRvIHBpZEFmdGVyRmlyc3RMb2FkID0g W3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIFt3ZWJWaWV3IGV2YWx1YXRl SmF2YVNjcmlwdDpAInRlc3RMaW5rLmNsaWNrKCkiIGNvbXBsZXRpb25IYW5kbGVyOm5pbF07CisK KyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzbGVlcCgxKTsKKworICAgIC8vIFdlIHNob3VsZCBz dGlsbCBiZSBvbiB3ZWJraXQub3JnLgorICAgIEVYUEVDVF9FUShwaWRBZnRlckZpcnN0TG9hZCwg W3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAi cHNvbjovL3d3dy53ZWJraXQub3JnL21haW4uaHRtbCIsIFtbd2ViVmlldyBVUkxdIGFic29sdXRl U3RyaW5nXSk7Cit9CisKKyNlbmRpZgorCiBlbnVtIGNsYXNzIFNob3VsZEVuYWJsZVBTT04geyBO bywgWWVzIH07CiBzdGF0aWMgdm9pZCBydW5DbGllbnRTaWRlUmVkaXJlY3RUZXN0KFNob3VsZEVu YWJsZVBTT04gc2hvdWxkRW5hYmxlUFNPTikKIHsKQEAgLTI5MjEsNyArMzAxMSw3IEBAIFRFU1Qo UHJvY2Vzc1N3YXAsIFByb2Nlc3NSZXVzZSkKICAgICBFWFBFQ1RfRVEocGlkMSwgcGlkMyk7CiB9 CiAKLVRFU1QoUHJvY2Vzc1N3YXAsIFByb2Nlc3NSZXVzZWVUTERQbHVzMikKK1RFU1QoUHJvY2Vz c1N3YXAsIFByb2Nlc3NSZVVzZVRMRFBsdXMyKQogewogICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25m aWd1cmF0aW9uID0gYWRvcHROUyhbW19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbiBhbGxvY10g aW5pdF0pOwogICAgIFtwcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24gc2V0UHJvY2Vzc1N3YXBzT25O YXZpZ2F0aW9uOllFU107Cg==