187206 2018-06-29 16:54:01 -0700 Resource Load Statistics: Make network process calls only for the process pool that the page belongs to 2018-06-29 18:07:46 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wilander wilander cdumez commit-queue webkit-bug-importer oldest_to_newest 1437998 0 wilander 2018-06-29 16:54:01 -0700 In the WebKit::WebsiteDataStore infrastructure for ITP and the Storage Access API, instead of iterating over all process pools, we should resolve which process pool the page belongs to and call the network process only for that pool. 1438000 1 webkit-bug-importer 2018-06-29 16:54:42 -0700 <rdar://problem/41659160> 1438003 2 343975 wilander 2018-06-29 17:00:38 -0700 Created attachment 343975 Patch 1438011 3 343975 cdumez 2018-06-29 17:06:28 -0700 Comment on attachment 343975 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=343975&action=review r=me with nits. > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1221 > + if (auto webPage = WebProcessProxy::webPage(pageID)) { auto* > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1224 > + } else I think I'd rather we do an early return: auto* webPage = WebProcessProxy::webPage(pageID); if (!webPage) { completionHandler(false); return; } auto& networkProcess = webPage->process().processPool().ensureNetworkProcess(); networkProcess.hasStorageAccessForFrame(m_sessionID, resourceDomain, firstPartyDomain, frameID, pageID, WTFMove(completionHandler)); Same comments apply below. > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1231 > + processPool->networkProcess()->getAllStorageAccessEntries(m_sessionID, WTFMove(completionHandler)); This is still wrong but I guess we can fix separately since you do not have a pageID here. 1438018 4 wilander 2018-06-29 17:13:19 -0700 (In reply to Chris Dumez from comment #3) > Comment on attachment 343975 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=343975&action=review > > r=me with nits. > > > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1221 > > + if (auto webPage = WebProcessProxy::webPage(pageID)) { > > auto* Will fix. > > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1224 > > + } else > > I think I'd rather we do an early return: > auto* webPage = WebProcessProxy::webPage(pageID); > if (!webPage) { > completionHandler(false); > return; > } > auto& networkProcess = > webPage->process().processPool().ensureNetworkProcess(); > networkProcess.hasStorageAccessForFrame(m_sessionID, resourceDomain, > firstPartyDomain, frameID, pageID, WTFMove(completionHandler)); Will fix. > Same comments apply below. Will fix. > > Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp:1231 > > + processPool->networkProcess()->getAllStorageAccessEntries(m_sessionID, WTFMove(completionHandler)); > > This is still wrong but I guess we can fix separately since you do not have > a pageID here. I'll add a FIXME comment. Thanks, Chris! 1438031 5 343982 wilander 2018-06-29 17:28:35 -0700 Created attachment 343982 Patch for landing 1438064 6 343982 commit-queue 2018-06-29 18:07:45 -0700 Comment on attachment 343982 Patch for landing Clearing flags on attachment: 343982 Committed r233384: <https://trac.webkit.org/changeset/233384> 1438065 7 commit-queue 2018-06-29 18:07:46 -0700 All reviewed patches have been landed. Closing bug. 343975 2018-06-29 17:00:38 -0700 2018-06-29 17:28:34 -0700 Patch bug-187206-20180629170037.patch text/plain 7899 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE1ZjEyNGRjMWJkNzM0ODY4 NzM4N2IxNTYwMTg4MzdiY2VmMzdlYzkuLmFjZjE1MmE1ZTY4NDkxNTIwYWQ5NDhjNmJiMTNhN2Y0 MDAyYTNiOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTgtMDYtMjkgIEpvaG4gV2ls YW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2UgTG9hZCBTdGF0 aXN0aWNzOiBNYWtlIG5ldHdvcmsgcHJvY2VzcyBjYWxscyBvbmx5IGZvciB0aGUgcHJvY2VzcyBw b29sIHRoYXQgdGhlIHBhZ2UgYmVsb25ncyB0bworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MjA2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTY1 OTE2MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJ bnN0ZWFkIG9mIGl0ZXJhdGluZyBvdmVyIGFsbCBwcm9jZXNzIHBvb2xzLCB3ZSBzaG91bGQgcmVz b2x2ZQorICAgICAgICB3aGljaCBwcm9jZXNzIHBvb2wgdGhlIHBhZ2UgYmVsb25ncyB0byBhbmQg Y2FsbCB0aGUgbmV0d29yaworICAgICAgICBwcm9jZXNzIG9ubHkgZm9yIHRoYXQgcG9vbC4gVGhp cyBpcyBlc3BlY2lhbGx5IGltcG9ydGFudCBzaW5jZQorICAgICAgICB3ZSB1c2UgV1RGTW92ZSBm b3IgdGhlIGNvbXBsZXRpb24gaGFuZGxlcnMuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhbHNvIHJl bmFtZXMgImNhbGxiYWNrIiB0byAiY29tcGxldGlvbkhhbmRsZXIiIGZvcgorICAgICAgICB0aGUg ZnVuY3Rpb25zIHRvdWNoZWQuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vi c2l0ZURhdGFTdG9yZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnVw ZGF0ZVByZXZhbGVudERvbWFpbnNUb1BhcnRpdGlvbk9yQmxvY2tDb29raWVzKToKKyAgICAgICAg KFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6aGFzU3RvcmFnZUFjY2Vzc0ZvckZyYW1lSGFuZGxl cik6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OmdldEFsbFN0b3JhZ2VBY2Nl c3NFbnRyaWVzKToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6Z3JhbnRTdG9y YWdlQWNjZXNzSGFuZGxlcik6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6Omhh c1N0b3JhZ2VBY2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpyZXF1 ZXN0U3RvcmFnZUFjY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6Omdy YW50U3RvcmFnZUFjY2Vzcyk6CisKIDIwMTgtMDYtMjkgIEpvaG4gV2lsYW5kZXIgIDx3aWxhbmRl ckBhcHBsZS5jb20+CiAKICAgICAgICAgUmVzb3VyY2UgTG9hZCBTdGF0aXN0aWNzOiBEb24ndCBj cmVhdGUgYSBXZWJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzU3RvcmUgZm9yIGVwaGVtZXJhbCBzZXNz aW9ucwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vi c2l0ZURhdGFTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9X ZWJzaXRlRGF0YVN0b3JlLmNwcAppbmRleCA0MDE4ZmM3MDgzYzIxNWUxMjVjYmJkODQ1MDY3ZDM0 OWE3YjUwMDExLi44YzkyNmRhYWRlZjdkZmQ5YzE4N2M1ZGVhNmZkNzk5OWY2ZTY3OWY3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0 b3JlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRl RGF0YVN0b3JlLmNwcApAQCAtMTIxMiwyNiArMTIxMiwzMiBAQCB2b2lkIFdlYnNpdGVEYXRhU3Rv cmU6OnVwZGF0ZVByZXZhbGVudERvbWFpbnNUb1BhcnRpdGlvbk9yQmxvY2tDb29raWVzKGNvbnN0 IFZlYwogCiAgICAgZm9yIChhdXRvJiBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scygpKSB7CiAg ICAgICAgIGlmIChhdXRvKiBwcm9jZXNzID0gcHJvY2Vzc1Bvb2wtPm5ldHdvcmtQcm9jZXNzKCkp Ci0gICAgICAgICAgICBwcm9jZXNzLT51cGRhdGVQcmV2YWxlbnREb21haW5zVG9QYXJ0aXRpb25P ckJsb2NrQ29va2llcyhtX3Nlc3Npb25JRCwgZG9tYWluc1RvUGFydGl0aW9uLCBkb21haW5zVG9C bG9jaywgZG9tYWluc1RvTmVpdGhlclBhcnRpdGlvbk5vckJsb2NrLCBzaG91bGRDbGVhckZpcnN0 LCAgW2NhbGxiYWNrQWdncmVnYXRvciA9IGNhbGxiYWNrQWdncmVnYXRvci5jb3B5UmVmKCldIHsg fSk7CisgICAgICAgICAgICBwcm9jZXNzLT51cGRhdGVQcmV2YWxlbnREb21haW5zVG9QYXJ0aXRp b25PckJsb2NrQ29va2llcyhtX3Nlc3Npb25JRCwgZG9tYWluc1RvUGFydGl0aW9uLCBkb21haW5z VG9CbG9jaywgZG9tYWluc1RvTmVpdGhlclBhcnRpdGlvbk5vckJsb2NrLCBzaG91bGRDbGVhckZp cnN0LCBbY2FsbGJhY2tBZ2dyZWdhdG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlSZWYoKV0g eyB9KTsKICAgICB9CiB9CiAKLXZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6aGFzU3RvcmFnZUFjY2Vz c0ZvckZyYW1lSGFuZGxlcihjb25zdCBTdHJpbmcmIHJlc291cmNlRG9tYWluLCBjb25zdCBTdHJp bmcmIGZpcnN0UGFydHlEb21haW4sIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwg V1RGOjpDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wgaGFzQWNjZXNzKT4mJiBjYWxsYmFjaykK K3ZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6aGFzU3RvcmFnZUFjY2Vzc0ZvckZyYW1lSGFuZGxlcihj b25zdCBTdHJpbmcmIHJlc291cmNlRG9tYWluLCBjb25zdCBTdHJpbmcmIGZpcnN0UGFydHlEb21h aW4sIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgQ29tcGxldGlvbkhhbmRsZXI8 dm9pZChib29sIGhhc0FjY2Vzcyk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAgZm9yIChh dXRvJiBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scygpKQotICAgICAgICBwcm9jZXNzUG9vbC0+ bmV0d29ya1Byb2Nlc3MoKS0+aGFzU3RvcmFnZUFjY2Vzc0ZvckZyYW1lKG1fc2Vzc2lvbklELCBy ZXNvdXJjZURvbWFpbiwgZmlyc3RQYXJ0eURvbWFpbiwgZnJhbWVJRCwgcGFnZUlELCBXVEZNb3Zl KGNhbGxiYWNrKSk7CisgICAgaWYgKGF1dG8gd2ViUGFnZSA9IFdlYlByb2Nlc3NQcm94eTo6d2Vi UGFnZShwYWdlSUQpKSB7CisgICAgICAgIGF1dG8mIG5ldHdvcmtQcm9jZXNzID0gd2ViUGFnZS0+ cHJvY2VzcygpLnByb2Nlc3NQb29sKCkuZW5zdXJlTmV0d29ya1Byb2Nlc3MoKTsKKyAgICAgICAg bmV0d29ya1Byb2Nlc3MuaGFzU3RvcmFnZUFjY2Vzc0ZvckZyYW1lKG1fc2Vzc2lvbklELCByZXNv dXJjZURvbWFpbiwgZmlyc3RQYXJ0eURvbWFpbiwgZnJhbWVJRCwgcGFnZUlELCBXVEZNb3ZlKGNv bXBsZXRpb25IYW5kbGVyKSk7CisgICAgfSBlbHNlCisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVy KGZhbHNlKTsKIH0KIAotdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpnZXRBbGxTdG9yYWdlQWNjZXNz RW50cmllcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxTdHJpbmc+JiYgZG9tYWlucyk+ JiYgY2FsbGJhY2spCit2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmdldEFsbFN0b3JhZ2VBY2Nlc3NF bnRyaWVzKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoVmVjdG9yPFN0cmluZz4mJiBkb21haW5zKT4m JiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBmb3IgKGF1dG8mIHByb2Nlc3NQb29sIDogcHJv Y2Vzc1Bvb2xzKCkpCi0gICAgICAgIHByb2Nlc3NQb29sLT5uZXR3b3JrUHJvY2VzcygpLT5nZXRB bGxTdG9yYWdlQWNjZXNzRW50cmllcyhtX3Nlc3Npb25JRCwgV1RGTW92ZShjYWxsYmFjaykpOwor ICAgICAgICBwcm9jZXNzUG9vbC0+bmV0d29ya1Byb2Nlc3MoKS0+Z2V0QWxsU3RvcmFnZUFjY2Vz c0VudHJpZXMobV9zZXNzaW9uSUQsIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKIH0KIAot dm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpncmFudFN0b3JhZ2VBY2Nlc3NIYW5kbGVyKGNvbnN0IFN0 cmluZyYgcmVzb3VyY2VEb21haW4sIGNvbnN0IFN0cmluZyYgZmlyc3RQYXJ0eURvbWFpbiwgc3Rk OjpvcHRpb25hbDx1aW50NjRfdD4gZnJhbWVJRCwgdWludDY0X3QgcGFnZUlELCBXVEY6OkNvbXBs ZXRpb25IYW5kbGVyPHZvaWQoYm9vbCB3YXNHcmFudGVkKT4mJiBjYWxsYmFjaykKK3ZvaWQgV2Vi c2l0ZURhdGFTdG9yZTo6Z3JhbnRTdG9yYWdlQWNjZXNzSGFuZGxlcihjb25zdCBTdHJpbmcmIHJl c291cmNlRG9tYWluLCBjb25zdCBTdHJpbmcmIGZpcnN0UGFydHlEb21haW4sIHN0ZDo6b3B0aW9u YWw8dWludDY0X3Q+IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgQ29tcGxldGlvbkhhbmRsZXI8 dm9pZChib29sIHdhc0dyYW50ZWQpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewotICAgIGZvciAo YXV0byYgcHJvY2Vzc1Bvb2wgOiBwcm9jZXNzUG9vbHMoKSkKLSAgICAgICAgcHJvY2Vzc1Bvb2wt Pm5ldHdvcmtQcm9jZXNzKCktPmdyYW50U3RvcmFnZUFjY2VzcyhtX3Nlc3Npb25JRCwgcmVzb3Vy Y2VEb21haW4sIGZpcnN0UGFydHlEb21haW4sIGZyYW1lSUQsIHBhZ2VJRCwgV1RGTW92ZShjYWxs YmFjaykpOworICAgIGlmIChhdXRvIHdlYlBhZ2UgPSBXZWJQcm9jZXNzUHJveHk6OndlYlBhZ2Uo cGFnZUlEKSkgeworICAgICAgICBhdXRvJiBuZXR3b3JrUHJvY2VzcyA9IHdlYlBhZ2UtPnByb2Nl c3MoKS5wcm9jZXNzUG9vbCgpLmVuc3VyZU5ldHdvcmtQcm9jZXNzKCk7CisgICAgICAgIG5ldHdv cmtQcm9jZXNzLmdyYW50U3RvcmFnZUFjY2VzcyhtX3Nlc3Npb25JRCwgcmVzb3VyY2VEb21haW4s IGZpcnN0UGFydHlEb21haW4sIGZyYW1lSUQsIHBhZ2VJRCwgV1RGTW92ZShjb21wbGV0aW9uSGFu ZGxlcikpOworICAgIH0gZWxzZQorICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihmYWxzZSk7CiB9 CiAKIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVtb3ZlQWxsU3RvcmFnZUFjY2Vzc0hhbmRsZXIo KQpAQCAtMTI0OCwzNCArMTI1NCwzNCBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZVBy ZXZhbGVudERvbWFpbnMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnMpCiAgICAgICAgIHBy b2Nlc3NQb29sLT5zZW5kVG9OZXR3b3JraW5nUHJvY2VzcyhNZXNzYWdlczo6TmV0d29ya1Byb2Nl c3M6OlJlbW92ZVByZXZhbGVudERvbWFpbnMobV9zZXNzaW9uSUQsIGRvbWFpbnMpKTsKIH0KIAot dm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpoYXNTdG9yYWdlQWNjZXNzKFN0cmluZyYmIHN1YkZyYW1l SG9zdCwgU3RyaW5nJiYgdG9wRnJhbWVIb3N0LCB1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBw YWdlSUQsIFdURjo6Q29tcGxldGlvbkhhbmRsZXI8dm9pZCAoYm9vbCk+JiYgY2FsbGJhY2spCit2 b2lkIFdlYnNpdGVEYXRhU3RvcmU6Omhhc1N0b3JhZ2VBY2Nlc3MoU3RyaW5nJiYgc3ViRnJhbWVI b3N0LCBTdHJpbmcmJiB0b3BGcmFtZUhvc3QsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBh Z2VJRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcikK IHsKICAgICBpZiAoIXJlc291cmNlTG9hZFN0YXRpc3RpY3NFbmFibGVkKCkpIHsKLSAgICAgICAg Y2FsbGJhY2soZmFsc2UpOworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihmYWxzZSk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAgICAgCi0gICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5o YXNTdG9yYWdlQWNjZXNzKFdURk1vdmUoc3ViRnJhbWVIb3N0KSwgV1RGTW92ZSh0b3BGcmFtZUhv c3QpLCBmcmFtZUlELCBwYWdlSUQsIFdURk1vdmUoY2FsbGJhY2spKTsKKyAgICBtX3Jlc291cmNl TG9hZFN0YXRpc3RpY3MtPmhhc1N0b3JhZ2VBY2Nlc3MoV1RGTW92ZShzdWJGcmFtZUhvc3QpLCBX VEZNb3ZlKHRvcEZyYW1lSG9zdCksIGZyYW1lSUQsIHBhZ2VJRCwgV1RGTW92ZShjb21wbGV0aW9u SGFuZGxlcikpOwogfQogCi12b2lkIFdlYnNpdGVEYXRhU3RvcmU6OnJlcXVlc3RTdG9yYWdlQWNj ZXNzKFN0cmluZyYmIHN1YkZyYW1lSG9zdCwgU3RyaW5nJiYgdG9wRnJhbWVIb3N0LCB1aW50NjRf dCBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIGJvb2wgcHJvbXB0RW5hYmxlZCwgQ29tcGxldGlv bkhhbmRsZXI8dm9pZChTdG9yYWdlQWNjZXNzU3RhdHVzKT4mJiBjYWxsYmFjaykKK3ZvaWQgV2Vi c2l0ZURhdGFTdG9yZTo6cmVxdWVzdFN0b3JhZ2VBY2Nlc3MoU3RyaW5nJiYgc3ViRnJhbWVIb3N0 LCBTdHJpbmcmJiB0b3BGcmFtZUhvc3QsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJ RCwgYm9vbCBwcm9tcHRFbmFibGVkLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFN0b3JhZ2VBY2Nl c3NTdGF0dXMpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQogewogICAgIGlmICghcmVzb3VyY2VMb2Fk U3RhdGlzdGljc0VuYWJsZWQoKSkgewotICAgICAgICBjYWxsYmFjayhTdG9yYWdlQWNjZXNzU3Rh dHVzOjpDYW5ub3RSZXF1ZXN0QWNjZXNzKTsKKyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoU3Rv cmFnZUFjY2Vzc1N0YXR1czo6Q2Fubm90UmVxdWVzdEFjY2Vzcyk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAgICAgCi0gICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5yZXF1ZXN0U3RvcmFn ZUFjY2VzcyhXVEZNb3ZlKHN1YkZyYW1lSG9zdCksIFdURk1vdmUodG9wRnJhbWVIb3N0KSwgZnJh bWVJRCwgcGFnZUlELCBwcm9tcHRFbmFibGVkLCBXVEZNb3ZlKGNhbGxiYWNrKSk7CisgICAgbV9y ZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5yZXF1ZXN0U3RvcmFnZUFjY2VzcyhXVEZNb3ZlKHN1YkZy YW1lSG9zdCksIFdURk1vdmUodG9wRnJhbWVIb3N0KSwgZnJhbWVJRCwgcGFnZUlELCBwcm9tcHRF bmFibGVkLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9CiAKLXZvaWQgV2Vic2l0ZURh dGFTdG9yZTo6Z3JhbnRTdG9yYWdlQWNjZXNzKFN0cmluZyYmIHN1YkZyYW1lSG9zdCwgU3RyaW5n JiYgdG9wRnJhbWVIb3N0LCB1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIGJvb2wg dXNlcldhc1Byb21wdGVkLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGNhbGxiYWNr KQordm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpncmFudFN0b3JhZ2VBY2Nlc3MoU3RyaW5nJiYgc3Vi RnJhbWVIb3N0LCBTdHJpbmcmJiB0b3BGcmFtZUhvc3QsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2 NF90IHBhZ2VJRCwgYm9vbCB1c2VyV2FzUHJvbXB0ZWQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo Ym9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CiAgICAgaWYgKCFyZXNvdXJjZUxvYWRTdGF0 aXN0aWNzRW5hYmxlZCgpKSB7Ci0gICAgICAgIGNhbGxiYWNrKGZhbHNlKTsKKyAgICAgICAgY29t cGxldGlvbkhhbmRsZXIoZmFsc2UpOwogICAgICAgICByZXR1cm47CiAgICAgfQogICAgIAotICAg IG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+Z3JhbnRTdG9yYWdlQWNjZXNzKFdURk1vdmUoc3Vi RnJhbWVIb3N0KSwgV1RGTW92ZSh0b3BGcmFtZUhvc3QpLCBmcmFtZUlELCBwYWdlSUQsIHVzZXJX YXNQcm9tcHRlZCwgV1RGTW92ZShjYWxsYmFjaykpOworICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlz dGljcy0+Z3JhbnRTdG9yYWdlQWNjZXNzKFdURk1vdmUoc3ViRnJhbWVIb3N0KSwgV1RGTW92ZSh0 b3BGcmFtZUhvc3QpLCBmcmFtZUlELCBwYWdlSUQsIHVzZXJXYXNQcm9tcHRlZCwgV1RGTW92ZShj b21wbGV0aW9uSGFuZGxlcikpOwogfQogI2VuZGlmCiAK 343982 2018-06-29 17:28:35 -0700 2018-06-29 18:07:45 -0700 Patch for landing bug-187206-20180629172835.patch text/plain 8211 wilander U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGE1ZjEyNGRjMWJkNzM0ODY4 NzM4N2IxNTYwMTg4MzdiY2VmMzdlYzkuLmRmMjUxZWVmYjI3YmE3MjlhNjhlMzgwNTc4ZDJmZDY4 NGYzNWJhNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTgtMDYtMjkgIEpvaG4gV2ls YW5kZXIgIDx3aWxhbmRlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmVzb3VyY2UgTG9hZCBTdGF0 aXN0aWNzOiBNYWtlIG5ldHdvcmsgcHJvY2VzcyBjYWxscyBvbmx5IGZvciB0aGUgcHJvY2VzcyBw b29sIHRoYXQgdGhlIHBhZ2UgYmVsb25ncyB0bworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MjA2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80MTY1 OTE2MD4KKworICAgICAgICBSZXZpZXdlZCBieSBDaHJpcyBEdW1lei4KKworICAgICAgICBJbnN0 ZWFkIG9mIGl0ZXJhdGluZyBvdmVyIGFsbCBwcm9jZXNzIHBvb2xzLCB3ZSBzaG91bGQgcmVzb2x2 ZSB3aGljaAorICAgICAgICBwcm9jZXNzIHBvb2wgdGhlIHBhZ2UgYmVsb25ncyB0byBhbmQgY2Fs bCB0aGUgbmV0d29yayBwcm9jZXNzIG9ubHkgZm9yCisgICAgICAgIHRoYXQgcG9vbC4gVGhpcyBp cyBlc3BlY2lhbGx5IGltcG9ydGFudCBzaW5jZSB3ZSB1c2UgV1RGTW92ZSBmb3IgdGhlCisgICAg ICAgIGNvbXBsZXRpb24gaGFuZGxlcnMuCisKKyAgICAgICAgVGhpcyBwYXRjaCBhbHNvIHJlbmFt ZXMgImNhbGxiYWNrIiB0byAiY29tcGxldGlvbkhhbmRsZXIiIGZvcgorICAgICAgICB0aGUgZnVu Y3Rpb25zIHRvdWNoZWQuCisKKyAgICAgICAgQSBGSVhNRSBjb21tZW50IGlzIGFkZGVkIHRvIFdl YnNpdGVEYXRhU3RvcmU6OmdldEFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVzKCkKKyAgICAgICAgd2hl cmUgd2UgY3VycmVudGx5IGRvbid0IGhhdmUgYSBwYWdlIElEIHRvIGRvIHRoZSBsb29rdXAgd2l0 aC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6dXBkYXRlUHJldmFsZW50RG9t YWluc1RvUGFydGl0aW9uT3JCbG9ja0Nvb2tpZXMpOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRl RGF0YVN0b3JlOjpoYXNTdG9yYWdlQWNjZXNzRm9yRnJhbWVIYW5kbGVyKToKKyAgICAgICAgKFdl YktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6Z2V0QWxsU3RvcmFnZUFjY2Vzc0VudHJpZXMpOgorICAg ICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpncmFudFN0b3JhZ2VBY2Nlc3NIYW5kbGVy KToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6aGFzU3RvcmFnZUFjY2Vzcyk6 CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnJlcXVlc3RTdG9yYWdlQWNjZXNz KToKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURhdGFTdG9yZTo6Z3JhbnRTdG9yYWdlQWNjZXNz KToKKwogMjAxOC0wNi0yOSAgSm9obiBXaWxhbmRlciAgPHdpbGFuZGVyQGFwcGxlLmNvbT4KIAog ICAgICAgICBSZXNvdXJjZSBMb2FkIFN0YXRpc3RpY3M6IERvbid0IGNyZWF0ZSBhIFdlYlJlc291 cmNlTG9hZFN0YXRpc3RpY3NTdG9yZSBmb3IgZXBoZW1lcmFsIHNlc3Npb25zCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmNw cCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUu Y3BwCmluZGV4IDQwMThmYzcwODNjMjE1ZTEyNWNiYmQ4NDUwNjdkMzQ5YTdiNTAwMTEuLjc3Yzdi YjBjNDVjNzc1YjA5OTJmYjA5YmM1ZmI0ZWVkYTk0MjhhMmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuY3BwCkBA IC0xMjEyLDI2ICsxMjEyLDM5IEBAIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6dXBkYXRlUHJldmFs ZW50RG9tYWluc1RvUGFydGl0aW9uT3JCbG9ja0Nvb2tpZXMoY29uc3QgVmVjCiAKICAgICBmb3Ig KGF1dG8mIHByb2Nlc3NQb29sIDogcHJvY2Vzc1Bvb2xzKCkpIHsKICAgICAgICAgaWYgKGF1dG8q IHByb2Nlc3MgPSBwcm9jZXNzUG9vbC0+bmV0d29ya1Byb2Nlc3MoKSkKLSAgICAgICAgICAgIHBy b2Nlc3MtPnVwZGF0ZVByZXZhbGVudERvbWFpbnNUb1BhcnRpdGlvbk9yQmxvY2tDb29raWVzKG1f c2Vzc2lvbklELCBkb21haW5zVG9QYXJ0aXRpb24sIGRvbWFpbnNUb0Jsb2NrLCBkb21haW5zVG9O ZWl0aGVyUGFydGl0aW9uTm9yQmxvY2ssIHNob3VsZENsZWFyRmlyc3QsICBbY2FsbGJhY2tBZ2dy ZWdhdG9yID0gY2FsbGJhY2tBZ2dyZWdhdG9yLmNvcHlSZWYoKV0geyB9KTsKKyAgICAgICAgICAg IHByb2Nlc3MtPnVwZGF0ZVByZXZhbGVudERvbWFpbnNUb1BhcnRpdGlvbk9yQmxvY2tDb29raWVz KG1fc2Vzc2lvbklELCBkb21haW5zVG9QYXJ0aXRpb24sIGRvbWFpbnNUb0Jsb2NrLCBkb21haW5z VG9OZWl0aGVyUGFydGl0aW9uTm9yQmxvY2ssIHNob3VsZENsZWFyRmlyc3QsIFtjYWxsYmFja0Fn Z3JlZ2F0b3IgPSBjYWxsYmFja0FnZ3JlZ2F0b3IuY29weVJlZigpXSB7IH0pOwogICAgIH0KIH0K IAotdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpoYXNTdG9yYWdlQWNjZXNzRm9yRnJhbWVIYW5kbGVy KGNvbnN0IFN0cmluZyYgcmVzb3VyY2VEb21haW4sIGNvbnN0IFN0cmluZyYgZmlyc3RQYXJ0eURv bWFpbiwgdWludDY0X3QgZnJhbWVJRCwgdWludDY0X3QgcGFnZUlELCBXVEY6OkNvbXBsZXRpb25I YW5kbGVyPHZvaWQoYm9vbCBoYXNBY2Nlc3MpPiYmIGNhbGxiYWNrKQordm9pZCBXZWJzaXRlRGF0 YVN0b3JlOjpoYXNTdG9yYWdlQWNjZXNzRm9yRnJhbWVIYW5kbGVyKGNvbnN0IFN0cmluZyYgcmVz b3VyY2VEb21haW4sIGNvbnN0IFN0cmluZyYgZmlyc3RQYXJ0eURvbWFpbiwgdWludDY0X3QgZnJh bWVJRCwgdWludDY0X3QgcGFnZUlELCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wgaGFzQWNj ZXNzKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKLSAgICBmb3IgKGF1dG8mIHByb2Nlc3NQb29s IDogcHJvY2Vzc1Bvb2xzKCkpCi0gICAgICAgIHByb2Nlc3NQb29sLT5uZXR3b3JrUHJvY2Vzcygp LT5oYXNTdG9yYWdlQWNjZXNzRm9yRnJhbWUobV9zZXNzaW9uSUQsIHJlc291cmNlRG9tYWluLCBm aXJzdFBhcnR5RG9tYWluLCBmcmFtZUlELCBwYWdlSUQsIFdURk1vdmUoY2FsbGJhY2spKTsKKyAg ICBhdXRvKiB3ZWJQYWdlID0gV2ViUHJvY2Vzc1Byb3h5Ojp3ZWJQYWdlKHBhZ2VJRCk7CisgICAg aWYgKCF3ZWJQYWdlKSB7CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKGZhbHNlKTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKworICAgIGF1dG8mIG5ldHdvcmtQcm9jZXNzID0gd2ViUGFnZS0+ cHJvY2VzcygpLnByb2Nlc3NQb29sKCkuZW5zdXJlTmV0d29ya1Byb2Nlc3MoKTsKKyAgICBuZXR3 b3JrUHJvY2Vzcy5oYXNTdG9yYWdlQWNjZXNzRm9yRnJhbWUobV9zZXNzaW9uSUQsIHJlc291cmNl RG9tYWluLCBmaXJzdFBhcnR5RG9tYWluLCBmcmFtZUlELCBwYWdlSUQsIFdURk1vdmUoY29tcGxl dGlvbkhhbmRsZXIpKTsKIH0KIAotdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpnZXRBbGxTdG9yYWdl QWNjZXNzRW50cmllcyhDb21wbGV0aW9uSGFuZGxlcjx2b2lkKFZlY3RvcjxTdHJpbmc+JiYgZG9t YWlucyk+JiYgY2FsbGJhY2spCit2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmdldEFsbFN0b3JhZ2VB Y2Nlc3NFbnRyaWVzKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoVmVjdG9yPFN0cmluZz4mJiBkb21h aW5zKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKKyAgICAvLyBGSVhNRTogQWx0aG91Z2ggdGhp cyBpcyBvbmx5IHVzZWQgZm9yIHRlc3RpbmcsIGl0IHNob3VsZCBub3QgaXRlcmF0ZSBhbmQgV1RG TW92ZSB0aGUgY29tcGxldGlvbiBoYW5kbGVyLgogICAgIGZvciAoYXV0byYgcHJvY2Vzc1Bvb2wg OiBwcm9jZXNzUG9vbHMoKSkKLSAgICAgICAgcHJvY2Vzc1Bvb2wtPm5ldHdvcmtQcm9jZXNzKCkt PmdldEFsbFN0b3JhZ2VBY2Nlc3NFbnRyaWVzKG1fc2Vzc2lvbklELCBXVEZNb3ZlKGNhbGxiYWNr KSk7CisgICAgICAgIHByb2Nlc3NQb29sLT5uZXR3b3JrUHJvY2VzcygpLT5nZXRBbGxTdG9yYWdl QWNjZXNzRW50cmllcyhtX3Nlc3Npb25JRCwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwog fQogCi12b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmdyYW50U3RvcmFnZUFjY2Vzc0hhbmRsZXIoY29u c3QgU3RyaW5nJiByZXNvdXJjZURvbWFpbiwgY29uc3QgU3RyaW5nJiBmaXJzdFBhcnR5RG9tYWlu LCBzdGQ6Om9wdGlvbmFsPHVpbnQ2NF90PiBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIFdURjo6 Q29tcGxldGlvbkhhbmRsZXI8dm9pZChib29sIHdhc0dyYW50ZWQpPiYmIGNhbGxiYWNrKQordm9p ZCBXZWJzaXRlRGF0YVN0b3JlOjpncmFudFN0b3JhZ2VBY2Nlc3NIYW5kbGVyKGNvbnN0IFN0cmlu ZyYgcmVzb3VyY2VEb21haW4sIGNvbnN0IFN0cmluZyYgZmlyc3RQYXJ0eURvbWFpbiwgc3RkOjpv cHRpb25hbDx1aW50NjRfdD4gZnJhbWVJRCwgdWludDY0X3QgcGFnZUlELCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKGJvb2wgd2FzR3JhbnRlZCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7Ci0gICAg Zm9yIChhdXRvJiBwcm9jZXNzUG9vbCA6IHByb2Nlc3NQb29scygpKQotICAgICAgICBwcm9jZXNz UG9vbC0+bmV0d29ya1Byb2Nlc3MoKS0+Z3JhbnRTdG9yYWdlQWNjZXNzKG1fc2Vzc2lvbklELCBy ZXNvdXJjZURvbWFpbiwgZmlyc3RQYXJ0eURvbWFpbiwgZnJhbWVJRCwgcGFnZUlELCBXVEZNb3Zl KGNhbGxiYWNrKSk7CisgICAgYXV0byogd2ViUGFnZSA9IFdlYlByb2Nlc3NQcm94eTo6d2ViUGFn ZShwYWdlSUQpOworICAgIGlmICghd2ViUGFnZSkgeworICAgICAgICBjb21wbGV0aW9uSGFuZGxl cihmYWxzZSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBhdXRvJiBuZXR3b3JrUHJv Y2VzcyA9IHdlYlBhZ2UtPnByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLmVuc3VyZU5ldHdvcmtQcm9j ZXNzKCk7CisgICAgbmV0d29ya1Byb2Nlc3MuZ3JhbnRTdG9yYWdlQWNjZXNzKG1fc2Vzc2lvbklE LCByZXNvdXJjZURvbWFpbiwgZmlyc3RQYXJ0eURvbWFpbiwgZnJhbWVJRCwgcGFnZUlELCBXVEZN b3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CiB9CiAKIHZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVt b3ZlQWxsU3RvcmFnZUFjY2Vzc0hhbmRsZXIoKQpAQCAtMTI0OCwzNCArMTI2MSwzNCBAQCB2b2lk IFdlYnNpdGVEYXRhU3RvcmU6OnJlbW92ZVByZXZhbGVudERvbWFpbnMoY29uc3QgVmVjdG9yPFN0 cmluZz4mIGRvbWFpbnMpCiAgICAgICAgIHByb2Nlc3NQb29sLT5zZW5kVG9OZXR3b3JraW5nUHJv Y2VzcyhNZXNzYWdlczo6TmV0d29ya1Byb2Nlc3M6OlJlbW92ZVByZXZhbGVudERvbWFpbnMobV9z ZXNzaW9uSUQsIGRvbWFpbnMpKTsKIH0KIAotdm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpoYXNTdG9y YWdlQWNjZXNzKFN0cmluZyYmIHN1YkZyYW1lSG9zdCwgU3RyaW5nJiYgdG9wRnJhbWVIb3N0LCB1 aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIFdURjo6Q29tcGxldGlvbkhhbmRsZXI8 dm9pZCAoYm9vbCk+JiYgY2FsbGJhY2spCit2b2lkIFdlYnNpdGVEYXRhU3RvcmU6Omhhc1N0b3Jh Z2VBY2Nlc3MoU3RyaW5nJiYgc3ViRnJhbWVIb3N0LCBTdHJpbmcmJiB0b3BGcmFtZUhvc3QsIHVp bnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChi b29sKT4mJiBjb21wbGV0aW9uSGFuZGxlcikKIHsKICAgICBpZiAoIXJlc291cmNlTG9hZFN0YXRp c3RpY3NFbmFibGVkKCkpIHsKLSAgICAgICAgY2FsbGJhY2soZmFsc2UpOworICAgICAgICBjb21w bGV0aW9uSGFuZGxlcihmYWxzZSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgCi0gICAg bV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5oYXNTdG9yYWdlQWNjZXNzKFdURk1vdmUoc3ViRnJh bWVIb3N0KSwgV1RGTW92ZSh0b3BGcmFtZUhvc3QpLCBmcmFtZUlELCBwYWdlSUQsIFdURk1vdmUo Y2FsbGJhY2spKTsKKyAgICBtX3Jlc291cmNlTG9hZFN0YXRpc3RpY3MtPmhhc1N0b3JhZ2VBY2Nl c3MoV1RGTW92ZShzdWJGcmFtZUhvc3QpLCBXVEZNb3ZlKHRvcEZyYW1lSG9zdCksIGZyYW1lSUQs IHBhZ2VJRCwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogfQogCi12b2lkIFdlYnNpdGVE YXRhU3RvcmU6OnJlcXVlc3RTdG9yYWdlQWNjZXNzKFN0cmluZyYmIHN1YkZyYW1lSG9zdCwgU3Ry aW5nJiYgdG9wRnJhbWVIb3N0LCB1aW50NjRfdCBmcmFtZUlELCB1aW50NjRfdCBwYWdlSUQsIGJv b2wgcHJvbXB0RW5hYmxlZCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChTdG9yYWdlQWNjZXNzU3Rh dHVzKT4mJiBjYWxsYmFjaykKK3ZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6cmVxdWVzdFN0b3JhZ2VB Y2Nlc3MoU3RyaW5nJiYgc3ViRnJhbWVIb3N0LCBTdHJpbmcmJiB0b3BGcmFtZUhvc3QsIHVpbnQ2 NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgYm9vbCBwcm9tcHRFbmFibGVkLCBDb21wbGV0 aW9uSGFuZGxlcjx2b2lkKFN0b3JhZ2VBY2Nlc3NTdGF0dXMpPiYmIGNvbXBsZXRpb25IYW5kbGVy KQogewogICAgIGlmICghcmVzb3VyY2VMb2FkU3RhdGlzdGljc0VuYWJsZWQoKSkgewotICAgICAg ICBjYWxsYmFjayhTdG9yYWdlQWNjZXNzU3RhdHVzOjpDYW5ub3RSZXF1ZXN0QWNjZXNzKTsKKyAg ICAgICAgY29tcGxldGlvbkhhbmRsZXIoU3RvcmFnZUFjY2Vzc1N0YXR1czo6Q2Fubm90UmVxdWVz dEFjY2Vzcyk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAgICAgCi0gICAgbV9yZXNvdXJjZUxv YWRTdGF0aXN0aWNzLT5yZXF1ZXN0U3RvcmFnZUFjY2VzcyhXVEZNb3ZlKHN1YkZyYW1lSG9zdCks IFdURk1vdmUodG9wRnJhbWVIb3N0KSwgZnJhbWVJRCwgcGFnZUlELCBwcm9tcHRFbmFibGVkLCBX VEZNb3ZlKGNhbGxiYWNrKSk7CisgICAgbV9yZXNvdXJjZUxvYWRTdGF0aXN0aWNzLT5yZXF1ZXN0 U3RvcmFnZUFjY2VzcyhXVEZNb3ZlKHN1YkZyYW1lSG9zdCksIFdURk1vdmUodG9wRnJhbWVIb3N0 KSwgZnJhbWVJRCwgcGFnZUlELCBwcm9tcHRFbmFibGVkLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5k bGVyKSk7CiB9CiAKLXZvaWQgV2Vic2l0ZURhdGFTdG9yZTo6Z3JhbnRTdG9yYWdlQWNjZXNzKFN0 cmluZyYmIHN1YkZyYW1lSG9zdCwgU3RyaW5nJiYgdG9wRnJhbWVIb3N0LCB1aW50NjRfdCBmcmFt ZUlELCB1aW50NjRfdCBwYWdlSUQsIGJvb2wgdXNlcldhc1Byb21wdGVkLCBDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKGJvb2wpPiYmIGNhbGxiYWNrKQordm9pZCBXZWJzaXRlRGF0YVN0b3JlOjpncmFu dFN0b3JhZ2VBY2Nlc3MoU3RyaW5nJiYgc3ViRnJhbWVIb3N0LCBTdHJpbmcmJiB0b3BGcmFtZUhv c3QsIHVpbnQ2NF90IGZyYW1lSUQsIHVpbnQ2NF90IHBhZ2VJRCwgYm9vbCB1c2VyV2FzUHJvbXB0 ZWQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7 CiAgICAgaWYgKCFyZXNvdXJjZUxvYWRTdGF0aXN0aWNzRW5hYmxlZCgpKSB7Ci0gICAgICAgIGNh bGxiYWNrKGZhbHNlKTsKKyAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoZmFsc2UpOwogICAgICAg ICByZXR1cm47CiAgICAgfQogICAgIAotICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+Z3Jh bnRTdG9yYWdlQWNjZXNzKFdURk1vdmUoc3ViRnJhbWVIb3N0KSwgV1RGTW92ZSh0b3BGcmFtZUhv c3QpLCBmcmFtZUlELCBwYWdlSUQsIHVzZXJXYXNQcm9tcHRlZCwgV1RGTW92ZShjYWxsYmFjaykp OworICAgIG1fcmVzb3VyY2VMb2FkU3RhdGlzdGljcy0+Z3JhbnRTdG9yYWdlQWNjZXNzKFdURk1v dmUoc3ViRnJhbWVIb3N0KSwgV1RGTW92ZSh0b3BGcmFtZUhvc3QpLCBmcmFtZUlELCBwYWdlSUQs IHVzZXJXYXNQcm9tcHRlZCwgV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcikpOwogfQogI2VuZGlm CiAK