133374 2014-05-29 03:55:01 -0700 Pass C++11 lambdas to callOnMainThread() calls in IconDatabase 2014-06-07 06:11:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan commit-queue japhet oldest_to_newest 1012391 0 zan 2014-05-29 03:55:01 -0700 Pass C++11 lambdas to callOnMainThread() calls in IconDatabase 1012392 1 232240 zan 2014-05-29 04:03:25 -0700 Created attachment 232240 Patch 1012766 2 232240 darin 2014-05-31 15:31:17 -0700 Comment on attachment 232240 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=232240&action=review > Source/WebCore/loader/icon/IconDatabase.cpp:2160 > + ImportedIconURLForPageURLWorkItem* itemPtr = new ImportedIconURLForPageURLWorkItem(m_client, pageURL); Does this allocation need to be done in the icon sync thread? Can it be done on the main thread instead? > Source/WebCore/loader/icon/IconDatabase.cpp:2171 > + ImportedIconDataForPageURLWorkItem* itemPtr = new ImportedIconDataForPageURLWorkItem(m_client, pageURL); Does this allocation need to be done in the icon sync thread? Can it be done on the main thread instead? > Source/WebCore/loader/icon/IconDatabase.cpp:2182 > + RemovedAllIconsWorkItem* itemPtr = new RemovedAllIconsWorkItem(m_client); Does this allocation need to be done in the icon sync thread? Can it be done on the main thread instead? > Source/WebCore/loader/icon/IconDatabase.cpp:2193 > + FinishedURLImport* itemPtr = new FinishedURLImport(m_client); Does this allocation need to be done in the icon sync thread? Can it be done on the main thread instead? 1013477 3 232530 zan 2014-06-05 01:39:47 -0700 Created attachment 232530 Patch 1013478 4 zan 2014-06-05 01:48:48 -0700 (In reply to comment #2) > (From update of attachment 232240 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=232240&action=review > > > Source/WebCore/loader/icon/IconDatabase.cpp:2160 > > + ImportedIconURLForPageURLWorkItem* itemPtr = new ImportedIconURLForPageURLWorkItem(m_client, pageURL); > > Does this allocation need to be done in the icon sync thread? Can it be done on the main thread instead? I went on and removed all of these classes as they were just calling a specific method on the IconDatabaseClient in their performWork() override. Requesting a re-review because of that. 1013948 5 232530 zan 2014-06-07 06:10:55 -0700 Comment on attachment 232530 Patch Clearing flags on attachment: 232530 Committed r169674: <http://trac.webkit.org/changeset/169674> 1013949 6 zan 2014-06-07 06:11:02 -0700 All reviewed patches have been landed. Closing bug. 232240 2014-05-29 04:03:25 -0700 2014-06-05 01:39:41 -0700 Patch bug-133374-20140529040259.patch text/plain 6440 zan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2OTQ0NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE0LTA1LTI5ICBaYW4gRG9i ZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBQYXNzIEMrKzExIGxhbWJk YXMgdG8gY2FsbE9uTWFpblRocmVhZCgpIGNhbGxzIGluIEljb25EYXRhYmFzZQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMzc0CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIEMrKzExIGxhbWJhZHMg dG8gaW5saW5lIHRoZSBtYWluIHRocmVhZCB0YXNrcyBpbnRvIHRoZSBjYWxsaW5nIGNvZGUsCisg ICAgICAgIG1vZGVybml6aW5nIHRoZSBsb29rIG9mIHRoZSBjb2RlIGFuZCByZW1vdmluZyBhIGZl dyBzdGF0aWMgaGVscGVyIG1ldGhvZHMuCisKKyAgICAgICAgKiBsb2FkZXIvaWNvbi9JY29uRGF0 YWJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlOjpzY2hlZHVsZU9yRGVm ZXJTeW5jVGltZXIpOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlOjpwZXJmb3JtVVJM SW1wb3J0KToKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6ZGlzcGF0Y2hEaWRJbXBv cnRJY29uVVJMRm9yUGFnZVVSTE9uTWFpblRocmVhZCk6CisgICAgICAgIChXZWJDb3JlOjpJY29u RGF0YWJhc2U6OmRpc3BhdGNoRGlkSW1wb3J0SWNvbkRhdGFGb3JQYWdlVVJMT25NYWluVGhyZWFk KToKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6ZGlzcGF0Y2hEaWRSZW1vdmVBbGxJ Y29uc09uTWFpblRocmVhZCk6CisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6OmRpc3Bh dGNoRGlkRmluaXNoVVJMSW1wb3J0T25NYWluVGhyZWFkKToKKyAgICAgICAgKFdlYkNvcmU6Oklj b25EYXRhYmFzZTo6bm90aWZ5UGVuZGluZ0xvYWREZWNpc2lvbnNPbk1haW5UaHJlYWQpOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlOjpwZXJmb3JtU2NoZWR1bGVPckRl ZmVyU3luY1RpbWVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6 cGVyZm9ybVNjaGVkdWxlT3JEZWZlclN5bmNUaW1lck9uTWFpblRocmVhZCk6IERlbGV0ZWQuCisg ICAgICAgIChXZWJDb3JlOjpwZXJmb3JtV29ya0l0ZW0pOiBEZWxldGVkLgorICAgICAgICAqIGxv YWRlci9pY29uL0ljb25EYXRhYmFzZS5oOgorCiAyMDE0LTA1LTI4ICBCcmVudCBGdWxnaGFtICA8 YmZ1bGdoYW1AYXBwbGUuY29tPgogCiAgICAgICAgIENhcHRpb25zIGR1cmluZyBITFMgcGxheWJh Y2sgZmxhc2gvYXJlIGRpZmZpY3VsdCB0byByZWFkaWx5CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9s b2FkZXIvaWNvbi9JY29uRGF0YWJhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5jcHAJKHJldmlzaW9uIDE2OTQ0NCkKKysrIFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTgwNCwxMSArODA0LDYgQEAgSWNvbkRhdGFiYXNlOjp+SWNvbkRhdGFiYXNlKCkKICAgICBBU1NF UlQoIWlzT3BlbigpKTsKIH0KIAotdm9pZCBJY29uRGF0YWJhc2U6Om5vdGlmeVBlbmRpbmdMb2Fk RGVjaXNpb25zT25NYWluVGhyZWFkKHZvaWQqIGNvbnRleHQpCi17Ci0gICAgc3RhdGljX2Nhc3Q8 SWNvbkRhdGFiYXNlKj4oY29udGV4dCktPm5vdGlmeVBlbmRpbmdMb2FkRGVjaXNpb25zKCk7Ci19 Ci0KIHZvaWQgSWNvbkRhdGFiYXNlOjpub3RpZnlQZW5kaW5nTG9hZERlY2lzaW9ucygpCiB7CiAg ICAgQVNTRVJUX05PVF9TWU5DX1RIUkVBRCgpOwpAQCAtODM4LDE3ICs4MzMsNiBAQCB2b2lkIElj b25EYXRhYmFzZTo6d2FrZVN5bmNUaHJlYWQoKQogICAgIG1fc3luY0NvbmRpdGlvbi5zaWduYWwo KTsKIH0KIAotdm9pZCBJY29uRGF0YWJhc2U6OnBlcmZvcm1TY2hlZHVsZU9yRGVmZXJTeW5jVGlt ZXIoKQotewotICAgIG1fc3luY1RpbWVyLnN0YXJ0T25lU2hvdCh1cGRhdGVUaW1lckRlbGF5KTsK LSAgICBtX3NjaGVkdWxlT3JEZWZlclN5bmNUaW1lclJlcXVlc3RlZCA9IGZhbHNlOwotfQotCi12 b2lkIEljb25EYXRhYmFzZTo6cGVyZm9ybVNjaGVkdWxlT3JEZWZlclN5bmNUaW1lck9uTWFpblRo cmVhZCh2b2lkKiBjb250ZXh0KQotewotICAgIHN0YXRpY19jYXN0PEljb25EYXRhYmFzZSo+KGNv bnRleHQpLT5wZXJmb3JtU2NoZWR1bGVPckRlZmVyU3luY1RpbWVyKCk7Ci19Ci0KIHZvaWQgSWNv bkRhdGFiYXNlOjpzY2hlZHVsZU9yRGVmZXJTeW5jVGltZXIoKQogewogICAgIEFTU0VSVF9OT1Rf U1lOQ19USFJFQUQoKTsKQEAgLTg2MCw3ICs4NDQsMTAgQEAgdm9pZCBJY29uRGF0YWJhc2U6OnNj aGVkdWxlT3JEZWZlclN5bmNUaQogICAgICAgICBtX2Rpc2FibGVTdWRkZW5UZXJtaW5hdGlvbldo aWxlU3luY1RpbWVyU2NoZWR1bGVkID0gc3RkOjptYWtlX3VuaXF1ZTxTdWRkZW5UZXJtaW5hdGlv bkRpc2FibGVyPigpOwogCiAgICAgbV9zY2hlZHVsZU9yRGVmZXJTeW5jVGltZXJSZXF1ZXN0ZWQg PSB0cnVlOwotICAgIGNhbGxPbk1haW5UaHJlYWQocGVyZm9ybVNjaGVkdWxlT3JEZWZlclN5bmNU aW1lck9uTWFpblRocmVhZCwgdGhpcyk7CisgICAgY2FsbE9uTWFpblRocmVhZChbdGhpc10gewor ICAgICAgICBtX3N5bmNUaW1lci5zdGFydE9uZVNob3QodXBkYXRlVGltZXJEZWxheSk7CisgICAg ICAgIG1fc2NoZWR1bGVPckRlZmVyU3luY1RpbWVyUmVxdWVzdGVkID0gZmFsc2U7CisgICAgfSk7 CiB9CiAKIHZvaWQgSWNvbkRhdGFiYXNlOjpzeW5jVGltZXJGaXJlZChUaW1lcjxJY29uRGF0YWJh c2U+JikKQEAgLTEzMzcsNyArMTMyNCw5IEBAIHZvaWQgSWNvbkRhdGFiYXNlOjpwZXJmb3JtVVJM SW1wb3J0KCkKICAgICBkaXNwYXRjaERpZEZpbmlzaFVSTEltcG9ydE9uTWFpblRocmVhZCgpOwog ICAgIAogICAgIC8vIE5vdGlmeSBhbGwgRG9jdW1lbnRMb2FkZXJzIHRoYXQgd2VyZSB3YWl0aW5n IGZvciBhbiBpY29uIGxvYWQgZGVjaXNpb24gb24gdGhlIG1haW4gdGhyZWFkCi0gICAgY2FsbE9u TWFpblRocmVhZChub3RpZnlQZW5kaW5nTG9hZERlY2lzaW9uc09uTWFpblRocmVhZCwgdGhpcyk7 CisgICAgY2FsbE9uTWFpblRocmVhZChbdGhpc10geworICAgICAgICBub3RpZnlQZW5kaW5nTG9h ZERlY2lzaW9ucygpOworICAgIH0pOwogfQogCiB2b2lkIEljb25EYXRhYmFzZTo6c3luY1RocmVh ZE1haW5Mb29wKCkKQEAgLTIxNjQsNDMgKzIxNTMsNDggQEAgcHVibGljOgogICAgIH0KIH07CiAK LXN0YXRpYyB2b2lkIHBlcmZvcm1Xb3JrSXRlbSh2b2lkKiBjb250ZXh0KQotewotICAgIENsaWVu dFdvcmtJdGVtKiBpdGVtID0gc3RhdGljX2Nhc3Q8Q2xpZW50V29ya0l0ZW0qPihjb250ZXh0KTsK LSAgICBpdGVtLT5wZXJmb3JtV29yaygpOwotICAgIGRlbGV0ZSBpdGVtOwotfQotCiB2b2lkIElj b25EYXRhYmFzZTo6ZGlzcGF0Y2hEaWRJbXBvcnRJY29uVVJMRm9yUGFnZVVSTE9uTWFpblRocmVh ZChjb25zdCBTdHJpbmcmIHBhZ2VVUkwpCiB7CiAgICAgQVNTRVJUX0lDT05fU1lOQ19USFJFQUQo KTsKIAotICAgIEltcG9ydGVkSWNvblVSTEZvclBhZ2VVUkxXb3JrSXRlbSogd29yayA9IG5ldyBJ bXBvcnRlZEljb25VUkxGb3JQYWdlVVJMV29ya0l0ZW0obV9jbGllbnQsIHBhZ2VVUkwpOwotICAg IGNhbGxPbk1haW5UaHJlYWQocGVyZm9ybVdvcmtJdGVtLCB3b3JrKTsKKyAgICBJbXBvcnRlZElj b25VUkxGb3JQYWdlVVJMV29ya0l0ZW0qIGl0ZW1QdHIgPSBuZXcgSW1wb3J0ZWRJY29uVVJMRm9y UGFnZVVSTFdvcmtJdGVtKG1fY2xpZW50LCBwYWdlVVJMKTsKKyAgICBjYWxsT25NYWluVGhyZWFk KFtpdGVtUHRyXSB7CisgICAgICAgIHN0ZDo6dW5pcXVlX3B0cjxJbXBvcnRlZEljb25VUkxGb3JQ YWdlVVJMV29ya0l0ZW0+IGl0ZW0oaXRlbVB0cik7CisgICAgICAgIGl0ZW0tPnBlcmZvcm1Xb3Jr KCk7CisgICAgfSk7CiB9CiAKIHZvaWQgSWNvbkRhdGFiYXNlOjpkaXNwYXRjaERpZEltcG9ydElj b25EYXRhRm9yUGFnZVVSTE9uTWFpblRocmVhZChjb25zdCBTdHJpbmcmIHBhZ2VVUkwpCiB7CiAg ICAgQVNTRVJUX0lDT05fU1lOQ19USFJFQUQoKTsKIAotICAgIEltcG9ydGVkSWNvbkRhdGFGb3JQ YWdlVVJMV29ya0l0ZW0qIHdvcmsgPSBuZXcgSW1wb3J0ZWRJY29uRGF0YUZvclBhZ2VVUkxXb3Jr SXRlbShtX2NsaWVudCwgcGFnZVVSTCk7Ci0gICAgY2FsbE9uTWFpblRocmVhZChwZXJmb3JtV29y a0l0ZW0sIHdvcmspOworICAgIEltcG9ydGVkSWNvbkRhdGFGb3JQYWdlVVJMV29ya0l0ZW0qIGl0 ZW1QdHIgPSBuZXcgSW1wb3J0ZWRJY29uRGF0YUZvclBhZ2VVUkxXb3JrSXRlbShtX2NsaWVudCwg cGFnZVVSTCk7CisgICAgY2FsbE9uTWFpblRocmVhZChbaXRlbVB0cl0geworICAgICAgICBzdGQ6 OnVuaXF1ZV9wdHI8SW1wb3J0ZWRJY29uRGF0YUZvclBhZ2VVUkxXb3JrSXRlbT4gaXRlbShpdGVt UHRyKTsKKyAgICAgICAgaXRlbS0+cGVyZm9ybVdvcmsoKTsKKyAgICB9KTsKIH0KIAogdm9pZCBJ Y29uRGF0YWJhc2U6OmRpc3BhdGNoRGlkUmVtb3ZlQWxsSWNvbnNPbk1haW5UaHJlYWQoKQogewog ICAgIEFTU0VSVF9JQ09OX1NZTkNfVEhSRUFEKCk7CiAKLSAgICBSZW1vdmVkQWxsSWNvbnNXb3Jr SXRlbSogd29yayA9IG5ldyBSZW1vdmVkQWxsSWNvbnNXb3JrSXRlbShtX2NsaWVudCk7Ci0gICAg Y2FsbE9uTWFpblRocmVhZChwZXJmb3JtV29ya0l0ZW0sIHdvcmspOworICAgIFJlbW92ZWRBbGxJ Y29uc1dvcmtJdGVtKiBpdGVtUHRyID0gbmV3IFJlbW92ZWRBbGxJY29uc1dvcmtJdGVtKG1fY2xp ZW50KTsKKyAgICBjYWxsT25NYWluVGhyZWFkKFtpdGVtUHRyXSB7CisgICAgICAgIHN0ZDo6dW5p cXVlX3B0cjxSZW1vdmVkQWxsSWNvbnNXb3JrSXRlbT4gaXRlbShpdGVtUHRyKTsKKyAgICAgICAg aXRlbS0+cGVyZm9ybVdvcmsoKTsKKyAgICB9KTsKIH0KIAogdm9pZCBJY29uRGF0YWJhc2U6OmRp c3BhdGNoRGlkRmluaXNoVVJMSW1wb3J0T25NYWluVGhyZWFkKCkKIHsKICAgICBBU1NFUlRfSUNP Tl9TWU5DX1RIUkVBRCgpOwogCi0gICAgRmluaXNoZWRVUkxJbXBvcnQqIHdvcmsgPSBuZXcgRmlu aXNoZWRVUkxJbXBvcnQobV9jbGllbnQpOwotICAgIGNhbGxPbk1haW5UaHJlYWQocGVyZm9ybVdv cmtJdGVtLCB3b3JrKTsKKyAgICBGaW5pc2hlZFVSTEltcG9ydCogaXRlbVB0ciA9IG5ldyBGaW5p c2hlZFVSTEltcG9ydChtX2NsaWVudCk7CisgICAgY2FsbE9uTWFpblRocmVhZChbaXRlbVB0cl0g eworICAgICAgICBzdGQ6OnVuaXF1ZV9wdHI8RmluaXNoZWRVUkxJbXBvcnQ+IGl0ZW0oaXRlbVB0 cik7CisgICAgICAgIGl0ZW0tPnBlcmZvcm1Xb3JrKCk7CisgICAgfSk7CiB9CiAKIApJbmRleDog U291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmgKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmgJKHJldmlzaW9uIDE2OTQ0 NCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5oCSh3b3JraW5n IGNvcHkpCkBAIC0xMTEsNyArMTExLDYgQEAgcHVibGljOgogcHJpdmF0ZToKICAgICBmcmllbmQg SWNvbkRhdGFiYXNlQmFzZSYgaWNvbkRhdGFiYXNlKCk7CiAKLSAgICBzdGF0aWMgdm9pZCBub3Rp ZnlQZW5kaW5nTG9hZERlY2lzaW9uc09uTWFpblRocmVhZCh2b2lkKik7CiAgICAgdm9pZCBub3Rp ZnlQZW5kaW5nTG9hZERlY2lzaW9ucygpOwogCiAgICAgdm9pZCB3YWtlU3luY1RocmVhZCgpOwpA QCAtMTI2LDkgKzEyNSw2IEBAIHByaXZhdGU6CiAKICAgICBSZWZQdHI8SWNvblJlY29yZD4gbV9k ZWZhdWx0SWNvblJlY29yZDsKIAotICAgIHN0YXRpYyB2b2lkIHBlcmZvcm1TY2hlZHVsZU9yRGVm ZXJTeW5jVGltZXJPbk1haW5UaHJlYWQodm9pZCopOwotICAgIHZvaWQgcGVyZm9ybVNjaGVkdWxl T3JEZWZlclN5bmNUaW1lcigpOwotCiAgICAgYm9vbCBtX3NjaGVkdWxlT3JEZWZlclN5bmNUaW1l clJlcXVlc3RlZDsKICAgICBzdGQ6OnVuaXF1ZV9wdHI8U3VkZGVuVGVybWluYXRpb25EaXNhYmxl cj4gbV9kaXNhYmxlU3VkZGVuVGVybWluYXRpb25XaGlsZVN5bmNUaW1lclNjaGVkdWxlZDsKIAo= 232530 2014-06-05 01:39:47 -0700 2014-06-07 06:10:54 -0700 Patch bug-133374-20140605013922.patch text/plain 9346 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5NjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmNiODQ5ZWQzNTMzZWUx NzIwZDY5MzE5MzVkOTQ0ZmFhMTMxYjk0ZS4uNjYzYTc3NjY1NzBlYjQxMmNjNWY5MGVkNmY5NDg4 MTAzOTNmZjdhNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE0LTA2LTA1ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KKworICAgICAgICBQYXNzIEMrKzExIGxh bWJkYXMgdG8gY2FsbE9uTWFpblRocmVhZCgpIGNhbGxzIGluIEljb25EYXRhYmFzZQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMzMzc0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNlIEMrKzExIGxhbWJh ZHMgdG8gaW5saW5lIHRoZSBtYWluIHRocmVhZCB0YXNrcyBpbnRvIHRoZSBjYWxsaW5nIGNvZGUs CisgICAgICAgIG1vZGVybml6aW5nIHRoZSBsb29rIG9mIHRoZSBjb2RlIGFuZCByZW1vdmluZyBh IGZldyBzdGF0aWMgbWV0aG9kcyBhbmQKKyAgICAgICAgY2xhc3NlcyB0aGF0IHdlcmUgdXNlZCBh cyBoZWxwZXJzLgorCisgICAgICAgICogbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6c2NoZWR1bGVPckRlZmVyU3luY1RpbWVyKToK KyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6cGVyZm9ybVVSTEltcG9ydCk6CisgICAg ICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6OmRpc3BhdGNoRGlkSW1wb3J0SWNvblVSTEZvclBh Z2VVUkxPbk1haW5UaHJlYWQpOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlOjpkaXNw YXRjaERpZEltcG9ydEljb25EYXRhRm9yUGFnZVVSTE9uTWFpblRocmVhZCk6CisgICAgICAgIChX ZWJDb3JlOjpJY29uRGF0YWJhc2U6OmRpc3BhdGNoRGlkUmVtb3ZlQWxsSWNvbnNPbk1haW5UaHJl YWQpOgorICAgICAgICAoV2ViQ29yZTo6SWNvbkRhdGFiYXNlOjpkaXNwYXRjaERpZEZpbmlzaFVS TEltcG9ydE9uTWFpblRocmVhZCk6CisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6Om5v dGlmeVBlbmRpbmdMb2FkRGVjaXNpb25zT25NYWluVGhyZWFkKTogRGVsZXRlZC4KKyAgICAgICAg KFdlYkNvcmU6Okljb25EYXRhYmFzZTo6cGVyZm9ybVNjaGVkdWxlT3JEZWZlclN5bmNUaW1lcik6 IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJY29uRGF0YWJhc2U6OnBlcmZvcm1TY2hlZHVs ZU9yRGVmZXJTeW5jVGltZXJPbk1haW5UaHJlYWQpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6Q2xpZW50V29ya0l0ZW06OkNsaWVudFdvcmtJdGVtKTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OkNsaWVudFdvcmtJdGVtOjp+Q2xpZW50V29ya0l0ZW0pOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6SW1wb3J0ZWRJY29uVVJMRm9yUGFnZVVSTFdvcmtJdGVtOjpJbXBvcnRlZElj b25VUkxGb3JQYWdlVVJMV29ya0l0ZW0pOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6SW1w b3J0ZWRJY29uVVJMRm9yUGFnZVVSTFdvcmtJdGVtOjp+SW1wb3J0ZWRJY29uVVJMRm9yUGFnZVVS TFdvcmtJdGVtKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkltcG9ydGVkSWNvblVSTEZv clBhZ2VVUkxXb3JrSXRlbTo6cGVyZm9ybVdvcmspOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29y ZTo6SW1wb3J0ZWRJY29uRGF0YUZvclBhZ2VVUkxXb3JrSXRlbTo6SW1wb3J0ZWRJY29uRGF0YUZv clBhZ2VVUkxXb3JrSXRlbSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbXBvcnRlZElj b25EYXRhRm9yUGFnZVVSTFdvcmtJdGVtOjp+SW1wb3J0ZWRJY29uRGF0YUZvclBhZ2VVUkxXb3Jr SXRlbSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpJbXBvcnRlZEljb25EYXRhRm9yUGFn ZVVSTFdvcmtJdGVtOjpwZXJmb3JtV29yayk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpS ZW1vdmVkQWxsSWNvbnNXb3JrSXRlbTo6UmVtb3ZlZEFsbEljb25zV29ya0l0ZW0pOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6UmVtb3ZlZEFsbEljb25zV29ya0l0ZW06OnBlcmZvcm1Xb3Jr KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkZpbmlzaGVkVVJMSW1wb3J0OjpGaW5pc2hl ZFVSTEltcG9ydCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpGaW5pc2hlZFVSTEltcG9y dDo6cGVyZm9ybVdvcmspOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6cGVyZm9ybVdvcmtJ dGVtKTogRGVsZXRlZC4KKyAgICAgICAgKiBsb2FkZXIvaWNvbi9JY29uRGF0YWJhc2UuaDoKKwog MjAxNC0wNi0wNCAgQmVtIEpvbmVzLUJleSAgPGJqb25lc2JlQGFkb2JlLmNvbT4KIAogICAgICAg ICBbQ1NTIFNoYXBlc10gSW1hZ2UgbGlmZXRpbWUgaXMgbm90IHByb3Blcmx5IGhhbmRsZWQgZm9y IGdyYWRpZW50IHNoYXBlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24v SWNvbkRhdGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFz ZS5jcHAKaW5kZXggMmJmZWRmNWNlNTE3ZjYxMmE3YWViMDkxYzZmNGI5YmZlYjhlOGQwNy4uOWEy YjYyZmNhOWFiZTI4MTZhYWVmMjhmMjEyNGVmMzFmM2Q3NWRlNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvaWNvbi9JY29uRGF0YWJhc2UuY3BwCkBAIC04MDQsMTEgKzgwNCw2IEBAIEljb25E YXRhYmFzZTo6fkljb25EYXRhYmFzZSgpCiAgICAgQVNTRVJUKCFpc09wZW4oKSk7CiB9CiAKLXZv aWQgSWNvbkRhdGFiYXNlOjpub3RpZnlQZW5kaW5nTG9hZERlY2lzaW9uc09uTWFpblRocmVhZCh2 b2lkKiBjb250ZXh0KQotewotICAgIHN0YXRpY19jYXN0PEljb25EYXRhYmFzZSo+KGNvbnRleHQp LT5ub3RpZnlQZW5kaW5nTG9hZERlY2lzaW9ucygpOwotfQotCiB2b2lkIEljb25EYXRhYmFzZTo6 bm90aWZ5UGVuZGluZ0xvYWREZWNpc2lvbnMoKQogewogICAgIEFTU0VSVF9OT1RfU1lOQ19USFJF QUQoKTsKQEAgLTgzOCwxNyArODMzLDYgQEAgdm9pZCBJY29uRGF0YWJhc2U6Ondha2VTeW5jVGhy ZWFkKCkKICAgICBtX3N5bmNDb25kaXRpb24uc2lnbmFsKCk7CiB9CiAKLXZvaWQgSWNvbkRhdGFi YXNlOjpwZXJmb3JtU2NoZWR1bGVPckRlZmVyU3luY1RpbWVyKCkKLXsKLSAgICBtX3N5bmNUaW1l ci5zdGFydE9uZVNob3QodXBkYXRlVGltZXJEZWxheSk7Ci0gICAgbV9zY2hlZHVsZU9yRGVmZXJT eW5jVGltZXJSZXF1ZXN0ZWQgPSBmYWxzZTsKLX0KLQotdm9pZCBJY29uRGF0YWJhc2U6OnBlcmZv cm1TY2hlZHVsZU9yRGVmZXJTeW5jVGltZXJPbk1haW5UaHJlYWQodm9pZCogY29udGV4dCkKLXsK LSAgICBzdGF0aWNfY2FzdDxJY29uRGF0YWJhc2UqPihjb250ZXh0KS0+cGVyZm9ybVNjaGVkdWxl T3JEZWZlclN5bmNUaW1lcigpOwotfQotCiB2b2lkIEljb25EYXRhYmFzZTo6c2NoZWR1bGVPckRl ZmVyU3luY1RpbWVyKCkKIHsKICAgICBBU1NFUlRfTk9UX1NZTkNfVEhSRUFEKCk7CkBAIC04NjAs NyArODQ0LDEwIEBAIHZvaWQgSWNvbkRhdGFiYXNlOjpzY2hlZHVsZU9yRGVmZXJTeW5jVGltZXIo KQogICAgICAgICBtX2Rpc2FibGVTdWRkZW5UZXJtaW5hdGlvbldoaWxlU3luY1RpbWVyU2NoZWR1 bGVkID0gc3RkOjptYWtlX3VuaXF1ZTxTdWRkZW5UZXJtaW5hdGlvbkRpc2FibGVyPigpOwogCiAg ICAgbV9zY2hlZHVsZU9yRGVmZXJTeW5jVGltZXJSZXF1ZXN0ZWQgPSB0cnVlOwotICAgIGNhbGxP bk1haW5UaHJlYWQocGVyZm9ybVNjaGVkdWxlT3JEZWZlclN5bmNUaW1lck9uTWFpblRocmVhZCwg dGhpcyk7CisgICAgY2FsbE9uTWFpblRocmVhZChbdGhpc10geworICAgICAgICBtX3N5bmNUaW1l ci5zdGFydE9uZVNob3QodXBkYXRlVGltZXJEZWxheSk7CisgICAgICAgIG1fc2NoZWR1bGVPckRl ZmVyU3luY1RpbWVyUmVxdWVzdGVkID0gZmFsc2U7CisgICAgfSk7CiB9CiAKIHZvaWQgSWNvbkRh dGFiYXNlOjpzeW5jVGltZXJGaXJlZChUaW1lcjxJY29uRGF0YWJhc2U+JikKQEAgLTEzMzcsNyAr MTMyNCw5IEBAIHZvaWQgSWNvbkRhdGFiYXNlOjpwZXJmb3JtVVJMSW1wb3J0KCkKICAgICBkaXNw YXRjaERpZEZpbmlzaFVSTEltcG9ydE9uTWFpblRocmVhZCgpOwogICAgIAogICAgIC8vIE5vdGlm eSBhbGwgRG9jdW1lbnRMb2FkZXJzIHRoYXQgd2VyZSB3YWl0aW5nIGZvciBhbiBpY29uIGxvYWQg ZGVjaXNpb24gb24gdGhlIG1haW4gdGhyZWFkCi0gICAgY2FsbE9uTWFpblRocmVhZChub3RpZnlQ ZW5kaW5nTG9hZERlY2lzaW9uc09uTWFpblRocmVhZCwgdGhpcyk7CisgICAgY2FsbE9uTWFpblRo cmVhZChbdGhpc10geworICAgICAgICBub3RpZnlQZW5kaW5nTG9hZERlY2lzaW9ucygpOworICAg IH0pOwogfQogCiB2b2lkIEljb25EYXRhYmFzZTo6c3luY1RocmVhZE1haW5Mb29wKCkKQEAgLTIw NzcsMTMwICsyMDY2LDQyIEBAIHZvaWQgSWNvbkRhdGFiYXNlOjpzZXRXYXNFeGNsdWRlZEZyb21C YWNrdXAoKQogICAgIFNRTGl0ZVN0YXRlbWVudChtX3N5bmNEQiwgIklOU0VSVCBJTlRPIEljb25E YXRhYmFzZUluZm8gKGtleSwgdmFsdWUpIFZBTFVFUyAoJ0V4Y2x1ZGVkRnJvbUJhY2t1cCcsIDEp IikuZXhlY3V0ZUNvbW1hbmQoKTsKIH0KIAotY2xhc3MgQ2xpZW50V29ya0l0ZW0gewotICAgIFdU Rl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwotcHVibGljOgotICAgIENsaWVudFdvcmtJdGVtKEljb25E YXRhYmFzZUNsaWVudCogY2xpZW50KQotICAgICAgICA6IG1fY2xpZW50KGNsaWVudCkKLSAgICB7 IH0KLSAgICB2aXJ0dWFsIHZvaWQgcGVyZm9ybVdvcmsoKSA9IDA7Ci0gICAgdmlydHVhbCB+Q2xp ZW50V29ya0l0ZW0oKSB7IH0KLQotcHJvdGVjdGVkOgotICAgIEljb25EYXRhYmFzZUNsaWVudCog bV9jbGllbnQ7Ci19OwotCi1jbGFzcyBJbXBvcnRlZEljb25VUkxGb3JQYWdlVVJMV29ya0l0ZW0g OiBwdWJsaWMgQ2xpZW50V29ya0l0ZW0gewotcHVibGljOgotICAgIEltcG9ydGVkSWNvblVSTEZv clBhZ2VVUkxXb3JrSXRlbShJY29uRGF0YWJhc2VDbGllbnQqIGNsaWVudCwgY29uc3QgU3RyaW5n JiBwYWdlVVJMKQotICAgICAgICA6IENsaWVudFdvcmtJdGVtKGNsaWVudCkKLSAgICAgICAgLCBt X3BhZ2VVUkwobmV3IFN0cmluZyhwYWdlVVJMLmlzb2xhdGVkQ29weSgpKSkKLSAgICB7IH0KLSAg ICAKLSAgICB2aXJ0dWFsIH5JbXBvcnRlZEljb25VUkxGb3JQYWdlVVJMV29ya0l0ZW0oKQotICAg IHsKLSAgICAgICAgZGVsZXRlIG1fcGFnZVVSTDsKLSAgICB9Ci0KLSAgICB2aXJ0dWFsIHZvaWQg cGVyZm9ybVdvcmsoKQotICAgIHsKLSAgICAgICAgQVNTRVJUKG1fY2xpZW50KTsKLSAgICAgICAg bV9jbGllbnQtPmRpZEltcG9ydEljb25VUkxGb3JQYWdlVVJMKCptX3BhZ2VVUkwpOwotICAgICAg ICBtX2NsaWVudCA9IDA7Ci0gICAgfQotICAgIAotcHJpdmF0ZToKLSAgICBTdHJpbmcqIG1fcGFn ZVVSTDsKLX07Ci0KLWNsYXNzIEltcG9ydGVkSWNvbkRhdGFGb3JQYWdlVVJMV29ya0l0ZW0gOiBw dWJsaWMgQ2xpZW50V29ya0l0ZW0gewotcHVibGljOgotICAgIEltcG9ydGVkSWNvbkRhdGFGb3JQ YWdlVVJMV29ya0l0ZW0oSWNvbkRhdGFiYXNlQ2xpZW50KiBjbGllbnQsIGNvbnN0IFN0cmluZyYg cGFnZVVSTCkKLSAgICAgICAgOiBDbGllbnRXb3JrSXRlbShjbGllbnQpCi0gICAgICAgICwgbV9w YWdlVVJMKG5ldyBTdHJpbmcocGFnZVVSTC5pc29sYXRlZENvcHkoKSkpCi0gICAgeyB9Ci0gICAg Ci0gICAgdmlydHVhbCB+SW1wb3J0ZWRJY29uRGF0YUZvclBhZ2VVUkxXb3JrSXRlbSgpCi0gICAg ewotICAgICAgICBkZWxldGUgbV9wYWdlVVJMOwotICAgIH0KLQotICAgIHZpcnR1YWwgdm9pZCBw ZXJmb3JtV29yaygpCi0gICAgewotICAgICAgICBBU1NFUlQobV9jbGllbnQpOwotICAgICAgICBt X2NsaWVudC0+ZGlkSW1wb3J0SWNvbkRhdGFGb3JQYWdlVVJMKCptX3BhZ2VVUkwpOwotICAgICAg ICBtX2NsaWVudCA9IDA7Ci0gICAgfQotICAgIAotcHJpdmF0ZToKLSAgICBTdHJpbmcqIG1fcGFn ZVVSTDsKLX07Ci0KLWNsYXNzIFJlbW92ZWRBbGxJY29uc1dvcmtJdGVtIDogcHVibGljIENsaWVu dFdvcmtJdGVtIHsKLXB1YmxpYzoKLSAgICBSZW1vdmVkQWxsSWNvbnNXb3JrSXRlbShJY29uRGF0 YWJhc2VDbGllbnQqIGNsaWVudCkKLSAgICAgICAgOiBDbGllbnRXb3JrSXRlbShjbGllbnQpCi0g ICAgeyB9Ci0KLSAgICB2aXJ0dWFsIHZvaWQgcGVyZm9ybVdvcmsoKQotICAgIHsKLSAgICAgICAg QVNTRVJUKG1fY2xpZW50KTsKLSAgICAgICAgbV9jbGllbnQtPmRpZFJlbW92ZUFsbEljb25zKCk7 Ci0gICAgICAgIG1fY2xpZW50ID0gMDsKLSAgICB9Ci19OwotCi1jbGFzcyBGaW5pc2hlZFVSTElt cG9ydCA6IHB1YmxpYyBDbGllbnRXb3JrSXRlbSB7Ci1wdWJsaWM6Ci0gICAgRmluaXNoZWRVUkxJ bXBvcnQoSWNvbkRhdGFiYXNlQ2xpZW50KiBjbGllbnQpCi0gICAgICAgIDogQ2xpZW50V29ya0l0 ZW0oY2xpZW50KQotICAgIHsgfQotCi0gICAgdmlydHVhbCB2b2lkIHBlcmZvcm1Xb3JrKCkKLSAg ICB7Ci0gICAgICAgIEFTU0VSVChtX2NsaWVudCk7Ci0gICAgICAgIG1fY2xpZW50LT5kaWRGaW5p c2hVUkxJbXBvcnQoKTsKLSAgICAgICAgbV9jbGllbnQgPSAwOwotICAgIH0KLX07Ci0KLXN0YXRp YyB2b2lkIHBlcmZvcm1Xb3JrSXRlbSh2b2lkKiBjb250ZXh0KQotewotICAgIENsaWVudFdvcmtJ dGVtKiBpdGVtID0gc3RhdGljX2Nhc3Q8Q2xpZW50V29ya0l0ZW0qPihjb250ZXh0KTsKLSAgICBp dGVtLT5wZXJmb3JtV29yaygpOwotICAgIGRlbGV0ZSBpdGVtOwotfQotCiB2b2lkIEljb25EYXRh YmFzZTo6ZGlzcGF0Y2hEaWRJbXBvcnRJY29uVVJMRm9yUGFnZVVSTE9uTWFpblRocmVhZChjb25z dCBTdHJpbmcmIHBhZ2VVUkwpCiB7CiAgICAgQVNTRVJUX0lDT05fU1lOQ19USFJFQUQoKTsKIAot ICAgIEltcG9ydGVkSWNvblVSTEZvclBhZ2VVUkxXb3JrSXRlbSogd29yayA9IG5ldyBJbXBvcnRl ZEljb25VUkxGb3JQYWdlVVJMV29ya0l0ZW0obV9jbGllbnQsIHBhZ2VVUkwpOwotICAgIGNhbGxP bk1haW5UaHJlYWQocGVyZm9ybVdvcmtJdGVtLCB3b3JrKTsKKyAgICBTdHJpbmcgcGFnZVVSTENv cHkgPSBwYWdlVVJMLmlzb2xhdGVkQ29weSgpOworICAgIGNhbGxPbk1haW5UaHJlYWQoW3RoaXMs IHBhZ2VVUkxDb3B5XSB7CisgICAgICAgIG1fY2xpZW50LT5kaWRJbXBvcnRJY29uVVJMRm9yUGFn ZVVSTChwYWdlVVJMQ29weSk7CisgICAgfSk7CiB9CiAKIHZvaWQgSWNvbkRhdGFiYXNlOjpkaXNw YXRjaERpZEltcG9ydEljb25EYXRhRm9yUGFnZVVSTE9uTWFpblRocmVhZChjb25zdCBTdHJpbmcm IHBhZ2VVUkwpCiB7CiAgICAgQVNTRVJUX0lDT05fU1lOQ19USFJFQUQoKTsKIAotICAgIEltcG9y dGVkSWNvbkRhdGFGb3JQYWdlVVJMV29ya0l0ZW0qIHdvcmsgPSBuZXcgSW1wb3J0ZWRJY29uRGF0 YUZvclBhZ2VVUkxXb3JrSXRlbShtX2NsaWVudCwgcGFnZVVSTCk7Ci0gICAgY2FsbE9uTWFpblRo cmVhZChwZXJmb3JtV29ya0l0ZW0sIHdvcmspOworICAgIFN0cmluZyBwYWdlVVJMQ29weSA9IHBh Z2VVUkwuaXNvbGF0ZWRDb3B5KCk7CisgICAgY2FsbE9uTWFpblRocmVhZChbdGhpcywgcGFnZVVS TENvcHldIHsKKyAgICAgICAgbV9jbGllbnQtPmRpZEltcG9ydEljb25EYXRhRm9yUGFnZVVSTChw YWdlVVJMQ29weSk7CisgICAgfSk7CiB9CiAKIHZvaWQgSWNvbkRhdGFiYXNlOjpkaXNwYXRjaERp ZFJlbW92ZUFsbEljb25zT25NYWluVGhyZWFkKCkKIHsKICAgICBBU1NFUlRfSUNPTl9TWU5DX1RI UkVBRCgpOwogCi0gICAgUmVtb3ZlZEFsbEljb25zV29ya0l0ZW0qIHdvcmsgPSBuZXcgUmVtb3Zl ZEFsbEljb25zV29ya0l0ZW0obV9jbGllbnQpOwotICAgIGNhbGxPbk1haW5UaHJlYWQocGVyZm9y bVdvcmtJdGVtLCB3b3JrKTsKKyAgICBjYWxsT25NYWluVGhyZWFkKFt0aGlzXSB7CisgICAgICAg IG1fY2xpZW50LT5kaWRSZW1vdmVBbGxJY29ucygpOworICAgIH0pOwogfQogCiB2b2lkIEljb25E YXRhYmFzZTo6ZGlzcGF0Y2hEaWRGaW5pc2hVUkxJbXBvcnRPbk1haW5UaHJlYWQoKQogewogICAg IEFTU0VSVF9JQ09OX1NZTkNfVEhSRUFEKCk7CiAKLSAgICBGaW5pc2hlZFVSTEltcG9ydCogd29y ayA9IG5ldyBGaW5pc2hlZFVSTEltcG9ydChtX2NsaWVudCk7Ci0gICAgY2FsbE9uTWFpblRocmVh ZChwZXJmb3JtV29ya0l0ZW0sIHdvcmspOworICAgIGNhbGxPbk1haW5UaHJlYWQoW3RoaXNdIHsK KyAgICAgICAgbV9jbGllbnQtPmRpZEZpbmlzaFVSTEltcG9ydCgpOworICAgIH0pOwogfQogCiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5oIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmgKaW5kZXggNzY4OGY1ZmY0 NDI1MzY3ZDdiYjEwMGZmNTkwZDZlOGVjZWE1ZDM5Mi4uZDJkODE3YzE5OTM2ZDkwZDgxZGZlMDc4 OWIzNDM2MDFiZWRkNjFlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24v SWNvbkRhdGFiYXNlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRhdGFi YXNlLmgKQEAgLTExMSw3ICsxMTEsNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGZyaWVuZCBJ Y29uRGF0YWJhc2VCYXNlJiBpY29uRGF0YWJhc2UoKTsKIAotICAgIHN0YXRpYyB2b2lkIG5vdGlm eVBlbmRpbmdMb2FkRGVjaXNpb25zT25NYWluVGhyZWFkKHZvaWQqKTsKICAgICB2b2lkIG5vdGlm eVBlbmRpbmdMb2FkRGVjaXNpb25zKCk7CiAKICAgICB2b2lkIHdha2VTeW5jVGhyZWFkKCk7CkBA IC0xMjYsOSArMTI1LDYgQEAgcHJpdmF0ZToKIAogICAgIFJlZlB0cjxJY29uUmVjb3JkPiBtX2Rl ZmF1bHRJY29uUmVjb3JkOwogCi0gICAgc3RhdGljIHZvaWQgcGVyZm9ybVNjaGVkdWxlT3JEZWZl clN5bmNUaW1lck9uTWFpblRocmVhZCh2b2lkKik7Ci0gICAgdm9pZCBwZXJmb3JtU2NoZWR1bGVP ckRlZmVyU3luY1RpbWVyKCk7Ci0KICAgICBib29sIG1fc2NoZWR1bGVPckRlZmVyU3luY1RpbWVy UmVxdWVzdGVkOwogICAgIHN0ZDo6dW5pcXVlX3B0cjxTdWRkZW5UZXJtaW5hdGlvbkRpc2FibGVy PiBtX2Rpc2FibGVTdWRkZW5UZXJtaW5hdGlvbldoaWxlU3luY1RpbWVyU2NoZWR1bGVkOwogCg==