95869 2012-09-05 10:38:08 -0700 [WK2] Make visited link tracking work in multi-process mode 2012-09-05 11:22:08 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap oldest_to_newest 712230 0 ap 2012-09-05 10:38:08 -0700 Patch forthcoming. 712240 1 162281 ap 2012-09-05 10:44:53 -0700 Created attachment 162281 proposed fix 712245 2 162281 mitz 2012-09-05 10:47:00 -0700 Comment on attachment 162281 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=162281&action=review > Source/WebKit2/UIProcess/VisitedLinkProvider.cpp:35 > +using namespace std; The guidelines now say that you shouldn’t do this: <http://www.webkit.org/coding/coding-style.html#using-in-cpp>. 712248 3 162281 mitz 2012-09-05 10:48:53 -0700 Comment on attachment 162281 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=162281&action=review > Source/WebKit2/ChangeLog:11 > + was making no sense in mult0process world, so it was let go. Typo: mult0process. 712352 4 ap 2012-09-05 11:22:08 -0700 Committed <http://trac.webkit.org/changeset/127614> with comments addressed, and an additional bug fix in WebContext::disconnectProcess - we were neglecting to call m_visitedLinkProvider.processDidClose(). 162281 2012-09-05 10:44:53 -0700 2012-09-05 11:15:18 -0700 proposed fix VisitedLink.txt text/plain 8809 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNzYwNykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA5LTA1ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIE1ha2UgdmlzaXRl ZCBsaW5rIHRyYWNraW5nIHdvcmsgaW4gbXVsdGktcHJvY2VzcyBtb2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NTg2OQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL1Zpc2l0ZWRMaW5r UHJvdmlkZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvVmlzaXRlZExpbmtQcm92aWRlci5jcHA6 CisgICAgICAgIChXZWJLaXQ6OlZpc2l0ZWRMaW5rUHJvdmlkZXI6OlZpc2l0ZWRMaW5rUHJvdmlk ZXIpOiBtX3dlYlByb2Nlc3NIYXNWaXNpdGVkTGlua1N0YXRlCisgICAgICAgIHdhcyBtYWtpbmcg bm8gc2Vuc2UgaW4gbXVsdDBwcm9jZXNzIHdvcmxkLCBzbyBpdCB3YXMgbGV0IGdvLgorICAgICAg ICAoV2ViS2l0OjpWaXNpdGVkTGlua1Byb3ZpZGVyOjpwcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5n KTogVHJhY2sgbmV3IHByb2Nlc3Nlcy4KKyAgICAgICAgKFdlYktpdDo6VmlzaXRlZExpbmtQcm92 aWRlcjo6cHJvY2Vzc0RpZENsb3NlKTogQ2xlYW4gdXAgcG9pbnRlcnMgdGhhdCBhcmUgZ29pbmcK KyAgICAgICAgdG8gYmVjb21lIHN0YWxlLgorICAgICAgICAoV2ViS2l0OjpWaXNpdGVkTGlua1By b3ZpZGVyOjpwZW5kaW5nVmlzaXRlZExpbmtzVGltZXJGaXJlZCk6IEFkZGVkIGNvbW1lbnRzLiBG aXhlZAorICAgICAgICBhIGJ1ZyB3aGVyZSB3ZSB3b3VsZCBjaHVybiB0YWJsZSBzaXplIGluIHNv bWUgY2FzZXMuIEFkZGVkIGRlYnVnIGxvZ2dpbmcgaW4gZmFpbHVyZQorICAgICAgICBjYXNlLiBS ZS1pbXBsZW1lbnRlZCBtZXNzYWdpbmcgY29kZSB0byB3b3JrIHdpdGggbXVsdGlwbGUgd2ViIHBy b2Nlc3Nlcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViQ29udGV4dDo6cHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZyk6IFBhc3MgcHJv Y2VzcyBwcm94eSBwb2ludGVyIHRvCisgICAgICAgIG1fdmlzaXRlZExpbmtQcm92aWRlciwgYXMg aXQgbm93IG5lZWRzIHRvIHRyYWNrIHByb2Nlc3Nlcy4KKyAgICAgICAgKFdlYktpdDo6V2ViQ29u dGV4dDo6ZGlzY29ubmVjdFByb2Nlc3MpOiBEaXR0by4KKwogMjAxMi0wOS0wNSAgQnJhZHkgRWlk c29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgRnJlcXVlbnQgY3Jhc2hlcyBpbiBQ bHVnaW5WaWV3OjpzY3JpcHRPYmplY3QgdW5kZXIgcnVudGltZU9iamVjdEN1c3RvbUdldE93blBy b3BlcnR5U2xvdApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Zpc2l0ZWRMaW5rUHJv dmlkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9WaXNpdGVk TGlua1Byb3ZpZGVyLmNwcAkocmV2aXNpb24gMTI3NDcxKQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1Zpc2l0ZWRMaW5rUHJvdmlkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICsz Miw3IEBACiAjaW5jbHVkZSAiV2ViUHJvY2Vzc01lc3NhZ2VzLmgiCiAKIHVzaW5nIG5hbWVzcGFj ZSBXZWJDb3JlOwordXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAK QEAgLTQwLDE2ICs0MSwxNSBAQCBzdGF0aWMgY29uc3QgaW50IFZpc2l0ZWRMaW5rVGFibGVNYXhM b2FkCiBWaXNpdGVkTGlua1Byb3ZpZGVyOjpWaXNpdGVkTGlua1Byb3ZpZGVyKFdlYkNvbnRleHQq IGNvbnRleHQpCiAgICAgOiBtX2NvbnRleHQoY29udGV4dCkKICAgICAsIG1fdmlzaXRlZExpbmtz UG9wdWxhdGVkKGZhbHNlKQotICAgICwgbV93ZWJQcm9jZXNzSGFzVmlzaXRlZExpbmtTdGF0ZShm YWxzZSkKICAgICAsIG1fa2V5Q291bnQoMCkKICAgICAsIG1fdGFibGVTaXplKDApCiAgICAgLCBt X3BlbmRpbmdWaXNpdGVkTGlua3NUaW1lcihSdW5Mb29wOjptYWluKCksIHRoaXMsICZWaXNpdGVk TGlua1Byb3ZpZGVyOjpwZW5kaW5nVmlzaXRlZExpbmtzVGltZXJGaXJlZCkKIHsKIH0KIAotdm9p ZCBWaXNpdGVkTGlua1Byb3ZpZGVyOjpwcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKCkKK3ZvaWQg VmlzaXRlZExpbmtQcm92aWRlcjo6cHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZyhXZWJQcm9jZXNz UHJveHkqIHByb2Nlc3MpCiB7Ci0gICAgbV93ZWJQcm9jZXNzSGFzVmlzaXRlZExpbmtTdGF0ZSA9 IGZhbHNlOworICAgIG1fcHJvY2Vzc2VzV2l0aG91dFZpc2l0ZWRMaW5rU3RhdGUuYWRkKHByb2Nl c3MpOwogCiAgICAgaWYgKG1fa2V5Q291bnQpCiAgICAgICAgIG1fcGVuZGluZ1Zpc2l0ZWRMaW5r c1RpbWVyLnN0YXJ0T25lU2hvdCgwKTsKQEAgLTcwLDkgKzcwLDEwIEBAIHZvaWQgVmlzaXRlZExp bmtQcm92aWRlcjo6YWRkVmlzaXRlZExpbmsKICAgICAgICAgbV9wZW5kaW5nVmlzaXRlZExpbmtz VGltZXIuc3RhcnRPbmVTaG90KDApOwogfQogCi12b2lkIFZpc2l0ZWRMaW5rUHJvdmlkZXI6OnBy b2Nlc3NEaWRDbG9zZSgpCit2b2lkIFZpc2l0ZWRMaW5rUHJvdmlkZXI6OnByb2Nlc3NEaWRDbG9z ZShXZWJQcm9jZXNzUHJveHkqIHByb2Nlc3MpCiB7Ci0gICAgbV9wZW5kaW5nVmlzaXRlZExpbmtz VGltZXIuc3RvcCgpOworICAgIG1fcHJvY2Vzc2VzV2l0aFZpc2l0ZWRMaW5rU3RhdGUucmVtb3Zl KHByb2Nlc3MpOworICAgIG1fcHJvY2Vzc2VzV2l0aG91dFZpc2l0ZWRMaW5rU3RhdGUucmVtb3Zl KHByb2Nlc3MpOwogfQogCiBzdGF0aWMgdW5zaWduZWQgbmV4dFBvd2VyT2YyKHVuc2lnbmVkIHYp CkBAIC0xMTEsMTggKzExMiwyNiBAQCB2b2lkIFZpc2l0ZWRMaW5rUHJvdmlkZXI6OnBlbmRpbmdW aXNpdGVkCiAgICAgbV9wZW5kaW5nVmlzaXRlZExpbmtzLmNsZWFyKCk7CiAKICAgICB1bnNpZ25l ZCBjdXJyZW50VGFibGVTaXplID0gbV90YWJsZVNpemU7CisKKyAgICAvLyBVcHBlciBib3VuZCBv biBuZWVkZWQgc2l6ZSAtIHNvbWUgb2YgdGhlIGxpbmtzIG1heSBiZSBkdXBsaWNhdGVzLCBpbiB3 aGljaCBjYXNlIHdlIGNvdWxkIGhhdmUgZG9uZSB3aXRoIGxlc3MuCiAgICAgdW5zaWduZWQgbmV3 VGFibGVTaXplID0gdGFibGVTaXplRm9yS2V5Q291bnQobV9rZXlDb3VudCArIHBlbmRpbmdWaXNp dGVkTGlua3Muc2l6ZSgpKTsKIAorICAgIC8vIE5ldmVyIGRlY3JlYXNlIHRhYmxlIHNpemUgd2hl biBhZGRpbmcgdG8gaXQsIHRvIGF2b2lkIHVubmVlZGVkIGNodXJuLgorICAgIG5ld1RhYmxlU2l6 ZSA9IG1heChjdXJyZW50VGFibGVTaXplLCBuZXdUYWJsZVNpemUpOworCiAgICAgLy8gTGlua3Mg dGhhdCB3ZXJlIGFkZGVkLgogICAgIFZlY3RvcjxXZWJDb3JlOjpMaW5rSGFzaD4gYWRkZWRWaXNp dGVkTGlua3M7CiAKKyAgICAvLyBWaXNpdGVkTGlua1RhYmxlIHJlbWFpbnMgaW50ZXJuYWxseSBj b25zaXN0ZW50IHdoZW4gYWRkaW5nLCBzbyBpdCdzIE9LIHRvIG1vZGlmeSBpdCBpbiBwbGFjZQor ICAgIC8vIGV2ZW4gaWYgYSB3ZWIgcHJvY2VzcyBpcyBhY2Nlc3NpbmcgaXQgYXQgdGhlIHNhbWUg dGltZS4KICAgICBpZiAoY3VycmVudFRhYmxlU2l6ZSAhPSBuZXdUYWJsZVNpemUpIHsKLSAgICAg ICAgLy8gQ3JlYXRlIGEgbmV3IHRhYmxlLgogICAgICAgICBSZWZQdHI8U2hhcmVkTWVtb3J5PiBu ZXdUYWJsZU1lbW9yeSA9IFNoYXJlZE1lbW9yeTo6Y3JlYXRlKG5ld1RhYmxlU2l6ZSAqIHNpemVv ZihMaW5rSGFzaCkpOwogCiAgICAgICAgIC8vIFdlIGZhaWxlZCB0byBjcmVhdGUgdGhlIHNoYXJl ZCBtZW1vcnkuCi0gICAgICAgIGlmICghbmV3VGFibGVNZW1vcnkpCisgICAgICAgIGlmICghbmV3 VGFibGVNZW1vcnkpIHsKKyAgICAgICAgICAgIExPR19FUlJPUigiQ291bGQgbm90IGFsbG9jYXRl IHNoYXJlZCBtZW1vcnkgZm9yIHZpc2l0ZWQgbGluayB0YWJsZSIpOwogICAgICAgICAgICAgcmV0 dXJuOworICAgICAgICB9CiAKICAgICAgICAgbWVtc2V0KG5ld1RhYmxlTWVtb3J5LT5kYXRhKCks IDAsIG5ld1RhYmxlTWVtb3J5LT5zaXplKCkpOwogCkBAIC0xNTYsMjcgKzE2NSwzNiBAQCB2b2lk IFZpc2l0ZWRMaW5rUHJvdmlkZXI6OnBlbmRpbmdWaXNpdGVkCiAKICAgICBtX2tleUNvdW50ICs9 IHBlbmRpbmdWaXNpdGVkTGlua3Muc2l6ZSgpOwogCi0gICAgaWYgKCFtX3dlYlByb2Nlc3NIYXNW aXNpdGVkTGlua1N0YXRlIHx8IGN1cnJlbnRUYWJsZVNpemUgIT0gbmV3VGFibGVTaXplKSB7Ci0g ICAgICAgIC8vIFNlbmQgdGhlIG5ldyB2aXNpdGVkIGxpbmsgdGFibGUuCi0gICAgICAgIAorCisg ICAgZm9yIChIYXNoU2V0PFdlYlByb2Nlc3NQcm94eSo+OjppdGVyYXRvciBpdGVyID0gbV9wcm9j ZXNzZXNXaXRoVmlzaXRlZExpbmtTdGF0ZS5iZWdpbigpOyBpdGVyICE9IG1fcHJvY2Vzc2VzV2l0 aFZpc2l0ZWRMaW5rU3RhdGUuZW5kKCk7ICsraXRlcikgeworICAgICAgICBXZWJQcm9jZXNzUHJv eHkqIHByb2Nlc3MgPSAqaXRlcjsKKyAgICAgICAgaWYgKGN1cnJlbnRUYWJsZVNpemUgIT0gbmV3 VGFibGVTaXplKSB7CisgICAgICAgICAgICAvLyBJbiB0aGUgcmFyZSBjYXNlIG9mIG5lZWRpbmcg dG8gcmVzaXplIHRoZSB0YWJsZSwgd2UnbGwgYnlwYXNzIHRoZSBWaXNpdGVkTGlua1N0YXRlQ2hh bmdlZCBvcHRpbWl6YXRpb24sCisgICAgICAgICAgICAvLyBhbmQgdW5jb25kaXRpb25hbGx5IHVz ZSBBbGxWaXNpdGVkTGlua1N0YXRlQ2hhbmdlZCBmb3IgdGhlIHByb2Nlc3MuCisgICAgICAgICAg ICBtX3Byb2Nlc3Nlc1dpdGhvdXRWaXNpdGVkTGlua1N0YXRlLmFkZChwcm9jZXNzKTsKKyAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisKKyAgICAgICAgaWYgKGFkZGVkVmlzaXRlZExp bmtzLnNpemUoKSA8PSAyMCkKKyAgICAgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6Oldl YlByb2Nlc3M6OlZpc2l0ZWRMaW5rU3RhdGVDaGFuZ2VkKGFkZGVkVmlzaXRlZExpbmtzKSwgMCk7 CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBy b2Nlc3M6OkFsbFZpc2l0ZWRMaW5rU3RhdGVDaGFuZ2VkKCksIDApOworICAgIH0KKworICAgIGZv ciAoSGFzaFNldDxXZWJQcm9jZXNzUHJveHkqPjo6aXRlcmF0b3IgaXRlciA9IG1fcHJvY2Vzc2Vz V2l0aG91dFZpc2l0ZWRMaW5rU3RhdGUuYmVnaW4oKTsgaXRlciAhPSBtX3Byb2Nlc3Nlc1dpdGhv dXRWaXNpdGVkTGlua1N0YXRlLmVuZCgpOyArK2l0ZXIpIHsKKyAgICAgICAgV2ViUHJvY2Vzc1By b3h5KiBwcm9jZXNzID0gKml0ZXI7CisKICAgICAgICAgU2hhcmVkTWVtb3J5OjpIYW5kbGUgaGFu ZGxlOwogICAgICAgICBpZiAoIW1fdGFibGUuc2hhcmVkTWVtb3J5KCktPmNyZWF0ZUhhbmRsZSho YW5kbGUsIFNoYXJlZE1lbW9yeTo6UmVhZE9ubHkpKQogICAgICAgICAgICAgcmV0dXJuOwogCi0g ICAgICAgIC8vIEZJWE1FIChNdWx0aS1XZWJQcm9jZXNzKTogRW5jb2RpbmcgYSBoYW5kbGUgd2ls bCBudWxsIGl0IG91dCBzbyB3ZSBuZWVkIHRvIGNyZWF0ZSBhIG5ldwotICAgICAgICAvLyBoYW5k bGUgZm9yIGV2ZXJ5IHByb2Nlc3MuIE1heWJlIHRoZSBBcmd1bWVudEVuY29kZXIgc2hvdWxkIGhh bmRsZSB0aGlzLgotICAgICAgICBtX2NvbnRleHQtPnNlbmRUb0FsbFByb2Nlc3NlcyhNZXNzYWdl czo6V2ViUHJvY2Vzczo6U2V0VmlzaXRlZExpbmtUYWJsZShoYW5kbGUpKTsKLSAgICB9Ci0gICAg Ci0gICAgLy8gV2Ugbm93IG5lZWQgdG8gbGV0IHRoZSB3ZWIgcHJvY2VzcyBrbm93IHRoYXQgd2Un dmUgYWRkZWQgbGlua3MuCi0gICAgaWYgKG1fd2ViUHJvY2Vzc0hhc1Zpc2l0ZWRMaW5rU3RhdGUg JiYgYWRkZWRWaXNpdGVkTGlua3Muc2l6ZSgpIDw9IDIwKSB7Ci0gICAgICAgIG1fY29udGV4dC0+ c2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjpWaXNpdGVkTGlua1N0YXRl Q2hhbmdlZChhZGRlZFZpc2l0ZWRMaW5rcykpOwotICAgICAgICByZXR1cm47CisgICAgICAgIHBy b2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlNldFZpc2l0ZWRMaW5rVGFibGUoaGFu ZGxlKSwgMCk7CisgICAgICAgIHByb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlByb2Nlc3M6OkFs bFZpc2l0ZWRMaW5rU3RhdGVDaGFuZ2VkKCksIDApOworCisgICAgICAgIG1fcHJvY2Vzc2VzV2l0 aFZpc2l0ZWRMaW5rU3RhdGUuYWRkKHByb2Nlc3MpOwogICAgIH0KICAgICAKLSAgICAvLyBKdXN0 IHJlY2FsY3VsYXRlIGFsbCB0aGUgdmlzaXRlZCBsaW5rcy4KLSAgICBtX2NvbnRleHQtPnNlbmRU b0FsbFByb2Nlc3NlcyhNZXNzYWdlczo6V2ViUHJvY2Vzczo6QWxsVmlzaXRlZExpbmtTdGF0ZUNo YW5nZWQoKSk7Ci0gICAgbV93ZWJQcm9jZXNzSGFzVmlzaXRlZExpbmtTdGF0ZSA9IHRydWU7Cisg ICAgbV9wcm9jZXNzZXNXaXRob3V0VmlzaXRlZExpbmtTdGF0ZS5jbGVhcigpOwogfQogCiB9IC8v IG5hbWVzcGFjZSBXZWJLaXQKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9WaXNpdGVk TGlua1Byb3ZpZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1Zp c2l0ZWRMaW5rUHJvdmlkZXIuaAkocmV2aXNpb24gMTI3NDcxKQorKysgU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1Zpc2l0ZWRMaW5rUHJvdmlkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzUsNiAr MzUsNyBAQAogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIFdlYkNvbnRleHQ7CitjbGFzcyBX ZWJQcm9jZXNzUHJveHk7CiAgICAgCiBjbGFzcyBWaXNpdGVkTGlua1Byb3ZpZGVyIHsKICAgICBX VEZfTUFLRV9OT05DT1BZQUJMRShWaXNpdGVkTGlua1Byb3ZpZGVyKTsKQEAgLTQzLDE1ICs0NCwx NiBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGFkZFZpc2l0ZWRMaW5rKFdlYkNvcmU6OkxpbmtIYXNo KTsKIAotICAgIHZvaWQgcHJvY2Vzc0RpZEZpbmlzaExhdW5jaGluZygpOwotICAgIHZvaWQgcHJv Y2Vzc0RpZENsb3NlKCk7CisgICAgdm9pZCBwcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKFdlYlBy b2Nlc3NQcm94eSopOworICAgIHZvaWQgcHJvY2Vzc0RpZENsb3NlKFdlYlByb2Nlc3NQcm94eSop OwogCiBwcml2YXRlOgogICAgIHZvaWQgcGVuZGluZ1Zpc2l0ZWRMaW5rc1RpbWVyRmlyZWQoKTsK IAogICAgIFdlYkNvbnRleHQqIG1fY29udGV4dDsKICAgICBib29sIG1fdmlzaXRlZExpbmtzUG9w dWxhdGVkOwotICAgIGJvb2wgbV93ZWJQcm9jZXNzSGFzVmlzaXRlZExpbmtTdGF0ZTsKKyAgICBI YXNoU2V0PFdlYlByb2Nlc3NQcm94eSo+IG1fcHJvY2Vzc2VzV2l0aFZpc2l0ZWRMaW5rU3RhdGU7 CisgICAgSGFzaFNldDxXZWJQcm9jZXNzUHJveHkqPiBtX3Byb2Nlc3Nlc1dpdGhvdXRWaXNpdGVk TGlua1N0YXRlOwogCiAgICAgdW5zaWduZWQgbV9rZXlDb3VudDsKICAgICB1bnNpZ25lZCBtX3Rh YmxlU2l6ZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAJKHJl dmlzaW9uIDEyNzQ3MSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNw cAkod29ya2luZyBjb3B5KQpAQCAtNDIxLDcgKzQyMSw3IEBAIHZvaWQgV2ViQ29udGV4dDo6cHJv Y2Vzc0RpZEZpbmlzaExhdW5jaGkKIHsKICAgICBBU1NFUlQobV9wcm9jZXNzZXMuY29udGFpbnMo cHJvY2VzcykpOwogCi0gICAgbV92aXNpdGVkTGlua1Byb3ZpZGVyLnByb2Nlc3NEaWRGaW5pc2hM YXVuY2hpbmcoKTsKKyAgICBtX3Zpc2l0ZWRMaW5rUHJvdmlkZXIucHJvY2Vzc0RpZEZpbmlzaExh dW5jaGluZyhwcm9jZXNzKTsKIAogICAgIC8vIFNvbWV0aW1lcyB0aGUgbWVtb3J5U2FtcGxlciBn ZXRzIGluaXRpYWxpemVkIGFmdGVyIHByb2Nlc3MgaW5pdGlhbGl6YXRpb24gaGFzIGhhcHBlbmVk IGJ1dCBiZWZvcmUgdGhlIHByb2Nlc3MgaGFzIGZpbmlzaGVkIGxhdW5jaGluZwogICAgIC8vIHNv IGNoZWNrIGlmIGl0IG5lZWRzIHRvIGJlIHN0YXJ0ZWQgaGVyZQpAQCAtNDQ5LDcgKzQ0OSw3IEBA IHZvaWQgV2ViQ29udGV4dDo6ZGlzY29ubmVjdFByb2Nlc3MoV2ViUHIKICAgICAgICAgcmV0dXJu OwogICAgIH0KIAotICAgIG1fdmlzaXRlZExpbmtQcm92aWRlci5wcm9jZXNzRGlkQ2xvc2UoKTsK KyAgICBtX3Zpc2l0ZWRMaW5rUHJvdmlkZXIucHJvY2Vzc0RpZENsb3NlKHByb2Nlc3MpOwogCiAg ICAgLy8gSW52YWxpZGF0ZSBhbGwgb3V0c3RhbmRpbmcgZG93bmxvYWRzLgogICAgIGZvciAoSGFz aE1hcDx1aW50NjRfdCwgUmVmUHRyPERvd25sb2FkUHJveHk+ID46Oml0ZXJhdG9yOjpWYWx1ZXMg aXQgPSBtX2Rvd25sb2Fkcy5iZWdpbigpLnZhbHVlcygpLCBlbmQgPSBtX2Rvd25sb2Fkcy5lbmQo KS52YWx1ZXMoKTsgaXQgIT0gZW5kOyArK2l0KSB7Cg==