155593 2016-03-17 11:52:44 -0700 [ES6] Getters and Setters should be prefixed appropriately 2016-03-17 13:13:26 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 msaboff msaboff commit-queue keith_miller mark.lam saam webkit-bug-importer oldest_to_newest 1175796 0 msaboff 2016-03-17 11:52:44 -0700 According to the ES6 spec, the names of getters and setters should have a "get " or "set ". This is true for the getters and setter defined in our static tables. Those that are created explicitly are currently don't have the prefixes. 1175797 1 webkit-bug-importer 2016-03-17 11:53:52 -0700 <rdar://problem/25221898> 1175803 2 274309 msaboff 2016-03-17 12:06:52 -0700 Created attachment 274309 Patch 1175809 3 274309 mark.lam 2016-03-17 12:15:50 -0700 Comment on attachment 274309 Patch r=me 1175812 4 274309 keith_miller 2016-03-17 12:18:18 -0700 Comment on attachment 274309 Patch LGTM, JSObject::putDirectNativeIntrinsicGetter should only be used internally so adding the "get " should not be a problem. 1175836 5 274309 commit-queue 2016-03-17 13:13:23 -0700 Comment on attachment 274309 Patch Clearing flags on attachment: 274309 Committed r198348: <http://trac.webkit.org/changeset/198348> 1175837 6 commit-queue 2016-03-17 13:13:26 -0700 All reviewed patches have been landed. Closing bug. 274309 2016-03-17 12:06:52 -0700 2016-03-17 13:13:23 -0700 Patch 155593.patch text/plain 13317 msaboff SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk4MzQ0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBA CisyMDE2LTAzLTE3ICBNaWNoYWVsIFNhYm9mZiAgPG1zYWJvZmZAYXBwbGUuY29tPgorCisgICAg ICAgIFtFUzZdIEdldHRlcnMgYW5kIFNldHRlcnMgc2hvdWxkIGJlIHByZWZpeGVkIGFwcHJvcHJp YXRlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1 NTU5MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENo YW5nZWQgdGhlIHB1dERpcmVjdE5hdGl2ZUludHJpbnNpY0dldHRlcigpIHRvIHByZXBlbmQgImdl dCAiIHRvIHRoZSBmdW50aW9uIG5hbWUuCisKKyAgICAgICAgVXBkYXRlZCBwbGFjZXMgdGhhdCBo YWQgdGhlaXIgb3duIG1hY3JvIG9yIGhhbmQgY29uc3RydWN0ZWQgYSBnZXR0ZXIgZnVuY3Rpb24g dG8gdXNlCisgICAgICAgIHRoZSBKU0NfTkFUSVZFX0dFVFRFUiBtYWNybyB3aGljaCB3aWxsIHBy b3Blcmx5IGFwcGVuZCAiZ2V0ICIuCisKKyAgICAgICAgUHJlcGVuZGVkICJnZXQgIiBhbmQgInNl dCAiIHRvIHRoZSBfX3Byb3RvX18gYWNjZXNzb3IgY3JlYXRlZCBvbiB0aGUgT2JqZWN0IHByb3Rv dHlwZS4KKworICAgICAgICBXaGVuIHdlIGNyZWF0ZSB0aGUgU3ltYm9sLnNwZWNpZXMgZ2V0dGVy LCBhZGRlZCBhbiBleHBsaWNpdCBmdW5jdGlvbiBuYW1lIG9mICJnZXQgW1N5bWJvbC5zcGVjaWVz XSIuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGUu Y3BwOgorICAgICAgICAoSW5zcGVjdG9yOjpKU0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZTo6 ZmluaXNoQ3JlYXRpb24pOgorICAgICAgICAoSW5zcGVjdG9yOjpqc0luamVjdGVkU2NyaXB0SG9z dFByb3RvdHlwZUF0dHJpYnV0ZUV2YWx1YXRlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSlNKYXZh U2NyaXB0Q2FsbEZyYW1lUHJvdG90eXBlLmNwcDoKKyAgICAgICAgKEluc3BlY3Rvcjo6SlNKYXZh U2NyaXB0Q2FsbEZyYW1lUHJvdG90eXBlOjpmaW5pc2hDcmVhdGlvbik6CisgICAgICAgIChJbnNw ZWN0b3I6OmpzSmF2YVNjcmlwdENhbGxGcmFtZVByb3RvdHlwZUZ1bmN0aW9uRXZhbHVhdGUpOgor ICAgICAgICAqIHJ1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwOgorICAgICAgICAoSlNDOjpKU0ds b2JhbE9iamVjdDo6aW5pdCk6CisgICAgICAgICogcnVudGltZS9KU09iamVjdC5jcHA6CisgICAg ICAgIChKU0M6OkpTT2JqZWN0OjpwdXREaXJlY3ROYXRpdmVJbnRyaW5zaWNHZXR0ZXIpOgorICAg ICAgICAqIHJ1bnRpbWUvTWFwUHJvdG90eXBlLmNwcDoKKyAgICAgICAgKEpTQzo6TWFwUHJvdG90 eXBlOjpmaW5pc2hDcmVhdGlvbik6CisgICAgICAgIChKU0M6Ok1hcFByb3RvdHlwZTo6Z2V0T3du UHJvcGVydHlTbG90KToKKyAgICAgICAgKiBydW50aW1lL1NldFByb3RvdHlwZS5jcHA6CisgICAg ICAgIChKU0M6OlNldFByb3RvdHlwZTo6ZmluaXNoQ3JlYXRpb24pOgorICAgICAgICAoSlNDOjpT ZXRQcm90b3R5cGU6OmdldE93blByb3BlcnR5U2xvdCk6CisgICAgICAgICogdGVzdHMvc3RyZXNz L2FjY2Vzc29ycy1nZXQtc2V0LXByZWZpeC5qczogQWRkZWQuCisgICAgICAgICh0cnlHZXRPd25Q cm9wZXJ0eURlc2NyaXB0b3JHZXROYW1lKToKKwogMjAxNi0wMy0xNiAgTWFyayBMYW0gIDxtYXJr LmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAgTWV0aG9kIG5hbWVzIHNob3VsZCBub3QgYXBwZWFy IGluIHRoZSBsZXhpY2FsIHNjb3BlIG9mIHRoZSBtZXRob2QncyBib2R5LgpJbmRleDogU291cmNl L0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVjdGVkU2NyaXB0SG9zdFByb3RvdHlwZS5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0luamVj dGVkU2NyaXB0SG9zdFByb3RvdHlwZS5jcHAJKHJldmlzaW9uIDE5ODMzMikKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvSlNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGUuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC03MCwxMSArNzAsNyBAQCB2b2lkIEpTSW5qZWN0ZWRTY3JpcHRI b3N0UHJvdG90eXBlOjpmaW5pCiAgICAgSlNDX05BVElWRV9GVU5DVElPTl9XSVRIT1VUX1RSQU5T SVRJT04oIndlYWtTZXRFbnRyaWVzIiwganNJbmplY3RlZFNjcmlwdEhvc3RQcm90b3R5cGVGdW5j dGlvbldlYWtTZXRFbnRyaWVzLCBEb250RW51bSwgMSk7CiAgICAgSlNDX05BVElWRV9GVU5DVElP Tl9XSVRIT1VUX1RSQU5TSVRJT04oIml0ZXJhdG9yRW50cmllcyIsIGpzSW5qZWN0ZWRTY3JpcHRI b3N0UHJvdG90eXBlRnVuY3Rpb25JdGVyYXRvckVudHJpZXMsIERvbnRFbnVtLCAxKTsKIAotICAg IElkZW50aWZpZXIgZXZhbHVhdGVJZGVudGlmaWVyID0gSWRlbnRpZmllcjo6ZnJvbVN0cmluZygm dm0sICJldmFsdWF0ZSIpOwotICAgIEdldHRlclNldHRlciogYWNjZXNzb3IgPSBHZXR0ZXJTZXR0 ZXI6OmNyZWF0ZSh2bSwgZ2xvYmFsT2JqZWN0KTsKLSAgICBKU0Z1bmN0aW9uKiBmdW5jdGlvbiA9 IEpTRnVuY3Rpb246OmNyZWF0ZSh2bSwgZ2xvYmFsT2JqZWN0LCAwLCBldmFsdWF0ZUlkZW50aWZp ZXIuc3RyaW5nKCksIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlQXR0cmlidXRlRXZhbHVh dGUpOwotICAgIGFjY2Vzc29yLT5zZXRHZXR0ZXIodm0sIGdsb2JhbE9iamVjdCwgZnVuY3Rpb24p OwotICAgIHB1dERpcmVjdE5vbkluZGV4QWNjZXNzb3Iodm0sIGV2YWx1YXRlSWRlbnRpZmllciwg YWNjZXNzb3IsIERvbnRFbnVtIHwgQWNjZXNzb3IpOworICAgIEpTQ19OQVRJVkVfR0VUVEVSKCJl dmFsdWF0ZSIsIGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlQXR0cmlidXRlRXZhbHVhdGUs IERvbnRFbnVtIHwgQWNjZXNzb3IpOwogfQogCiBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxM IGpzSW5qZWN0ZWRTY3JpcHRIb3N0UHJvdG90eXBlQXR0cmlidXRlRXZhbHVhdGUoRXhlY1N0YXRl KiBleGVjKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0phdmFTY3Jp cHRDYWxsRnJhbWVQcm90b3R5cGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnNwZWN0b3IvSlNKYXZhU2NyaXB0Q2FsbEZyYW1lUHJvdG90eXBlLmNwcAkocmV2aXNp b24gMTk4MzMyKQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9KU0phdmFTY3Jp cHRDYWxsRnJhbWVQcm90b3R5cGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MywxNSArNTMsNiBA QCBzdGF0aWMgRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBqc0phCiAKIGNvbnN0IENsYXNz SW5mbyBKU0phdmFTY3JpcHRDYWxsRnJhbWVQcm90b3R5cGU6OnNfaW5mbyA9IHsgIkphdmFTY3Jp cHRDYWxsRnJhbWUiLCAmQmFzZTo6c19pbmZvLCAwLCBDUkVBVEVfTUVUSE9EX1RBQkxFKEpTSmF2 YVNjcmlwdENhbGxGcmFtZVByb3RvdHlwZSkgfTsKIAotI2RlZmluZSBKU0NfTkFUSVZFX05PTl9J TkRFWF9BQ0NFU1NPUihqc05hbWUsIGNwcE5hbWUsIGF0dHJpYnV0ZXMpIFwKLSAgICB7IFwKLSAg ICAgICAgSWRlbnRpZmllciBpZGVudGlmaWVyID0gSWRlbnRpZmllcjo6ZnJvbVN0cmluZygmdm0s IGpzTmFtZSk7IFwKLSAgICAgICAgR2V0dGVyU2V0dGVyKiBhY2Nlc3NvciA9IEdldHRlclNldHRl cjo6Y3JlYXRlKHZtLCBnbG9iYWxPYmplY3QpOyBcCi0gICAgICAgIEpTRnVuY3Rpb24qIGZ1bmN0 aW9uID0gSlNGdW5jdGlvbjo6Y3JlYXRlKHZtLCBnbG9iYWxPYmplY3QsIDAsIGlkZW50aWZpZXIu c3RyaW5nKCksIGNwcE5hbWUpOyBcCi0gICAgICAgIGFjY2Vzc29yLT5zZXRHZXR0ZXIodm0sIGds b2JhbE9iamVjdCwgZnVuY3Rpb24pOyBcCi0gICAgICAgIHB1dERpcmVjdE5vbkluZGV4QWNjZXNz b3Iodm0sIGlkZW50aWZpZXIsIGFjY2Vzc29yLCAoYXR0cmlidXRlcykpOyBcCi0gICAgfQotCiB2 b2lkIEpTSmF2YVNjcmlwdENhbGxGcmFtZVByb3RvdHlwZTo6ZmluaXNoQ3JlYXRpb24oVk0mIHZt LCBKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0KQogewogICAgIEJhc2U6OmZpbmlzaENyZWF0 aW9uKHZtKTsKQEAgLTcxLDE0ICs2MiwxNCBAQCB2b2lkIEpTSmF2YVNjcmlwdENhbGxGcmFtZVBy b3RvdHlwZTo6ZmluCiAgICAgSlNDX05BVElWRV9GVU5DVElPTl9XSVRIT1VUX1RSQU5TSVRJT04o ImV2YWx1YXRlIiwganNKYXZhU2NyaXB0Q2FsbEZyYW1lUHJvdG90eXBlRnVuY3Rpb25FdmFsdWF0 ZSwgRG9udEVudW0sIDEpOwogICAgIEpTQ19OQVRJVkVfRlVOQ1RJT05fV0lUSE9VVF9UUkFOU0lU SU9OKCJzY29wZVR5cGUiLCBqc0phdmFTY3JpcHRDYWxsRnJhbWVQcm90b3R5cGVGdW5jdGlvblNj b3BlVHlwZSwgRG9udEVudW0sIDEpOwogCi0gICAgSlNDX05BVElWRV9OT05fSU5ERVhfQUNDRVNT T1IoImNhbGxlciIsIGpzSmF2YVNjcmlwdENhbGxGcmFtZUF0dHJpYnV0ZUNhbGxlciwgRG9udEVu dW0gfCBBY2Nlc3Nvcik7Ci0gICAgSlNDX05BVElWRV9OT05fSU5ERVhfQUNDRVNTT1IoInNvdXJj ZUlEIiwganNKYXZhU2NyaXB0Q2FsbEZyYW1lQXR0cmlidXRlU291cmNlSUQsIERvbnRFbnVtIHwg QWNjZXNzb3IpOwotICAgIEpTQ19OQVRJVkVfTk9OX0lOREVYX0FDQ0VTU09SKCJsaW5lIiwganNK YXZhU2NyaXB0Q2FsbEZyYW1lQXR0cmlidXRlTGluZSwgRG9udEVudW0gfCBBY2Nlc3Nvcik7Ci0g ICAgSlNDX05BVElWRV9OT05fSU5ERVhfQUNDRVNTT1IoImNvbHVtbiIsIGpzSmF2YVNjcmlwdENh bGxGcmFtZUF0dHJpYnV0ZUNvbHVtbiwgRG9udEVudW0gfCBBY2Nlc3Nvcik7Ci0gICAgSlNDX05B VElWRV9OT05fSU5ERVhfQUNDRVNTT1IoImZ1bmN0aW9uTmFtZSIsIGpzSmF2YVNjcmlwdENhbGxG cmFtZUF0dHJpYnV0ZUZ1bmN0aW9uTmFtZSwgRG9udEVudW0gfCBBY2Nlc3Nvcik7Ci0gICAgSlND X05BVElWRV9OT05fSU5ERVhfQUNDRVNTT1IoInNjb3BlQ2hhaW4iLCBqc0phdmFTY3JpcHRDYWxs RnJhbWVBdHRyaWJ1dGVTY29wZUNoYWluLCBEb250RW51bSB8IEFjY2Vzc29yKTsKLSAgICBKU0Nf TkFUSVZFX05PTl9JTkRFWF9BQ0NFU1NPUigidGhpc09iamVjdCIsIGpzSmF2YVNjcmlwdENhbGxG cmFtZUF0dHJpYnV0ZVRoaXNPYmplY3QsIERvbnRFbnVtIHwgQWNjZXNzb3IpOwotICAgIEpTQ19O QVRJVkVfTk9OX0lOREVYX0FDQ0VTU09SKCJ0eXBlIiwganNKYXZhU2NyaXB0Q2FsbEZyYW1lQXR0 cmlidXRlVHlwZSwgRG9udEVudW0gfCBBY2Nlc3Nvcik7CisgICAgSlNDX05BVElWRV9HRVRURVIo ImNhbGxlciIsIGpzSmF2YVNjcmlwdENhbGxGcmFtZUF0dHJpYnV0ZUNhbGxlciwgRG9udEVudW0g fCBBY2Nlc3Nvcik7CisgICAgSlNDX05BVElWRV9HRVRURVIoInNvdXJjZUlEIiwganNKYXZhU2Ny aXB0Q2FsbEZyYW1lQXR0cmlidXRlU291cmNlSUQsIERvbnRFbnVtIHwgQWNjZXNzb3IpOworICAg IEpTQ19OQVRJVkVfR0VUVEVSKCJsaW5lIiwganNKYXZhU2NyaXB0Q2FsbEZyYW1lQXR0cmlidXRl TGluZSwgRG9udEVudW0gfCBBY2Nlc3Nvcik7CisgICAgSlNDX05BVElWRV9HRVRURVIoImNvbHVt biIsIGpzSmF2YVNjcmlwdENhbGxGcmFtZUF0dHJpYnV0ZUNvbHVtbiwgRG9udEVudW0gfCBBY2Nl c3Nvcik7CisgICAgSlNDX05BVElWRV9HRVRURVIoImZ1bmN0aW9uTmFtZSIsIGpzSmF2YVNjcmlw dENhbGxGcmFtZUF0dHJpYnV0ZUZ1bmN0aW9uTmFtZSwgRG9udEVudW0gfCBBY2Nlc3Nvcik7Cisg ICAgSlNDX05BVElWRV9HRVRURVIoInNjb3BlQ2hhaW4iLCBqc0phdmFTY3JpcHRDYWxsRnJhbWVB dHRyaWJ1dGVTY29wZUNoYWluLCBEb250RW51bSB8IEFjY2Vzc29yKTsKKyAgICBKU0NfTkFUSVZF X0dFVFRFUigidGhpc09iamVjdCIsIGpzSmF2YVNjcmlwdENhbGxGcmFtZUF0dHJpYnV0ZVRoaXNP YmplY3QsIERvbnRFbnVtIHwgQWNjZXNzb3IpOworICAgIEpTQ19OQVRJVkVfR0VUVEVSKCJ0eXBl IiwganNKYXZhU2NyaXB0Q2FsbEZyYW1lQXR0cmlidXRlVHlwZSwgRG9udEVudW0gfCBBY2Nlc3Nv cik7CiB9CiAKIEVuY29kZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNKYXZhU2NyaXB0Q2FsbEZy YW1lUHJvdG90eXBlRnVuY3Rpb25FdmFsdWF0ZShFeGVjU3RhdGUqIGV4ZWMpCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9iamVjdC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvSlNHbG9iYWxPYmplY3QuY3BwCShyZXZp c2lvbiAxOTgzMzIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU0dsb2JhbE9i amVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwMSw4ICszMDEsOCBAQCB2b2lkIEpTR2xvYmFs T2JqZWN0Ojppbml0KFZNJiB2bSkKICAgICBtX251bGxTZXR0ZXJGdW5jdGlvbi5zZXQodm0sIHRo aXMsIE51bGxTZXR0ZXJGdW5jdGlvbjo6Y3JlYXRlKHZtLCBOdWxsU2V0dGVyRnVuY3Rpb246OmNy ZWF0ZVN0cnVjdHVyZSh2bSwgdGhpcywgbV9mdW5jdGlvblByb3RvdHlwZS5nZXQoKSkpKTsKICAg ICBtX29iamVjdFByb3RvdHlwZS5zZXQodm0sIHRoaXMsIE9iamVjdFByb3RvdHlwZTo6Y3JlYXRl KHZtLCB0aGlzLCBPYmplY3RQcm90b3R5cGU6OmNyZWF0ZVN0cnVjdHVyZSh2bSwgdGhpcywganNO dWxsKCkpKSk7CiAgICAgR2V0dGVyU2V0dGVyKiBwcm90b0FjY2Vzc29yID0gR2V0dGVyU2V0dGVy OjpjcmVhdGUodm0sIHRoaXMpOwotICAgIHByb3RvQWNjZXNzb3ItPnNldEdldHRlcih2bSwgdGhp cywgSlNGdW5jdGlvbjo6Y3JlYXRlKHZtLCB0aGlzLCAwLCBTdHJpbmcoKSwgZ2xvYmFsRnVuY1By b3RvR2V0dGVyKSk7Ci0gICAgcHJvdG9BY2Nlc3Nvci0+c2V0U2V0dGVyKHZtLCB0aGlzLCBKU0Z1 bmN0aW9uOjpjcmVhdGUodm0sIHRoaXMsIDAsIFN0cmluZygpLCBnbG9iYWxGdW5jUHJvdG9TZXR0 ZXIpKTsKKyAgICBwcm90b0FjY2Vzc29yLT5zZXRHZXR0ZXIodm0sIHRoaXMsIEpTRnVuY3Rpb246 OmNyZWF0ZSh2bSwgdGhpcywgMCwgbWFrZVN0cmluZygiZ2V0ICIsIHZtLnByb3BlcnR5TmFtZXMt PnVuZGVyc2NvcmVQcm90by5zdHJpbmcoKSksIGdsb2JhbEZ1bmNQcm90b0dldHRlcikpOworICAg IHByb3RvQWNjZXNzb3ItPnNldFNldHRlcih2bSwgdGhpcywgSlNGdW5jdGlvbjo6Y3JlYXRlKHZt LCB0aGlzLCAwLCBtYWtlU3RyaW5nKCJzZXQgIiwgdm0ucHJvcGVydHlOYW1lcy0+dW5kZXJzY29y ZVByb3RvLnN0cmluZygpKSwgZ2xvYmFsRnVuY1Byb3RvU2V0dGVyKSk7CiAgICAgbV9vYmplY3RQ cm90b3R5cGUtPnB1dERpcmVjdE5vbkluZGV4QWNjZXNzb3Iodm0sIHZtLnByb3BlcnR5TmFtZXMt PnVuZGVyc2NvcmVQcm90bywgcHJvdG9BY2Nlc3NvciwgQWNjZXNzb3IgfCBEb250RW51bSk7CiAg ICAgbV9mdW5jdGlvblByb3RvdHlwZS0+c3RydWN0dXJlKCktPnNldFByb3RvdHlwZVdpdGhvdXRU cmFuc2l0aW9uKHZtLCBtX29iamVjdFByb3RvdHlwZS5nZXQoKSk7CiAKQEAgLTQwOCw3ICs0MDgs NyBAQCBtXyAjIyBwcm9wZXJOYW1lICMjIFN0cnVjdHVyZS5zZXQodm0sIHRoCiAgICAgLy8gQ29u c3RydWN0b3JzCiAKICAgICBHZXR0ZXJTZXR0ZXIqIHNwZWNpZXNHZXR0ZXJTZXR0ZXIgPSBHZXR0 ZXJTZXR0ZXI6OmNyZWF0ZSh2bSwgdGhpcyk7Ci0gICAgc3BlY2llc0dldHRlclNldHRlci0+c2V0 R2V0dGVyKHZtLCB0aGlzLCBKU0Z1bmN0aW9uOjpjcmVhdGVCdWlsdGluRnVuY3Rpb24odm0sIGds b2JhbE9iamVjdFNwZWNpZXNHZXR0ZXJDb2RlR2VuZXJhdG9yKHZtKSwgdGhpcykpOworICAgIHNw ZWNpZXNHZXR0ZXJTZXR0ZXItPnNldEdldHRlcih2bSwgdGhpcywgSlNGdW5jdGlvbjo6Y3JlYXRl QnVpbHRpbkZ1bmN0aW9uKHZtLCBnbG9iYWxPYmplY3RTcGVjaWVzR2V0dGVyQ29kZUdlbmVyYXRv cih2bSksIHRoaXMsICJnZXQgW1N5bWJvbC5zcGVjaWVzXSIpKTsKIAogICAgIE9iamVjdENvbnN0 cnVjdG9yKiBvYmplY3RDb25zdHJ1Y3RvciA9IE9iamVjdENvbnN0cnVjdG9yOjpjcmVhdGUodm0s IHRoaXMsIE9iamVjdENvbnN0cnVjdG9yOjpjcmVhdGVTdHJ1Y3R1cmUodm0sIHRoaXMsIG1fZnVu Y3Rpb25Qcm90b3R5cGUuZ2V0KCkpLCBtX29iamVjdFByb3RvdHlwZS5nZXQoKSk7CiAgICAgbV9v YmplY3RDb25zdHJ1Y3Rvci5zZXQodm0sIHRoaXMsIG9iamVjdENvbnN0cnVjdG9yKTsKSW5kZXg6 IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9KU09iamVjdC5jcHAJKHJldmlzaW9uIDE5 ODMzMikKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0pTT2JqZWN0LmNwcAkod29y a2luZyBjb3B5KQpAQCAtMjU3Niw3ICsyNTc2LDcgQEAgYm9vbCBKU09iamVjdDo6cHV0RGlyZWN0 SW5kZXhCZXlvbmRWZWN0bwogYm9vbCBKU09iamVjdDo6cHV0RGlyZWN0TmF0aXZlSW50cmluc2lj R2V0dGVyKFZNJiB2bSwgSlNHbG9iYWxPYmplY3QqIGdsb2JhbE9iamVjdCwgSWRlbnRpZmllciBu YW1lLCBOYXRpdmVGdW5jdGlvbiBuYXRpdmVGdW5jdGlvbiwgSW50cmluc2ljIGludHJpbnNpYywg dW5zaWduZWQgYXR0cmlidXRlcykKIHsKICAgICBHZXR0ZXJTZXR0ZXIqIGFjY2Vzc29yID0gR2V0 dGVyU2V0dGVyOjpjcmVhdGUodm0sIGdsb2JhbE9iamVjdCk7Ci0gICAgSlNGdW5jdGlvbiogZnVu Y3Rpb24gPSBKU0Z1bmN0aW9uOjpjcmVhdGUodm0sIGdsb2JhbE9iamVjdCwgMCwgbmFtZS5zdHJp bmcoKSwgbmF0aXZlRnVuY3Rpb24sIGludHJpbnNpYyk7CisgICAgSlNGdW5jdGlvbiogZnVuY3Rp b24gPSBKU0Z1bmN0aW9uOjpjcmVhdGUodm0sIGdsb2JhbE9iamVjdCwgMCwgbWFrZVN0cmluZygi Z2V0ICIsIG5hbWUuc3RyaW5nKCkpLCBuYXRpdmVGdW5jdGlvbiwgaW50cmluc2ljKTsKICAgICBh Y2Nlc3Nvci0+c2V0R2V0dGVyKHZtLCBnbG9iYWxPYmplY3QsIGZ1bmN0aW9uKTsKICAgICByZXR1 cm4gcHV0RGlyZWN0Tm9uSW5kZXhBY2Nlc3Nvcih2bSwgbmFtZSwgYWNjZXNzb3IsIGF0dHJpYnV0 ZXMpOwogfQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTWFwUHJvdG90eXBl LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9NYXBQcm90 b3R5cGUuY3BwCShyZXZpc2lvbiAxOTgzMzIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVu dGltZS9NYXBQcm90b3R5cGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NSwxMCArODUsNyBAQCB2 b2lkIE1hcFByb3RvdHlwZTo6ZmluaXNoQ3JlYXRpb24oVk0mIHZtCiAgICAgcHV0RGlyZWN0V2l0 aG91dFRyYW5zaXRpb24odm0sIHZtLnByb3BlcnR5TmFtZXMtPml0ZXJhdG9yU3ltYm9sLCBlbnRy aWVzLCBEb250RW51bSk7CiAgICAgcHV0RGlyZWN0V2l0aG91dFRyYW5zaXRpb24odm0sIHZtLnBy b3BlcnR5TmFtZXMtPnRvU3RyaW5nVGFnU3ltYm9sLCBqc1N0cmluZygmdm0sICJNYXAiKSwgRG9u dEVudW0gfCBSZWFkT25seSk7CiAKLSAgICBHZXR0ZXJTZXR0ZXIqIGFjY2Vzc29yID0gR2V0dGVy U2V0dGVyOjpjcmVhdGUodm0sIGdsb2JhbE9iamVjdCk7Ci0gICAgSlNGdW5jdGlvbiogZnVuY3Rp b24gPSBKU0Z1bmN0aW9uOjpjcmVhdGUodm0sIGdsb2JhbE9iamVjdCwgMCwgdm0ucHJvcGVydHlO YW1lcy0+c2l6ZS5zdHJpbmcoKSwgbWFwUHJvdG9GdW5jU2l6ZSk7Ci0gICAgYWNjZXNzb3ItPnNl dEdldHRlcih2bSwgZ2xvYmFsT2JqZWN0LCBmdW5jdGlvbik7Ci0gICAgcHV0RGlyZWN0Tm9uSW5k ZXhBY2Nlc3Nvcih2bSwgdm0ucHJvcGVydHlOYW1lcy0+c2l6ZSwgYWNjZXNzb3IsIERvbnRFbnVt IHwgQWNjZXNzb3IpOworICAgIEpTQ19OQVRJVkVfR0VUVEVSKHZtLnByb3BlcnR5TmFtZXMtPnNp emUsIG1hcFByb3RvRnVuY1NpemUsIERvbnRFbnVtIHwgQWNjZXNzb3IpOwogfQogCiBib29sIE1h cFByb3RvdHlwZTo6Z2V0T3duUHJvcGVydHlTbG90KEpTT2JqZWN0KiBvYmplY3QsIEV4ZWNTdGF0 ZSogZXhlYywgUHJvcGVydHlOYW1lIHByb3BlcnR5TmFtZSwgUHJvcGVydHlTbG90JiBzbG90KQpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvU2V0UHJvdG90eXBlLmNwcAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TZXRQcm90b3R5cGUuY3Bw CShyZXZpc2lvbiAxOTgzMzIpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9TZXRQ cm90b3R5cGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03OSwxMCArNzksNyBAQCB2b2lkIFNldFBy b3RvdHlwZTo6ZmluaXNoQ3JlYXRpb24oVk0mIHZtCiAgICAgcHV0RGlyZWN0V2l0aG91dFRyYW5z aXRpb24odm0sIHZtLnByb3BlcnR5TmFtZXMtPml0ZXJhdG9yU3ltYm9sLCB2YWx1ZXMsIERvbnRF bnVtKTsKICAgICBwdXREaXJlY3RXaXRob3V0VHJhbnNpdGlvbih2bSwgdm0ucHJvcGVydHlOYW1l cy0+dG9TdHJpbmdUYWdTeW1ib2wsIGpzU3RyaW5nKCZ2bSwgIlNldCIpLCBEb250RW51bSB8IFJl YWRPbmx5KTsKIAotICAgIEdldHRlclNldHRlciogYWNjZXNzb3IgPSBHZXR0ZXJTZXR0ZXI6OmNy ZWF0ZSh2bSwgZ2xvYmFsT2JqZWN0KTsKLSAgICBKU0Z1bmN0aW9uKiBmdW5jdGlvbiA9IEpTRnVu Y3Rpb246OmNyZWF0ZSh2bSwgZ2xvYmFsT2JqZWN0LCAwLCB2bS5wcm9wZXJ0eU5hbWVzLT5zaXpl LnN0cmluZygpLCBzZXRQcm90b0Z1bmNTaXplKTsKLSAgICBhY2Nlc3Nvci0+c2V0R2V0dGVyKHZt LCBnbG9iYWxPYmplY3QsIGZ1bmN0aW9uKTsKLSAgICBwdXREaXJlY3ROb25JbmRleEFjY2Vzc29y KHZtLCB2bS5wcm9wZXJ0eU5hbWVzLT5zaXplLCBhY2Nlc3NvciwgRG9udEVudW0gfCBBY2Nlc3Nv cik7CisgICAgSlNDX05BVElWRV9HRVRURVIodm0ucHJvcGVydHlOYW1lcy0+c2l6ZSwgc2V0UHJv dG9GdW5jU2l6ZSwgRG9udEVudW0gfCBBY2Nlc3Nvcik7CiB9CiAKIGJvb2wgU2V0UHJvdG90eXBl OjpnZXRPd25Qcm9wZXJ0eVNsb3QoSlNPYmplY3QqIG9iamVjdCwgRXhlY1N0YXRlKiBleGVjLCBQ cm9wZXJ0eU5hbWUgcHJvcGVydHlOYW1lLCBQcm9wZXJ0eVNsb3QmIHNsb3QpCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL2FjY2Vzc29ycy1nZXQtc2V0LXByZWZpeC5q cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL2FjY2Vz c29ycy1nZXQtc2V0LXByZWZpeC5qcwkocmV2aXNpb24gMCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS90ZXN0cy9zdHJlc3MvYWNjZXNzb3JzLWdldC1zZXQtcHJlZml4LmpzCSh3b3JraW5nIGNv cHkpCkBAIC0wLDAgKzEsMjcgQEAKK2Z1bmN0aW9uIHRyeUdldE93blByb3BlcnR5RGVzY3JpcHRv ckdldE5hbWUob2JqLCBwcm9wZXJ0eSwgZXhwZWN0ZWROYW1lKQoreworICAgIGxldCBkZXNjcmlw dG9yID0gT2JqZWN0LmdldE93blByb3BlcnR5RGVzY3JpcHRvcihvYmosIHByb3BlcnR5KTsKKyAg ICBpZiAoIWRlc2NyaXB0b3IpCisgICAgICAgIHRocm93ICJDb3VsZG4ndCBmaW5kIHByb3BlcnR5 IGRlc2NyaXB0b3Igb24gb2JqZWN0ICIgKyBvYmoudG9TdHJpbmcoKSArICIgZm9yIHByb3BlcnR5 ICIgKyBwcm9wZXJ0eS50b1N0cmluZygpOworCisgICAgbGV0IGdldHRlciA9IGRlc2NyaXB0b3Iu Z2V0OworICAgIGlmICghZ2V0dGVyKQorICAgICAgICB0aHJvdyAiUHJvcGVydHkgIiArIHByb3Bl cnR5LnRvU3RyaW5nKCkgKyAiIG9uIG9iamVjdCAiICsgb2JqLnRvU3RyaW5nKCkgKyAiIGlzIG5v dCBhIGdldHRlciI7CisKKyAgICBsZXQgZ2V0dGVyTmFtZSA9IGdldHRlci5uYW1lOworICAgIGlm IChnZXR0ZXJOYW1lICE9PSBleHBlY3RlZE5hbWUpCisgICAgICAgIHRocm93ICJXcm9uZyBnZXR0 ZXIgbmFtZSBmb3IgcHJvcGVydHkgIiArIHByb3BlcnR5LnRvU3RyaW5nKCkgKyAiIG9uIG9iamVj dCAiICsgb2JqLnRvU3RyaW5nKCkgKyAiIGV4cGVjdGVkICIgKyBleHBlY3RlZE5hbWUgKyAiIGdv dCAiICsgZ2V0dGVyTmFtZTsKK30KKwordHJ5R2V0T3duUHJvcGVydHlEZXNjcmlwdG9yR2V0TmFt ZShBcnJheSwgU3ltYm9sLnNwZWNpZXMsICJnZXQgW1N5bWJvbC5zcGVjaWVzXSIpOwordHJ5R2V0 T3duUHJvcGVydHlEZXNjcmlwdG9yR2V0TmFtZShNYXAucHJvdG90eXBlLCAic2l6ZSIsICJnZXQg c2l6ZSIpOwordHJ5R2V0T3duUHJvcGVydHlEZXNjcmlwdG9yR2V0TmFtZShTZXQucHJvdG90eXBl LCAic2l6ZSIsICJnZXQgc2l6ZSIpOworCitpZiAoT2JqZWN0Ll9fbG9va3VwR2V0dGVyX18oIl9f cHJvdG9fXyIpLm5hbWUgIT09ICJnZXQgX19wcm90b19fIikKKyAgICB0aHJvdyAiRXhwZWN0ZWQg T2JqZWN0IF9fcHJvdG9fXyBnZXR0ZXIgdG8gYmUgbmFtZWQgXCJnZXQgX19wcm90b1wiIjsKKwor aWYgKE9iamVjdC5fX2xvb2t1cFNldHRlcl9fKCJfX3Byb3RvX18iKS5uYW1lICE9PSAic2V0IF9f cHJvdG9fXyIpCisgICAgdGhyb3cgIkV4cGVjdGVkIE9iamVjdCBfX3Byb3RvX18gc2V0dGVyIHRv IGJlIG5hbWVkIFwic2V0IF9fcHJvdG9cIiI7CisKK2lmIChJbnQzMkFycmF5LnByb3RvdHlwZS5f X2xvb2t1cEdldHRlcl9fKCJieXRlT2Zmc2V0IikubmFtZSAhPT0gImdldCBieXRlT2Zmc2V0IikK KyAgICB0aHJvdyAiRXhwZWN0ZWQgVHlwZWRBcnJheS5wcm90b3R5cGUgYnl0ZU9mZnNldCBnZXR0 ZXIgdG8gYmUgbmFtZWQgXCJnZXQgYnl0ZU9mZnNldFwiIjsK