208457 2020-03-02 11:12:12 -0800 Assertion failed: !m_function in CompletionHandler::~CompletionHandler() 2020-03-04 11:37:14 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 sihui_liu sihui_liu achristensen bfulgham cdumez commit-queue katherine_cheney webkit-bug-importer oldest_to_newest 1624627 0 sihui_liu 2020-03-02 11:12:12 -0800 Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.JavaScriptCore 0x00000001089edcde WTFCrash + 14 (Assertions.cpp:305) 1 com.apple.WebKit 0x0000000110d39ff7 WTF::CompletionHandler<void (WTF::Vector<WebKit::WebResourceLoadStatisticsStore::ThirdPartyData, 0ul, WTF::CrashOnOverflow, 16ul, WTF::FastMalloc>&&)>::~CompletionHandler() + 87 (CompletionHandler.h:53) 2 com.apple.WebKit 0x0000000110d38fb5 WTF::CompletionHandler<void (WTF::Vector<WebKit::WebResourceLoadStatisticsStore::ThirdPartyData, 0ul, WTF::CrashOnOverflow, 16ul, WTF::FastMalloc>&&)>::~CompletionHandler() + 21 (CompletionHandler.h:54) 3 com.apple.WebKit 0x00000001115a89c9 -[WKWebsiteDataStore(WKPrivate) _getResourceLoadStatisticsDataSummary:] + 105 (WKWebsiteDataStore.mm:536) 1624634 1 392161 sihui_liu 2020-03-02 11:19:36 -0800 Created attachment 392161 Patch 1624652 2 392161 cdumez 2020-03-02 11:53:58 -0800 Comment on attachment 392161 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392161&action=review > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1522 > + struct CallbackAggregator final : ThreadSafeRefCounted<CallbackAggregator> { Why ThreadSafe? > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1536 > + void completeCallback(Vector<WebResourceLoadStatisticsStore::ThirdPartyData>&& results) Can we name this better? Maybe something like addResult(). This really does not have much to do with the callback. > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1538 > + for (auto& result : results) m_results.appendVector(WTFMove(results)) for performance. 1624660 3 392161 sihui_liu 2020-03-02 12:16:26 -0800 Comment on attachment 392161 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392161&action=review >> Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1522 >> + struct CallbackAggregator final : ThreadSafeRefCounted<CallbackAggregator> { > > Why ThreadSafe? Not necessary to be ThreadSafe in this case as long as async reply is handled on main thread. Just to be consistent with other CallbackAggregators. >> Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1536 >> + void completeCallback(Vector<WebResourceLoadStatisticsStore::ThirdPartyData>&& results) > > Can we name this better? Maybe something like addResult(). This really does not have much to do with the callback. Okay. >> Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1538 >> + for (auto& result : results) > > m_results.appendVector(WTFMove(results)) for performance. Sure. 1624662 4 392170 sihui_liu 2020-03-02 12:17:56 -0800 Created attachment 392170 Patch 1625627 5 392170 commit-queue 2020-03-04 10:59:55 -0800 Comment on attachment 392170 Patch Rejecting attachment 392170 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 392170, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=392170&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=208457&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 392170 from bug 208457. Fetching: https://bugs.webkit.org/attachment.cgi?id=392170 Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Chris Dumez']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 2 diffs from patch file(s). patching file Source/WebKit/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp Hunk #1 FAILED at 1519. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Chris Dumez']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 2 diffs from patch file(s). patching file Source/WebKit/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp Hunk #1 FAILED at 1519. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Chris Dumez']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Updating OpenSource From git://git.webkit.org/WebKit 966e9850239..0a60812f941 master -> origin/master Partial-rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc ... Currently at 257854 = 966e9850239dc5c2012aab350aa990e5c73a063f r257855 = 3483be115a2459e9240b96ffe591b8a6c83ecd1e r257856 = 61155812937193b3898d2e958db070299d3837ee r257857 = 2082772a8b600fa67c35bff4319d2ac921e72c0c r257858 = 2c649a99bda9bc8683eb22b39755415e0b3fdd86 r257859 = 6533465765f7759e7c3f160d3edd0271ae8f643a r257860 = e2220183f268e8463339f70aef12ebf62f4b7b80 r257861 = 0a60812f941902e48fb997b9143fb9b25494fd31 Done rebuilding .git/svn/refs/remotes/origin/master/.rev_map.268f45cc-cd09-0410-ab3c-d52691b4dbfc First, rewinding head to replay your work on top of it... Fast-forwarded master to refs/remotes/origin/master. Full output: https://webkit-queues.webkit.org/results/13333561 1625635 6 392443 sihui_liu 2020-03-04 11:09:43 -0800 Created attachment 392443 Patch for landing 1625654 7 392443 commit-queue 2020-03-04 11:36:04 -0800 Comment on attachment 392443 Patch for landing Clearing flags on attachment: 392443 Committed r257866: <https://trac.webkit.org/changeset/257866> 1625655 8 commit-queue 2020-03-04 11:36:05 -0800 All reviewed patches have been landed. Closing bug. 1625657 9 webkit-bug-importer 2020-03-04 11:37:14 -0800 <rdar://problem/60049004> 392161 2020-03-02 11:19:36 -0800 2020-03-02 12:17:54 -0800 Patch bug-208457-20200302111935.patch text/plain 2899 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NzE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ5NGVjNDAzMGI1YjJkMjA2 MjQ4ZGVkODI2ZTI0MzEzMjNkMzM1MTIuLjZhMjg4Mzk5YjNhYWQzMjRiOWY4YmI4ODIyYjE3YmM0 MzFlMTBmNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDMtMDIgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQXNzZXJ0aW9uIGZhaWxlZDogIW1f ZnVuY3Rpb24gaW4gQ29tcGxldGlvbkhhbmRsZXI6On5Db21wbGV0aW9uSGFuZGxlcigpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg0NTcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbnN1cmUgY29tcGxl dGlvbiBoYW5kbGVyIGlzIGNhbGxlZCBpbiBXZWJzaXRlRGF0YVN0b3JlOjpnZXRSZXNvdXJjZUxv YWRTdGF0aXN0aWNzRGF0YVN1bW1hcnkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURh dGEvV2Vic2l0ZURhdGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3Rv cmU6OmdldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhU3VtbWFyeSk6CisKIDIwMjAtMDMtMDIg IEphY29iIFVwaG9mZiAgPGphY29iX3VwaG9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZp ZXdlZCwgcm9sbGluZyBvdXQgcjI1NzY4Ny4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKaW5kZXggMDMwY2YxNDAy Yjg2N2ZmYjU2ZDJlZjQyODI5MWMwZDVhZTdmN2E2Zi4uNjRlNzgxYTM2MjI0YTA4NDUzMmU2M2Mx YTFjYmRhOTM1ZjE4YjI5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vi c2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAKQEAgLTE1MTksOSArMTUxOSwzOCBA QCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmdldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhU3Vt bWFyeShDb21wbGV0aW9uSGFuZGxlcjx2bwogewogICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4o KSk7CiAKKyAgICBzdHJ1Y3QgQ2FsbGJhY2tBZ2dyZWdhdG9yIGZpbmFsIDogVGhyZWFkU2FmZVJl ZkNvdW50ZWQ8Q2FsbGJhY2tBZ2dyZWdhdG9yPiB7CisgICAgICAgIENhbGxiYWNrQWdncmVnYXRv cihDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNz U3RvcmU6OlRoaXJkUGFydHlEYXRhPiYmKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKKyAgICAgICAg ICAgIDogbV9jb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSkKKyAg ICAgICAgeworICAgICAgICAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKKyAgICAgICAg fTsKKworICAgICAgICB+Q2FsbGJhY2tBZ2dyZWdhdG9yKCkKKyAgICAgICAgeworICAgICAgICAg ICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKKworICAgICAgICAgICAgbV9jb21wbGV0aW9u SGFuZGxlcihXVEZNb3ZlKG1fcmVzdWx0cykpOworICAgICAgICB9CisKKyAgICAgICAgdm9pZCBj b21wbGV0ZUNhbGxiYWNrKFZlY3RvcjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OlRo aXJkUGFydHlEYXRhPiYmIHJlc3VsdHMpCisgICAgICAgIHsKKyAgICAgICAgICAgIGZvciAoYXV0 byYgcmVzdWx0IDogcmVzdWx0cykKKyAgICAgICAgICAgICAgICBtX3Jlc3VsdHMuYXBwZW5kKHJl c3VsdCk7CisgICAgICAgIH0KKworICAgICAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3Rv cjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OlRoaXJkUGFydHlEYXRhPiYmKT4gbV9j b21wbGV0aW9uSGFuZGxlcjsKKyAgICAgICAgVmVjdG9yPFdlYlJlc291cmNlTG9hZFN0YXRpc3Rp Y3NTdG9yZTo6VGhpcmRQYXJ0eURhdGE+IG1fcmVzdWx0czsKKyAgICB9OworCisgICAgUmVmUHRy PENhbGxiYWNrQWdncmVnYXRvcj4gY2FsbGJhY2tBZ2dyZWdhdG9yID0gYWRvcHRSZWYobmV3IENh bGxiYWNrQWdncmVnYXRvcihXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSkpOworCiAgICAgZm9y IChhdXRvJiBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scygpKSB7Ci0gICAgICAgIGlmIChhdXRv KiBwcm9jZXNzID0gcHJvY2Vzc1Bvb2wtPm5ldHdvcmtQcm9jZXNzKCkpCi0gICAgICAgICAgICBw cm9jZXNzLT5nZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YVN1bW1hcnkobV9zZXNzaW9uSUQs IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICAgICAgaWYgKGF1dG8qIHByb2Nlc3Mg PSBwcm9jZXNzUG9vbC0+bmV0d29ya1Byb2Nlc3MoKSkgeworICAgICAgICAgICAgcHJvY2Vzcy0+ Z2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFTdW1tYXJ5KG1fc2Vzc2lvbklELCBbY2FsbGJh Y2tBZ2dyZWdhdG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlSZWYoKV0oVmVjdG9yPFdlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6VGhpcmRQYXJ0eURhdGE+JiYgZGF0YSkgeworICAg ICAgICAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+Y29tcGxldGVDYWxsYmFjayhXVEZNb3Zl KGRhdGEpKTsKKyAgICAgICAgICAgIH0pOworICAgICAgICB9CiAgICAgfQogfQogCg== 392170 2020-03-02 12:17:56 -0800 2020-03-04 11:09:42 -0800 Patch bug-208457-20200302121755.patch text/plain 2853 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NzAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQzODkyNGE0YjI5ODQ1YzY1 NTQ5YjBkZDAzOGYyMTQ1ZDBmYzJhZTIuLjY3ZDAyNWQ1ZmMxY2Q1ZjMwMGUyYzMyNmZkNGU1N2M2 MmE5MmI3ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDMtMDIgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQXNzZXJ0aW9uIGZhaWxlZDogIW1f ZnVuY3Rpb24gaW4gQ29tcGxldGlvbkhhbmRsZXI6On5Db21wbGV0aW9uSGFuZGxlcigpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg0NTcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFbnN1cmUgY29tcGxl dGlvbiBoYW5kbGVyIGlzIGNhbGxlZCBpbiBXZWJzaXRlRGF0YVN0b3JlOjpnZXRSZXNvdXJjZUxv YWRTdGF0aXN0aWNzRGF0YVN1bW1hcnkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURh dGEvV2Vic2l0ZURhdGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3Rv cmU6OmdldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhU3VtbWFyeSk6CisKIDIwMjAtMDMtMDEg IFRpbmctV2VpIExhbiAgPGxhbnR3NDRAZ21haWwuY29tPgogCiAgICAgICAgIFtHVEtdIEZpeCB0 aGUgYnVpbGQgd2hlbiBXYXlsYW5kIHRhcmdldCBpcyBkaXNhYmxlZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApp bmRleCAwMzBjZjE0MDJiODY3ZmZiNTZkMmVmNDI4MjkxYzBkNWFlN2Y3YTZmLi5mZDA1YzE3ZjIz NGY5NmQyY2YxOWQ3MTA2NjI3NTZjOWVmNzEyODhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcApAQCAtMTUx OSw5ICsxNTE5LDM3IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6Z2V0UmVzb3VyY2VMb2FkU3Rh dGlzdGljc0RhdGFTdW1tYXJ5KENvbXBsZXRpb25IYW5kbGVyPHZvCiB7CiAgICAgQVNTRVJUKFJ1 bkxvb3A6OmlzTWFpbigpKTsKIAorICAgIHN0cnVjdCBDYWxsYmFja0FnZ3JlZ2F0b3IgOiBSZWZD b3VudGVkPENhbGxiYWNrQWdncmVnYXRvcj4geworICAgICAgICBDYWxsYmFja0FnZ3JlZ2F0b3Io Q29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0 b3JlOjpUaGlyZFBhcnR5RGF0YT4mJik+JiYgY29tcGxldGlvbkhhbmRsZXIpCisgICAgICAgICAg ICA6IG1fY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpCisgICAg ICAgIHsKKyAgICAgICAgICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CisgICAgICAgIH07 CisKKyAgICAgICAgfkNhbGxiYWNrQWdncmVnYXRvcigpCisgICAgICAgIHsKKyAgICAgICAgICAg IEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CisKKyAgICAgICAgICAgIG1fY29tcGxldGlvbkhh bmRsZXIoV1RGTW92ZShtX3Jlc3VsdHMpKTsKKyAgICAgICAgfQorCisgICAgICAgIHZvaWQgYWRk UmVzdWx0KFZlY3RvcjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OlRoaXJkUGFydHlE YXRhPiYmIHJlc3VsdHMpCisgICAgICAgIHsKKyAgICAgICAgICAgIG1fcmVzdWx0cy5hcHBlbmRW ZWN0b3IoV1RGTW92ZShyZXN1bHRzKSk7CisgICAgICAgIH0KKworICAgICAgICBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKFZlY3RvcjxXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmU6OlRoaXJk UGFydHlEYXRhPiYmKT4gbV9jb21wbGV0aW9uSGFuZGxlcjsKKyAgICAgICAgVmVjdG9yPFdlYlJl c291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6VGhpcmRQYXJ0eURhdGE+IG1fcmVzdWx0czsKKyAg ICB9OworCisgICAgUmVmUHRyPENhbGxiYWNrQWdncmVnYXRvcj4gY2FsbGJhY2tBZ2dyZWdhdG9y ID0gYWRvcHRSZWYobmV3IENhbGxiYWNrQWdncmVnYXRvcihXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKSkpOworCiAgICAgZm9yIChhdXRvJiBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scygpKSB7 Ci0gICAgICAgIGlmIChhdXRvKiBwcm9jZXNzID0gcHJvY2Vzc1Bvb2wtPm5ldHdvcmtQcm9jZXNz KCkpCi0gICAgICAgICAgICBwcm9jZXNzLT5nZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YVN1 bW1hcnkobV9zZXNzaW9uSUQsIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICAgICAg aWYgKGF1dG8qIHByb2Nlc3MgPSBwcm9jZXNzUG9vbC0+bmV0d29ya1Byb2Nlc3MoKSkgeworICAg ICAgICAgICAgcHJvY2Vzcy0+Z2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFTdW1tYXJ5KG1f c2Vzc2lvbklELCBbY2FsbGJhY2tBZ2dyZWdhdG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlS ZWYoKV0oVmVjdG9yPFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6VGhpcmRQYXJ0eURh dGE+JiYgZGF0YSkgeworICAgICAgICAgICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUmVz dWx0KFdURk1vdmUoZGF0YSkpOworICAgICAgICAgICAgfSk7CisgICAgICAgIH0KICAgICB9CiB9 CiAK 392443 2020-03-04 11:09:43 -0800 2020-03-04 11:36:04 -0800 Patch for landing bug-208457-20200304110942.patch text/plain 2829 sihui_liu U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg0ZjAwNmVmZjlhYTAxOTdk MzVlNWNjN2FiMjdlMDZmN2IzN2EyZTAuLmE3NTUwNGMyODFiNzBmYmNlMTkxYmNmNTE5NWNjNWZj ZTA5YTA0ZDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDMtMDQgIFNpaHVpIExp dSAgPHNpaHVpX2xpdUBhcHBsZS5jb20+CisKKyAgICAgICAgQXNzZXJ0aW9uIGZhaWxlZDogIW1f ZnVuY3Rpb24gaW4gQ29tcGxldGlvbkhhbmRsZXI6On5Db21wbGV0aW9uSGFuZGxlcigpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg0NTcKKworICAg ICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICBFbnN1cmUgY29tcGxldGlv biBoYW5kbGVyIGlzIGNhbGxlZCBpbiBXZWJzaXRlRGF0YVN0b3JlOjpnZXRSZXNvdXJjZUxvYWRT dGF0aXN0aWNzRGF0YVN1bW1hcnkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEv V2Vic2l0ZURhdGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6 OmdldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEYXRhU3VtbWFyeSk6CisKIDIwMjAtMDMtMDQgIEJl biBOaGFtICA8bmhhbUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIGluaXRpYWwgbGF5b3V0 IHRocm90dGxlcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURh dGEvV2Vic2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRl RGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNwcAppbmRleCAxNjcyM2UyOWZjYWJlZGUyMzMzZDgzYjdl MDJjMjk4ZWE5YzM0Y2QzLi5kOTAyZTAyMzdmNjI2ZGMwMDNhN2VlN2U0ZWU4YmZjOTc5NDM1ZmFh IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRl RGF0YVN0b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9X ZWJzaXRlRGF0YVN0b3JlLmNwcApAQCAtMTUxNCw5ICsxNTE0LDM3IEBAIHZvaWQgV2Vic2l0ZURh dGFTdG9yZTo6Z2V0UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RhdGFTdW1tYXJ5KENvbXBsZXRpb25I YW5kbGVyPHZvCiB7CiAgICAgQVNTRVJUKFJ1bkxvb3A6OmlzTWFpbigpKTsKIAorICAgIHN0cnVj dCBDYWxsYmFja0FnZ3JlZ2F0b3IgOiBSZWZDb3VudGVkPENhbGxiYWNrQWdncmVnYXRvcj4gewor ICAgICAgICBDYWxsYmFja0FnZ3JlZ2F0b3IoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChWZWN0b3I8 V2ViUmVzb3VyY2VMb2FkU3RhdGlzdGljc1N0b3JlOjpUaGlyZFBhcnR5RGF0YT4mJik+JiYgY29t cGxldGlvbkhhbmRsZXIpCisgICAgICAgICAgICA6IG1fY29tcGxldGlvbkhhbmRsZXIoV1RGTW92 ZShjb21wbGV0aW9uSGFuZGxlcikpCisgICAgICAgIHsKKyAgICAgICAgICAgIEFTU0VSVChSdW5M b29wOjppc01haW4oKSk7CisgICAgICAgIH07CisKKyAgICAgICAgfkNhbGxiYWNrQWdncmVnYXRv cigpCisgICAgICAgIHsKKyAgICAgICAgICAgIEFTU0VSVChSdW5Mb29wOjppc01haW4oKSk7CisK KyAgICAgICAgICAgIG1fY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShtX3Jlc3VsdHMpKTsKKyAg ICAgICAgfQorCisgICAgICAgIHZvaWQgYWRkUmVzdWx0KFZlY3RvcjxXZWJSZXNvdXJjZUxvYWRT dGF0aXN0aWNzU3RvcmU6OlRoaXJkUGFydHlEYXRhPiYmIHJlc3VsdHMpCisgICAgICAgIHsKKyAg ICAgICAgICAgIG1fcmVzdWx0cy5hcHBlbmRWZWN0b3IoV1RGTW92ZShyZXN1bHRzKSk7CisgICAg ICAgIH0KKworICAgICAgICBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxXZWJSZXNvdXJj ZUxvYWRTdGF0aXN0aWNzU3RvcmU6OlRoaXJkUGFydHlEYXRhPiYmKT4gbV9jb21wbGV0aW9uSGFu ZGxlcjsKKyAgICAgICAgVmVjdG9yPFdlYlJlc291cmNlTG9hZFN0YXRpc3RpY3NTdG9yZTo6VGhp cmRQYXJ0eURhdGE+IG1fcmVzdWx0czsKKyAgICB9OworCisgICAgUmVmUHRyPENhbGxiYWNrQWdn cmVnYXRvcj4gY2FsbGJhY2tBZ2dyZWdhdG9yID0gYWRvcHRSZWYobmV3IENhbGxiYWNrQWdncmVn YXRvcihXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSkpOworCiAgICAgZm9yIChhdXRvJiBwcm9j ZXNzUG9vbCA6IGVuc3VyZVByb2Nlc3NQb29scygpKSB7Ci0gICAgICAgIGlmIChhdXRvKiBwcm9j ZXNzID0gcHJvY2Vzc1Bvb2wtPm5ldHdvcmtQcm9jZXNzKCkpCi0gICAgICAgICAgICBwcm9jZXNz LT5nZXRSZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGF0YVN1bW1hcnkobV9zZXNzaW9uSUQsIFdURk1v dmUoY29tcGxldGlvbkhhbmRsZXIpKTsKKyAgICAgICAgaWYgKGF1dG8qIHByb2Nlc3MgPSBwcm9j ZXNzUG9vbC0+bmV0d29ya1Byb2Nlc3MoKSkgeworICAgICAgICAgICAgcHJvY2Vzcy0+Z2V0UmVz b3VyY2VMb2FkU3RhdGlzdGljc0RhdGFTdW1tYXJ5KG1fc2Vzc2lvbklELCBbY2FsbGJhY2tBZ2dy ZWdhdG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlSZWYoKV0oVmVjdG9yPFdlYlJlc291cmNl TG9hZFN0YXRpc3RpY3NTdG9yZTo6VGhpcmRQYXJ0eURhdGE+JiYgZGF0YSkgeworICAgICAgICAg ICAgICAgIGNhbGxiYWNrQWdncmVnYXRvci0+YWRkUmVzdWx0KFdURk1vdmUoZGF0YSkpOworICAg ICAgICAgICAgfSk7CisgICAgICAgIH0KICAgICB9CiB9CiAK