37729 2010-04-16 14:00:40 -0700 [Qt] QScriptValuePrivate class needs some cleanup. 2010-04-29 01:15:05 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED Qt P2 Normal --- 31863 36594 1 jedrzej.nowacki jedrzej.nowacki commit-queue jedrzej.nowacki kenneth kent.hansen oldest_to_newest 213416 0 jedrzej.nowacki 2010-04-16 14:00:40 -0700 QtScript implementation is placed in a private classes. Private classes should use only other private classes to avoid unnecessary conversions. QScriptValuePrivate breaks this rule, which is wrong. QScriptValuePrivate constructor shouldn't take QScriptEngine pointer as a parameter. 213419 1 53562 jedrzej.nowacki 2010-04-16 14:05:50 -0700 Created attachment 53562 Fix v1 214460 2 53562 kenneth 2010-04-19 19:45:57 -0700 Comment on attachment 53562 Fix v1 > diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog > index 12327e4..d5621a3 100644 > --- a/JavaScriptCore/ChangeLog > +++ b/JavaScriptCore/ChangeLog > @@ -1,3 +1,20 @@ > +2010-04-16 Jedrzej Nowacki <jedrzej.nowacki@nokia.com> > + > + Reviewed by NOBODY (OOPS!). > + > + QtScript implementation is placed in a private classes. a classes? Wrong English > + use only other private classes. QScriptValuePrivate breaks this rule, which > + is wrong. No need to say it is wrong, you already made that clear. Remove dedundant information. > QScriptValuePrivate constructor shouldn't take QScriptEngine pointer > + as a parameter. Is this another comment? or are you fixing a second thing? > + if (engine) > + d_ptr = new QScriptValuePrivate(QScriptEnginePrivate::get(engine).data(), value); > + else > + d_ptr = new QScriptValuePrivate(value); > } I do not understand this get method? It gets the private of the engine? I guess you use a kind of smart pointer inside it, couldn't the method to the data() internally in that method. The code is not easy readable. 214760 3 53844 jedrzej.nowacki 2010-04-20 10:43:51 -0700 Created attachment 53844 Fix v2 (In reply to comment #2) Changelog changed. > I do not understand this get method? It gets the private of the engine? Yes and the class do not have to be a friend, In general the get method is used for conversion between a public and a private class. In QtScript I decided to separete a public implementation and a private implementation. Public implementation is used only for converting to a private one. All real work is done in a private implementation. The design adventage is that we can inline nearby all methods in private imlementation and we do not waste time for converting values inside private implementation. If you want I can describe it in detail. > I guess > you use a kind of smart pointer inside it, couldn't the method to the data() > internally in that method. The code is not easy readable. You are right. It is done. 218893 4 53844 commit-queue 2010-04-29 01:14:59 -0700 Comment on attachment 53844 Fix v2 Clearing flags on attachment: 53844 Committed r58483: <http://trac.webkit.org/changeset/58483> 218894 5 commit-queue 2010-04-29 01:15:05 -0700 All reviewed patches have been landed. Closing bug. 53562 2010-04-16 14:05:50 -0700 2010-04-20 10:43:51 -0700 Fix v1 refactor.diff text/plain 10622 jedrzej.nowacki ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCAxMjMyN2U0Li5kNTYyMWEzIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTAtMDQtMTYgIEplZHJ6ZWogTm93YWNraSAgPGplZHJ6ZWoubm93YWNraUBub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUXRT Y3JpcHQgaW1wbGVtZW50YXRpb24gaXMgcGxhY2VkIGluIGEgcHJpdmF0ZSBjbGFzc2VzLiBQcml2 YXRlIGNsYXNzZXMgc2hvdWxkCisgICAgICAgIHVzZSBvbmx5IG90aGVyIHByaXZhdGUgY2xhc3Nl cy4gUVNjcmlwdFZhbHVlUHJpdmF0ZSBicmVha3MgdGhpcyBydWxlLCB3aGljaAorICAgICAgICBp cyB3cm9uZy4gUVNjcmlwdFZhbHVlUHJpdmF0ZSBjb25zdHJ1Y3RvciBzaG91bGRuJ3QgdGFrZSBR U2NyaXB0RW5naW5lIHBvaW50ZXIKKyAgICAgICAgYXMgYSBwYXJhbWV0ZXIuCisKKyAgICAgICAg W1F0XSBRU2NyaXB0VmFsdWVQcml2YXRlIGNsYXNzIG5lZWRzIHNvbWUgY2xlYW51cC4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM3NzI5CisKKyAgICAg ICAgKiBxdC9hcGkvcXNjcmlwdHZhbHVlLmNwcDoKKyAgICAgICAgKFFTY3JpcHRWYWx1ZTo6UVNj cmlwdFZhbHVlKToKKyAgICAgICAgKiBxdC9hcGkvcXNjcmlwdHZhbHVlX3AuaDoKKyAgICAgICAg KFFTY3JpcHRWYWx1ZVByaXZhdGU6OlFTY3JpcHRWYWx1ZVByaXZhdGUpOgorCiAyMDEwLTA0LTE1 ICBKZWRyemVqIE5vd2Fja2kgIDxqZWRyemVqLm5vd2Fja2lAbm9raWEuY29tPgogCiAgICAgICAg IFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpkaWZmIC0tZ2l0IGEvSmF2 YVNjcmlwdENvcmUvcXQvYXBpL3FzY3JpcHR2YWx1ZS5jcHAgYi9KYXZhU2NyaXB0Q29yZS9xdC9h cGkvcXNjcmlwdHZhbHVlLmNwcAppbmRleCAxMjdmZTA0Li5lZGYwM2VlIDEwMDY0NAotLS0gYS9K YXZhU2NyaXB0Q29yZS9xdC9hcGkvcXNjcmlwdHZhbHVlLmNwcAorKysgYi9KYXZhU2NyaXB0Q29y ZS9xdC9hcGkvcXNjcmlwdHZhbHVlLmNwcApAQCAtMTE1LDggKzExNSwxMSBAQCBRU2NyaXB0VmFs dWU6OlFTY3JpcHRWYWx1ZShRU2NyaXB0VmFsdWVQcml2YXRlKiBkKQogICByZWdpc3RlcnMgaXQg d2l0aCB0aGUgc2NyaXB0IFxhIGVuZ2luZS4KICovCiBRU2NyaXB0VmFsdWU6OlFTY3JpcHRWYWx1 ZShRU2NyaXB0RW5naW5lKiBlbmdpbmUsIGJvb2wgdmFsdWUpCi0gICAgOiBkX3B0cihuZXcgUVNj cmlwdFZhbHVlUHJpdmF0ZShlbmdpbmUsIHZhbHVlKSkKIHsKKyAgICBpZiAoZW5naW5lKQorICAg ICAgICBkX3B0ciA9IG5ldyBRU2NyaXB0VmFsdWVQcml2YXRlKFFTY3JpcHRFbmdpbmVQcml2YXRl OjpnZXQoZW5naW5lKS5kYXRhKCksIHZhbHVlKTsKKyAgICBlbHNlCisgICAgICAgIGRfcHRyID0g bmV3IFFTY3JpcHRWYWx1ZVByaXZhdGUodmFsdWUpOwogfQogCiAvKiEKQEAgLTEyNiw4ICsxMjks MTEgQEAgUVNjcmlwdFZhbHVlOjpRU2NyaXB0VmFsdWUoUVNjcmlwdEVuZ2luZSogZW5naW5lLCBi b29sIHZhbHVlKQogICByZWdpc3RlcnMgaXQgd2l0aCB0aGUgc2NyaXB0IFxhIGVuZ2luZS4KICov CiBRU2NyaXB0VmFsdWU6OlFTY3JpcHRWYWx1ZShRU2NyaXB0RW5naW5lKiBlbmdpbmUsIGludCB2 YWx1ZSkKLSAgICA6IGRfcHRyKG5ldyBRU2NyaXB0VmFsdWVQcml2YXRlKGVuZ2luZSwgdmFsdWUp KQogeworICAgIGlmIChlbmdpbmUpCisgICAgICAgIGRfcHRyID0gbmV3IFFTY3JpcHRWYWx1ZVBy aXZhdGUoUVNjcmlwdEVuZ2luZVByaXZhdGU6OmdldChlbmdpbmUpLmRhdGEoKSwgdmFsdWUpOwor ICAgIGVsc2UKKyAgICAgICAgZF9wdHIgPSBuZXcgUVNjcmlwdFZhbHVlUHJpdmF0ZSh2YWx1ZSk7 CiB9CiAKIC8qIQpAQCAtMTM3LDggKzE0MywxMSBAQCBRU2NyaXB0VmFsdWU6OlFTY3JpcHRWYWx1 ZShRU2NyaXB0RW5naW5lKiBlbmdpbmUsIGludCB2YWx1ZSkKICAgcmVnaXN0ZXJzIGl0IHdpdGgg dGhlIHNjcmlwdCBcYSBlbmdpbmUuCiAgKi8KIFFTY3JpcHRWYWx1ZTo6UVNjcmlwdFZhbHVlKFFT Y3JpcHRFbmdpbmUqIGVuZ2luZSwgdWludCB2YWx1ZSkKLSAgICA6IGRfcHRyKG5ldyBRU2NyaXB0 VmFsdWVQcml2YXRlKGVuZ2luZSwgdmFsdWUpKQogeworICAgIGlmIChlbmdpbmUpCisgICAgICAg IGRfcHRyID0gbmV3IFFTY3JpcHRWYWx1ZVByaXZhdGUoUVNjcmlwdEVuZ2luZVByaXZhdGU6Omdl dChlbmdpbmUpLmRhdGEoKSwgdmFsdWUpOworICAgIGVsc2UKKyAgICAgICAgZF9wdHIgPSBuZXcg UVNjcmlwdFZhbHVlUHJpdmF0ZSh2YWx1ZSk7CiB9CiAKIC8qIQpAQCAtMTQ4LDggKzE1NywxMSBA QCBRU2NyaXB0VmFsdWU6OlFTY3JpcHRWYWx1ZShRU2NyaXB0RW5naW5lKiBlbmdpbmUsIHVpbnQg dmFsdWUpCiAgIHJlZ2lzdGVycyBpdCB3aXRoIHRoZSBzY3JpcHQgXGEgZW5naW5lLgogKi8KIFFT Y3JpcHRWYWx1ZTo6UVNjcmlwdFZhbHVlKFFTY3JpcHRFbmdpbmUqIGVuZ2luZSwgcXNyZWFsIHZh bHVlKQotICAgIDogZF9wdHIobmV3IFFTY3JpcHRWYWx1ZVByaXZhdGUoZW5naW5lLCB2YWx1ZSkp CiB7CisgICAgaWYgKGVuZ2luZSkKKyAgICAgICAgZF9wdHIgPSBuZXcgUVNjcmlwdFZhbHVlUHJp dmF0ZShRU2NyaXB0RW5naW5lUHJpdmF0ZTo6Z2V0KGVuZ2luZSkuZGF0YSgpLCB2YWx1ZSk7Cisg ICAgZWxzZQorICAgICAgICBkX3B0ciA9IG5ldyBRU2NyaXB0VmFsdWVQcml2YXRlKHZhbHVlKTsK IH0KIAogLyohCkBAIC0xNTksOCArMTcxLDExIEBAIFFTY3JpcHRWYWx1ZTo6UVNjcmlwdFZhbHVl KFFTY3JpcHRFbmdpbmUqIGVuZ2luZSwgcXNyZWFsIHZhbHVlKQogICByZWdpc3RlcnMgaXQgd2l0 aCB0aGUgc2NyaXB0IFxhIGVuZ2luZS4KICovCiBRU2NyaXB0VmFsdWU6OlFTY3JpcHRWYWx1ZShR U2NyaXB0RW5naW5lKiBlbmdpbmUsIGNvbnN0IFFTdHJpbmcmIHZhbHVlKQotICAgIDogZF9wdHIo bmV3IFFTY3JpcHRWYWx1ZVByaXZhdGUoZW5naW5lLCB2YWx1ZSkpCiB7CisgICAgaWYgKGVuZ2lu ZSkKKyAgICAgICAgZF9wdHIgPSBuZXcgUVNjcmlwdFZhbHVlUHJpdmF0ZShRU2NyaXB0RW5naW5l UHJpdmF0ZTo6Z2V0KGVuZ2luZSkuZGF0YSgpLCB2YWx1ZSk7CisgICAgZWxzZQorICAgICAgICBk X3B0ciA9IG5ldyBRU2NyaXB0VmFsdWVQcml2YXRlKHZhbHVlKTsKIH0KIAogLyohCkBAIC0xNzAs OCArMTg1LDExIEBAIFFTY3JpcHRWYWx1ZTo6UVNjcmlwdFZhbHVlKFFTY3JpcHRFbmdpbmUqIGVu Z2luZSwgY29uc3QgUVN0cmluZyYgdmFsdWUpCiAgIHJlZ2lzdGVycyBpdCB3aXRoIHRoZSBzY3Jp cHQgXGEgZW5naW5lLgogKi8KIFFTY3JpcHRWYWx1ZTo6UVNjcmlwdFZhbHVlKFFTY3JpcHRFbmdp bmUqIGVuZ2luZSwgY29uc3QgY2hhciogdmFsdWUpCi0gICAgOiBkX3B0cihuZXcgUVNjcmlwdFZh bHVlUHJpdmF0ZShlbmdpbmUsIFFTdHJpbmc6OmZyb21VdGY4KHZhbHVlKSkpCiB7CisgICAgaWYg KGVuZ2luZSkKKyAgICAgICAgZF9wdHIgPSBuZXcgUVNjcmlwdFZhbHVlUHJpdmF0ZShRU2NyaXB0 RW5naW5lUHJpdmF0ZTo6Z2V0KGVuZ2luZSkuZGF0YSgpLCBRU3RyaW5nOjpmcm9tVXRmOCh2YWx1 ZSkpOworICAgIGVsc2UKKyAgICAgICAgZF9wdHIgPSBuZXcgUVNjcmlwdFZhbHVlUHJpdmF0ZShR U3RyaW5nOjpmcm9tVXRmOCh2YWx1ZSkpOwogfQogCiAvKiEKQEAgLTE4MSw4ICsxOTksMTEgQEAg UVNjcmlwdFZhbHVlOjpRU2NyaXB0VmFsdWUoUVNjcmlwdEVuZ2luZSogZW5naW5lLCBjb25zdCBj aGFyKiB2YWx1ZSkKICAgcmVnaXN0ZXJzIGl0IHdpdGggdGhlIHNjcmlwdCBcYSBlbmdpbmUuCiAq LwogUVNjcmlwdFZhbHVlOjpRU2NyaXB0VmFsdWUoUVNjcmlwdEVuZ2luZSogZW5naW5lLCBTcGVj aWFsVmFsdWUgdmFsdWUpCi0gICAgOiBkX3B0cihuZXcgUVNjcmlwdFZhbHVlUHJpdmF0ZShlbmdp bmUsIHZhbHVlKSkKIHsKKyAgICBpZiAoZW5naW5lKQorICAgICAgICBkX3B0ciA9IG5ldyBRU2Ny aXB0VmFsdWVQcml2YXRlKFFTY3JpcHRFbmdpbmVQcml2YXRlOjpnZXQoZW5naW5lKS5kYXRhKCks IHZhbHVlKTsKKyAgICBlbHNlCisgICAgICAgIGRfcHRyID0gbmV3IFFTY3JpcHRWYWx1ZVByaXZh dGUodmFsdWUpOwogfQogCiAvKiEKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3F0L2FwaS9x c2NyaXB0dmFsdWVfcC5oIGIvSmF2YVNjcmlwdENvcmUvcXQvYXBpL3FzY3JpcHR2YWx1ZV9wLmgK aW5kZXggODMwYjM4ZS4uYjU4ODdjYyAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvcXQvYXBp L3FzY3JpcHR2YWx1ZV9wLmgKKysrIGIvSmF2YVNjcmlwdENvcmUvcXQvYXBpL3FzY3JpcHR2YWx1 ZV9wLmgKQEAgLTc2LDEyICs3NiwxMiBAQCBwdWJsaWM6CiAgICAgaW5saW5lIFFTY3JpcHRWYWx1 ZVByaXZhdGUocXNyZWFsIG51bWJlcik7CiAgICAgaW5saW5lIFFTY3JpcHRWYWx1ZVByaXZhdGUo UVNjcmlwdFZhbHVlOjpTcGVjaWFsVmFsdWUgdmFsdWUpOwogCi0gICAgaW5saW5lIFFTY3JpcHRW YWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZSogZW5naW5lLCBib29sIHZhbHVlKTsKLSAg ICBpbmxpbmUgUVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5naW5lKiBlbmdpbmUs IGludCB2YWx1ZSk7Ci0gICAgaW5saW5lIFFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlw dEVuZ2luZSogZW5naW5lLCB1aW50IHZhbHVlKTsKLSAgICBpbmxpbmUgUVNjcmlwdFZhbHVlUHJp dmF0ZShjb25zdCBRU2NyaXB0RW5naW5lKiBlbmdpbmUsIHFzcmVhbCB2YWx1ZSk7Ci0gICAgaW5s aW5lIFFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZSogZW5naW5lLCBjb25z dCBRU3RyaW5nJiB2YWx1ZSk7Ci0gICAgaW5saW5lIFFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3Qg UVNjcmlwdEVuZ2luZSogZW5naW5lLCBRU2NyaXB0VmFsdWU6OlNwZWNpYWxWYWx1ZSB2YWx1ZSk7 CisgICAgaW5saW5lIFFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZVByaXZh dGUqIGVuZ2luZSwgYm9vbCB2YWx1ZSk7CisgICAgaW5saW5lIFFTY3JpcHRWYWx1ZVByaXZhdGUo Y29uc3QgUVNjcmlwdEVuZ2luZVByaXZhdGUqIGVuZ2luZSwgaW50IHZhbHVlKTsKKyAgICBpbmxp bmUgUVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5naW5lUHJpdmF0ZSogZW5naW5l LCB1aW50IHZhbHVlKTsKKyAgICBpbmxpbmUgUVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2Ny aXB0RW5naW5lUHJpdmF0ZSogZW5naW5lLCBxc3JlYWwgdmFsdWUpOworICAgIGlubGluZSBRU2Ny aXB0VmFsdWVQcml2YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmVQcml2YXRlKiBlbmdpbmUsIGNvbnN0 IFFTdHJpbmcmIHZhbHVlKTsKKyAgICBpbmxpbmUgUVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBR U2NyaXB0RW5naW5lUHJpdmF0ZSogZW5naW5lLCBRU2NyaXB0VmFsdWU6OlNwZWNpYWxWYWx1ZSB2 YWx1ZSk7CiAKICAgICBpbmxpbmUgUVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5n aW5lUHJpdmF0ZSogZW5naW5lLCBKU1ZhbHVlUmVmIHZhbHVlKTsKICAgICBpbmxpbmUgUVNjcmlw dFZhbHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5naW5lUHJpdmF0ZSogZW5naW5lLCBKU1ZhbHVl UmVmIHZhbHVlLCBKU09iamVjdFJlZiBvYmplY3QpOwpAQCAtMjA5LDk0ICsyMDksNTggQEAgUVNj cmlwdFZhbHVlUHJpdmF0ZTo6UVNjcmlwdFZhbHVlUHJpdmF0ZShRU2NyaXB0VmFsdWU6OlNwZWNp YWxWYWx1ZSB2YWx1ZSkKIHsKIH0KIAotUVNjcmlwdFZhbHVlUHJpdmF0ZTo6UVNjcmlwdFZhbHVl UHJpdmF0ZShjb25zdCBRU2NyaXB0RW5naW5lKiBlbmdpbmUsIGJvb2wgdmFsdWUpCitRU2NyaXB0 VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFsdWVQcml2YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmVQcml2 YXRlKiBlbmdpbmUsIGJvb2wgdmFsdWUpCiAgICAgOiBtX3N0YXRlKEpTUHJpbWl0aXZlKQorICAg ICwgbV9lbmdpbmUoY29uc3RfY2FzdDxRU2NyaXB0RW5naW5lUHJpdmF0ZSo+KGVuZ2luZSkpCisg ICAgLCBtX3ZhbHVlKGVuZ2luZS0+bWFrZUpTVmFsdWUodmFsdWUpKQogewotICAgIGlmICghZW5n aW5lKSB7Ci0gICAgICAgIC8vIHNsb3dlciBwYXRoIHJlaW5pdGlhbGl6YXRpb24KLSAgICAgICAg bV9zdGF0ZSA9IENCb29sOwotICAgICAgICBtX251bWJlciA9IHZhbHVlOwotICAgICAgICBtX3Zh bHVlID0gMDsKLSAgICB9IGVsc2UgewotICAgICAgICBtX2VuZ2luZSA9IFFTY3JpcHRFbmdpbmVQ cml2YXRlOjpnZXQoZW5naW5lKTsKLSAgICAgICAgbV92YWx1ZSA9IG1fZW5naW5lLT5tYWtlSlNW YWx1ZSh2YWx1ZSk7Ci0gICAgICAgIEpTVmFsdWVQcm90ZWN0KGNvbnRleHQoKSwgbV92YWx1ZSk7 Ci0gICAgfQorICAgIFFfQVNTRVJUKGVuZ2luZSk7CisgICAgSlNWYWx1ZVByb3RlY3QoY29udGV4 dCgpLCBtX3ZhbHVlKTsKIH0KIAotUVNjcmlwdFZhbHVlUHJpdmF0ZTo6UVNjcmlwdFZhbHVlUHJp dmF0ZShjb25zdCBRU2NyaXB0RW5naW5lKiBlbmdpbmUsIGludCB2YWx1ZSkKK1FTY3JpcHRWYWx1 ZVByaXZhdGU6OlFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZVByaXZhdGUq IGVuZ2luZSwgaW50IHZhbHVlKQogICAgIDogbV9zdGF0ZShKU1ByaW1pdGl2ZSkKKyAgICAsIG1f ZW5naW5lKGNvbnN0X2Nhc3Q8UVNjcmlwdEVuZ2luZVByaXZhdGUqPihlbmdpbmUpKQorICAgICwg bV92YWx1ZShtX2VuZ2luZS0+bWFrZUpTVmFsdWUodmFsdWUpKQogewotICAgIGlmICghZW5naW5l KSB7Ci0gICAgICAgIC8vIHNsb3dlciBwYXRoIHJlaW5pdGlhbGl6YXRpb24KLSAgICAgICAgbV9z dGF0ZSA9IENOdW1iZXI7Ci0gICAgICAgIG1fbnVtYmVyID0gdmFsdWU7Ci0gICAgICAgIG1fdmFs dWUgPSAwOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIG1fZW5naW5lID0gUVNjcmlwdEVuZ2luZVBy aXZhdGU6OmdldChlbmdpbmUpOwotICAgICAgICBtX3ZhbHVlID0gbV9lbmdpbmUtPm1ha2VKU1Zh bHVlKHZhbHVlKTsKLSAgICAgICAgSlNWYWx1ZVByb3RlY3QoY29udGV4dCgpLCBtX3ZhbHVlKTsK LSAgICB9CisgICAgUV9BU1NFUlQoZW5naW5lKTsKKyAgICBKU1ZhbHVlUHJvdGVjdChjb250ZXh0 KCksIG1fdmFsdWUpOwogfQogCi1RU2NyaXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFsdWVQcml2 YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmUqIGVuZ2luZSwgdWludCB2YWx1ZSkKK1FTY3JpcHRWYWx1 ZVByaXZhdGU6OlFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZVByaXZhdGUq IGVuZ2luZSwgdWludCB2YWx1ZSkKICAgICA6IG1fc3RhdGUoSlNQcmltaXRpdmUpCisgICAgLCBt X2VuZ2luZShjb25zdF9jYXN0PFFTY3JpcHRFbmdpbmVQcml2YXRlKj4oZW5naW5lKSkKKyAgICAs IG1fdmFsdWUobV9lbmdpbmUtPm1ha2VKU1ZhbHVlKHZhbHVlKSkKIHsKLSAgICBpZiAoIWVuZ2lu ZSkgewotICAgICAgICAvLyBzbG93ZXIgcGF0aCByZWluaXRpYWxpemF0aW9uCi0gICAgICAgIG1f c3RhdGUgPSBDTnVtYmVyOwotICAgICAgICBtX251bWJlciA9IHZhbHVlOwotICAgICAgICBtX3Zh bHVlID0gMDsKLSAgICB9IGVsc2UgewotICAgICAgICBtX2VuZ2luZSA9IFFTY3JpcHRFbmdpbmVQ cml2YXRlOjpnZXQoZW5naW5lKTsKLSAgICAgICAgbV92YWx1ZSA9IG1fZW5naW5lLT5tYWtlSlNW YWx1ZSh2YWx1ZSk7Ci0gICAgICAgIEpTVmFsdWVQcm90ZWN0KGNvbnRleHQoKSwgbV92YWx1ZSk7 Ci0gICAgfQorICAgIFFfQVNTRVJUKGVuZ2luZSk7CisgICAgSlNWYWx1ZVByb3RlY3QoY29udGV4 dCgpLCBtX3ZhbHVlKTsKIH0KIAotUVNjcmlwdFZhbHVlUHJpdmF0ZTo6UVNjcmlwdFZhbHVlUHJp dmF0ZShjb25zdCBRU2NyaXB0RW5naW5lKiBlbmdpbmUsIHFzcmVhbCB2YWx1ZSkKK1FTY3JpcHRW YWx1ZVByaXZhdGU6OlFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZVByaXZh dGUqIGVuZ2luZSwgcXNyZWFsIHZhbHVlKQogICAgIDogbV9zdGF0ZShKU1ByaW1pdGl2ZSkKKyAg ICAsIG1fZW5naW5lKGNvbnN0X2Nhc3Q8UVNjcmlwdEVuZ2luZVByaXZhdGUqPihlbmdpbmUpKQor ICAgICwgbV92YWx1ZShtX2VuZ2luZS0+bWFrZUpTVmFsdWUodmFsdWUpKQogewotICAgIGlmICgh ZW5naW5lKSB7Ci0gICAgICAgIC8vIHNsb3dlciBwYXRoIHJlaW5pdGlhbGl6YXRpb24KLSAgICAg ICAgbV9zdGF0ZSA9IENOdW1iZXI7Ci0gICAgICAgIG1fbnVtYmVyID0gdmFsdWU7Ci0gICAgICAg IG1fdmFsdWUgPSAwOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIG1fZW5naW5lID0gUVNjcmlwdEVu Z2luZVByaXZhdGU6OmdldChlbmdpbmUpOwotICAgICAgICBtX3ZhbHVlID0gbV9lbmdpbmUtPm1h a2VKU1ZhbHVlKHZhbHVlKTsKLSAgICAgICAgSlNWYWx1ZVByb3RlY3QoY29udGV4dCgpLCBtX3Zh bHVlKTsKLSAgICB9CisgICAgUV9BU1NFUlQoZW5naW5lKTsKKyAgICBKU1ZhbHVlUHJvdGVjdChj b250ZXh0KCksIG1fdmFsdWUpOwogfQogCi1RU2NyaXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFs dWVQcml2YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmUqIGVuZ2luZSwgY29uc3QgUVN0cmluZyYgdmFs dWUpCitRU2NyaXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFsdWVQcml2YXRlKGNvbnN0IFFTY3Jp cHRFbmdpbmVQcml2YXRlKiBlbmdpbmUsIGNvbnN0IFFTdHJpbmcmIHZhbHVlKQogICAgIDogbV9z dGF0ZShKU1ByaW1pdGl2ZSkKKyAgICAsIG1fZW5naW5lKGNvbnN0X2Nhc3Q8UVNjcmlwdEVuZ2lu ZVByaXZhdGUqPihlbmdpbmUpKQorICAgICwgbV92YWx1ZShtX2VuZ2luZS0+bWFrZUpTVmFsdWUo dmFsdWUpKQogewotICAgIGlmICghZW5naW5lKSB7Ci0gICAgICAgIC8vIHNsb3dlciBwYXRoIHJl aW5pdGlhbGl6YXRpb24KLSAgICAgICAgbV9zdGF0ZSA9IENTdHJpbmc7Ci0gICAgICAgIG1fc3Ry aW5nID0gdmFsdWU7Ci0gICAgICAgIG1fdmFsdWUgPSAwOwotICAgIH0gZWxzZSB7Ci0gICAgICAg IG1fZW5naW5lID0gUVNjcmlwdEVuZ2luZVByaXZhdGU6OmdldChlbmdpbmUpOwotICAgICAgICBt X3ZhbHVlID0gbV9lbmdpbmUtPm1ha2VKU1ZhbHVlKHZhbHVlKTsKLSAgICAgICAgSlNWYWx1ZVBy b3RlY3QoY29udGV4dCgpLCBtX3ZhbHVlKTsKLSAgICB9CisgICAgUV9BU1NFUlQoZW5naW5lKTsK KyAgICBKU1ZhbHVlUHJvdGVjdChjb250ZXh0KCksIG1fdmFsdWUpOwogfQogCi1RU2NyaXB0VmFs dWVQcml2YXRlOjpRU2NyaXB0VmFsdWVQcml2YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmUqIGVuZ2lu ZSwgUVNjcmlwdFZhbHVlOjpTcGVjaWFsVmFsdWUgdmFsdWUpCitRU2NyaXB0VmFsdWVQcml2YXRl OjpRU2NyaXB0VmFsdWVQcml2YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmVQcml2YXRlKiBlbmdpbmUs IFFTY3JpcHRWYWx1ZTo6U3BlY2lhbFZhbHVlIHZhbHVlKQogICAgIDogbV9zdGF0ZShKU1ByaW1p dGl2ZSkKKyAgICAsIG1fZW5naW5lKGNvbnN0X2Nhc3Q8UVNjcmlwdEVuZ2luZVByaXZhdGUqPihl bmdpbmUpKQorICAgICwgbV92YWx1ZShtX2VuZ2luZS0+bWFrZUpTVmFsdWUodmFsdWUpKQogewot ICAgIGlmICghZW5naW5lKSB7Ci0gICAgICAgIC8vIHNsb3dlciBwYXRoIHJlaW5pdGlhbGl6YXRp b24KLSAgICAgICAgbV9zdGF0ZSA9IENTcGVjaWFsOwotICAgICAgICBtX251bWJlciA9IHZhbHVl OwotICAgICAgICBtX3ZhbHVlID0gMDsKLSAgICB9IGVsc2UgewotICAgICAgICBtX2VuZ2luZSA9 IFFTY3JpcHRFbmdpbmVQcml2YXRlOjpnZXQoZW5naW5lKTsKLSAgICAgICAgbV92YWx1ZSA9IG1f ZW5naW5lLT5tYWtlSlNWYWx1ZSh2YWx1ZSk7Ci0gICAgICAgIEpTVmFsdWVQcm90ZWN0KGNvbnRl eHQoKSwgbV92YWx1ZSk7Ci0gICAgfQorICAgIFFfQVNTRVJUKGVuZ2luZSk7CisgICAgSlNWYWx1 ZVByb3RlY3QoY29udGV4dCgpLCBtX3ZhbHVlKTsKIH0KIAogUVNjcmlwdFZhbHVlUHJpdmF0ZTo6 UVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5naW5lUHJpdmF0ZSogZW5naW5lLCBK U1ZhbHVlUmVmIHZhbHVlKQpAQCAtMzA1LDYgKzI2OSw3IEBAIFFTY3JpcHRWYWx1ZVByaXZhdGU6 OlFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZVByaXZhdGUqIGVuZ2luZSwg SlNWCiAgICAgLCBtX3ZhbHVlKHZhbHVlKQogewogICAgIFFfQVNTRVJUKGVuZ2luZSk7CisgICAg UV9BU1NFUlQodmFsdWUpOwogICAgIEpTVmFsdWVQcm90ZWN0KGNvbnRleHQoKSwgbV92YWx1ZSk7 CiB9CiAKQEAgLTMxNSw2ICsyODAsOCBAQCBRU2NyaXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFs dWVQcml2YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmVQcml2YXRlKiBlbmdpbmUsIEpTVgogICAgICwg bV9vYmplY3Qob2JqZWN0KQogewogICAgIFFfQVNTRVJUKGVuZ2luZSk7CisgICAgUV9BU1NFUlQo dmFsdWUpOworICAgIFFfQVNTRVJUKG9iamVjdCk7CiAgICAgSlNWYWx1ZVByb3RlY3QoY29udGV4 dCgpLCBtX3ZhbHVlKTsKIH0KIAo= 53844 2010-04-20 10:43:51 -0700 2010-04-29 01:14:59 -0700 Fix v2 refactor.diff text/plain 11396 jedrzej.nowacki ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBmODNhZTEyLi5iMDQxMTdjIDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTAtMDQtMjAgIEplZHJ6ZWogTm93YWNraSAgPGplZHJ6ZWoubm93YWNraUBub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU21h bGwgY2xlYW51cC4KKworICAgICAgICBRU2NyaXB0VmFsdWVQcml2YXRlIGNvbnN0cnVjdG9yIHNo b3VsZG4ndCB0YWtlIFFTY3JpcHRFbmdpbmUgcG9pbnRlcgorICAgICAgICBhcyBhIHBhcmFtZXRl ciwgYmVjYXVzZSBpdCBicmVha3MgYSBwcml2YXRlIC8gcHVibGljIHNlcGFyYXRpb24gcnVsZS4K KyAgICAgICAgUVNjcmlwdEVuZ2luZVByaXZhdGU6OmdldChRU2NyaXB0RW5naW5lKikgc2hvdWxk IHJldHVybgorICAgICAgICBhIFFTY3JpcHRFbmdpbmVQcml2YXRlIHBvaW50ZXIgaW5zdGVhZCBv ZiBhIFFTY3JpcHRFbmdpbmVQdHIsIGl0IHNpbXBsaWZpZXMKKyAgICAgICAgaW1wbGVtZW50YXRp b24uCisKKyAgICAgICAgW1F0XSBRU2NyaXB0VmFsdWVQcml2YXRlIGNsYXNzIG5lZWRzIHNvbWUg Y2xlYW51cC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTM3NzI5CisKKyAgICAgICAgKiBxdC9hcGkvcXNjcmlwdGVuZ2luZV9wLmg6CisgICAgICAgIChR U2NyaXB0RW5naW5lUHJpdmF0ZTo6Z2V0KToKKyAgICAgICAgKiBxdC9hcGkvcXNjcmlwdHZhbHVl LmNwcDoKKyAgICAgICAgKFFTY3JpcHRWYWx1ZTo6UVNjcmlwdFZhbHVlKToKKyAgICAgICAgKiBx dC9hcGkvcXNjcmlwdHZhbHVlX3AuaDoKKyAgICAgICAgKFFTY3JpcHRWYWx1ZVByaXZhdGU6OlFT Y3JpcHRWYWx1ZVByaXZhdGUpOgorCiAyMDEwLTA0LTE5ICBHYXZpbiBCYXJyYWNsb3VnaCAgPGJh cnJhY2xvdWdoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKHJvbGxp bmcgb3V0IHI1NzgyOSkuCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9xdC9hcGkvcXNjcmlw dGVuZ2luZV9wLmggYi9KYXZhU2NyaXB0Q29yZS9xdC9hcGkvcXNjcmlwdGVuZ2luZV9wLmgKaW5k ZXggMmJkYTY4ZS4uYzZjNjRkZCAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvcXQvYXBpL3Fz Y3JpcHRlbmdpbmVfcC5oCisrKyBiL0phdmFTY3JpcHRDb3JlL3F0L2FwaS9xc2NyaXB0ZW5naW5l X3AuaApAQCAtMzUsNyArMzUsNyBAQCBjbGFzcyBRU2NyaXB0U3ludGF4Q2hlY2tSZXN1bHRQcml2 YXRlOwogCiBjbGFzcyBRU2NyaXB0RW5naW5lUHJpdmF0ZSA6IHB1YmxpYyBRU2hhcmVkRGF0YSB7 CiBwdWJsaWM6Ci0gICAgc3RhdGljIFFTY3JpcHRFbmdpbmVQdHIgZ2V0KGNvbnN0IFFTY3JpcHRF bmdpbmUqIHEpIHsgUV9BU1NFUlQocSk7IHJldHVybiBxLT5kX3B0cjsgfQorICAgIHN0YXRpYyBR U2NyaXB0RW5naW5lUHJpdmF0ZSogZ2V0KGNvbnN0IFFTY3JpcHRFbmdpbmUqIHEpIHsgUV9BU1NF UlQocSk7IHJldHVybiBxLT5kX3B0ci5kYXRhKCk7IH0KICAgICBzdGF0aWMgUVNjcmlwdEVuZ2lu ZSogZ2V0KGNvbnN0IFFTY3JpcHRFbmdpbmVQcml2YXRlKiBkKSB7IFFfQVNTRVJUKGQpOyByZXR1 cm4gZC0+cV9wdHI7IH0KIAogICAgIFFTY3JpcHRFbmdpbmVQcml2YXRlKGNvbnN0IFFTY3JpcHRF bmdpbmUqKTsKZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3F0L2FwaS9xc2NyaXB0dmFsdWUu Y3BwIGIvSmF2YVNjcmlwdENvcmUvcXQvYXBpL3FzY3JpcHR2YWx1ZS5jcHAKaW5kZXggMTI3ZmUw NC4uZjY5MjgxNyAxMDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvcXQvYXBpL3FzY3JpcHR2YWx1 ZS5jcHAKKysrIGIvSmF2YVNjcmlwdENvcmUvcXQvYXBpL3FzY3JpcHR2YWx1ZS5jcHAKQEAgLTEx NSw4ICsxMTUsMTEgQEAgUVNjcmlwdFZhbHVlOjpRU2NyaXB0VmFsdWUoUVNjcmlwdFZhbHVlUHJp dmF0ZSogZCkKICAgcmVnaXN0ZXJzIGl0IHdpdGggdGhlIHNjcmlwdCBcYSBlbmdpbmUuCiAqLwog UVNjcmlwdFZhbHVlOjpRU2NyaXB0VmFsdWUoUVNjcmlwdEVuZ2luZSogZW5naW5lLCBib29sIHZh bHVlKQotICAgIDogZF9wdHIobmV3IFFTY3JpcHRWYWx1ZVByaXZhdGUoZW5naW5lLCB2YWx1ZSkp CiB7CisgICAgaWYgKGVuZ2luZSkKKyAgICAgICAgZF9wdHIgPSBuZXcgUVNjcmlwdFZhbHVlUHJp dmF0ZShRU2NyaXB0RW5naW5lUHJpdmF0ZTo6Z2V0KGVuZ2luZSksIHZhbHVlKTsKKyAgICBlbHNl CisgICAgICAgIGRfcHRyID0gbmV3IFFTY3JpcHRWYWx1ZVByaXZhdGUodmFsdWUpOwogfQogCiAv KiEKQEAgLTEyNiw4ICsxMjksMTEgQEAgUVNjcmlwdFZhbHVlOjpRU2NyaXB0VmFsdWUoUVNjcmlw dEVuZ2luZSogZW5naW5lLCBib29sIHZhbHVlKQogICByZWdpc3RlcnMgaXQgd2l0aCB0aGUgc2Ny aXB0IFxhIGVuZ2luZS4KICovCiBRU2NyaXB0VmFsdWU6OlFTY3JpcHRWYWx1ZShRU2NyaXB0RW5n aW5lKiBlbmdpbmUsIGludCB2YWx1ZSkKLSAgICA6IGRfcHRyKG5ldyBRU2NyaXB0VmFsdWVQcml2 YXRlKGVuZ2luZSwgdmFsdWUpKQogeworICAgIGlmIChlbmdpbmUpCisgICAgICAgIGRfcHRyID0g bmV3IFFTY3JpcHRWYWx1ZVByaXZhdGUoUVNjcmlwdEVuZ2luZVByaXZhdGU6OmdldChlbmdpbmUp LCB2YWx1ZSk7CisgICAgZWxzZQorICAgICAgICBkX3B0ciA9IG5ldyBRU2NyaXB0VmFsdWVQcml2 YXRlKHZhbHVlKTsKIH0KIAogLyohCkBAIC0xMzcsOCArMTQzLDExIEBAIFFTY3JpcHRWYWx1ZTo6 UVNjcmlwdFZhbHVlKFFTY3JpcHRFbmdpbmUqIGVuZ2luZSwgaW50IHZhbHVlKQogICByZWdpc3Rl cnMgaXQgd2l0aCB0aGUgc2NyaXB0IFxhIGVuZ2luZS4KICAqLwogUVNjcmlwdFZhbHVlOjpRU2Ny aXB0VmFsdWUoUVNjcmlwdEVuZ2luZSogZW5naW5lLCB1aW50IHZhbHVlKQotICAgIDogZF9wdHIo bmV3IFFTY3JpcHRWYWx1ZVByaXZhdGUoZW5naW5lLCB2YWx1ZSkpCiB7CisgICAgaWYgKGVuZ2lu ZSkKKyAgICAgICAgZF9wdHIgPSBuZXcgUVNjcmlwdFZhbHVlUHJpdmF0ZShRU2NyaXB0RW5naW5l UHJpdmF0ZTo6Z2V0KGVuZ2luZSksIHZhbHVlKTsKKyAgICBlbHNlCisgICAgICAgIGRfcHRyID0g bmV3IFFTY3JpcHRWYWx1ZVByaXZhdGUodmFsdWUpOwogfQogCiAvKiEKQEAgLTE0OCw4ICsxNTcs MTEgQEAgUVNjcmlwdFZhbHVlOjpRU2NyaXB0VmFsdWUoUVNjcmlwdEVuZ2luZSogZW5naW5lLCB1 aW50IHZhbHVlKQogICByZWdpc3RlcnMgaXQgd2l0aCB0aGUgc2NyaXB0IFxhIGVuZ2luZS4KICov CiBRU2NyaXB0VmFsdWU6OlFTY3JpcHRWYWx1ZShRU2NyaXB0RW5naW5lKiBlbmdpbmUsIHFzcmVh bCB2YWx1ZSkKLSAgICA6IGRfcHRyKG5ldyBRU2NyaXB0VmFsdWVQcml2YXRlKGVuZ2luZSwgdmFs dWUpKQogeworICAgIGlmIChlbmdpbmUpCisgICAgICAgIGRfcHRyID0gbmV3IFFTY3JpcHRWYWx1 ZVByaXZhdGUoUVNjcmlwdEVuZ2luZVByaXZhdGU6OmdldChlbmdpbmUpLCB2YWx1ZSk7CisgICAg ZWxzZQorICAgICAgICBkX3B0ciA9IG5ldyBRU2NyaXB0VmFsdWVQcml2YXRlKHZhbHVlKTsKIH0K IAogLyohCkBAIC0xNTksOCArMTcxLDExIEBAIFFTY3JpcHRWYWx1ZTo6UVNjcmlwdFZhbHVlKFFT Y3JpcHRFbmdpbmUqIGVuZ2luZSwgcXNyZWFsIHZhbHVlKQogICByZWdpc3RlcnMgaXQgd2l0aCB0 aGUgc2NyaXB0IFxhIGVuZ2luZS4KICovCiBRU2NyaXB0VmFsdWU6OlFTY3JpcHRWYWx1ZShRU2Ny aXB0RW5naW5lKiBlbmdpbmUsIGNvbnN0IFFTdHJpbmcmIHZhbHVlKQotICAgIDogZF9wdHIobmV3 IFFTY3JpcHRWYWx1ZVByaXZhdGUoZW5naW5lLCB2YWx1ZSkpCiB7CisgICAgaWYgKGVuZ2luZSkK KyAgICAgICAgZF9wdHIgPSBuZXcgUVNjcmlwdFZhbHVlUHJpdmF0ZShRU2NyaXB0RW5naW5lUHJp dmF0ZTo6Z2V0KGVuZ2luZSksIHZhbHVlKTsKKyAgICBlbHNlCisgICAgICAgIGRfcHRyID0gbmV3 IFFTY3JpcHRWYWx1ZVByaXZhdGUodmFsdWUpOwogfQogCiAvKiEKQEAgLTE3MCw4ICsxODUsMTEg QEAgUVNjcmlwdFZhbHVlOjpRU2NyaXB0VmFsdWUoUVNjcmlwdEVuZ2luZSogZW5naW5lLCBjb25z dCBRU3RyaW5nJiB2YWx1ZSkKICAgcmVnaXN0ZXJzIGl0IHdpdGggdGhlIHNjcmlwdCBcYSBlbmdp bmUuCiAqLwogUVNjcmlwdFZhbHVlOjpRU2NyaXB0VmFsdWUoUVNjcmlwdEVuZ2luZSogZW5naW5l LCBjb25zdCBjaGFyKiB2YWx1ZSkKLSAgICA6IGRfcHRyKG5ldyBRU2NyaXB0VmFsdWVQcml2YXRl KGVuZ2luZSwgUVN0cmluZzo6ZnJvbVV0ZjgodmFsdWUpKSkKIHsKKyAgICBpZiAoZW5naW5lKQor ICAgICAgICBkX3B0ciA9IG5ldyBRU2NyaXB0VmFsdWVQcml2YXRlKFFTY3JpcHRFbmdpbmVQcml2 YXRlOjpnZXQoZW5naW5lKSwgUVN0cmluZzo6ZnJvbVV0ZjgodmFsdWUpKTsKKyAgICBlbHNlCisg ICAgICAgIGRfcHRyID0gbmV3IFFTY3JpcHRWYWx1ZVByaXZhdGUoUVN0cmluZzo6ZnJvbVV0Zjgo dmFsdWUpKTsKIH0KIAogLyohCkBAIC0xODEsOCArMTk5LDExIEBAIFFTY3JpcHRWYWx1ZTo6UVNj cmlwdFZhbHVlKFFTY3JpcHRFbmdpbmUqIGVuZ2luZSwgY29uc3QgY2hhciogdmFsdWUpCiAgIHJl Z2lzdGVycyBpdCB3aXRoIHRoZSBzY3JpcHQgXGEgZW5naW5lLgogKi8KIFFTY3JpcHRWYWx1ZTo6 UVNjcmlwdFZhbHVlKFFTY3JpcHRFbmdpbmUqIGVuZ2luZSwgU3BlY2lhbFZhbHVlIHZhbHVlKQot ICAgIDogZF9wdHIobmV3IFFTY3JpcHRWYWx1ZVByaXZhdGUoZW5naW5lLCB2YWx1ZSkpCiB7Cisg ICAgaWYgKGVuZ2luZSkKKyAgICAgICAgZF9wdHIgPSBuZXcgUVNjcmlwdFZhbHVlUHJpdmF0ZShR U2NyaXB0RW5naW5lUHJpdmF0ZTo6Z2V0KGVuZ2luZSksIHZhbHVlKTsKKyAgICBlbHNlCisgICAg ICAgIGRfcHRyID0gbmV3IFFTY3JpcHRWYWx1ZVByaXZhdGUodmFsdWUpOwogfQogCiAvKiEKZGlm ZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL3F0L2FwaS9xc2NyaXB0dmFsdWVfcC5oIGIvSmF2YVNj cmlwdENvcmUvcXQvYXBpL3FzY3JpcHR2YWx1ZV9wLmgKaW5kZXggODMwYjM4ZS4uYjU4ODdjYyAx MDA2NDQKLS0tIGEvSmF2YVNjcmlwdENvcmUvcXQvYXBpL3FzY3JpcHR2YWx1ZV9wLmgKKysrIGIv SmF2YVNjcmlwdENvcmUvcXQvYXBpL3FzY3JpcHR2YWx1ZV9wLmgKQEAgLTc2LDEyICs3NiwxMiBA QCBwdWJsaWM6CiAgICAgaW5saW5lIFFTY3JpcHRWYWx1ZVByaXZhdGUocXNyZWFsIG51bWJlcik7 CiAgICAgaW5saW5lIFFTY3JpcHRWYWx1ZVByaXZhdGUoUVNjcmlwdFZhbHVlOjpTcGVjaWFsVmFs dWUgdmFsdWUpOwogCi0gICAgaW5saW5lIFFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlw dEVuZ2luZSogZW5naW5lLCBib29sIHZhbHVlKTsKLSAgICBpbmxpbmUgUVNjcmlwdFZhbHVlUHJp dmF0ZShjb25zdCBRU2NyaXB0RW5naW5lKiBlbmdpbmUsIGludCB2YWx1ZSk7Ci0gICAgaW5saW5l IFFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZSogZW5naW5lLCB1aW50IHZh bHVlKTsKLSAgICBpbmxpbmUgUVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5naW5l KiBlbmdpbmUsIHFzcmVhbCB2YWx1ZSk7Ci0gICAgaW5saW5lIFFTY3JpcHRWYWx1ZVByaXZhdGUo Y29uc3QgUVNjcmlwdEVuZ2luZSogZW5naW5lLCBjb25zdCBRU3RyaW5nJiB2YWx1ZSk7Ci0gICAg aW5saW5lIFFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZSogZW5naW5lLCBR U2NyaXB0VmFsdWU6OlNwZWNpYWxWYWx1ZSB2YWx1ZSk7CisgICAgaW5saW5lIFFTY3JpcHRWYWx1 ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZVByaXZhdGUqIGVuZ2luZSwgYm9vbCB2YWx1ZSk7 CisgICAgaW5saW5lIFFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZVByaXZh dGUqIGVuZ2luZSwgaW50IHZhbHVlKTsKKyAgICBpbmxpbmUgUVNjcmlwdFZhbHVlUHJpdmF0ZShj b25zdCBRU2NyaXB0RW5naW5lUHJpdmF0ZSogZW5naW5lLCB1aW50IHZhbHVlKTsKKyAgICBpbmxp bmUgUVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5naW5lUHJpdmF0ZSogZW5naW5l LCBxc3JlYWwgdmFsdWUpOworICAgIGlubGluZSBRU2NyaXB0VmFsdWVQcml2YXRlKGNvbnN0IFFT Y3JpcHRFbmdpbmVQcml2YXRlKiBlbmdpbmUsIGNvbnN0IFFTdHJpbmcmIHZhbHVlKTsKKyAgICBp bmxpbmUgUVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5naW5lUHJpdmF0ZSogZW5n aW5lLCBRU2NyaXB0VmFsdWU6OlNwZWNpYWxWYWx1ZSB2YWx1ZSk7CiAKICAgICBpbmxpbmUgUVNj cmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5naW5lUHJpdmF0ZSogZW5naW5lLCBKU1Zh bHVlUmVmIHZhbHVlKTsKICAgICBpbmxpbmUgUVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2Ny aXB0RW5naW5lUHJpdmF0ZSogZW5naW5lLCBKU1ZhbHVlUmVmIHZhbHVlLCBKU09iamVjdFJlZiBv YmplY3QpOwpAQCAtMjA5LDk0ICsyMDksNTggQEAgUVNjcmlwdFZhbHVlUHJpdmF0ZTo6UVNjcmlw dFZhbHVlUHJpdmF0ZShRU2NyaXB0VmFsdWU6OlNwZWNpYWxWYWx1ZSB2YWx1ZSkKIHsKIH0KIAot UVNjcmlwdFZhbHVlUHJpdmF0ZTo6UVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5n aW5lKiBlbmdpbmUsIGJvb2wgdmFsdWUpCitRU2NyaXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFs dWVQcml2YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmVQcml2YXRlKiBlbmdpbmUsIGJvb2wgdmFsdWUp CiAgICAgOiBtX3N0YXRlKEpTUHJpbWl0aXZlKQorICAgICwgbV9lbmdpbmUoY29uc3RfY2FzdDxR U2NyaXB0RW5naW5lUHJpdmF0ZSo+KGVuZ2luZSkpCisgICAgLCBtX3ZhbHVlKGVuZ2luZS0+bWFr ZUpTVmFsdWUodmFsdWUpKQogewotICAgIGlmICghZW5naW5lKSB7Ci0gICAgICAgIC8vIHNsb3dl ciBwYXRoIHJlaW5pdGlhbGl6YXRpb24KLSAgICAgICAgbV9zdGF0ZSA9IENCb29sOwotICAgICAg ICBtX251bWJlciA9IHZhbHVlOwotICAgICAgICBtX3ZhbHVlID0gMDsKLSAgICB9IGVsc2Ugewot ICAgICAgICBtX2VuZ2luZSA9IFFTY3JpcHRFbmdpbmVQcml2YXRlOjpnZXQoZW5naW5lKTsKLSAg ICAgICAgbV92YWx1ZSA9IG1fZW5naW5lLT5tYWtlSlNWYWx1ZSh2YWx1ZSk7Ci0gICAgICAgIEpT VmFsdWVQcm90ZWN0KGNvbnRleHQoKSwgbV92YWx1ZSk7Ci0gICAgfQorICAgIFFfQVNTRVJUKGVu Z2luZSk7CisgICAgSlNWYWx1ZVByb3RlY3QoY29udGV4dCgpLCBtX3ZhbHVlKTsKIH0KIAotUVNj cmlwdFZhbHVlUHJpdmF0ZTo6UVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5naW5l KiBlbmdpbmUsIGludCB2YWx1ZSkKK1FTY3JpcHRWYWx1ZVByaXZhdGU6OlFTY3JpcHRWYWx1ZVBy aXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZVByaXZhdGUqIGVuZ2luZSwgaW50IHZhbHVlKQogICAg IDogbV9zdGF0ZShKU1ByaW1pdGl2ZSkKKyAgICAsIG1fZW5naW5lKGNvbnN0X2Nhc3Q8UVNjcmlw dEVuZ2luZVByaXZhdGUqPihlbmdpbmUpKQorICAgICwgbV92YWx1ZShtX2VuZ2luZS0+bWFrZUpT VmFsdWUodmFsdWUpKQogewotICAgIGlmICghZW5naW5lKSB7Ci0gICAgICAgIC8vIHNsb3dlciBw YXRoIHJlaW5pdGlhbGl6YXRpb24KLSAgICAgICAgbV9zdGF0ZSA9IENOdW1iZXI7Ci0gICAgICAg IG1fbnVtYmVyID0gdmFsdWU7Ci0gICAgICAgIG1fdmFsdWUgPSAwOwotICAgIH0gZWxzZSB7Ci0g ICAgICAgIG1fZW5naW5lID0gUVNjcmlwdEVuZ2luZVByaXZhdGU6OmdldChlbmdpbmUpOwotICAg ICAgICBtX3ZhbHVlID0gbV9lbmdpbmUtPm1ha2VKU1ZhbHVlKHZhbHVlKTsKLSAgICAgICAgSlNW YWx1ZVByb3RlY3QoY29udGV4dCgpLCBtX3ZhbHVlKTsKLSAgICB9CisgICAgUV9BU1NFUlQoZW5n aW5lKTsKKyAgICBKU1ZhbHVlUHJvdGVjdChjb250ZXh0KCksIG1fdmFsdWUpOwogfQogCi1RU2Ny aXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFsdWVQcml2YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmUq IGVuZ2luZSwgdWludCB2YWx1ZSkKK1FTY3JpcHRWYWx1ZVByaXZhdGU6OlFTY3JpcHRWYWx1ZVBy aXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZVByaXZhdGUqIGVuZ2luZSwgdWludCB2YWx1ZSkKICAg ICA6IG1fc3RhdGUoSlNQcmltaXRpdmUpCisgICAgLCBtX2VuZ2luZShjb25zdF9jYXN0PFFTY3Jp cHRFbmdpbmVQcml2YXRlKj4oZW5naW5lKSkKKyAgICAsIG1fdmFsdWUobV9lbmdpbmUtPm1ha2VK U1ZhbHVlKHZhbHVlKSkKIHsKLSAgICBpZiAoIWVuZ2luZSkgewotICAgICAgICAvLyBzbG93ZXIg cGF0aCByZWluaXRpYWxpemF0aW9uCi0gICAgICAgIG1fc3RhdGUgPSBDTnVtYmVyOwotICAgICAg ICBtX251bWJlciA9IHZhbHVlOwotICAgICAgICBtX3ZhbHVlID0gMDsKLSAgICB9IGVsc2Ugewot ICAgICAgICBtX2VuZ2luZSA9IFFTY3JpcHRFbmdpbmVQcml2YXRlOjpnZXQoZW5naW5lKTsKLSAg ICAgICAgbV92YWx1ZSA9IG1fZW5naW5lLT5tYWtlSlNWYWx1ZSh2YWx1ZSk7Ci0gICAgICAgIEpT VmFsdWVQcm90ZWN0KGNvbnRleHQoKSwgbV92YWx1ZSk7Ci0gICAgfQorICAgIFFfQVNTRVJUKGVu Z2luZSk7CisgICAgSlNWYWx1ZVByb3RlY3QoY29udGV4dCgpLCBtX3ZhbHVlKTsKIH0KIAotUVNj cmlwdFZhbHVlUHJpdmF0ZTo6UVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5naW5l KiBlbmdpbmUsIHFzcmVhbCB2YWx1ZSkKK1FTY3JpcHRWYWx1ZVByaXZhdGU6OlFTY3JpcHRWYWx1 ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZVByaXZhdGUqIGVuZ2luZSwgcXNyZWFsIHZhbHVl KQogICAgIDogbV9zdGF0ZShKU1ByaW1pdGl2ZSkKKyAgICAsIG1fZW5naW5lKGNvbnN0X2Nhc3Q8 UVNjcmlwdEVuZ2luZVByaXZhdGUqPihlbmdpbmUpKQorICAgICwgbV92YWx1ZShtX2VuZ2luZS0+ bWFrZUpTVmFsdWUodmFsdWUpKQogewotICAgIGlmICghZW5naW5lKSB7Ci0gICAgICAgIC8vIHNs b3dlciBwYXRoIHJlaW5pdGlhbGl6YXRpb24KLSAgICAgICAgbV9zdGF0ZSA9IENOdW1iZXI7Ci0g ICAgICAgIG1fbnVtYmVyID0gdmFsdWU7Ci0gICAgICAgIG1fdmFsdWUgPSAwOwotICAgIH0gZWxz ZSB7Ci0gICAgICAgIG1fZW5naW5lID0gUVNjcmlwdEVuZ2luZVByaXZhdGU6OmdldChlbmdpbmUp OwotICAgICAgICBtX3ZhbHVlID0gbV9lbmdpbmUtPm1ha2VKU1ZhbHVlKHZhbHVlKTsKLSAgICAg ICAgSlNWYWx1ZVByb3RlY3QoY29udGV4dCgpLCBtX3ZhbHVlKTsKLSAgICB9CisgICAgUV9BU1NF UlQoZW5naW5lKTsKKyAgICBKU1ZhbHVlUHJvdGVjdChjb250ZXh0KCksIG1fdmFsdWUpOwogfQog Ci1RU2NyaXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFsdWVQcml2YXRlKGNvbnN0IFFTY3JpcHRF bmdpbmUqIGVuZ2luZSwgY29uc3QgUVN0cmluZyYgdmFsdWUpCitRU2NyaXB0VmFsdWVQcml2YXRl OjpRU2NyaXB0VmFsdWVQcml2YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmVQcml2YXRlKiBlbmdpbmUs IGNvbnN0IFFTdHJpbmcmIHZhbHVlKQogICAgIDogbV9zdGF0ZShKU1ByaW1pdGl2ZSkKKyAgICAs IG1fZW5naW5lKGNvbnN0X2Nhc3Q8UVNjcmlwdEVuZ2luZVByaXZhdGUqPihlbmdpbmUpKQorICAg ICwgbV92YWx1ZShtX2VuZ2luZS0+bWFrZUpTVmFsdWUodmFsdWUpKQogewotICAgIGlmICghZW5n aW5lKSB7Ci0gICAgICAgIC8vIHNsb3dlciBwYXRoIHJlaW5pdGlhbGl6YXRpb24KLSAgICAgICAg bV9zdGF0ZSA9IENTdHJpbmc7Ci0gICAgICAgIG1fc3RyaW5nID0gdmFsdWU7Ci0gICAgICAgIG1f dmFsdWUgPSAwOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIG1fZW5naW5lID0gUVNjcmlwdEVuZ2lu ZVByaXZhdGU6OmdldChlbmdpbmUpOwotICAgICAgICBtX3ZhbHVlID0gbV9lbmdpbmUtPm1ha2VK U1ZhbHVlKHZhbHVlKTsKLSAgICAgICAgSlNWYWx1ZVByb3RlY3QoY29udGV4dCgpLCBtX3ZhbHVl KTsKLSAgICB9CisgICAgUV9BU1NFUlQoZW5naW5lKTsKKyAgICBKU1ZhbHVlUHJvdGVjdChjb250 ZXh0KCksIG1fdmFsdWUpOwogfQogCi1RU2NyaXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFsdWVQ cml2YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmUqIGVuZ2luZSwgUVNjcmlwdFZhbHVlOjpTcGVjaWFs VmFsdWUgdmFsdWUpCitRU2NyaXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFsdWVQcml2YXRlKGNv bnN0IFFTY3JpcHRFbmdpbmVQcml2YXRlKiBlbmdpbmUsIFFTY3JpcHRWYWx1ZTo6U3BlY2lhbFZh bHVlIHZhbHVlKQogICAgIDogbV9zdGF0ZShKU1ByaW1pdGl2ZSkKKyAgICAsIG1fZW5naW5lKGNv bnN0X2Nhc3Q8UVNjcmlwdEVuZ2luZVByaXZhdGUqPihlbmdpbmUpKQorICAgICwgbV92YWx1ZSht X2VuZ2luZS0+bWFrZUpTVmFsdWUodmFsdWUpKQogewotICAgIGlmICghZW5naW5lKSB7Ci0gICAg ICAgIC8vIHNsb3dlciBwYXRoIHJlaW5pdGlhbGl6YXRpb24KLSAgICAgICAgbV9zdGF0ZSA9IENT cGVjaWFsOwotICAgICAgICBtX251bWJlciA9IHZhbHVlOwotICAgICAgICBtX3ZhbHVlID0gMDsK LSAgICB9IGVsc2UgewotICAgICAgICBtX2VuZ2luZSA9IFFTY3JpcHRFbmdpbmVQcml2YXRlOjpn ZXQoZW5naW5lKTsKLSAgICAgICAgbV92YWx1ZSA9IG1fZW5naW5lLT5tYWtlSlNWYWx1ZSh2YWx1 ZSk7Ci0gICAgICAgIEpTVmFsdWVQcm90ZWN0KGNvbnRleHQoKSwgbV92YWx1ZSk7Ci0gICAgfQor ICAgIFFfQVNTRVJUKGVuZ2luZSk7CisgICAgSlNWYWx1ZVByb3RlY3QoY29udGV4dCgpLCBtX3Zh bHVlKTsKIH0KIAogUVNjcmlwdFZhbHVlUHJpdmF0ZTo6UVNjcmlwdFZhbHVlUHJpdmF0ZShjb25z dCBRU2NyaXB0RW5naW5lUHJpdmF0ZSogZW5naW5lLCBKU1ZhbHVlUmVmIHZhbHVlKQpAQCAtMzA1 LDYgKzI2OSw3IEBAIFFTY3JpcHRWYWx1ZVByaXZhdGU6OlFTY3JpcHRWYWx1ZVByaXZhdGUoY29u c3QgUVNjcmlwdEVuZ2luZVByaXZhdGUqIGVuZ2luZSwgSlNWCiAgICAgLCBtX3ZhbHVlKHZhbHVl KQogewogICAgIFFfQVNTRVJUKGVuZ2luZSk7CisgICAgUV9BU1NFUlQodmFsdWUpOwogICAgIEpT VmFsdWVQcm90ZWN0KGNvbnRleHQoKSwgbV92YWx1ZSk7CiB9CiAKQEAgLTMxNSw2ICsyODAsOCBA QCBRU2NyaXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFsdWVQcml2YXRlKGNvbnN0IFFTY3JpcHRF bmdpbmVQcml2YXRlKiBlbmdpbmUsIEpTVgogICAgICwgbV9vYmplY3Qob2JqZWN0KQogewogICAg IFFfQVNTRVJUKGVuZ2luZSk7CisgICAgUV9BU1NFUlQodmFsdWUpOworICAgIFFfQVNTRVJUKG9i amVjdCk7CiAgICAgSlNWYWx1ZVByb3RlY3QoY29udGV4dCgpLCBtX3ZhbHVlKTsKIH0KIAo=