209410 2020-03-23 00:09:05 -0700 WebKitTestRunner should enable ResourceLoadStatistics also for non-Cocoa ports 2020-03-27 01:02:13 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=209644 InRadar P2 Normal --- 1 fujii fujii bfulgham don.olmstead dpino ross.kirsling webkit-bug-importer wilander youennf oldest_to_newest 1632741 0 fujii 2020-03-23 00:09:05 -0700 [WinCairo][WebKitTestRunner] Failing ASSERT(m_resourceLoadStatistics) in NetworkSession::setThirdPartyCookieBlockingMode WinCairo debug builds always failing to start WebKitTestRunner. > ASSERTION FAILED: m_resourceLoadStatistics > ..\..\Source\WebKit\NetworkProcess/NetworkSession.cpp(238) : setThirdPartyCookieBlockingMode > 1 00007FFB58071429 WTFCrash > 2 00007FFB29931F70 WTFCrashWithInfo > 3 00007FFB2D7AC65F WebKit::NetworkSession::setThirdPartyCookieBlockingMode > 4 00007FFB2D70C368 WebKit::NetworkProcess::setShouldBlockThirdPartyCookiesForTesting > 5 00007FFB2D385104 IPC::callMemberFunctionImpl<WebKit::NetworkProcess,void (WebKit::NetworkProcess::*)(PAL::SessionID, WebCore::ThirdPartyCookieBlockingMode, WTF::CompletionHandler<void ()> &&),void (),std::tuple<PAL::SessionID,WebCore::ThirdPartyCookieBlockingMode>,0,1> > 6 00007FFB2D383444 IPC::callMemberFunction<WebKit::NetworkProcess,void (WebKit::NetworkProcess::*)(PAL::SessionID, WebCore::ThirdPartyCookieBlockingMode, WTF::CompletionHandler<void ()> &&),void (),std::tuple<PAL::SessionID,WebCore::ThirdPartyCookieBlockingMode>,std::integer_sequence<unsigned long long,0,1> > > 7 00007FFB2D31DB53 IPC::handleMessageAsync<Messages::NetworkProcess::SetShouldBlockThirdPartyCookiesForTesting,WebKit::NetworkProcess,void (WebKit::NetworkProcess::*)(PAL::SessionID, WebCore::ThirdPartyCookieBlockingMode, WTF::CompletionHandler<void ()> &&)> > 8 00007FFB2D311F61 WebKit::NetworkProcess::didReceiveNetworkProcessMessage > 9 00007FFB2D70525C WebKit::NetworkProcess::didReceiveMessage > 10 00007FFB2D936E56 IPC::Connection::dispatchMessage > 11 00007FFB2D937547 IPC::Connection::dispatchMessage > 12 00007FFB2D937BEB IPC::Connection::dispatchOneIncomingMessage > 13 00007FFB2D93AB2F IPC::Connection::enqueueIncomingMessage::<unnamed-tag>::operator() > 14 00007FFB2D93AA6C WTF::Detail::CallableWrapper<`lambda at ..\..\Source\WebKit\Platform\IPC\Connection.cpp:981:30',void>::call > 15 00007FFB580850A0 WTF::Function<void ()>::operator() > 16 00007FFB580E1B36 WTF::RunLoop::performWork > 17 00007FFB581ACC97 WTF::RunLoop::wndProc > 18 00007FFB581ACBB9 WTF::RunLoop::RunLoopWndProc > 19 00007FFB87F65C0D CallWindowProcW > 20 00007FFB87F65602 DispatchMessageW > 21 00007FFB581ACE93 WTF::RunLoop::run > 22 00007FFB2D1C931B WebKit::AuxiliaryProcessMain<WebKit::NetworkProcess,WebKit::NetworkProcessMainCurl> > 23 00007FFB2D1C90AB WebKit::NetworkProcessMain > 24 00007FF6FDDD101C main > 25 00007FF6FDDD123C __scrt_common_main_seh > 26 00007FFB87EA7BD4 BaseThreadInitThunk > 27 00007FFB884CCED1 RtlUserThreadStart 1632742 1 fujii 2020-03-23 00:29:09 -0700 Here is the callstack of UI process to send SetShouldBlockThirdPartyCookiesForTesting to Network process. > WebKit2.dll!WebKit::NetworkProcessProxy::setShouldBlockThirdPartyCookiesForTesting(PAL::SessionID sessionID={...}, WebCore::ThirdPartyCookieBlockingMode blockingMode=OnlyAccordingToPerDomainPolicy, WTF::CompletionHandler<void ()> && completionHandler={...}) Line 1156 C++ > WebKit2.dll!WebKit::WebsiteDataStore::setResourceLoadStatisticsShouldBlockThirdPartyCookiesForTesting(bool enabled=false, bool onlyOnSitesWithoutUserInteraction=false, WTF::CompletionHandler<void ()> && completionHandler={...}) Line 1846 C++ > WebKit2.dll!WKWebsiteDataStoreStatisticsResetToConsistentState(const OpaqueWKWebsiteDataStore * dataStoreRef=0x00000269129822e0, void * context=0x00000082018fe058, void(*)(void *) completionHandler=0x00007ffb4edbe440) Line 597 C++ > WebKitTestRunnerLib.dll!WTR::TestController::statisticsResetToConsistentState() Line 3711 C++ > WebKitTestRunnerLib.dll!WTR::TestController::resetStateToConsistentValues(const WTR::TestOptions & options={...}, WTR::TestController::ResetStage resetStage=BeforeTest) Line 1131 C++ > WebKitTestRunnerLib.dll!WTR::TestController::ensureViewSupportsOptionsForTest(const WTR::TestInvocation & test={...}) Line 822 C++ > WebKitTestRunnerLib.dll!WTR::TestController::configureViewForTest(const WTR::TestInvocation & test={...}) Line 1561 C++ > WebKitTestRunnerLib.dll!WTR::TestInvocation::invoke() Line 161 C++ > WebKitTestRunnerLib.dll!WTR::TestController::runTest(const char * inputLine=0x00000082018fe750) Line 1780 C++ > WebKitTestRunnerLib.dll!WTR::TestController::runTestingServerLoop() Line 1826 C++ > WebKitTestRunnerLib.dll!WTR::TestController::run() Line 1834 C++ > WebKitTestRunnerLib.dll!WTR::TestController::TestController(int argc=2, const char * * argv=0x000002691292e8c0) Line 168 C++ > WebKitTestRunnerLib.dll!dllLauncherEntryPoint(int argc=2, const char * * argv=0x000002691292e8c0) Line 34 C++ > WebKitTestRunner.exe!main(int argc=2, const char * * argv=0x000002691292e8c0) Line 230 C++ > [External Code] 1632750 2 fujii 2020-03-23 01:15:30 -0700 It seems that Cocoa WebKitTestRunner always enables ResourceLoadStatistics. https://trac.webkit.org/browser/webkit/trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm?rev=258562#L75 > [globalWebViewConfiguration.websiteDataStore _setResourceLoadStatisticsEnabled:YES]; 1632754 3 394244 fujii 2020-03-23 01:28:49 -0700 Created attachment 394244 WIP patch 1632999 4 394295 fujii 2020-03-23 13:37:46 -0700 Created attachment 394295 Patch 1633008 5 394295 wilander 2020-03-23 13:53:00 -0700 Comment on attachment 394295 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394295&action=review > Source/WebKit/ChangeLog:3 > + [WinCairo][WebKitTestRunner] Failing ASSERT(m_resourceLoadStatistics) in NetworkSession::setThirdPartyCookieBlockingMode I don't think WinCairo and WebKitTestRunner are good prefixes on a patch that changes WebKit code across platforms. Also the "Failing ASSERT …" description does not convey what's being changed. Please rephrase. > Tools/WebKitTestRunner/TestController.cpp:3115 > + WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(WKContextGetWebsiteDataStore(context), true); I remember someone making changes here recently. Or was it a specific platform? 1633019 6 394295 fujii 2020-03-23 14:10:51 -0700 Comment on attachment 394295 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394295&action=review Thank you for the review. >> Source/WebKit/ChangeLog:3 >> + [WinCairo][WebKitTestRunner] Failing ASSERT(m_resourceLoadStatistics) in NetworkSession::setThirdPartyCookieBlockingMode > > I don't think WinCairo and WebKitTestRunner are good prefixes on a patch that changes WebKit code across platforms. Also the "Failing ASSERT …" description does not convey what's being changed. Please rephrase. Agreed. Will fix. >> Tools/WebKitTestRunner/TestController.cpp:3115 >> + WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(WKContextGetWebsiteDataStore(context), true); > > I remember someone making changes here recently. Or was it a specific platform? I can't find it. which bug? 1633033 7 wilander 2020-03-23 14:38:07 -0700 (In reply to Fujii Hironori from comment #6) > Comment on attachment 394295 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=394295&action=review > > Thank you for the review. > > >> Source/WebKit/ChangeLog:3 > >> + [WinCairo][WebKitTestRunner] Failing ASSERT(m_resourceLoadStatistics) in NetworkSession::setThirdPartyCookieBlockingMode > > > > I don't think WinCairo and WebKitTestRunner are good prefixes on a patch that changes WebKit code across platforms. Also the "Failing ASSERT …" description does not convey what's being changed. Please rephrase. > > Agreed. Will fix. > > >> Tools/WebKitTestRunner/TestController.cpp:3115 > >> + WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(WKContextGetWebsiteDataStore(context), true); > > > > I remember someone making changes here recently. Or was it a specific platform? > > I can't find it. which bug? Found it: https://bugs.webkit.org/show_bug.cgi?id=208506 1633482 8 394410 fujii 2020-03-24 14:18:08 -0700 Created attachment 394410 Patch 1634280 9 394410 youennf 2020-03-26 05:30:48 -0700 Comment on attachment 394410 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394410&action=review > Tools/WebKitTestRunner/TestController.cpp:3115 > + WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(WKContextGetWebsiteDataStore(context), true); This probably makes the call to _setResourceLoadStatisticsEnabled:YES in TestControlerCocoa.mm unnecessary. 1634541 10 394410 fujii 2020-03-26 13:32:08 -0700 Comment on attachment 394410 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=394410&action=review Thank you for the review. >> Tools/WebKitTestRunner/TestController.cpp:3115 >> + WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(WKContextGetWebsiteDataStore(context), true); > > This probably makes the call to _setResourceLoadStatisticsEnabled:YES in TestControlerCocoa.mm unnecessary. No. Cocoa ports don't use this code. https://trac.webkit.org/browser/webkit/trunk/Tools/WebKitTestRunner/TestController.cpp?rev=258562#L3098 1634558 11 fujii 2020-03-26 13:59:22 -0700 Committed r259076: <https://trac.webkit.org/changeset/259076> 1634559 12 webkit-bug-importer 2020-03-26 14:00:16 -0700 <rdar://problem/60935096> 394244 2020-03-23 01:28:49 -0700 2020-03-23 13:37:24 -0700 WIP patch wip.patch text/plain 2279 fujii ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9OZXR3b3JrU2Vz c2lvbkN1cmwuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL05ldHdvcmtT ZXNzaW9uQ3VybC5jcHAKaW5kZXggYmMyODgzYWUxM2UuLjFkODcwODg1NTJmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya1Nlc3Npb25DdXJsLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL2N1cmwvTmV0d29ya1Nlc3Npb25D dXJsLmNwcApAQCAtNDMsNiArNDMsMTcgQEAgTmV0d29ya1Nlc3Npb25DdXJsOjpOZXR3b3JrU2Vz c2lvbkN1cmwoTmV0d29ya1Byb2Nlc3MmIG5ldHdvcmtQcm9jZXNzLCBOZXR3b3JrU2UKICAgICBp ZiAoIXBhcmFtZXRlcnMuY29va2llUGVyc2lzdGVudFN0b3JhZ2VGaWxlLmlzRW1wdHkoKSkKICAg ICAgICAgbmV0d29ya1N0b3JhZ2VTZXNzaW9uKCktPnNldENvb2tpZURhdGFiYXNlKG1ha2VVbmlx dWVSZWY8Q29va2llSmFyREI+KHBhcmFtZXRlcnMuY29va2llUGVyc2lzdGVudFN0b3JhZ2VGaWxl KSk7CiAgICAgbmV0d29ya1N0b3JhZ2VTZXNzaW9uKCktPnNldFByb3h5U2V0dGluZ3MoV1RGTW92 ZShwYXJhbWV0ZXJzLnByb3h5U2V0dGluZ3MpKTsKKworI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FE X1NUQVRJU1RJQ1MpCisgICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5ID0gV1RG TW92ZShwYXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRpc3RpY3NQYXJhbWV0ZXJzLmRpcmVjdG9y eSk7CisgICAgbV9zaG91bGRJbmNsdWRlTG9jYWxob3N0SW5SZXNvdXJjZUxvYWRTdGF0aXN0aWNz ID0gcGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGFyYW1ldGVycy5zaG91bGRJbmNs dWRlTG9jYWxob3N0ID8gU2hvdWxkSW5jbHVkZUxvY2FsaG9zdDo6WWVzIDogU2hvdWxkSW5jbHVk ZUxvY2FsaG9zdDo6Tm87CisgICAgbV9lbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdN b2RlID0gcGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGFyYW1ldGVycy5lbmFibGVE ZWJ1Z01vZGUgPyBFbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlOjpZZXMgOiBF bmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlOjpObzsKKyAgICBtX3Jlc291cmNl TG9hZFN0YXRpc3RpY3NNYW51YWxQcmV2YWxlbnRSZXNvdXJjZSA9IHBhcmFtZXRlcnMucmVzb3Vy Y2VMb2FkU3RhdGlzdGljc1BhcmFtZXRlcnMubWFudWFsUHJldmFsZW50UmVzb3VyY2U7CisgICAg bV90aGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlID0gcGFyYW1ldGVycy5yZXNvdXJjZUxvYWRT dGF0aXN0aWNzUGFyYW1ldGVycy50aGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlOworICAgIG1f Zmlyc3RQYXJ0eVdlYnNpdGVEYXRhUmVtb3ZhbE1vZGUgPSBwYXJhbWV0ZXJzLnJlc291cmNlTG9h ZFN0YXRpc3RpY3NQYXJhbWV0ZXJzLmZpcnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxNb2RlOwor ICAgIHNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKHBhcmFtZXRlcnMucmVzb3VyY2VM b2FkU3RhdGlzdGljc1BhcmFtZXRlcnMuZW5hYmxlZCk7CisjZW5kaWYKKwogfQogCiBOZXR3b3Jr U2Vzc2lvbkN1cmw6On5OZXR3b3JrU2Vzc2lvbkN1cmwoKQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVy L1Rlc3RDb250cm9sbGVyLmNwcAppbmRleCAzY2JjZDYyYWMxZC4uMTU5NDBlNWMyOGYgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCisrKyBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCkBAIC0zMTEyLDYgKzMxMTIs NyBAQCBQbGF0Zm9ybVdlYlZpZXcqIFRlc3RDb250cm9sbGVyOjpwbGF0Zm9ybUNyZWF0ZU90aGVy UGFnZShQbGF0Zm9ybVdlYlZpZXcqIHBhcmVudAogCiBXS0NvbnRleHRSZWYgVGVzdENvbnRyb2xs ZXI6OnBsYXRmb3JtQWRqdXN0Q29udGV4dChXS0NvbnRleHRSZWYgY29udGV4dCwgV0tDb250ZXh0 Q29uZmlndXJhdGlvblJlZiBjb250ZXh0Q29uZmlndXJhdGlvbikKIHsKKyAgICBXS1dlYnNpdGVE YXRhU3RvcmVTZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChXS0NvbnRleHRHZXRXZWJz aXRlRGF0YVN0b3JlKGNvbnRleHQpLCB0cnVlKTsKICAgICByZXR1cm4gY29udGV4dDsKIH0KIAo= 394295 2020-03-23 13:37:46 -0700 2020-03-24 14:17:53 -0700 Patch bug-209410-20200324053745.patch text/plain 8253 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4ODI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEyOWM3MGZmZGNjYmMyYWVh ZDQ1NWI3YTljOTRmYTE2N2NkNjc1YjIuLjgwNTYyZGE5NTdmZTdlMmRiYmMxODg2ZDQ4ZjA4YTcw ZGNiYTQ4YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMDMtMjMgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgW1dpbkNhaXJvXVtX ZWJLaXRUZXN0UnVubmVyXSBGYWlsaW5nIEFTU0VSVChtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3Mp IGluIE5ldHdvcmtTZXNzaW9uOjpzZXRUaGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDk0MTAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOZXR3b3JrU2Vzc2lv bidzIG1lbWJlciB2YXJpYWJsZXMgZm9yIFJlc291cmNlTG9hZFN0YXRpc3RpY3Mgd2VyZQorICAg ICAgICBpbml0aWFsaXplZCBvbmx5IGZvciBDb2NvYSBwb3J0LiBUaGV5IGFsc28gc2hvdWxkIGJl IGluaXRpYWxpemVkCisgICAgICAgIGZvciBub24tQ29jb2EgcG9ydHMuCisKKyAgICAgICAgKiBO ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtTZXNzaW9uOjpOZXR3b3JrU2Vzc2lvbik6IEFkZGVkIG1lbWJlciBpbml0aWFsaXplcnMgZm9y IFJlc291cmNlTG9hZFN0YXRpc3RpY3MuCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Nlc3Npb24uaDogSGF2ZSBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3Rvcnkgb25seSBp ZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKS4KKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3 b3JrU2Vzc2lvbkNvY29hOjpOZXR3b3JrU2Vzc2lvbkNvY29hKTogUmVtb3ZlZCB0aGUgY29kZSB0 byBpbml0aWFsaXplIG1lbWJlciB2YXJpYWJsZXMgZm9yIFJlc291cmNlTG9hZFN0YXRpc3RpY3Mu CisKIDIwMjAtMDMtMjIgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAK ICAgICAgICAgQWRvcHQgLVtVSVdpbmRvd1NjZW5lIGludGVyZmFjZU9yaWVudGF0aW9uXSB3aGVu IGRldGVybWluaW5nIGRldmljZSBvcmllbnRhdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcAppbmRleCAwYzMzZWJmZjYwNDg0OGY0YmYyNWY4 YTFjNDkyMGRiMzVlZjZmOTI2Li41NjBiZWUwZjEyNjIxMjAwODk0ZjhjZWEzNDJkMjUyZmI0ZTA5 ZTA4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNz aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9u LmNwcApAQCAtNzYsMTEgKzc2LDE3IEBAIE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiogTmV0d29ya1Nl c3Npb246Om5ldHdvcmtTdG9yYWdlU2Vzc2lvbigpIGNvbnN0CiAgICAgcmV0dXJuIHN0b3JhZ2VT ZXNzaW9uOwogfQogCi1OZXR3b3JrU2Vzc2lvbjo6TmV0d29ya1Nlc3Npb24oTmV0d29ya1Byb2Nl c3MmIG5ldHdvcmtQcm9jZXNzLCBjb25zdCBOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVy cyYgcGFyYW1ldGVycykKK05ldHdvcmtTZXNzaW9uOjpOZXR3b3JrU2Vzc2lvbihOZXR3b3JrUHJv Y2VzcyYgbmV0d29ya1Byb2Nlc3MsIE5ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzJiBw YXJhbWV0ZXJzKQogICAgIDogbV9zZXNzaW9uSUQocGFyYW1ldGVycy5zZXNzaW9uSUQpCiAgICAg LCBtX25ldHdvcmtQcm9jZXNzKG5ldHdvcmtQcm9jZXNzKQogI2lmIEVOQUJMRShSRVNPVVJDRV9M T0FEX1NUQVRJU1RJQ1MpCisgICAgLCBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3Rvcnko V1RGTW92ZShwYXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRpc3RpY3NQYXJhbWV0ZXJzLmRpcmVj dG9yeSkpCisgICAgLCBtX3Nob3VsZEluY2x1ZGVMb2NhbGhvc3RJblJlc291cmNlTG9hZFN0YXRp c3RpY3MocGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGFyYW1ldGVycy5zaG91bGRJ bmNsdWRlTG9jYWxob3N0ID8gU2hvdWxkSW5jbHVkZUxvY2FsaG9zdDo6WWVzIDogU2hvdWxkSW5j bHVkZUxvY2FsaG9zdDo6Tm8pCisgICAgLCBtX2VuYWJsZVJlc291cmNlTG9hZFN0YXRpc3RpY3NE ZWJ1Z01vZGUocGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGFyYW1ldGVycy5lbmFi bGVEZWJ1Z01vZGUgPyBFbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlOjpZZXMg OiBFbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlOjpObykKKyAgICAsIG1fcmVz b3VyY2VMb2FkU3RhdGlzdGljc01hbnVhbFByZXZhbGVudFJlc291cmNlKHBhcmFtZXRlcnMucmVz b3VyY2VMb2FkU3RhdGlzdGljc1BhcmFtZXRlcnMubWFudWFsUHJldmFsZW50UmVzb3VyY2UpCiAg ICAgLCBtX2VuYWJsZVJlc291cmNlTG9hZFN0YXRpc3RpY3NMb2dUZXN0aW5nRXZlbnQocGFyYW1l dGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGFyYW1ldGVycy5lbmFibGVMb2dUZXN0aW5nRXZl bnQpCisgICAgLCBtX3RoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGUocGFyYW1ldGVycy5yZXNv dXJjZUxvYWRTdGF0aXN0aWNzUGFyYW1ldGVycy50aGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2Rl KQorICAgICwgbV9maXJzdFBhcnR5V2Vic2l0ZURhdGFSZW1vdmFsTW9kZShwYXJhbWV0ZXJzLnJl c291cmNlTG9hZFN0YXRpc3RpY3NQYXJhbWV0ZXJzLmZpcnN0UGFydHlXZWJzaXRlRGF0YVJlbW92 YWxNb2RlKQogI2VuZGlmCiAgICAgLCBtX2FkQ2xpY2tBdHRyaWJ1dGlvbihtYWtlVW5pcXVlUmVm PEFkQ2xpY2tBdHRyaWJ1dGlvbk1hbmFnZXI+KHBhcmFtZXRlcnMuc2Vzc2lvbklEKSkKICAgICAs IG1fdGVzdFNwZWVkTXVsdGlwbGllcihwYXJhbWV0ZXJzLnRlc3RTcGVlZE11bHRpcGxpZXIpCkBA IC0xMTcsNiArMTIzLDEwIEBAIE5ldHdvcmtTZXNzaW9uOjpOZXR3b3JrU2Vzc2lvbihOZXR3b3Jr UHJvY2VzcyYgbmV0d29ya1Byb2Nlc3MsIGNvbnN0IE5ldHdvcmtTZXNzCiAgICAgICAgIC8vIFBp bmdMb2FkIG1hbmFnZXMgaXRzIG93biBsaWZldGltZSwgZGVsZXRpbmcgaXRzZWxmIHdoZW4gaXRz IHB1cnBvc2UgaGFzIGJlZW4gZnVsZmlsbGVkLgogICAgICAgICBuZXcgUGluZ0xvYWQobV9uZXR3 b3JrUHJvY2VzcywgbV9zZXNzaW9uSUQsIFdURk1vdmUobG9hZFBhcmFtZXRlcnMpLCBXVEZNb3Zl KGNvbXBsZXRpb25IYW5kbGVyKSk7CiAgICAgfSk7CisKKyNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9B RF9TVEFUSVNUSUNTKQorICAgIHNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKHBhcmFt ZXRlcnMucmVzb3VyY2VMb2FkU3RhdGlzdGljc1BhcmFtZXRlcnMuZW5hYmxlZCk7CisjZW5kaWYK IH0KIAogTmV0d29ya1Nlc3Npb246On5OZXR3b3JrU2Vzc2lvbigpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmggYi9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgKaW5kZXggYzUyODAwNWI4NzkzN2RlODk1 ZjUzZThmOTNhM2E4YTg2NzdiNWExMy4uNGRhZjYxYTAyMDhmY2FiYjVkMzUzZTAzZWNlOTI0ZGQy MmRiNTRmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr U2Vzc2lvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Np b24uaApAQCAtMTQyLDcgKzE0Miw3IEBAIHB1YmxpYzoKICNlbmRpZgogCiBwcm90ZWN0ZWQ6Ci0g ICAgTmV0d29ya1Nlc3Npb24oTmV0d29ya1Byb2Nlc3MmLCBjb25zdCBOZXR3b3JrU2Vzc2lvbkNy ZWF0aW9uUGFyYW1ldGVycyYpOworICAgIE5ldHdvcmtTZXNzaW9uKE5ldHdvcmtQcm9jZXNzJiwg TmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMmKTsKIAogI2lmIEVOQUJMRShSRVNPVVJD RV9MT0FEX1NUQVRJU1RJQ1MpCiAgICAgdm9pZCBkZXN0cm95UmVzb3VyY2VMb2FkU3RhdGlzdGlj cygpOwpAQCAtMTUyLDggKzE1Miw4IEBAIHByb3RlY3RlZDoKICAgICBQQUw6OlNlc3Npb25JRCBt X3Nlc3Npb25JRDsKICAgICBSZWY8TmV0d29ya1Byb2Nlc3M+IG1fbmV0d29ya1Byb2Nlc3M7CiAg ICAgSGFzaFNldDxOZXR3b3JrRGF0YVRhc2sqPiBtX2RhdGFUYXNrU2V0OwotICAgIFN0cmluZyBt X3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3Rvcnk7CiAjaWYgRU5BQkxFKFJFU09VUkNFX0xP QURfU1RBVElTVElDUykKKyAgICBTdHJpbmcgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0 b3J5OwogICAgIFJlZlB0cjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU+IG1fcmVzb3Vy Y2VMb2FkU3RhdGlzdGljczsKICAgICBTaG91bGRJbmNsdWRlTG9jYWxob3N0IG1fc2hvdWxkSW5j bHVkZUxvY2FsaG9zdEluUmVzb3VyY2VMb2FkU3RhdGlzdGljcyB7IFNob3VsZEluY2x1ZGVMb2Nh bGhvc3Q6OlllcyB9OwogICAgIEVuYWJsZVJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUg bV9lbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlIHsgRW5hYmxlUmVzb3VyY2VM b2FkU3RhdGlzdGljc0RlYnVnTW9kZTo6Tm8gfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbSBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQppbmRleCA4MmU2 ZmZkMThhM2JjZDhhMTRlNGExODkwZmI1NDkyNjljOGI0MjUyLi42NDIyZDUyMzI3NDU3MjkzNzhl MWJkMjg3M2QzNzE0ZmE3N2MwNTk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCkBAIC0xMTcwLDE2ICsx MTcwLDYgQEAgTmV0d29ya1Nlc3Npb25Db2NvYTo6TmV0d29ya1Nlc3Npb25Db2NvYShOZXR3b3Jr UHJvY2VzcyYgbmV0d29ya1Byb2Nlc3MsIE5ldHdvcmsKICAgICBtX2RldmljZU1hbmFnZW1lbnRS ZXN0cmljdGlvbnNFbmFibGVkID0gcGFyYW1ldGVycy5kZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rp b25zRW5hYmxlZDsKICAgICBtX2FsbExvYWRzQmxvY2tlZEJ5RGV2aWNlTWFuYWdlbWVudFJlc3Ry aWN0aW9uc0ZvclRlc3RpbmcgPSBwYXJhbWV0ZXJzLmFsbExvYWRzQmxvY2tlZEJ5RGV2aWNlTWFu YWdlbWVudFJlc3RyaWN0aW9uc0ZvclRlc3Rpbmc7CiAKLSNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9B RF9TVEFUSVNUSUNTKQotICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSA9IFdU Rk1vdmUocGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzUGFyYW1ldGVycy5kaXJlY3Rv cnkpOwotICAgIG1fc2hvdWxkSW5jbHVkZUxvY2FsaG9zdEluUmVzb3VyY2VMb2FkU3RhdGlzdGlj cyA9IHBhcmFtZXRlcnMucmVzb3VyY2VMb2FkU3RhdGlzdGljc1BhcmFtZXRlcnMuc2hvdWxkSW5j bHVkZUxvY2FsaG9zdCA/IFNob3VsZEluY2x1ZGVMb2NhbGhvc3Q6OlllcyA6IFNob3VsZEluY2x1 ZGVMb2NhbGhvc3Q6Ok5vOwotICAgIG1fZW5hYmxlUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVn TW9kZSA9IHBhcmFtZXRlcnMucmVzb3VyY2VMb2FkU3RhdGlzdGljc1BhcmFtZXRlcnMuZW5hYmxl RGVidWdNb2RlID8gRW5hYmxlUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZTo6WWVzIDog RW5hYmxlUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZTo6Tm87Ci0gICAgbV9yZXNvdXJj ZUxvYWRTdGF0aXN0aWNzTWFudWFsUHJldmFsZW50UmVzb3VyY2UgPSBwYXJhbWV0ZXJzLnJlc291 cmNlTG9hZFN0YXRpc3RpY3NQYXJhbWV0ZXJzLm1hbnVhbFByZXZhbGVudFJlc291cmNlOwotICAg IG1fdGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZSA9IHBhcmFtZXRlcnMucmVzb3VyY2VMb2Fk U3RhdGlzdGljc1BhcmFtZXRlcnMudGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZTsKLSAgICBt X2ZpcnN0UGFydHlXZWJzaXRlRGF0YVJlbW92YWxNb2RlID0gcGFyYW1ldGVycy5yZXNvdXJjZUxv YWRTdGF0aXN0aWNzUGFyYW1ldGVycy5maXJzdFBhcnR5V2Vic2l0ZURhdGFSZW1vdmFsTW9kZTsK LSAgICBzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChwYXJhbWV0ZXJzLnJlc291cmNl TG9hZFN0YXRpc3RpY3NQYXJhbWV0ZXJzLmVuYWJsZWQpOwotI2VuZGlmCi0KICNpZiBIQVZFKFNF U1NJT05fQ0xFQU5VUCkKICAgICBhY3RpdmF0ZVNlc3Npb25DbGVhbnVwKCp0aGlzLCBwYXJhbWV0 ZXJzKTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IGQzOWVkNGY5YjUyNTY2YzRhZDczZTUzOWQ2ZjFlOGQyOGY4NWIxZjAuLjEyNTU4 M2JmNTQzYTIwNzllZGM5NWNlNjVjMTBiOWVkNWU3NjRjN2MgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAyMC0wMy0y MyAgRnVqaWkgSGlyb25vcmkgIDxIaXJvbm9yaS5GdWppaUBzb255LmNvbT4KKworICAgICAgICBb V2luQ2Fpcm9dW1dlYktpdFRlc3RSdW5uZXJdIEZhaWxpbmcgQVNTRVJUKG1fcmVzb3VyY2VMb2Fk U3RhdGlzdGljcykgaW4gTmV0d29ya1Nlc3Npb246OnNldFRoaXJkUGFydHlDb29raWVCbG9ja2lu Z01vZGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIw OTQxMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENv Y29hIFdlYktpdFRlc3RSdW5uZXIgYWx3YXlzIGVuYWJsZXMgUmVzb3VyY2VMb2FkU3RhdGlzdGlj cy4KKyAgICAgICAgT3RoZXIgcG9ydHMgc2hvdWxkIGRvIHNvLgorCisgICAgICAgICogV2ViS2l0 VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9s bGVyOjpwbGF0Zm9ybUFkanVzdENvbnRleHQpOiBFbmFibGUgUmVzb3VyY2VMb2FkU3RhdGlzdGlj cworICAgICAgICBieSB1c2luZyBXS1dlYnNpdGVEYXRhU3RvcmVTZXRSZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRW5hYmxlZC4KKwogMjAyMC0wMy0yMSAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56 YXJvQGdub21lLm9yZz4KIAogICAgICAgICBbR1RLXSBVc2UgJHtQWVRIT05fRVhFQ1VUQUJMRX0g dG8gcnVuIGdlbmVyYXRlLWd0a2RvYwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9UZXN0Q29udHJvbGxlci5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9s bGVyLmNwcAppbmRleCAzY2JjZDYyYWMxZGZjZDM3ZWQxNTUyYTVmN2Y1MTYwZWI1OGFlMjlhLi4x NTk0MGU1YzI4ZjA0OTg3MmUyNWU5MWViMzg4ZjE1NDIyOWI3ZDQ5IDEwMDY0NAotLS0gYS9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAorKysgYi9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcApAQCAtMzExMiw2ICszMTEyLDcgQEAgUGxhdGZv cm1XZWJWaWV3KiBUZXN0Q29udHJvbGxlcjo6cGxhdGZvcm1DcmVhdGVPdGhlclBhZ2UoUGxhdGZv cm1XZWJWaWV3KiBwYXJlbnQKIAogV0tDb250ZXh0UmVmIFRlc3RDb250cm9sbGVyOjpwbGF0Zm9y bUFkanVzdENvbnRleHQoV0tDb250ZXh0UmVmIGNvbnRleHQsIFdLQ29udGV4dENvbmZpZ3VyYXRp b25SZWYgY29udGV4dENvbmZpZ3VyYXRpb24pCiB7CisgICAgV0tXZWJzaXRlRGF0YVN0b3JlU2V0 UmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoV0tDb250ZXh0R2V0V2Vic2l0ZURhdGFTdG9y ZShjb250ZXh0KSwgdHJ1ZSk7CiAgICAgcmV0dXJuIGNvbnRleHQ7CiB9CiAK 394410 2020-03-24 14:18:08 -0700 2020-03-26 05:30:48 -0700 Patch bug-209410-20200325061807.patch text/plain 7627 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4ODI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDEyOWM3MGZmZGNjYmMyYWVh ZDQ1NWI3YTljOTRmYTE2N2NkNjc1YjIuLjQxOTkxNDIzMjU3ZTA4OTM1YjFiYmIyMGQ1OTI4MDk2 NzRjZjgzNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMjAtMDMtMjMgIEZ1amlpIEhp cm9ub3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgV2ViS2l0VGVzdFJ1 bm5lciBzaG91bGQgZW5hYmxlIFJlc291cmNlTG9hZFN0YXRpc3RpY3MgYWxzbyBmb3Igbm9uLUNv Y29hIHBvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMDk0MTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBOZXR3b3JrU2Vzc2lvbidzIG1lbWJlciB2YXJpYWJsZXMgZm9yIFJlc291cmNlTG9hZFN0YXRp c3RpY3Mgd2VyZQorICAgICAgICBpbml0aWFsaXplZCBvbmx5IGZvciBDb2NvYSBwb3J0LiBUaGV5 IGFsc28gc2hvdWxkIGJlIGluaXRpYWxpemVkCisgICAgICAgIGZvciBub24tQ29jb2EgcG9ydHMu CisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHA6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uOjpOZXR3b3JrU2Vzc2lvbik6IEFkZGVkIG1lbWJlciBp bml0aWFsaXplcnMgZm9yIFJlc291cmNlTG9hZFN0YXRpc3RpY3MuCisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaDogSGF2ZSBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NE aXJlY3Rvcnkgb25seSBpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9TVEFUSVNUSUNTKS4KKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tOgorICAgICAg ICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbkNvY29hOjpOZXR3b3JrU2Vzc2lvbkNvY29hKTogUmVt b3ZlZCB0aGUgY29kZSB0byBpbml0aWFsaXplIG1lbWJlciB2YXJpYWJsZXMgZm9yIFJlc291cmNl TG9hZFN0YXRpc3RpY3MuCisKIDIwMjAtMDMtMjIgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2ll aEBhcHBsZS5jb20+CiAKICAgICAgICAgQWRvcHQgLVtVSVdpbmRvd1NjZW5lIGludGVyZmFjZU9y aWVudGF0aW9uXSB3aGVuIGRldGVybWluaW5nIGRldmljZSBvcmllbnRhdGlvbgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmNwcAppbmRleCAwYzMzZWJm ZjYwNDg0OGY0YmYyNWY4YTFjNDkyMGRiMzVlZjZmOTI2Li42MzQyMzY3OWFiZDgyNmZkNmJhMDdk MzY2NjVkNmQzZTk4NjZkOWZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtTZXNzaW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L05ldHdvcmtTZXNzaW9uLmNwcApAQCAtODAsNyArODAsMTMgQEAgTmV0d29ya1Nlc3Npb246Ok5l dHdvcmtTZXNzaW9uKE5ldHdvcmtQcm9jZXNzJiBuZXR3b3JrUHJvY2VzcywgY29uc3QgTmV0d29y a1Nlc3MKICAgICA6IG1fc2Vzc2lvbklEKHBhcmFtZXRlcnMuc2Vzc2lvbklEKQogICAgICwgbV9u ZXR3b3JrUHJvY2VzcyhuZXR3b3JrUHJvY2VzcykKICNpZiBFTkFCTEUoUkVTT1VSQ0VfTE9BRF9T VEFUSVNUSUNTKQorICAgICwgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5KHBhcmFt ZXRlcnMucmVzb3VyY2VMb2FkU3RhdGlzdGljc1BhcmFtZXRlcnMuZGlyZWN0b3J5KQorICAgICwg bV9zaG91bGRJbmNsdWRlTG9jYWxob3N0SW5SZXNvdXJjZUxvYWRTdGF0aXN0aWNzKHBhcmFtZXRl cnMucmVzb3VyY2VMb2FkU3RhdGlzdGljc1BhcmFtZXRlcnMuc2hvdWxkSW5jbHVkZUxvY2FsaG9z dCA/IFNob3VsZEluY2x1ZGVMb2NhbGhvc3Q6OlllcyA6IFNob3VsZEluY2x1ZGVMb2NhbGhvc3Q6 Ok5vKQorICAgICwgbV9lbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlKHBhcmFt ZXRlcnMucmVzb3VyY2VMb2FkU3RhdGlzdGljc1BhcmFtZXRlcnMuZW5hYmxlRGVidWdNb2RlID8g RW5hYmxlUmVzb3VyY2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZTo6WWVzIDogRW5hYmxlUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZTo6Tm8pCisgICAgLCBtX3Jlc291cmNlTG9hZFN0YXRp c3RpY3NNYW51YWxQcmV2YWxlbnRSZXNvdXJjZShwYXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRp c3RpY3NQYXJhbWV0ZXJzLm1hbnVhbFByZXZhbGVudFJlc291cmNlKQogICAgICwgbV9lbmFibGVS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzTG9nVGVzdGluZ0V2ZW50KHBhcmFtZXRlcnMucmVzb3VyY2VM b2FkU3RhdGlzdGljc1BhcmFtZXRlcnMuZW5hYmxlTG9nVGVzdGluZ0V2ZW50KQorICAgICwgbV90 aGlyZFBhcnR5Q29va2llQmxvY2tpbmdNb2RlKHBhcmFtZXRlcnMucmVzb3VyY2VMb2FkU3RhdGlz dGljc1BhcmFtZXRlcnMudGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nTW9kZSkKKyAgICAsIG1fZmly c3RQYXJ0eVdlYnNpdGVEYXRhUmVtb3ZhbE1vZGUocGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0 aXN0aWNzUGFyYW1ldGVycy5maXJzdFBhcnR5V2Vic2l0ZURhdGFSZW1vdmFsTW9kZSkKICNlbmRp ZgogICAgICwgbV9hZENsaWNrQXR0cmlidXRpb24obWFrZVVuaXF1ZVJlZjxBZENsaWNrQXR0cmli dXRpb25NYW5hZ2VyPihwYXJhbWV0ZXJzLnNlc3Npb25JRCkpCiAgICAgLCBtX3Rlc3RTcGVlZE11 bHRpcGxpZXIocGFyYW1ldGVycy50ZXN0U3BlZWRNdWx0aXBsaWVyKQpAQCAtMTE3LDYgKzEyMywx MCBAQCBOZXR3b3JrU2Vzc2lvbjo6TmV0d29ya1Nlc3Npb24oTmV0d29ya1Byb2Nlc3MmIG5ldHdv cmtQcm9jZXNzLCBjb25zdCBOZXR3b3JrU2VzcwogICAgICAgICAvLyBQaW5nTG9hZCBtYW5hZ2Vz IGl0cyBvd24gbGlmZXRpbWUsIGRlbGV0aW5nIGl0c2VsZiB3aGVuIGl0cyBwdXJwb3NlIGhhcyBi ZWVuIGZ1bGZpbGxlZC4KICAgICAgICAgbmV3IFBpbmdMb2FkKG1fbmV0d29ya1Byb2Nlc3MsIG1f c2Vzc2lvbklELCBXVEZNb3ZlKGxvYWRQYXJhbWV0ZXJzKSwgV1RGTW92ZShjb21wbGV0aW9uSGFu ZGxlcikpOwogICAgIH0pOworCisjaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykK KyAgICBzZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZChwYXJhbWV0ZXJzLnJlc291cmNl TG9hZFN0YXRpc3RpY3NQYXJhbWV0ZXJzLmVuYWJsZWQpOworI2VuZGlmCiB9CiAKIE5ldHdvcmtT ZXNzaW9uOjp+TmV0d29ya1Nlc3Npb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrU2Vzc2lvbi5oCmluZGV4IGM1MjgwMDViODc5MzdkZTg5NWY1M2U4ZjkzYTNhOGE4 Njc3YjVhMTMuLjMxNDVlMDQ3OTc5OThmMjA5ZTVjOTNkNmI3YzA1Mjk5YWYyYTNjMjggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Nlc3Npb24uaAorKysg Yi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgKQEAgLTE1Miw4 ICsxNTIsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgUEFMOjpTZXNzaW9uSUQgbV9zZXNzaW9uSUQ7CiAg ICAgUmVmPE5ldHdvcmtQcm9jZXNzPiBtX25ldHdvcmtQcm9jZXNzOwogICAgIEhhc2hTZXQ8TmV0 d29ya0RhdGFUYXNrKj4gbV9kYXRhVGFza1NldDsKLSAgICBTdHJpbmcgbV9yZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGlyZWN0b3J5OwogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1Mp CisgICAgU3RyaW5nIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeTsKICAgICBSZWZQ dHI8V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlPiBtX3Jlc291cmNlTG9hZFN0YXRpc3Rp Y3M7CiAgICAgU2hvdWxkSW5jbHVkZUxvY2FsaG9zdCBtX3Nob3VsZEluY2x1ZGVMb2NhbGhvc3RJ blJlc291cmNlTG9hZFN0YXRpc3RpY3MgeyBTaG91bGRJbmNsdWRlTG9jYWxob3N0OjpZZXMgfTsK ICAgICBFbmFibGVSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGVidWdNb2RlIG1fZW5hYmxlUmVzb3Vy Y2VMb2FkU3RhdGlzdGljc0RlYnVnTW9kZSB7IEVuYWJsZVJlc291cmNlTG9hZFN0YXRpc3RpY3NE ZWJ1Z01vZGU6Ok5vIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KaW5kZXggODJlNmZmZDE4YTNiY2Q4YTE0 ZTRhMTg5MGZiNTQ5MjY5YzhiNDI1Mi4uNjQyMmQ1MjMyNzQ1NzI5Mzc4ZTFiZDI4NzNkMzcxNGZh NzdjMDU5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9O ZXR3b3JrU2Vzc2lvbkNvY29hLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv Y29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQpAQCAtMTE3MCwxNiArMTE3MCw2IEBAIE5ldHdv cmtTZXNzaW9uQ29jb2E6Ok5ldHdvcmtTZXNzaW9uQ29jb2EoTmV0d29ya1Byb2Nlc3MmIG5ldHdv cmtQcm9jZXNzLCBOZXR3b3JrCiAgICAgbV9kZXZpY2VNYW5hZ2VtZW50UmVzdHJpY3Rpb25zRW5h YmxlZCA9IHBhcmFtZXRlcnMuZGV2aWNlTWFuYWdlbWVudFJlc3RyaWN0aW9uc0VuYWJsZWQ7CiAg ICAgbV9hbGxMb2Fkc0Jsb2NrZWRCeURldmljZU1hbmFnZW1lbnRSZXN0cmljdGlvbnNGb3JUZXN0 aW5nID0gcGFyYW1ldGVycy5hbGxMb2Fkc0Jsb2NrZWRCeURldmljZU1hbmFnZW1lbnRSZXN0cmlj dGlvbnNGb3JUZXN0aW5nOwogCi0jaWYgRU5BQkxFKFJFU09VUkNFX0xPQURfU1RBVElTVElDUykK LSAgICBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkgPSBXVEZNb3ZlKHBhcmFtZXRl cnMucmVzb3VyY2VMb2FkU3RhdGlzdGljc1BhcmFtZXRlcnMuZGlyZWN0b3J5KTsKLSAgICBtX3No b3VsZEluY2x1ZGVMb2NhbGhvc3RJblJlc291cmNlTG9hZFN0YXRpc3RpY3MgPSBwYXJhbWV0ZXJz LnJlc291cmNlTG9hZFN0YXRpc3RpY3NQYXJhbWV0ZXJzLnNob3VsZEluY2x1ZGVMb2NhbGhvc3Qg PyBTaG91bGRJbmNsdWRlTG9jYWxob3N0OjpZZXMgOiBTaG91bGRJbmNsdWRlTG9jYWxob3N0OjpO bzsKLSAgICBtX2VuYWJsZVJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGUgPSBwYXJhbWV0 ZXJzLnJlc291cmNlTG9hZFN0YXRpc3RpY3NQYXJhbWV0ZXJzLmVuYWJsZURlYnVnTW9kZSA/IEVu YWJsZVJlc291cmNlTG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGU6OlllcyA6IEVuYWJsZVJlc291cmNl TG9hZFN0YXRpc3RpY3NEZWJ1Z01vZGU6Ok5vOwotICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGlj c01hbnVhbFByZXZhbGVudFJlc291cmNlID0gcGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0 aWNzUGFyYW1ldGVycy5tYW51YWxQcmV2YWxlbnRSZXNvdXJjZTsKLSAgICBtX3RoaXJkUGFydHlD b29raWVCbG9ja2luZ01vZGUgPSBwYXJhbWV0ZXJzLnJlc291cmNlTG9hZFN0YXRpc3RpY3NQYXJh bWV0ZXJzLnRoaXJkUGFydHlDb29raWVCbG9ja2luZ01vZGU7Ci0gICAgbV9maXJzdFBhcnR5V2Vi c2l0ZURhdGFSZW1vdmFsTW9kZSA9IHBhcmFtZXRlcnMucmVzb3VyY2VMb2FkU3RhdGlzdGljc1Bh cmFtZXRlcnMuZmlyc3RQYXJ0eVdlYnNpdGVEYXRhUmVtb3ZhbE1vZGU7Ci0gICAgc2V0UmVzb3Vy Y2VMb2FkU3RhdGlzdGljc0VuYWJsZWQocGFyYW1ldGVycy5yZXNvdXJjZUxvYWRTdGF0aXN0aWNz UGFyYW1ldGVycy5lbmFibGVkKTsKLSNlbmRpZgotCiAjaWYgSEFWRShTRVNTSU9OX0NMRUFOVVAp CiAgICAgYWN0aXZhdGVTZXNzaW9uQ2xlYW51cCgqdGhpcywgcGFyYW1ldGVycyk7CiAjZW5kaWYK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkMzll ZDRmOWI1MjU2NmM0YWQ3M2U1MzlkNmYxZThkMjhmODViMWYwLi5lNGI3ODQyZGNjN2UzNWE4OWYw YTI0Njk3MmE4MjQ2NWNjNDQxYWZmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMjAtMDMtMjMgIEZ1amlpIEhpcm9u b3JpICA8SGlyb25vcmkuRnVqaWlAc29ueS5jb20+CisKKyAgICAgICAgV2ViS2l0VGVzdFJ1bm5l ciBzaG91bGQgZW5hYmxlIFJlc291cmNlTG9hZFN0YXRpc3RpY3MgYWxzbyBmb3Igbm9uLUNvY29h IHBvcnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDk0MTAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD b2NvYSBXZWJLaXRUZXN0UnVubmVyIGFsd2F5cyBlbmFibGVzIFJlc291cmNlTG9hZFN0YXRpc3Rp Y3MuCisgICAgICAgIE90aGVyIHBvcnRzIHNob3VsZCBkbyBzby4KKworICAgICAgICAqIFdlYktp dFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJv bGxlcjo6cGxhdGZvcm1BZGp1c3RDb250ZXh0KTogRW5hYmxlIFJlc291cmNlTG9hZFN0YXRpc3Rp Y3MKKyAgICAgICAgYnkgdXNpbmcgV0tXZWJzaXRlRGF0YVN0b3JlU2V0UmVzb3VyY2VMb2FkU3Rh dGlzdGljc0VuYWJsZWQuCisKIDIwMjAtMDMtMjEgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFu emFyb0Bnbm9tZS5vcmc+CiAKICAgICAgICAgW0dUS10gVXNlICR7UFlUSE9OX0VYRUNVVEFCTEV9 IHRvIHJ1biBnZW5lcmF0ZS1ndGtkb2MKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvVGVzdENvbnRyb2xsZXIuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJv bGxlci5jcHAKaW5kZXggM2NiY2Q2MmFjMWRmY2QzN2VkMTU1MmE1ZjdmNTE2MGViNThhZTI5YS4u MTU5NDBlNWMyOGYwNDk4NzJlMjVlOTFlYjM4OGYxNTQyMjliN2Q0OSAxMDA2NDQKLS0tIGEvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKKysrIGIvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAKQEAgLTMxMTIsNiArMzExMiw3IEBAIFBsYXRm b3JtV2ViVmlldyogVGVzdENvbnRyb2xsZXI6OnBsYXRmb3JtQ3JlYXRlT3RoZXJQYWdlKFBsYXRm b3JtV2ViVmlldyogcGFyZW50CiAKIFdLQ29udGV4dFJlZiBUZXN0Q29udHJvbGxlcjo6cGxhdGZv cm1BZGp1c3RDb250ZXh0KFdLQ29udGV4dFJlZiBjb250ZXh0LCBXS0NvbnRleHRDb25maWd1cmF0 aW9uUmVmIGNvbnRleHRDb25maWd1cmF0aW9uKQogeworICAgIFdLV2Vic2l0ZURhdGFTdG9yZVNl dFJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKFdLQ29udGV4dEdldFdlYnNpdGVEYXRhU3Rv cmUoY29udGV4dCksIHRydWUpOwogICAgIHJldHVybiBjb250ZXh0OwogfQogCg==