195602 2019-03-11 21:12:30 -0700 Move IDB storage in private browsing mode to NetworkProcess 2019-03-15 11:33:39 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen beidson cdumez commit-queue sihui_liu tsavell webkit-bug-importer oldest_to_newest 1515251 0 youennf 2019-03-11 21:12:30 -0700 Move IDB storage in private browsing mode to NetworkProcess 1515258 1 364347 youennf 2019-03-11 21:15:47 -0700 Created attachment 364347 Patch 1515543 2 364417 youennf 2019-03-12 11:32:42 -0700 Created attachment 364417 Patch 1516624 3 364681 youennf 2019-03-14 13:46:19 -0700 Created attachment 364681 Rebasing 1516651 4 364681 achristensen 2019-03-14 14:36:59 -0700 Comment on attachment 364681 Rebasing View in context: https://bugs.webkit.org/attachment.cgi?id=364681&action=review Is it really this simple? > Source/WebKit/WebProcess/Databases/WebDatabaseProvider.cpp:-73 > - auto result = m_idbEphemeralConnectionMap.add(sessionID.sessionID(), nullptr); m_idbEphemeralConnectionMap is now unused. 1516660 5 beidson 2019-03-14 14:46:41 -0700 (In reply to Alex Christensen from comment #4) > Comment on attachment 364681 [details] > Rebasing > > View in context: > https://bugs.webkit.org/attachment.cgi?id=364681&action=review > > Is it really this simple? Yup. There's two IDBServers - In-process and remote. There's two IDBBackingStores - SQLite and in-memory All we had to do was change the mix and match. 👍 1516676 6 364695 youennf 2019-03-14 15:08:52 -0700 Created attachment 364695 Removing unneeded member field 1516727 7 364695 commit-queue 2019-03-14 16:08:33 -0700 Comment on attachment 364695 Removing unneeded member field Clearing flags on attachment: 364695 Committed r242975: <https://trac.webkit.org/changeset/242975> 1516728 8 commit-queue 2019-03-14 16:08:34 -0700 All reviewed patches have been landed. Closing bug. 1516729 9 webkit-bug-importer 2019-03-14 16:09:20 -0700 <rdar://problem/48906494> 1516998 10 tsavell 2019-03-15 09:44:51 -0700 The changes in https://trac.webkit.org/changeset/242975/webkit appears to have broken: imported/w3c/IndexedDB-private-browsing/idbobjectstore_createIndex6-event_order.html History: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=imported%2Fw3c%2FIndexedDB-private-browsing%2Fidbobjectstore_createIndex6-event_order.html I was able to reproduce this locally using command: run-webkit-tests imported/w3c/IndexedDB-private-browsing/idbobjectstore_createIndex6-event_order.html --iterations 500 -f The test fails often when run on 242975 and not at all on 242974. 1517034 11 youennf 2019-03-15 11:33:39 -0700 (In reply to Truitt Savell from comment #10) > The changes in https://trac.webkit.org/changeset/242975/webkit > > appears to have broken: > imported/w3c/IndexedDB-private-browsing/idbobjectstore_createIndex6- > event_order.html > > History: > https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard. > html#showAllRuns=true&tests=imported%2Fw3c%2FIndexedDB-private- > browsing%2Fidbobjectstore_createIndex6-event_order.html > > I was able to reproduce this locally using command: > run-webkit-tests > imported/w3c/IndexedDB-private-browsing/idbobjectstore_createIndex6- > event_order.html --iterations 500 -f > > The test fails often when run on 242975 and not at all on 242974. Looking at the dashboard, the corresponding non private browsing is also flaky with the same kind of failure. Given we updated private IDB to be closer to regular IDB, it might be that an existing flakiness is now also happening with private IDB. 364347 2019-03-11 21:15:47 -0700 2019-03-12 11:32:40 -0700 Patch bug-195602-20190311211546.patch text/plain 6897 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNzA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI3YjIwY2QxNWZmOGUyYTQ5 ZGE3M2Q0MjUwYzlmNjQxODY5YTJmMDEuLjViYWNjM2YzYmFkN2Y5ODA3ODEwZmJkYjRlOTkwZjk0 YjNlYzAyMTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDMtMTEgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgSURCIHN0b3JhZ2UgaW4g cHJpdmF0ZSBicm93c2luZyBtb2RlIHRvIE5ldHdvcmtQcm9jZXNzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU2MDIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIElEQiB0 ZXN0cyBhbmQgYWRkZWQgQVBJIHRlc3QuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpjcmVhdGVJ REJTZXJ2ZXIpOgorICAgICAgICBNYWtlIHN1cmUgdGhhdCBwYXRoIGlzIGVtcHR5IGZvciBwcml2 YXRlIHNlc3Npb25zLgorICAgICAgICBUaGlzIHdpbGwgbWFrZSBJREIgdXNlIGEgbWVtb3J5IGJh Y2tpbmcgc3RvcmUuCisgICAgICAgICogV2ViUHJvY2Vzcy9EYXRhYmFzZXMvV2ViRGF0YWJhc2VQ cm92aWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFiYXNlUHJvdmlkZXI6OmlkYkNv bm5lY3Rpb25Ub1NlcnZlckZvclNlc3Npb24pOgorICAgICAgICBVc2UgTmV0d29ya1Byb2Nlc3Mg SURCIHNlcnZlciBpbnN0ZWFkIG9mIEluUHJvY2Vzc0lEQlNlcnZlci4KKwogMjAxOS0wMy0xMSAg WW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgQ2hlY2sgSURCIHF1 b3RhIHVzYWdlIHRocm91Z2ggUXVvdGFNYW5hZ2VyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCmluZGV4IDdiMjFlY2EwZWM1ODNiZTE2MTk4MjZi MmRlM2MwNzVlYjFmYzdmN2UuLmFjMjE5ZGVmZDRiNTg3OGE1YzBkNGE3NGQ4MGZiODgwYTk0NmU1 ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nl c3MuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3Mu Y3BwCkBAIC0yMDI0LDEwICsyMDI0LDEyIEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OmRpZFN5bmNB bGxDb29raWVzKCkKICNpZiBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKIFJlZjxJREJTZXJ2ZXI6 OklEQlNlcnZlcj4gTmV0d29ya1Byb2Nlc3M6OmNyZWF0ZUlEQlNlcnZlcihQQUw6OlNlc3Npb25J RCBzZXNzaW9uSUQpCiB7Ci0gICAgYXV0byBwYXRoID0gbV9pZGJEYXRhYmFzZVBhdGhzLmdldChz ZXNzaW9uSUQpOwotICAgIC8vIFRoZXJlIHNob3VsZCBhbHJlYWR5IGJlIGEgcmVnaXN0ZXJlZCBw YXRoIGZvciB0aGlzIFBBTDo6U2Vzc2lvbklELgotICAgIC8vIElmIHRoZXJlJ3Mgbm90LCB0aGVu IHdoZXJlIGRpZCB0aGlzIFBBTDo6U2Vzc2lvbklEIGNvbWUgZnJvbT8KLSAgICBBU1NFUlQoIXBh dGguaXNFbXB0eSgpKTsKKyAgICBTdHJpbmcgcGF0aDsKKworICAgIGlmICghc2Vzc2lvbklELmlz RXBoZW1lcmFsKCkpIHsKKyAgICAgICAgQVNTRVJUKG1faWRiRGF0YWJhc2VQYXRocy5jb250YWlu cyhzZXNzaW9uSUQpKTsKKyAgICAgICAgcGF0aCA9IG1faWRiRGF0YWJhc2VQYXRocy5nZXQoc2Vz c2lvbklEKTsKKyAgICB9CiAKICAgICBhdXRvIHNlcnZlciA9IElEQlNlcnZlcjo6SURCU2VydmVy OjpjcmVhdGUoc2Vzc2lvbklELCBwYXRoLCAqdGhpcywgW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdl YWtQdHIodGhpcyldKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCwgY29uc3QgYXV0byYgb3JpZ2lu KSAtPiBTdG9yYWdlUXVvdGFNYW5hZ2VyKiB7CiAgICAgICAgIGlmICghd2Vha1RoaXMpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvRGF0YWJhc2VzL1dlYkRhdGFiYXNlUHJv dmlkZXIuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0RhdGFiYXNlcy9XZWJEYXRhYmFz ZVByb3ZpZGVyLmNwcAppbmRleCAxYzlkZTY1ZTQ0Mjk4MmVjZmZlN2MxOTc5MzYwOTQ0YTI4OTNk NmUyLi4xNzI4ZGNkYWJmNzhmZjhlYWVlNjUwYzRjM2FjNDc4ODAwZWMwMWVjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvRGF0YWJhc2VzL1dlYkRhdGFiYXNlUHJvdmlkZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9EYXRhYmFzZXMvV2ViRGF0YWJhc2VQ cm92aWRlci5jcHAKQEAgLTY5LDE0ICs2OSw2IEBAIFdlYkRhdGFiYXNlUHJvdmlkZXI6On5XZWJE YXRhYmFzZVByb3ZpZGVyKCkKICNpZiBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKIFdlYkNvcmU6 OklEQkNsaWVudDo6SURCQ29ubmVjdGlvblRvU2VydmVyJiBXZWJEYXRhYmFzZVByb3ZpZGVyOjpp ZGJDb25uZWN0aW9uVG9TZXJ2ZXJGb3JTZXNzaW9uKGNvbnN0IFBBTDo6U2Vzc2lvbklEJiBzZXNz aW9uSUQpCiB7Ci0gICAgaWYgKHNlc3Npb25JRC5pc0VwaGVtZXJhbCgpKSB7Ci0gICAgICAgIGF1 dG8gcmVzdWx0ID0gbV9pZGJFcGhlbWVyYWxDb25uZWN0aW9uTWFwLmFkZChzZXNzaW9uSUQuc2Vz c2lvbklEKCksIG51bGxwdHIpOwotICAgICAgICBpZiAocmVzdWx0LmlzTmV3RW50cnkpCi0gICAg ICAgICAgICByZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gV2ViQ29yZTo6SW5Qcm9jZXNzSURCU2Vy dmVyOjpjcmVhdGUoc2Vzc2lvbklEKTsKLQotICAgICAgICByZXR1cm4gcmVzdWx0Lml0ZXJhdG9y LT52YWx1ZS0+Y29ubmVjdGlvblRvU2VydmVyKCk7Ci0gICAgfQotCiAgICAgcmV0dXJuIFdlYlBy b2Nlc3M6OnNpbmdsZXRvbigpLmVuc3VyZU5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbigpLmlkYkNv bm5lY3Rpb25Ub1NlcnZlckZvclNlc3Npb24oc2Vzc2lvbklEKS5jb3JlQ29ubmVjdGlvblRvU2Vy dmVyKCk7CiB9CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCBjZDYzODhlMTk4NDcxNDZhNmNhYWVkMzMyN2U5NmVmOWE1ZGE4MDljLi4y ZTBkNTkyNWU1NmUyNTVjNzhkNTUxNjAwZmYxNWI2Mzc3ZGU1NDZlIDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTkt MDMtMTEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUg SURCIHN0b3JhZ2UgaW4gcHJpdmF0ZSBicm93c2luZyBtb2RlIHRvIE5ldHdvcmtQcm9jZXNzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU2MDIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvSW5kZXhlZERCUGVyc2lzdGVuY2UubW06CisgICAgICAg IChURVNUKToKKwogMjAxOS0wMy0xMSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+ CiAKICAgICAgICAgQWxsb3cgc3RvcmFnZSBxdW90YSBpbmNyZWFzZSBieSBkZWZhdWx0IGluIFdU UgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9JbmRl eGVkREJQZXJzaXN0ZW5jZS5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvSW5kZXhlZERCUGVyc2lzdGVuY2UubW0KaW5kZXggOTA1OGE4NDUxMjAyNTIzMjk0MzdkY2Rk OTg3YTA3OTkxNzc3MThhZS4uZjQ4ODBhMThkZDkyM2JiMTZmMDExMDcyNTk0YmY3M2FiOWJkYmFh NCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9JbmRl eGVkREJQZXJzaXN0ZW5jZS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL0luZGV4ZWREQlBlcnNpc3RlbmNlLm1tCkBAIC0zMSw2ICszMSw3IEBACiAjaW1wb3J0 IDxXZWJLaXQvV0tQcm9jZXNzUG9vbFByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9XS1VzZXJD b250ZW50Q29udHJvbGxlclByaXZhdGUuaD4KICNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXdDb25m aWd1cmF0aW9uUHJpdmF0ZS5oPgorI2ltcG9ydCA8V2ViS2l0L1dLV2ViVmlld1ByaXZhdGUuaD4K ICNpbXBvcnQgPFdlYktpdC9fV0tQcm9jZXNzUG9vbENvbmZpZ3VyYXRpb24uaD4KICNpbXBvcnQg PFdlYktpdC9fV0tVc2VyU3R5bGVTaGVldC5oPgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgpA QCAtOTIsNiArOTMsNTAgQEAgVEVTVChJbmRleGVkREIsIEluZGV4ZWREQlBlcnNpc3RlbmNlKQog ICAgIEVYUEVDVF9XS19TVFJFUShAIjIgVGVzdE9iamVjdFN0b3JlIiwgc3RyaW5nMy5nZXQoKSk7 CiB9CiAKK1RFU1QoSW5kZXhlZERCLCBJbmRleGVkREJQZXJzaXN0ZW5jZVByaXZhdGUpCit7Cisg ICAgUmV0YWluUHRyPEluZGV4ZWREQk1lc3NhZ2VIYW5kbGVyPiBoYW5kbGVyID0gYWRvcHROUyhb W0luZGV4ZWREQk1lc3NhZ2VIYW5kbGVyIGFsbG9jXSBpbml0XSk7CisgICAgUmV0YWluUHRyPFdL V2ViVmlld0NvbmZpZ3VyYXRpb24+IGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtbV0tXZWJWaWV3 Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFtbY29uZmlndXJhdGlvbiB1c2VyQ29u dGVudENvbnRyb2xsZXJdIGFkZFNjcmlwdE1lc3NhZ2VIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgbmFt ZTpAInRlc3RIYW5kbGVyIl07CisKKyAgICBhdXRvIGVwaGVtZXJhbFN0b3JlID0gW1dLV2Vic2l0 ZURhdGFTdG9yZSBub25QZXJzaXN0ZW50RGF0YVN0b3JlXTsKKyAgICBjb25maWd1cmF0aW9uLmdl dCgpLndlYnNpdGVEYXRhU3RvcmUgPSBlcGhlbWVyYWxTdG9yZTsKKworICAgIGF1dG8gd2ViVmll dyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgw LCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7CisKKyAg ICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltb TlNCdW5kbGUgbWFpbkJ1bmRsZV0gVVJMRm9yUmVzb3VyY2U6QCJJbmRleGVkREJQZXJzaXN0ZW5j ZS0xIiB3aXRoRXh0ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5y ZXNvdXJjZXMiXV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBU ZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkU2NyaXB0TWVzc2FnZSk7CisgICAgcmVj ZWl2ZWRTY3JpcHRNZXNzYWdlID0gZmFsc2U7CisgICAgUmV0YWluUHRyPE5TU3RyaW5nPiBzdHJp bmcxID0gKE5TU3RyaW5nICopW2xhc3RTY3JpcHRNZXNzYWdlIGJvZHldOworCisgICAgVGVzdFdl YktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZFNjcmlwdE1lc3NhZ2UpOworICAgIHJlY2VpdmVk U2NyaXB0TWVzc2FnZSA9IGZhbHNlOworICAgIFJldGFpblB0cjxOU1N0cmluZz4gc3RyaW5nMiA9 IChOU1N0cmluZyAqKVtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XTsKKworICAgIGF1dG8gd2ViVmll d1BpZDEgPSBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworICAgIC8vIERpdGNoIHRo aXMgd2ViIHZpZXcgKGRpdGNoaW5nIGl0cyB3ZWIgcHJvY2VzcykKKyAgICB3ZWJWaWV3ID0gbmls OworCisgICAgLy8gTWFrZSBhIG5ldyB3ZWIgdmlldyB0byBmaW5pc2ggdGhlIHRlc3QKKyAgICB3 ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VS ZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsK KworICAgIHJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltbTlNCdW5kbGUg bWFpbkJ1bmRsZV0gVVJMRm9yUmVzb3VyY2U6QCJJbmRleGVkREJQZXJzaXN0ZW5jZS0yIiB3aXRo RXh0ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMi XV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0 QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkU2NyaXB0TWVzc2FnZSk7CisgICAgcmVjZWl2ZWRTY3Jp cHRNZXNzYWdlID0gZmFsc2U7CisgICAgUmV0YWluUHRyPE5TU3RyaW5nPiBzdHJpbmczID0gKE5T U3RyaW5nICopW2xhc3RTY3JpcHRNZXNzYWdlIGJvZHldOworCisgICAgYXV0byB3ZWJWaWV3UGlk MiA9IFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisgICAgRVhQRUNUX05FKHdlYlZp ZXdQaWQxLCB3ZWJWaWV3UGlkMik7CisKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJVcGdyYWRlTmVl ZGVkIiwgc3RyaW5nMS5nZXQoKSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAiU3VjY2VzcyIsIHN0 cmluZzIuZ2V0KCkpOworICAgIEVYUEVDVF9XS19TVFJFUShAIjIgVGVzdE9iamVjdFN0b3JlIiwg c3RyaW5nMy5nZXQoKSk7Cit9CisKIFRFU1QoSW5kZXhlZERCLCBJbmRleGVkREJEYXRhUmVtb3Zh bCkKIHsKICAgICBhdXRvIHdlYnNpdGVEYXRhVHlwZXMgPSBhZG9wdE5TKFtbTlNTZXQgYWxsb2Nd IGluaXRXaXRoQXJyYXk6QFtXS1dlYnNpdGVEYXRhVHlwZUluZGV4ZWREQkRhdGFiYXNlc11dKTsK 364417 2019-03-12 11:32:42 -0700 2019-03-14 13:46:18 -0700 Patch bug-195602-20190312113238.patch text/plain 7007 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyNzk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDUzYzNhNjY3YzQ2OGQxMTFm NzVkMzBiMDQyNzQyNzZhYTJlYjAzZGUuLjU3YTVkZTYzMTI1YWNlODUxNjQ2NDIzODcwNDlkZGRl OGFkMGRiNmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDMtMTIgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgSURCIHN0b3JhZ2UgaW4g cHJpdmF0ZSBicm93c2luZyBtb2RlIHRvIE5ldHdvcmtQcm9jZXNzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU2MDIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIElEQiB0 ZXN0cyBhbmQgYWRkZWQgQVBJIHRlc3QuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpjcmVhdGVJ REJTZXJ2ZXIpOgorICAgICAgICBNYWtlIHN1cmUgdGhhdCBwYXRoIGlzIGVtcHR5IGZvciBwcml2 YXRlIHNlc3Npb25zLgorICAgICAgICBUaGlzIHdpbGwgbWFrZSBJREIgdXNlIGEgbWVtb3J5IGJh Y2tpbmcgc3RvcmUuCisgICAgICAgICogV2ViUHJvY2Vzcy9EYXRhYmFzZXMvV2ViRGF0YWJhc2VQ cm92aWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFiYXNlUHJvdmlkZXI6OmlkYkNv bm5lY3Rpb25Ub1NlcnZlckZvclNlc3Npb24pOgorICAgICAgICBVc2UgTmV0d29ya1Byb2Nlc3Mg SURCIHNlcnZlciBpbnN0ZWFkIG9mIEluUHJvY2Vzc0lEQlNlcnZlci4KKwogMjAxOS0wMy0xMiAg WmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtDb250ZW50Q2hhbmdl T2JzZXJ2ZXJdIFN0b3AgY29udGVudCBjaGFuZ2Ugb2JzZXJ2YXRpb24gd2hlbiB0aGUgdG91Y2gg ZXZlbnQgdHVybnMgaW50byBsb25nIHByZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3BwCmluZGV4IGQxM2RmY2E4ZTZlZDA2ZmQ5ZTVmZjIzMDhh MTE4OTNkNzZkNDNhYmQuLjRmMGEwZTM0ZjQ5NmRiZWE1Y2RlMDE2NDFmODI3ZjMzZTA1NGQyNzMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3Mu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuY3Bw CkBAIC0yMDQyLDEyICsyMDQyLDEzIEBAIElEQlNlcnZlcjo6SURCU2VydmVyJiBOZXR3b3JrUHJv Y2Vzczo6aWRiU2VydmVyKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkKICAgICAgICAgQVNTRVJU KGFkZFJlc3VsdC5pdGVyYXRvci0+dmFsdWUpOwogICAgICAgICByZXR1cm4gKmFkZFJlc3VsdC5p dGVyYXRvci0+dmFsdWU7CiAgICAgfQotICAgIAotICAgIGF1dG8gcGF0aCA9IG1faWRiRGF0YWJh c2VQYXRocy5nZXQoc2Vzc2lvbklEKTsKLSAgICAvLyBUaGVyZSBzaG91bGQgYWxyZWFkeSBiZSBh IHJlZ2lzdGVyZWQgcGF0aCBmb3IgdGhpcyBQQUw6OlNlc3Npb25JRC4KLSAgICAvLyBJZiB0aGVy ZSdzIG5vdCwgdGhlbiB3aGVyZSBkaWQgdGhpcyBQQUw6OlNlc3Npb25JRCBjb21lIGZyb20/Ci0g ICAgQVNTRVJUKCFwYXRoLmlzRW1wdHkoKSk7Ci0gICAgCisKKyAgICBTdHJpbmcgcGF0aDsKKyAg ICBpZiAoIXNlc3Npb25JRC5pc0VwaGVtZXJhbCgpKSB7CisgICAgICAgIEFTU0VSVChtX2lkYkRh dGFiYXNlUGF0aHMuY29udGFpbnMoc2Vzc2lvbklEKSk7CisgICAgICAgIHBhdGggPSBtX2lkYkRh dGFiYXNlUGF0aHMuZ2V0KHNlc3Npb25JRCk7CisgICAgfQorCiAgICAgYWRkUmVzdWx0Lml0ZXJh dG9yLT52YWx1ZSA9IElEQlNlcnZlcjo6SURCU2VydmVyOjpjcmVhdGUocGF0aCwgKnRoaXMsIFt0 aGlzXShib29sIGlzSG9sZGluZ0xvY2tlZEZpbGVzKSB7CiAgICAgICAgIG5vdGlmeUhvbGRpbmdM b2NrZWRGaWxlcyhpc0hvbGRpbmdMb2NrZWRGaWxlcyk7CiAgICAgfSk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvRGF0YWJhc2VzL1dlYkRhdGFiYXNlUHJvdmlkZXIuY3Bw IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0RhdGFiYXNlcy9XZWJEYXRhYmFzZVByb3ZpZGVy LmNwcAppbmRleCBiMDc5OGU5OWE4ZTc1MzY2OWMzYWQzMDQ5NjgzYjU5ZDM2YzMyM2QyLi4xNzI4 ZGNkYWJmNzhmZjhlYWVlNjUwYzRjM2FjNDc4ODAwZWMwMWVjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvRGF0YWJhc2VzL1dlYkRhdGFiYXNlUHJvdmlkZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9EYXRhYmFzZXMvV2ViRGF0YWJhc2VQcm92aWRlci5j cHAKQEAgLTY5LDE0ICs2OSw2IEBAIFdlYkRhdGFiYXNlUHJvdmlkZXI6On5XZWJEYXRhYmFzZVBy b3ZpZGVyKCkKICNpZiBFTkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKIFdlYkNvcmU6OklEQkNsaWVu dDo6SURCQ29ubmVjdGlvblRvU2VydmVyJiBXZWJEYXRhYmFzZVByb3ZpZGVyOjppZGJDb25uZWN0 aW9uVG9TZXJ2ZXJGb3JTZXNzaW9uKGNvbnN0IFBBTDo6U2Vzc2lvbklEJiBzZXNzaW9uSUQpCiB7 Ci0gICAgaWYgKHNlc3Npb25JRC5pc0VwaGVtZXJhbCgpKSB7Ci0gICAgICAgIGF1dG8gcmVzdWx0 ID0gbV9pZGJFcGhlbWVyYWxDb25uZWN0aW9uTWFwLmFkZChzZXNzaW9uSUQuc2Vzc2lvbklEKCks IG51bGxwdHIpOwotICAgICAgICBpZiAocmVzdWx0LmlzTmV3RW50cnkpCi0gICAgICAgICAgICBy ZXN1bHQuaXRlcmF0b3ItPnZhbHVlID0gV2ViQ29yZTo6SW5Qcm9jZXNzSURCU2VydmVyOjpjcmVh dGUoKTsKLQotICAgICAgICByZXR1cm4gcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZS0+Y29ubmVjdGlv blRvU2VydmVyKCk7Ci0gICAgfQotCiAgICAgcmV0dXJuIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigp LmVuc3VyZU5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbigpLmlkYkNvbm5lY3Rpb25Ub1NlcnZlckZv clNlc3Npb24oc2Vzc2lvbklEKS5jb3JlQ29ubmVjdGlvblRvU2VydmVyKCk7CiB9CiAjZW5kaWYK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBhZTMx N2EyZTRhZmIxODljNzMxMzdiMmM3MDBkY2RkYjk0ODBkZDEzLi5hZTYyMDAyMzFlZTA2NTMxYWU2 NTk5ODU1MmZjNWJkZjEwN2NhZGVlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTktMDMtMTIgIFlvdWVubiBGYWJs ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgSURCIHN0b3JhZ2UgaW4gcHJp dmF0ZSBicm93c2luZyBtb2RlIHRvIE5ldHdvcmtQcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU2MDIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvSW5kZXhlZERCUGVyc2lzdGVuY2UubW06CisgICAgICAgIChURVNUKToKKwogMjAxOS0w My0xMiAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5jb20+CiAKICAgICAg ICAgW1dQRV1bR1RLXSBMb2FkIGV2ZW50cyBtYXkgb2NjdXIgaW4gdW5leHBlY3RlZCBvcmRlciB3 aGVuIEpTIHJlZGlyZWN0cyBwYWdlIGJlZm9yZSBzdWJyZXNvdXJjZSBsb2FkIGZpbmlzaGVzCmRp ZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0luZGV4ZWRE QlBlcnNpc3RlbmNlLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9J bmRleGVkREJQZXJzaXN0ZW5jZS5tbQppbmRleCA5MDU4YTg0NTEyMDI1MjMyOTQzN2RjZGQ5ODdh MDc5OTE3NzcxOGFlLi5mNDg4MGExOGRkOTIzYmIxNmYwMTEwNzI1OTRiZjczYWI5YmRiYWE0IDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0luZGV4ZWRE QlBlcnNpc3RlbmNlLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvSW5kZXhlZERCUGVyc2lzdGVuY2UubW0KQEAgLTMxLDYgKzMxLDcgQEAKICNpbXBvcnQgPFdl YktpdC9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLVXNlckNvbnRl bnRDb250cm9sbGVyUHJpdmF0ZS5oPgogI2ltcG9ydCA8V2ViS2l0L1dLV2ViVmlld0NvbmZpZ3Vy YXRpb25Qcml2YXRlLmg+CisjaW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3UHJpdmF0ZS5oPgogI2lt cG9ydCA8V2ViS2l0L19XS1Byb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5oPgogI2ltcG9ydCA8V2Vi S2l0L19XS1VzZXJTdHlsZVNoZWV0Lmg+CiAjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CkBAIC05 Miw2ICs5Myw1MCBAQCBURVNUKEluZGV4ZWREQiwgSW5kZXhlZERCUGVyc2lzdGVuY2UpCiAgICAg RVhQRUNUX1dLX1NUUkVRKEAiMiBUZXN0T2JqZWN0U3RvcmUiLCBzdHJpbmczLmdldCgpKTsKIH0K IAorVEVTVChJbmRleGVkREIsIEluZGV4ZWREQlBlcnNpc3RlbmNlUHJpdmF0ZSkKK3sKKyAgICBS ZXRhaW5QdHI8SW5kZXhlZERCTWVzc2FnZUhhbmRsZXI+IGhhbmRsZXIgPSBhZG9wdE5TKFtbSW5k ZXhlZERCTWVzc2FnZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKKyAgICBSZXRhaW5QdHI8V0tXZWJW aWV3Q29uZmlndXJhdGlvbj4gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25m aWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CisgICAgW1tjb25maWd1cmF0aW9uIHVzZXJDb250ZW50 Q29udHJvbGxlcl0gYWRkU2NyaXB0TWVzc2FnZUhhbmRsZXI6aGFuZGxlci5nZXQoKSBuYW1lOkAi dGVzdEhhbmRsZXIiXTsKKworICAgIGF1dG8gZXBoZW1lcmFsU3RvcmUgPSBbV0tXZWJzaXRlRGF0 YVN0b3JlIG5vblBlcnNpc3RlbnREYXRhU3RvcmVdOworICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCku d2Vic2l0ZURhdGFTdG9yZSA9IGVwaGVtZXJhbFN0b3JlOworCisgICAgYXV0byB3ZWJWaWV3ID0g YWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAs IDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKworICAgIE5T VVJMUmVxdWVzdCAqcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W1tOU0J1 bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAIkluZGV4ZWREQlBlcnNpc3RlbmNlLTEi IHdpdGhFeHRlbnNpb246QCJodG1sIiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291 cmNlcyJdXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RX ZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRTY3JpcHRNZXNzYWdlKTsKKyAgICByZWNlaXZl ZFNjcmlwdE1lc3NhZ2UgPSBmYWxzZTsKKyAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IHN0cmluZzEg PSAoTlNTdHJpbmcgKilbbGFzdFNjcmlwdE1lc3NhZ2UgYm9keV07CisKKyAgICBUZXN0V2ViS2l0 QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkU2NyaXB0TWVzc2FnZSk7CisgICAgcmVjZWl2ZWRTY3Jp cHRNZXNzYWdlID0gZmFsc2U7CisgICAgUmV0YWluUHRyPE5TU3RyaW5nPiBzdHJpbmcyID0gKE5T U3RyaW5nICopW2xhc3RTY3JpcHRNZXNzYWdlIGJvZHldOworCisgICAgYXV0byB3ZWJWaWV3UGlk MSA9IFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisgICAgLy8gRGl0Y2ggdGhpcyB3 ZWIgdmlldyAoZGl0Y2hpbmcgaXRzIHdlYiBwcm9jZXNzKQorICAgIHdlYlZpZXcgPSBuaWw7CisK KyAgICAvLyBNYWtlIGEgbmV3IHdlYiB2aWV3IHRvIGZpbmlzaCB0aGUgdGVzdAorICAgIHdlYlZp ZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFrZVJlY3Qo MCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOworCisg ICAgcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W1tOU0J1bmRsZSBtYWlu QnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAIkluZGV4ZWREQlBlcnNpc3RlbmNlLTIiIHdpdGhFeHRl bnNpb246QCJodG1sIiBzdWJkaXJlY3Rvcnk6QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdXTsK KyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpyZXF1ZXN0XTsKKworICAgIFRlc3RXZWJLaXRBUEk6 OlV0aWw6OnJ1bigmcmVjZWl2ZWRTY3JpcHRNZXNzYWdlKTsKKyAgICByZWNlaXZlZFNjcmlwdE1l c3NhZ2UgPSBmYWxzZTsKKyAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IHN0cmluZzMgPSAoTlNTdHJp bmcgKilbbGFzdFNjcmlwdE1lc3NhZ2UgYm9keV07CisKKyAgICBhdXRvIHdlYlZpZXdQaWQyID0g W3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKyAgICBFWFBFQ1RfTkUod2ViVmlld1Bp ZDEsIHdlYlZpZXdQaWQyKTsKKworICAgIEVYUEVDVF9XS19TVFJFUShAIlVwZ3JhZGVOZWVkZWQi LCBzdHJpbmcxLmdldCgpKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCJTdWNjZXNzIiwgc3RyaW5n Mi5nZXQoKSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKEAiMiBUZXN0T2JqZWN0U3RvcmUiLCBzdHJp bmczLmdldCgpKTsKK30KKwogVEVTVChJbmRleGVkREIsIEluZGV4ZWREQkRhdGFSZW1vdmFsKQog ewogICAgIGF1dG8gd2Vic2l0ZURhdGFUeXBlcyA9IGFkb3B0TlMoW1tOU1NldCBhbGxvY10gaW5p dFdpdGhBcnJheTpAW1dLV2Vic2l0ZURhdGFUeXBlSW5kZXhlZERCRGF0YWJhc2VzXV0pOwo= 364681 2019-03-14 13:46:19 -0700 2019-03-14 15:08:51 -0700 Rebasing bug-195602-20190314134612.patch text/plain 6973 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyOTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM3YjI3MmMxNzk5N2MyODU3 NTI4ZTBkNThlYTZiOGYwYTMyYTM5NGMuLmE2MTI5MDg5ZTczMTg0MjgxZTE0ZjViMzY0N2MxZjEz Y2M5M2JkMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDMtMTQgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgSURCIHN0b3JhZ2UgaW4g cHJpdmF0ZSBicm93c2luZyBtb2RlIHRvIE5ldHdvcmtQcm9jZXNzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU2MDIKKworICAgICAgICBSZXZpZXdl ZCBieSBCcmFkeSBFaWRzb24uCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyBJREIgdGVz dHMgYW5kIGFkZGVkIEFQSSB0ZXN0LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Byb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6Y3JlYXRlSURC U2VydmVyKToKKyAgICAgICAgTWFrZSBzdXJlIHRoYXQgcGF0aCBpcyBlbXB0eSBmb3IgcHJpdmF0 ZSBzZXNzaW9ucy4KKyAgICAgICAgVGhpcyB3aWxsIG1ha2UgSURCIHVzZSBhIG1lbW9yeSBiYWNr aW5nIHN0b3JlLgorICAgICAgICAqIFdlYlByb2Nlc3MvRGF0YWJhc2VzL1dlYkRhdGFiYXNlUHJv dmlkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhYmFzZVByb3ZpZGVyOjppZGJDb25u ZWN0aW9uVG9TZXJ2ZXJGb3JTZXNzaW9uKToKKyAgICAgICAgVXNlIE5ldHdvcmtQcm9jZXNzIElE QiBzZXJ2ZXIgaW5zdGVhZCBvZiBJblByb2Nlc3NJREJTZXJ2ZXIuCisKIDIwMTktMDMtMTQgIFRp bW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04g KHIyNDI5MDgpOiBUZXN0V2ViS2l0QVBJLldlYktpdC5BZGRBbmRSZW1vdmVEYXRhRGV0ZWN0b3Jz IENyYXNoZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Byb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vz cy5jcHAKaW5kZXggMTc1OThlZjA1Yzc2NTJjN2I4NzE1ODFjZGQzNWYxM2Q4YWE3MzBlYy4uNDhm MGYzYjhkZjEzNzRkNDAwNTFhMGJmMGM0ODEyOWFlYzc0MDUyNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTIwNTIsMTAgKzIwNTIs MTEgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6ZGlkU3luY0FsbENvb2tpZXMoKQogI2lmIEVOQUJM RShJTkRFWEVEX0RBVEFCQVNFKQogUmVmPElEQlNlcnZlcjo6SURCU2VydmVyPiBOZXR3b3JrUHJv Y2Vzczo6Y3JlYXRlSURCU2VydmVyKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkKIHsKLSAgICBh dXRvIHBhdGggPSBtX2lkYkRhdGFiYXNlUGF0aHMuZ2V0KHNlc3Npb25JRCk7Ci0gICAgLy8gVGhl cmUgc2hvdWxkIGFscmVhZHkgYmUgYSByZWdpc3RlcmVkIHBhdGggZm9yIHRoaXMgUEFMOjpTZXNz aW9uSUQuCi0gICAgLy8gSWYgdGhlcmUncyBub3QsIHRoZW4gd2hlcmUgZGlkIHRoaXMgUEFMOjpT ZXNzaW9uSUQgY29tZSBmcm9tPwotICAgIEFTU0VSVCghcGF0aC5pc0VtcHR5KCkpOworICAgIFN0 cmluZyBwYXRoOworICAgIGlmICghc2Vzc2lvbklELmlzRXBoZW1lcmFsKCkpIHsKKyAgICAgICAg QVNTRVJUKG1faWRiRGF0YWJhc2VQYXRocy5jb250YWlucyhzZXNzaW9uSUQpKTsKKyAgICAgICAg cGF0aCA9IG1faWRiRGF0YWJhc2VQYXRocy5nZXQoc2Vzc2lvbklEKTsKKyAgICB9CiAKICAgICBh dXRvIHNlcnZlciA9IElEQlNlcnZlcjo6SURCU2VydmVyOjpjcmVhdGUoc2Vzc2lvbklELCBwYXRo LCAqdGhpcywgW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIodGhpcyldKFBBTDo6U2Vzc2lv bklEIHNlc3Npb25JRCwgY29uc3QgYXV0byYgb3JpZ2luKSAtPiBTdG9yYWdlUXVvdGFNYW5hZ2Vy KiB7CiAgICAgICAgIGlmICghd2Vha1RoaXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvRGF0YWJhc2VzL1dlYkRhdGFiYXNlUHJvdmlkZXIuY3BwIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL0RhdGFiYXNlcy9XZWJEYXRhYmFzZVByb3ZpZGVyLmNwcAppbmRleCAxYzlk ZTY1ZTQ0Mjk4MmVjZmZlN2MxOTc5MzYwOTQ0YTI4OTNkNmUyLi4xNzI4ZGNkYWJmNzhmZjhlYWVl NjUwYzRjM2FjNDc4ODAwZWMwMWVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvRGF0YWJhc2VzL1dlYkRhdGFiYXNlUHJvdmlkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9EYXRhYmFzZXMvV2ViRGF0YWJhc2VQcm92aWRlci5jcHAKQEAgLTY5LDE0ICs2 OSw2IEBAIFdlYkRhdGFiYXNlUHJvdmlkZXI6On5XZWJEYXRhYmFzZVByb3ZpZGVyKCkKICNpZiBF TkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKIFdlYkNvcmU6OklEQkNsaWVudDo6SURCQ29ubmVjdGlv blRvU2VydmVyJiBXZWJEYXRhYmFzZVByb3ZpZGVyOjppZGJDb25uZWN0aW9uVG9TZXJ2ZXJGb3JT ZXNzaW9uKGNvbnN0IFBBTDo6U2Vzc2lvbklEJiBzZXNzaW9uSUQpCiB7Ci0gICAgaWYgKHNlc3Np b25JRC5pc0VwaGVtZXJhbCgpKSB7Ci0gICAgICAgIGF1dG8gcmVzdWx0ID0gbV9pZGJFcGhlbWVy YWxDb25uZWN0aW9uTWFwLmFkZChzZXNzaW9uSUQuc2Vzc2lvbklEKCksIG51bGxwdHIpOwotICAg ICAgICBpZiAocmVzdWx0LmlzTmV3RW50cnkpCi0gICAgICAgICAgICByZXN1bHQuaXRlcmF0b3It PnZhbHVlID0gV2ViQ29yZTo6SW5Qcm9jZXNzSURCU2VydmVyOjpjcmVhdGUoc2Vzc2lvbklEKTsK LQotICAgICAgICByZXR1cm4gcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZS0+Y29ubmVjdGlvblRvU2Vy dmVyKCk7Ci0gICAgfQotCiAgICAgcmV0dXJuIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuc3Vy ZU5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbigpLmlkYkNvbm5lY3Rpb25Ub1NlcnZlckZvclNlc3Np b24oc2Vzc2lvbklEKS5jb3JlQ29ubmVjdGlvblRvU2VydmVyKCk7CiB9CiAjZW5kaWYKZGlmZiAt LWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiMWViZGUzODhl NTZhM2E5N2U5ZDI3MjVjNDY0OTdjN2I1ZWZlYjRiLi5hYzdkYzRkMzI3ZmViOWE0YzliNjQ5Mjgw NzVlNzQzYjQxY2YwY2M3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTktMDMtMTQgIFlvdWVubiBGYWJsZXQgIDx5 b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgSURCIHN0b3JhZ2UgaW4gcHJpdmF0ZSBi cm93c2luZyBtb2RlIHRvIE5ldHdvcmtQcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU2MDIKKworICAgICAgICBSZXZpZXdlZCBieSBCcmFk eSBFaWRzb24uCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0lu ZGV4ZWREQlBlcnNpc3RlbmNlLm1tOgorICAgICAgICAoVEVTVCk6CisKIDIwMTktMDMtMTQgIENo cmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbUFNPTl0gTWFrZSBzdXJl IHRoZSBXZWJQcm9jZXNzQ2FjaGUgaXMgbGV2ZXJhZ2Ugd2hlbiByZWxhdW5jaGluZyBhIHByb2Nl c3MgYWZ0ZXIgdGVybWluYXRpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvSW5kZXhlZERCUGVyc2lzdGVuY2UubW0gYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL0luZGV4ZWREQlBlcnNpc3RlbmNlLm1tCmluZGV4IDkwNThh ODQ1MTIwMjUyMzI5NDM3ZGNkZDk4N2EwNzk5MTc3NzE4YWUuLmY0ODgwYTE4ZGQ5MjNiYjE2ZjAx MTA3MjU5NGJmNzNhYjliZGJhYTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvSW5kZXhlZERCUGVyc2lzdGVuY2UubW0KKysrIGIvVG9vbHMvVGVzdFdl YktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9JbmRleGVkREJQZXJzaXN0ZW5jZS5tbQpAQCAtMzEs NiArMzEsNyBAQAogI2ltcG9ydCA8V2ViS2l0L1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmg+CiAjaW1w b3J0IDxXZWJLaXQvV0tVc2VyQ29udGVudENvbnRyb2xsZXJQcml2YXRlLmg+CiAjaW1wb3J0IDxX ZWJLaXQvV0tXZWJWaWV3Q29uZmlndXJhdGlvblByaXZhdGUuaD4KKyNpbXBvcnQgPFdlYktpdC9X S1dlYlZpZXdQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvX1dLUHJvY2Vzc1Bvb2xDb25maWd1 cmF0aW9uLmg+CiAjaW1wb3J0IDxXZWJLaXQvX1dLVXNlclN0eWxlU2hlZXQuaD4KICNpbXBvcnQg PHd0Zi9SZXRhaW5QdHIuaD4KQEAgLTkyLDYgKzkzLDUwIEBAIFRFU1QoSW5kZXhlZERCLCBJbmRl eGVkREJQZXJzaXN0ZW5jZSkKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCIyIFRlc3RPYmplY3RTdG9y ZSIsIHN0cmluZzMuZ2V0KCkpOwogfQogCitURVNUKEluZGV4ZWREQiwgSW5kZXhlZERCUGVyc2lz dGVuY2VQcml2YXRlKQoreworICAgIFJldGFpblB0cjxJbmRleGVkREJNZXNzYWdlSGFuZGxlcj4g aGFuZGxlciA9IGFkb3B0TlMoW1tJbmRleGVkREJNZXNzYWdlSGFuZGxlciBhbGxvY10gaW5pdF0p OworICAgIFJldGFpblB0cjxXS1dlYlZpZXdDb25maWd1cmF0aW9uPiBjb25maWd1cmF0aW9uID0g YWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbW2Nv bmZpZ3VyYXRpb24gdXNlckNvbnRlbnRDb250cm9sbGVyXSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxl cjpoYW5kbGVyLmdldCgpIG5hbWU6QCJ0ZXN0SGFuZGxlciJdOworCisgICAgYXV0byBlcGhlbWVy YWxTdG9yZSA9IFtXS1dlYnNpdGVEYXRhU3RvcmUgbm9uUGVyc2lzdGVudERhdGFTdG9yZV07Cisg ICAgY29uZmlndXJhdGlvbi5nZXQoKS53ZWJzaXRlRGF0YVN0b3JlID0gZXBoZW1lcmFsU3RvcmU7 CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0 aEZyYW1lOk5TTWFrZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJh dGlvbi5nZXQoKV0pOworCisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVz dCByZXF1ZXN0V2l0aFVSTDpbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAi SW5kZXhlZERCUGVyc2lzdGVuY2UtMSIgd2l0aEV4dGVuc2lvbjpAImh0bWwiIHN1YmRpcmVjdG9y eTpAIlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0 OnJlcXVlc3RdOworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZFNjcmlw dE1lc3NhZ2UpOworICAgIHJlY2VpdmVkU2NyaXB0TWVzc2FnZSA9IGZhbHNlOworICAgIFJldGFp blB0cjxOU1N0cmluZz4gc3RyaW5nMSA9IChOU1N0cmluZyAqKVtsYXN0U2NyaXB0TWVzc2FnZSBi b2R5XTsKKworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRTY3JpcHRNZXNz YWdlKTsKKyAgICByZWNlaXZlZFNjcmlwdE1lc3NhZ2UgPSBmYWxzZTsKKyAgICBSZXRhaW5QdHI8 TlNTdHJpbmc+IHN0cmluZzIgPSAoTlNTdHJpbmcgKilbbGFzdFNjcmlwdE1lc3NhZ2UgYm9keV07 CisKKyAgICBhdXRvIHdlYlZpZXdQaWQxID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVy XTsKKyAgICAvLyBEaXRjaCB0aGlzIHdlYiB2aWV3IChkaXRjaGluZyBpdHMgd2ViIHByb2Nlc3Mp CisgICAgd2ViVmlldyA9IG5pbDsKKworICAgIC8vIE1ha2UgYSBuZXcgd2ViIHZpZXcgdG8gZmlu aXNoIHRoZSB0ZXN0CisgICAgd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGlu aXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25m aWd1cmF0aW9uLmdldCgpXSk7CisKKyAgICByZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0 V2l0aFVSTDpbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAiSW5kZXhlZERC UGVyc2lzdGVuY2UtMiIgd2l0aEV4dGVuc2lvbjpAImh0bWwiIHN1YmRpcmVjdG9yeTpAIlRlc3RX ZWJLaXRBUEkucmVzb3VyY2VzIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3Rd OworCisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZFNjcmlwdE1lc3NhZ2Up OworICAgIHJlY2VpdmVkU2NyaXB0TWVzc2FnZSA9IGZhbHNlOworICAgIFJldGFpblB0cjxOU1N0 cmluZz4gc3RyaW5nMyA9IChOU1N0cmluZyAqKVtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XTsKKwor ICAgIGF1dG8gd2ViVmlld1BpZDIgPSBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOwor ICAgIEVYUEVDVF9ORSh3ZWJWaWV3UGlkMSwgd2ViVmlld1BpZDIpOworCisgICAgRVhQRUNUX1dL X1NUUkVRKEAiVXBncmFkZU5lZWRlZCIsIHN0cmluZzEuZ2V0KCkpOworICAgIEVYUEVDVF9XS19T VFJFUShAIlN1Y2Nlc3MiLCBzdHJpbmcyLmdldCgpKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCIy IFRlc3RPYmplY3RTdG9yZSIsIHN0cmluZzMuZ2V0KCkpOworfQorCiBURVNUKEluZGV4ZWREQiwg SW5kZXhlZERCRGF0YVJlbW92YWwpCiB7CiAgICAgYXV0byB3ZWJzaXRlRGF0YVR5cGVzID0gYWRv cHROUyhbW05TU2V0IGFsbG9jXSBpbml0V2l0aEFycmF5OkBbV0tXZWJzaXRlRGF0YVR5cGVJbmRl eGVkREJEYXRhYmFzZXNdXSk7Cg== 364695 2019-03-14 15:08:52 -0700 2019-03-14 16:08:33 -0700 Removing unneeded member field bug-195602-20190314150846.patch text/plain 7588 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjQyOTU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGM3YjI3MmMxNzk5N2MyODU3 NTI4ZTBkNThlYTZiOGYwYTMyYTM5NGMuLmE2MTI5MDg5ZTczMTg0MjgxZTE0ZjViMzY0N2MxZjEz Y2M5M2JkMTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTktMDMtMTQgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgSURCIHN0b3JhZ2UgaW4g cHJpdmF0ZSBicm93c2luZyBtb2RlIHRvIE5ldHdvcmtQcm9jZXNzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTU2MDIKKworICAgICAgICBSZXZpZXdl ZCBieSBCcmFkeSBFaWRzb24uCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyBJREIgdGVz dHMgYW5kIGFkZGVkIEFQSSB0ZXN0LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Byb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6Y3JlYXRlSURC U2VydmVyKToKKyAgICAgICAgTWFrZSBzdXJlIHRoYXQgcGF0aCBpcyBlbXB0eSBmb3IgcHJpdmF0 ZSBzZXNzaW9ucy4KKyAgICAgICAgVGhpcyB3aWxsIG1ha2UgSURCIHVzZSBhIG1lbW9yeSBiYWNr aW5nIHN0b3JlLgorICAgICAgICAqIFdlYlByb2Nlc3MvRGF0YWJhc2VzL1dlYkRhdGFiYXNlUHJv dmlkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhYmFzZVByb3ZpZGVyOjppZGJDb25u ZWN0aW9uVG9TZXJ2ZXJGb3JTZXNzaW9uKToKKyAgICAgICAgVXNlIE5ldHdvcmtQcm9jZXNzIElE QiBzZXJ2ZXIgaW5zdGVhZCBvZiBJblByb2Nlc3NJREJTZXJ2ZXIuCisKIDIwMTktMDMtMTQgIFRp bW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04g KHIyNDI5MDgpOiBUZXN0V2ViS2l0QVBJLldlYktpdC5BZGRBbmRSZW1vdmVEYXRhRGV0ZWN0b3Jz IENyYXNoZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Byb2Nlc3MuY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vz cy5jcHAKaW5kZXggMTc1OThlZjA1Yzc2NTJjN2I4NzE1ODFjZGQzNWYxM2Q4YWE3MzBlYy4uNDhm MGYzYjhkZjEzNzRkNDAwNTFhMGJmMGM0ODEyOWFlYzc0MDUyNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5jcHAKQEAgLTIwNTIsMTAgKzIwNTIs MTEgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6ZGlkU3luY0FsbENvb2tpZXMoKQogI2lmIEVOQUJM RShJTkRFWEVEX0RBVEFCQVNFKQogUmVmPElEQlNlcnZlcjo6SURCU2VydmVyPiBOZXR3b3JrUHJv Y2Vzczo6Y3JlYXRlSURCU2VydmVyKFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRCkKIHsKLSAgICBh dXRvIHBhdGggPSBtX2lkYkRhdGFiYXNlUGF0aHMuZ2V0KHNlc3Npb25JRCk7Ci0gICAgLy8gVGhl cmUgc2hvdWxkIGFscmVhZHkgYmUgYSByZWdpc3RlcmVkIHBhdGggZm9yIHRoaXMgUEFMOjpTZXNz aW9uSUQuCi0gICAgLy8gSWYgdGhlcmUncyBub3QsIHRoZW4gd2hlcmUgZGlkIHRoaXMgUEFMOjpT ZXNzaW9uSUQgY29tZSBmcm9tPwotICAgIEFTU0VSVCghcGF0aC5pc0VtcHR5KCkpOworICAgIFN0 cmluZyBwYXRoOworICAgIGlmICghc2Vzc2lvbklELmlzRXBoZW1lcmFsKCkpIHsKKyAgICAgICAg QVNTRVJUKG1faWRiRGF0YWJhc2VQYXRocy5jb250YWlucyhzZXNzaW9uSUQpKTsKKyAgICAgICAg cGF0aCA9IG1faWRiRGF0YWJhc2VQYXRocy5nZXQoc2Vzc2lvbklEKTsKKyAgICB9CiAKICAgICBh dXRvIHNlcnZlciA9IElEQlNlcnZlcjo6SURCU2VydmVyOjpjcmVhdGUoc2Vzc2lvbklELCBwYXRo LCAqdGhpcywgW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIodGhpcyldKFBBTDo6U2Vzc2lv bklEIHNlc3Npb25JRCwgY29uc3QgYXV0byYgb3JpZ2luKSAtPiBTdG9yYWdlUXVvdGFNYW5hZ2Vy KiB7CiAgICAgICAgIGlmICghd2Vha1RoaXMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvRGF0YWJhc2VzL1dlYkRhdGFiYXNlUHJvdmlkZXIuY3BwIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL0RhdGFiYXNlcy9XZWJEYXRhYmFzZVByb3ZpZGVyLmNwcAppbmRleCAxYzlk ZTY1ZTQ0Mjk4MmVjZmZlN2MxOTc5MzYwOTQ0YTI4OTNkNmUyLi4xNzI4ZGNkYWJmNzhmZjhlYWVl NjUwYzRjM2FjNDc4ODAwZWMwMWVjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvRGF0YWJhc2VzL1dlYkRhdGFiYXNlUHJvdmlkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9EYXRhYmFzZXMvV2ViRGF0YWJhc2VQcm92aWRlci5jcHAKQEAgLTY5LDE0ICs2 OSw2IEBAIFdlYkRhdGFiYXNlUHJvdmlkZXI6On5XZWJEYXRhYmFzZVByb3ZpZGVyKCkKICNpZiBF TkFCTEUoSU5ERVhFRF9EQVRBQkFTRSkKIFdlYkNvcmU6OklEQkNsaWVudDo6SURCQ29ubmVjdGlv blRvU2VydmVyJiBXZWJEYXRhYmFzZVByb3ZpZGVyOjppZGJDb25uZWN0aW9uVG9TZXJ2ZXJGb3JT ZXNzaW9uKGNvbnN0IFBBTDo6U2Vzc2lvbklEJiBzZXNzaW9uSUQpCiB7Ci0gICAgaWYgKHNlc3Np b25JRC5pc0VwaGVtZXJhbCgpKSB7Ci0gICAgICAgIGF1dG8gcmVzdWx0ID0gbV9pZGJFcGhlbWVy YWxDb25uZWN0aW9uTWFwLmFkZChzZXNzaW9uSUQuc2Vzc2lvbklEKCksIG51bGxwdHIpOwotICAg ICAgICBpZiAocmVzdWx0LmlzTmV3RW50cnkpCi0gICAgICAgICAgICByZXN1bHQuaXRlcmF0b3It PnZhbHVlID0gV2ViQ29yZTo6SW5Qcm9jZXNzSURCU2VydmVyOjpjcmVhdGUoc2Vzc2lvbklEKTsK LQotICAgICAgICByZXR1cm4gcmVzdWx0Lml0ZXJhdG9yLT52YWx1ZS0+Y29ubmVjdGlvblRvU2Vy dmVyKCk7Ci0gICAgfQotCiAgICAgcmV0dXJuIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuc3Vy ZU5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbigpLmlkYkNvbm5lY3Rpb25Ub1NlcnZlckZvclNlc3Np b24oc2Vzc2lvbklEKS5jb3JlQ29ubmVjdGlvblRvU2VydmVyKCk7CiB9CiAjZW5kaWYKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9EYXRhYmFzZXMvV2ViRGF0YWJhc2VQcm92 aWRlci5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0RhdGFiYXNlcy9XZWJEYXRhYmFzZVBy b3ZpZGVyLmgKaW5kZXggZjlkYWFmMTFhYzcwZDRjNTI3N2ZhZTVjOGM2NDI2MWQ4ODYzYTliYy4u ZDRlN2YxY2YwNDAyY2M5NzJhZWM2MWFiMTIwZGIwODM5NGIyNTBkZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0RhdGFiYXNlcy9XZWJEYXRhYmFzZVByb3ZpZGVyLmgKKysr IGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0RhdGFiYXNlcy9XZWJEYXRhYmFzZVByb3ZpZGVy LmgKQEAgLTQ0LDEwICs0NCw2IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgV2Vi RGF0YWJhc2VQcm92aWRlcih1aW50NjRfdCBpZGVudGlmaWVyKTsKIAotI2lmIEVOQUJMRShJTkRF WEVEX0RBVEFCQVNFKQotICAgIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxXZWJDb3JlOjpJblBy b2Nlc3NJREJTZXJ2ZXI+PiBtX2lkYkVwaGVtZXJhbENvbm5lY3Rpb25NYXA7Ci0jZW5kaWYKLQog ICAgIGNvbnN0IHVpbnQ2NF90IG1faWRlbnRpZmllcjsKIH07CiAKZGlmZiAtLWdpdCBhL1Rvb2xz L0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiMWViZGUzODhlNTZhM2E5N2U5ZDI3 MjVjNDY0OTdjN2I1ZWZlYjRiLi5hYzdkYzRkMzI3ZmViOWE0YzliNjQ5MjgwNzVlNzQzYjQxY2Yw Y2M3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTMgQEAKKzIwMTktMDMtMTQgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUu Y29tPgorCisgICAgICAgIE1vdmUgSURCIHN0b3JhZ2UgaW4gcHJpdmF0ZSBicm93c2luZyBtb2Rl IHRvIE5ldHdvcmtQcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTU2MDIKKworICAgICAgICBSZXZpZXdlZCBieSBCcmFkeSBFaWRzb24uCisK KyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0luZGV4ZWREQlBlcnNp c3RlbmNlLm1tOgorICAgICAgICAoVEVTVCk6CisKIDIwMTktMDMtMTQgIENocmlzIER1bWV6ICA8 Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBbUFNPTl0gTWFrZSBzdXJlIHRoZSBXZWJQcm9j ZXNzQ2FjaGUgaXMgbGV2ZXJhZ2Ugd2hlbiByZWxhdW5jaGluZyBhIHByb2Nlc3MgYWZ0ZXIgdGVy bWluYXRpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvSW5kZXhlZERCUGVyc2lzdGVuY2UubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL0luZGV4ZWREQlBlcnNpc3RlbmNlLm1tCmluZGV4IDkwNThhODQ1MTIwMjUyMzI5 NDM3ZGNkZDk4N2EwNzk5MTc3NzE4YWUuLmY0ODgwYTE4ZGQ5MjNiYjE2ZjAxMTA3MjU5NGJmNzNh YjliZGJhYTQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvSW5kZXhlZERCUGVyc2lzdGVuY2UubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXRDb2NvYS9JbmRleGVkREJQZXJzaXN0ZW5jZS5tbQpAQCAtMzEsNiArMzEsNyBAQAog I2ltcG9ydCA8V2ViS2l0L1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQv V0tVc2VyQ29udGVudENvbnRyb2xsZXJQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJW aWV3Q29uZmlndXJhdGlvblByaXZhdGUuaD4KKyNpbXBvcnQgPFdlYktpdC9XS1dlYlZpZXdQcml2 YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvX1dLUHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uLmg+CiAj aW1wb3J0IDxXZWJLaXQvX1dLVXNlclN0eWxlU2hlZXQuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5Q dHIuaD4KQEAgLTkyLDYgKzkzLDUwIEBAIFRFU1QoSW5kZXhlZERCLCBJbmRleGVkREJQZXJzaXN0 ZW5jZSkKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCIyIFRlc3RPYmplY3RTdG9yZSIsIHN0cmluZzMu Z2V0KCkpOwogfQogCitURVNUKEluZGV4ZWREQiwgSW5kZXhlZERCUGVyc2lzdGVuY2VQcml2YXRl KQoreworICAgIFJldGFpblB0cjxJbmRleGVkREJNZXNzYWdlSGFuZGxlcj4gaGFuZGxlciA9IGFk b3B0TlMoW1tJbmRleGVkREJNZXNzYWdlSGFuZGxlciBhbGxvY10gaW5pdF0pOworICAgIFJldGFp blB0cjxXS1dlYlZpZXdDb25maWd1cmF0aW9uPiBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dL V2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbW2NvbmZpZ3VyYXRpb24g dXNlckNvbnRlbnRDb250cm9sbGVyXSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjpoYW5kbGVyLmdl dCgpIG5hbWU6QCJ0ZXN0SGFuZGxlciJdOworCisgICAgYXV0byBlcGhlbWVyYWxTdG9yZSA9IFtX S1dlYnNpdGVEYXRhU3RvcmUgbm9uUGVyc2lzdGVudERhdGFTdG9yZV07CisgICAgY29uZmlndXJh dGlvbi5nZXQoKS53ZWJzaXRlRGF0YVN0b3JlID0gZXBoZW1lcmFsU3RvcmU7CisKKyAgICBhdXRv IHdlYlZpZXcgPSBhZG9wdE5TKFtbV0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZyYW1lOk5TTWFr ZVJlY3QoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0p OworCisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0 aFVSTDpbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAiSW5kZXhlZERCUGVy c2lzdGVuY2UtMSIgd2l0aEV4dGVuc2lvbjpAImh0bWwiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJL aXRBUEkucmVzb3VyY2VzIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOwor CisgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZFNjcmlwdE1lc3NhZ2UpOwor ICAgIHJlY2VpdmVkU2NyaXB0TWVzc2FnZSA9IGZhbHNlOworICAgIFJldGFpblB0cjxOU1N0cmlu Zz4gc3RyaW5nMSA9IChOU1N0cmluZyAqKVtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XTsKKworICAg IFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRTY3JpcHRNZXNzYWdlKTsKKyAgICBy ZWNlaXZlZFNjcmlwdE1lc3NhZ2UgPSBmYWxzZTsKKyAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IHN0 cmluZzIgPSAoTlNTdHJpbmcgKilbbGFzdFNjcmlwdE1lc3NhZ2UgYm9keV07CisKKyAgICBhdXRv IHdlYlZpZXdQaWQxID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKyAgICAvLyBE aXRjaCB0aGlzIHdlYiB2aWV3IChkaXRjaGluZyBpdHMgd2ViIHByb2Nlc3MpCisgICAgd2ViVmll dyA9IG5pbDsKKworICAgIC8vIE1ha2UgYSBuZXcgd2ViIHZpZXcgdG8gZmluaXNoIHRoZSB0ZXN0 CisgICAgd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6 TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdl dCgpXSk7CisKKyAgICByZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbW05T QnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAiSW5kZXhlZERCUGVyc2lzdGVuY2Ut MiIgd2l0aEV4dGVuc2lvbjpAImh0bWwiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVz b3VyY2VzIl1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OnJlcXVlc3RdOworCisgICAgVGVz dFdlYktpdEFQSTo6VXRpbDo6cnVuKCZyZWNlaXZlZFNjcmlwdE1lc3NhZ2UpOworICAgIHJlY2Vp dmVkU2NyaXB0TWVzc2FnZSA9IGZhbHNlOworICAgIFJldGFpblB0cjxOU1N0cmluZz4gc3RyaW5n MyA9IChOU1N0cmluZyAqKVtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XTsKKworICAgIGF1dG8gd2Vi Vmlld1BpZDIgPSBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworICAgIEVYUEVDVF9O RSh3ZWJWaWV3UGlkMSwgd2ViVmlld1BpZDIpOworCisgICAgRVhQRUNUX1dLX1NUUkVRKEAiVXBn cmFkZU5lZWRlZCIsIHN0cmluZzEuZ2V0KCkpOworICAgIEVYUEVDVF9XS19TVFJFUShAIlN1Y2Nl c3MiLCBzdHJpbmcyLmdldCgpKTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoQCIyIFRlc3RPYmplY3RT dG9yZSIsIHN0cmluZzMuZ2V0KCkpOworfQorCiBURVNUKEluZGV4ZWREQiwgSW5kZXhlZERCRGF0 YVJlbW92YWwpCiB7CiAgICAgYXV0byB3ZWJzaXRlRGF0YVR5cGVzID0gYWRvcHROUyhbW05TU2V0 IGFsbG9jXSBpbml0V2l0aEFycmF5OkBbV0tXZWJzaXRlRGF0YVR5cGVJbmRleGVkREJEYXRhYmFz ZXNdXSk7Cg==