133081 2014-05-19 12:29:23 -0700 WebKitTestRunner: Move PassOwnPtr and OwnPtr to std::unique_ptr 2014-05-20 09:24:08 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dfarler dfarler dbates oldest_to_newest 1010261 0 dfarler 2014-05-19 12:29:23 -0700 WebKitTestRunner looks like a simple candidate to move off of {Pass,}OwnPtr. 1010262 1 231710 dfarler 2014-05-19 12:31:08 -0700 Created attachment 231710 Patch 1010401 2 231710 dbates 2014-05-19 20:42:38 -0700 Comment on attachment 231710 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231710&action=review > Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:108 > + m_pages.append(std::unique_ptr<InjectedBundlePage>(new InjectedBundlePage(page))); Notice that Source/WTF/wtf/StdLibExtras.h, <http://trac.webkit.org/browser/trunk/Source/WTF/wtf/StdLibExtras.h?rev=167453#L347>, includes support for the C++14 std::make_unique<>(). We should make use of this convenience template function to write this line as: m_pages.append(std::make_unique<InjectedBundlePage>(page)); > Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.h:137 > + Vector<std::unique_ptr<InjectedBundlePage> > m_pages; "> >" => ">>" That is, no need for the space character between the greater-than characters as C++11 compilers are smart enough to distinguish between a closing template and the right-shift operator. > Tools/WebKitTestRunner/TestController.cpp:343 > + m_geolocationProvider = std::unique_ptr<GeolocationProviderMock>(new GeolocationProviderMock(m_context.get())); We should write this line using std::make_unique. > Tools/WebKitTestRunner/TestController.cpp:420 > + m_mainWebView = std::unique_ptr<PlatformWebView>(new PlatformWebView(m_context.get(), m_pageGroup.get(), 0, options)); We should write this line using std::make_unique. Also, we should substitute nullptr for 0. > Tools/WebKitTestRunner/TestController.cpp:618 > + m_eventSenderProxy = std::unique_ptr<EventSenderProxy>(new EventSenderProxy(this)); We should write this line using std::make_unique. > Tools/WebKitTestRunner/TestController.cpp:762 > + m_currentInvocation = std::unique_ptr<TestInvocation>(new TestInvocation(command.pathOrURL)); Ditto. > Tools/WebKitTestRunner/WorkQueueManager.h:53 > + typedef Deque<std::unique_ptr<class WorkQueueItem> > WorkQueue; "> >" => ">>" That is, no need for the space character between the greater-than characters. See my remark on line 137 for the reasoning behind this change. 1010512 3 dfarler 2014-05-20 09:23:43 -0700 Committed r169113: <http://trac.webkit.org/changeset/169113> 1010514 4 dfarler 2014-05-20 09:24:08 -0700 Landed patch with all of your suggestions - thanks! 231710 2014-05-19 12:31:08 -0700 2014-05-19 20:42:38 -0700 Patch bug-133081-20140519123146.patch text/plain 10213 dfarler U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5MDUzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWExY2VmOWI2NzA1YjZjYzRjZjA2ODVhMzllZDgwMmVh MWVlZWFjMC4uZmI1NTg1YWQyYzIzNGI0YjEwNDM4N2UzMjA1YTMxNWFhMGIyNjc4MyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2 IEBACisyMDE0LTA1LTE5ICBEYXZpZCBGYXJsZXIgIDxkZmFybGVyQGFwcGxlLmNvbT4KKworICAg ICAgICBNb3ZlIFdlYktpdFRlc3RSdW5uZXIgdG8gc3RkOjp1bmlxdWVfcHRyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzMwODEKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIv SW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuY3BwOgorICAgICAgICAoV1RSOjpJbmplY3Rl ZEJ1bmRsZTo6ZGlkQ3JlYXRlUGFnZSk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5oOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIv VGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6aW5pdGlh bGl6ZSk6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpjcmVhdGVXZWJWaWV3V2l0aE9w dGlvbnMpOgorICAgICAgICAoV1RSOjpUZXN0Q29udHJvbGxlcjo6cmVzZXRTdGF0ZVRvQ29uc2lz dGVudFZhbHVlcyk6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpydW5UZXN0KToKKyAg ICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmg6CisgICAgICAgICogV2Vi S2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5jcHA6CisgICAgICAgICogV2ViS2l0VGVzdFJ1 bm5lci9UZXN0SW52b2NhdGlvbi5oOgorICAgICAgICAqIFdlYktpdFRlc3RSdW5uZXIvV29ya1F1 ZXVlTWFuYWdlci5jcHA6CisgICAgICAgIChXVFI6OldvcmtRdWV1ZU1hbmFnZXI6OnByb2Nlc3NX b3JrUXVldWUpOgorICAgICAgICAoV1RSOjpXb3JrUXVldWVNYW5hZ2VyOjplbnF1ZXVlKToKKyAg ICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL1dvcmtRdWV1ZU1hbmFnZXIuaDoKKwogMjAxNC0wNS0x OSAgRXZhIEJhbGF6c2ZhbHZpICA8ZXZhYi51LXN6ZWdlZEBwYXJ0bmVyLnNhbXN1bmcuY29tPgog CiAgICAgICAgIHJ1bi1qYXZhc2NyaXB0Y29yZS10ZXN0cyBzaG91bGQgc29ydCB0aGUgbGlzdCBv ZiBmYWlsaW5nIHN0cmVzcyB0ZXN0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcAppbmRleCAzODQ1NDMzMWNhNWI4 MjBjNTY5YTMwZDQ1MTZiMDY1MDI2ZWYyZGY3Li5hZGM0MTA0ZTlmMzZiYmRiMzc5ZDBkZTI2YWIy YjVmNTM5ZjI3NTAxIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVk QnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmNwcApAQCAtMzUsNyArMzUsNiBAQAogI2luY2x1 ZGUgPFdlYktpdC9XS0J1bmRsZVByaXZhdGUuaD4KICNpbmNsdWRlIDxXZWJLaXQvV0tSZXRhaW5Q dHIuaD4KICNpbmNsdWRlIDxXZWJLaXQvV2ViS2l0Ml9DLmg+Ci0jaW5jbHVkZSA8d3RmL1Bhc3NP d25QdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CiAjaW5jbHVkZSA8d3RmL3Rl eHQvU3RyaW5nQnVpbGRlci5oPgogI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KQEAgLTEwNiw3ICsx MDUsNyBAQCB2b2lkIEluamVjdGVkQnVuZGxlOjppbml0aWFsaXplKFdLQnVuZGxlUmVmIGJ1bmRs ZSwgV0tUeXBlUmVmIGluaXRpYWxpemF0aW9uVXNlcgogCiB2b2lkIEluamVjdGVkQnVuZGxlOjpk aWRDcmVhdGVQYWdlKFdLQnVuZGxlUGFnZVJlZiBwYWdlKQogewotICAgIG1fcGFnZXMuYXBwZW5k KGFkb3B0UHRyKG5ldyBJbmplY3RlZEJ1bmRsZVBhZ2UocGFnZSkpKTsKKyAgICBtX3BhZ2VzLmFw cGVuZChzdGQ6OnVuaXF1ZV9wdHI8SW5qZWN0ZWRCdW5kbGVQYWdlPihuZXcgSW5qZWN0ZWRCdW5k bGVQYWdlKHBhZ2UpKSk7CiB9CiAKIHZvaWQgSW5qZWN0ZWRCdW5kbGU6OndpbGxEZXN0cm95UGFn ZShXS0J1bmRsZVBhZ2VSZWYgcGFnZSkKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaAppbmRleCA0YWVkNGM2ZmJjMzBkZWIy Y2QzMTk3MzIyYjZjY2JiMDUxNTc1OWU5Li5lNDRjNzI1MjQ4NGZmNDRlZDYxMDJjMTEyOTllMTEy MWNlYWM0MWFiIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVu ZGxlL0luamVjdGVkQnVuZGxlLmgKKysrIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3Rl ZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5oCkBAIC0zNSw3ICszNSw2IEBACiAjaW5jbHVkZSA8V2Vi S2l0L1dLUmV0YWluUHRyLmg+CiAjaW5jbHVkZSA8c3N0cmVhbT4KICNpbmNsdWRlIDx3dGYvRm9y d2FyZC5oPgotI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+ CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCkBAIC0xMzUsNyArMTM0LDcgQEAgcHJpdmF0ZToK IAogICAgIFdLQnVuZGxlUmVmIG1fYnVuZGxlOwogICAgIFdLQnVuZGxlUGFnZUdyb3VwUmVmIG1f cGFnZUdyb3VwOwotICAgIFZlY3RvcjxPd25QdHI8SW5qZWN0ZWRCdW5kbGVQYWdlPiA+IG1fcGFn ZXM7CisgICAgVmVjdG9yPHN0ZDo6dW5pcXVlX3B0cjxJbmplY3RlZEJ1bmRsZVBhZ2U+ID4gbV9w YWdlczsKIAogICAgIFJlZlB0cjxBY2Nlc3NpYmlsaXR5Q29udHJvbGxlcj4gbV9hY2Nlc3NpYmls aXR5Q29udHJvbGxlcjsKICAgICBSZWZQdHI8VGVzdFJ1bm5lcj4gbV90ZXN0UnVubmVyOwpkaWZm IC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5jcHAgYi9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAppbmRleCAyMjMwOTM2MzJiZTY4 ZWUxNzFkYjhlYTc3MGJkZDU2MDg0MTgxNDZjLi5lYTFjY2VjOThhMWUzMTliNWM0MTU1NDY2YzQ4 ZGIzNjJkM2ExZGU0IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250 cm9sbGVyLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNw cApAQCAtNTEsNyArNTEsNiBAQAogI2luY2x1ZGUgPGN0eXBlLmg+CiAjaW5jbHVkZSA8c3RkbGli Lmg+CiAjaW5jbHVkZSA8c3RyaW5nPgotI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAjaW5j bHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCiAjaWYgUExBVEZPUk0oQ09DT0EpCkBAIC0zNDEs NyArMzQwLDcgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZShpbnQgYXJnYywgY29u c3QgY2hhciogYXJndltdKQogICAgIH0KIAogICAgIG1fY29udGV4dCA9IGFkb3B0V0soV0tDb250 ZXh0Q3JlYXRlV2l0aENvbmZpZ3VyYXRpb24oY29uZmlndXJhdGlvbi5nZXQoKSkpOwotICAgIG1f Z2VvbG9jYXRpb25Qcm92aWRlciA9IGFkb3B0UHRyKG5ldyBHZW9sb2NhdGlvblByb3ZpZGVyTW9j ayhtX2NvbnRleHQuZ2V0KCkpKTsKKyAgICBtX2dlb2xvY2F0aW9uUHJvdmlkZXIgPSBzdGQ6OnVu aXF1ZV9wdHI8R2VvbG9jYXRpb25Qcm92aWRlck1vY2s+KG5ldyBHZW9sb2NhdGlvblByb3ZpZGVy TW9jayhtX2NvbnRleHQuZ2V0KCkpKTsKIAogI2lmIFBMQVRGT1JNKElPUykgfHwgKFBMQVRGT1JN KE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+IDEwODApCiAgICAgV0tD b250ZXh0U2V0VXNlc05ldHdvcmtQcm9jZXNzKG1fY29udGV4dC5nZXQoKSwgdHJ1ZSk7CkBAIC00 MTgsNyArNDE3LDcgQEAgdm9pZCBUZXN0Q29udHJvbGxlcjo6aW5pdGlhbGl6ZShpbnQgYXJnYywg Y29uc3QgY2hhciogYXJndltdKQogCiB2b2lkIFRlc3RDb250cm9sbGVyOjpjcmVhdGVXZWJWaWV3 V2l0aE9wdGlvbnMoV0tEaWN0aW9uYXJ5UmVmIG9wdGlvbnMpCiB7Ci0gICAgbV9tYWluV2ViVmll dyA9IGFkb3B0UHRyKG5ldyBQbGF0Zm9ybVdlYlZpZXcobV9jb250ZXh0LmdldCgpLCBtX3BhZ2VH cm91cC5nZXQoKSwgMCwgb3B0aW9ucykpOworICAgIG1fbWFpbldlYlZpZXcgPSBzdGQ6OnVuaXF1 ZV9wdHI8UGxhdGZvcm1XZWJWaWV3PihuZXcgUGxhdGZvcm1XZWJWaWV3KG1fY29udGV4dC5nZXQo KSwgbV9wYWdlR3JvdXAuZ2V0KCksIDAsIG9wdGlvbnMpKTsKICAgICBXS1BhZ2VVSUNsaWVudFYy IHBhZ2VVSUNsaWVudCA9IHsKICAgICAgICAgeyAyLCBtX21haW5XZWJWaWV3LmdldCgpIH0sCiAg ICAgICAgIDAsIC8vIGNyZWF0ZU5ld1BhZ2VfZGVwcmVjYXRlZEZvclVzZVdpdGhWMApAQCAtNjE2 LDcgKzYxNSw3IEBAIGJvb2wgVGVzdENvbnRyb2xsZXI6OnJlc2V0U3RhdGVUb0NvbnNpc3RlbnRW YWx1ZXMoKQogICAgIC8vIEZJWE1FOiBUaGlzIGZ1bmN0aW9uIHNob3VsZCBhbHNvIGVuc3VyZSB0 aGF0IHRoZXJlIGlzIG9ubHkgb25lIHBhZ2Ugb3Blbi4KIAogICAgIC8vIFJlc2V0IHRoZSBFdmVu dFNlbmRlciBmb3IgZWFjaCB0ZXN0LgotICAgIG1fZXZlbnRTZW5kZXJQcm94eSA9IGFkb3B0UHRy KG5ldyBFdmVudFNlbmRlclByb3h5KHRoaXMpKTsKKyAgICBtX2V2ZW50U2VuZGVyUHJveHkgPSBz dGQ6OnVuaXF1ZV9wdHI8RXZlbnRTZW5kZXJQcm94eT4obmV3IEV2ZW50U2VuZGVyUHJveHkodGhp cykpOwogCiAgICAgLy8gRklYTUU6IElzIHRoaXMgbmVlZGVkPyBOb3RoaW5nIGluIFRlc3RDb250 cm9sbGVyIGNoYW5nZXMgcHJlZmVyZW5jZXMgZHVyaW5nIHRlc3RzLCBhbmQgaWYgdGhlcmUgaXMK ICAgICAvLyBzb21lIG90aGVyIGNvZGUgZG9pbmcgdGhpcywgaXQgc2hvdWxkIHByb2JhYmx5IGJl IHJlc3BvbnNpYmxlIGZvciBjbGVhbnVwIHRvby4KQEAgLTc2MCw3ICs3NTksNyBAQCBib29sIFRl c3RDb250cm9sbGVyOjpydW5UZXN0KGNvbnN0IGNoYXIqIGlucHV0TGluZSkKIAogICAgIG1fc3Rh dGUgPSBSdW5uaW5nVGVzdDsKIAotICAgIG1fY3VycmVudEludm9jYXRpb24gPSBhZG9wdFB0cihu ZXcgVGVzdEludm9jYXRpb24oY29tbWFuZC5wYXRoT3JVUkwpKTsKKyAgICBtX2N1cnJlbnRJbnZv Y2F0aW9uID0gc3RkOjp1bmlxdWVfcHRyPFRlc3RJbnZvY2F0aW9uPihuZXcgVGVzdEludm9jYXRp b24oY29tbWFuZC5wYXRoT3JVUkwpKTsKICAgICBpZiAoY29tbWFuZC5zaG91bGREdW1wUGl4ZWxz IHx8IG1fc2hvdWxkRHVtcFBpeGVsc0ZvckFsbFRlc3RzKQogICAgICAgICBtX2N1cnJlbnRJbnZv Y2F0aW9uLT5zZXRJc1BpeGVsVGVzdChjb21tYW5kLmV4cGVjdGVkUGl4ZWxIYXNoKTsKICAgICBp ZiAoY29tbWFuZC50aW1lb3V0ID4gMCkKQEAgLTc2OSw3ICs3NjgsNyBAQCBib29sIFRlc3RDb250 cm9sbGVyOjpydW5UZXN0KGNvbnN0IGNoYXIqIGlucHV0TGluZSkKICAgICBwbGF0Zm9ybVdpbGxS dW5UZXN0KCptX2N1cnJlbnRJbnZvY2F0aW9uKTsKIAogICAgIG1fY3VycmVudEludm9jYXRpb24t Pmludm9rZSgpOwotICAgIG1fY3VycmVudEludm9jYXRpb24uY2xlYXIoKTsKKyAgICBtX2N1cnJl bnRJbnZvY2F0aW9uID0gbnVsbHB0cjsKIAogICAgIHJldHVybiB0cnVlOwogfQpkaWZmIC0tZ2l0 IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oIGIvVG9vbHMvV2ViS2l0 VGVzdFJ1bm5lci9UZXN0Q29udHJvbGxlci5oCmluZGV4IDM0NzI1NzRjOGVjZWU3ZGIzNmM0MTM0 ODQ0ZTk3M2Y2ODc1ZTlmZTMuLjY4YTk5YjIwZjdiNDcyNmEyODc4NDZiZjNiODg5Zjg3YzBkYzM1 MDAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuaAor KysgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmgKQEAgLTMyLDcgKzMy LDYgQEAKICNpbmNsdWRlIDxXZWJLaXQvV0tSZXRhaW5QdHIuaD4KICNpbmNsdWRlIDxzdHJpbmc+ CiAjaW5jbHVkZSA8dmVjdG9yPgotI2luY2x1ZGUgPHd0Zi9Pd25QdHIuaD4KICNpbmNsdWRlIDx3 dGYvVmVjdG9yLmg+CiAKIG5hbWVzcGFjZSBXVFIgewpAQCAtMTg1LDcgKzE4NCw3IEBAIHByaXZh dGU6CiAgICAgc3RhdGljIGNvbnN0IGNoYXIqIGxpYnJhcnlQYXRoRm9yVGVzdGluZygpOwogICAg IHN0YXRpYyBjb25zdCBjaGFyKiBwbGF0Zm9ybUxpYnJhcnlQYXRoRm9yVGVzdGluZygpOwogCi0g ICAgT3duUHRyPFRlc3RJbnZvY2F0aW9uPiBtX2N1cnJlbnRJbnZvY2F0aW9uOworICAgIHN0ZDo6 dW5pcXVlX3B0cjxUZXN0SW52b2NhdGlvbj4gbV9jdXJyZW50SW52b2NhdGlvbjsKIAogICAgIGJv b2wgbV92ZXJib3NlOwogICAgIGJvb2wgbV9wcmludFNlcGFyYXRvcnM7CkBAIC0xOTgsNyArMTk3 LDcgQEAgcHJpdmF0ZToKIAogICAgIFdlYk5vdGlmaWNhdGlvblByb3ZpZGVyIG1fd2ViTm90aWZp Y2F0aW9uUHJvdmlkZXI7CiAKLSAgICBPd25QdHI8UGxhdGZvcm1XZWJWaWV3PiBtX21haW5XZWJW aWV3OworICAgIHN0ZDo6dW5pcXVlX3B0cjxQbGF0Zm9ybVdlYlZpZXc+IG1fbWFpbldlYlZpZXc7 CiAgICAgV0tSZXRhaW5QdHI8V0tDb250ZXh0UmVmPiBtX2NvbnRleHQ7CiAgICAgV0tSZXRhaW5Q dHI8V0tQYWdlR3JvdXBSZWY+IG1fcGFnZUdyb3VwOwogCkBAIC0yMjMsNyArMjIyLDcgQEAgcHJp dmF0ZToKICAgICAKICAgICBib29sIG1fYmVmb3JlVW5sb2FkUmV0dXJuVmFsdWU7CiAKLSAgICBP d25QdHI8R2VvbG9jYXRpb25Qcm92aWRlck1vY2s+IG1fZ2VvbG9jYXRpb25Qcm92aWRlcjsKKyAg ICBzdGQ6OnVuaXF1ZV9wdHI8R2VvbG9jYXRpb25Qcm92aWRlck1vY2s+IG1fZ2VvbG9jYXRpb25Q cm92aWRlcjsKICAgICBWZWN0b3I8V0tSZXRhaW5QdHI8V0tHZW9sb2NhdGlvblBlcm1pc3Npb25S ZXF1ZXN0UmVmPiA+IG1fZ2VvbG9jYXRpb25QZXJtaXNzaW9uUmVxdWVzdHM7CiAgICAgYm9vbCBt X2lzR2VvbG9jYXRpb25QZXJtaXNzaW9uU2V0OwogICAgIGJvb2wgbV9pc0dlb2xvY2F0aW9uUGVy bWlzc2lvbkFsbG93ZWQ7CkBAIC0yNDMsNyArMjQyLDcgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wg bV9zaG91bGRMb2dIaXN0b3J5Q2xpZW50Q2FsbGJhY2tzOwogCi0gICAgT3duUHRyPEV2ZW50U2Vu ZGVyUHJveHk+IG1fZXZlbnRTZW5kZXJQcm94eTsKKyAgICBzdGQ6OnVuaXF1ZV9wdHI8RXZlbnRT ZW5kZXJQcm94eT4gbV9ldmVudFNlbmRlclByb3h5OwogCiAgICAgV29ya1F1ZXVlTWFuYWdlciBt X3dvcmtRdWV1ZU1hbmFnZXI7CiB9OwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5l ci9UZXN0SW52b2NhdGlvbi5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0 aW9uLmNwcAppbmRleCAyZjk1MmI1Y2M0YzUwZDIzYTk0YWMxOTNkOTBkNTkwMzg1M2Y5M2M0Li41 OWJkYTQ0ZGM0NTQ3ODRjNjY3MWYyZDVhNjZiM2JiNTFjYmVmOWY0IDEwMDY0NAotLS0gYS9Ub29s cy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcAorKysgYi9Ub29scy9XZWJLaXRU ZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmNwcApAQCAtMzgsNyArMzgsNiBAQAogI2luY2x1ZGUg PFdlYktpdC9XS1JldGFpblB0ci5oPgogI2luY2x1ZGUgPGNsaW1pdHM+CiAjaW5jbHVkZSA8Y3N0 ZGlvPgotI2luY2x1ZGUgPHd0Zi9QYXNzT3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1N0ZExpYkV4 dHJhcy5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIApkaWZmIC0tZ2l0IGEvVG9v bHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0SW52b2NhdGlvbi5oIGIvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9UZXN0SW52b2NhdGlvbi5oCmluZGV4IDJlZDIxM2NkN2EzZjQxYTc1MTU0MDQ5M2FkYjY0 MTNiYTQyZTk2MWEuLjFkODEwYzJjZmZiM2U4YWI2NmI0ODJkN2U3ZGJmZWQ0ODJiMDllOTIgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdEludm9jYXRpb24uaAorKysgYi9U b29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RJbnZvY2F0aW9uLmgKQEAgLTI5LDcgKzI5LDYgQEAK ICNpbmNsdWRlIDxXZWJLaXQvV0tSZXRhaW5QdHIuaD4KICNpbmNsdWRlIDxzdHJpbmc+CiAjaW5j bHVkZSA8d3RmL05vbmNvcHlhYmxlLmg+Ci0jaW5jbHVkZSA8d3RmL093blB0ci5oPgogI2luY2x1 ZGUgPHd0Zi90ZXh0L1N0cmluZ0J1aWxkZXIuaD4KIAogbmFtZXNwYWNlIFdUUiB7CmRpZmYgLS1n aXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1dvcmtRdWV1ZU1hbmFnZXIuY3BwIGIvVG9vbHMv V2ViS2l0VGVzdFJ1bm5lci9Xb3JrUXVldWVNYW5hZ2VyLmNwcAppbmRleCAzMjUwMjNkMTk0MGJm ZjQ2ODQ3N2M3YWExNDdlNjk3MzQwY2I1ODlhLi4yNTVkOTM5MTdhYWY2M2YyZTA2ZjA3Yjc1Njdm MGI5ZWQ5NmNhY2I5IDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1dvcmtRdWV1 ZU1hbmFnZXIuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvV29ya1F1ZXVlTWFuYWdl ci5jcHAKQEAgLTMxLDcgKzMxLDYgQEAKICNpbmNsdWRlIDxXZWJLaXQvV0tQYWdlLmg+CiAjaW5j bHVkZSA8V2ViS2l0L1dLUmV0YWluUHRyLmg+CiAjaW5jbHVkZSA8c3RkaW8uaD4KLSNpbmNsdWRl IDx3dGYvUGFzc093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogbmFt ZXNwYWNlIFdUUiB7CkBAIC0xMTksNyArMTE4LDcgQEAgYm9vbCBXb3JrUXVldWVNYW5hZ2VyOjpw cm9jZXNzV29ya1F1ZXVlKCkKIHsKICAgICBtX3Byb2Nlc3NpbmcgPSBmYWxzZTsKICAgICB3aGls ZSAoIW1fcHJvY2Vzc2luZyAmJiAhbV93b3JrUXVldWUuaXNFbXB0eSgpKSB7Ci0gICAgICAgIE93 blB0cjxXb3JrUXVldWVJdGVtPiBpdGVtKG1fd29ya1F1ZXVlLnRha2VGaXJzdCgpKTsKKyAgICAg ICAgc3RkOjp1bmlxdWVfcHRyPFdvcmtRdWV1ZUl0ZW0+IGl0ZW0obV93b3JrUXVldWUudGFrZUZp cnN0KCkpOwogICAgICAgICBtX3Byb2Nlc3NpbmcgPSAoaXRlbS0+aW52b2tlKCkgPT0gV29ya1F1 ZXVlSXRlbTo6TG9hZGluZyk7CiAgICAgfQogCkBAIC0yMjIsNyArMjIxLDcgQEAgdm9pZCBXb3Jr UXVldWVNYW5hZ2VyOjplbnF1ZXVlKFdvcmtRdWV1ZUl0ZW0qIGl0ZW0pCiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKLSAgICBtX3dvcmtRdWV1ZS5hcHBlbmQoYWRvcHRQdHIoaXRlbSkpOworICAg IG1fd29ya1F1ZXVlLmFwcGVuZChzdGQ6OnVuaXF1ZV9wdHI8V29ya1F1ZXVlSXRlbT4oaXRlbSkp OwogfQogCiB9IC8vIG5hbWVzcGFjZSBXVFIKZGlmZiAtLWdpdCBhL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvV29ya1F1ZXVlTWFuYWdlci5oIGIvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Xb3JrUXVl dWVNYW5hZ2VyLmgKaW5kZXggMjFkNWViYjg4NDg0NmFmYzQyODZiY2MxMWViZGJiOGQwOGRhMGI0 MC4uZjE2NWM3MmQwODMxZGJiZjViMzQ2OTg5NDFhYmU1ODJmNWI5NWYwZiAxMDA2NDQKLS0tIGEv VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Xb3JrUXVldWVNYW5hZ2VyLmgKKysrIGIvVG9vbHMvV2Vi S2l0VGVzdFJ1bm5lci9Xb3JrUXVldWVNYW5hZ2VyLmgKQEAgLTI3LDcgKzI3LDYgQEAKICNkZWZp bmUgV29ya1F1ZXVlTWFuYWdlcl9oCiAKICNpbmNsdWRlIDx3dGYvRGVxdWUuaD4KLSNpbmNsdWRl IDx3dGYvT3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIG5hbWVz cGFjZSBXVFIgewpAQCAtNTEsNyArNTAsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBxdWV1ZU5vbkxv YWRpbmdTY3JpcHQoY29uc3QgU3RyaW5nJiBzY3JpcHQpOwogCiBwcml2YXRlOiAgICAKLSAgICB0 eXBlZGVmIERlcXVlPE93blB0cjxjbGFzcyBXb3JrUXVldWVJdGVtPiA+IFdvcmtRdWV1ZTsKKyAg ICB0eXBlZGVmIERlcXVlPHN0ZDo6dW5pcXVlX3B0cjxjbGFzcyBXb3JrUXVldWVJdGVtPiA+IFdv cmtRdWV1ZTsKIAogICAgIHZvaWQgZW5xdWV1ZShXb3JrUXVldWVJdGVtKik7IC8vIEFkb3B0cyBw b2ludGVyLgogCg==