35968 2010-03-10 05:37:53 -0800 [Qt] QScriptValuePrivate::States has naming issues 2010-03-11 21:41:52 -0800 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED Qt P3 Normal --- 31863 1 jedrzej.nowacki jedrzej.nowacki commit-queue oldest_to_newest 198002 0 jedrzej.nowacki 2010-03-10 05:37:53 -0800 - The enum States has invalid name, according to Qt coding style it should be "State" as enum's elements are not flags that could be or'ed or and'ed. - JSNative should be renamed to JSPrimitive as "primitive value" is a corresponding name in ECMA Script standard ("A primitive value is a member of one of the following built-in types: Undefined, Null, Boolean, Number, and String"). 198017 1 50397 jedrzej.nowacki 2010-03-10 06:08:36 -0800 Created attachment 50397 Fix v1 198925 2 50397 commit-queue 2010-03-11 21:41:48 -0800 Comment on attachment 50397 Fix v1 Clearing flags on attachment: 50397 Committed r55887: <http://trac.webkit.org/changeset/55887> 198926 3 commit-queue 2010-03-11 21:41:52 -0800 All reviewed patches have been landed. Closing bug. 50397 2010-03-10 06:08:36 -0800 2010-03-11 21:41:48 -0800 Fix v1 statev1.diff text/plain 9293 jedrzej.nowacki ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBkYjZkM2Q5Li42ZjQ3MDg3IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEg QEAKKzIwMTAtMDMtMTAgIEplZHJ6ZWogTm93YWNraSAgPGplZHJ6ZWoubm93YWNraUBub2tpYS5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhl IEpTTmF0aXZlIHN0YXRlIHdhcyByZW5hbWVkIHRvIEpTUHJpbWl0aXZlLiBUaGUgbmV3IG5hbWUg YmV0dGVyCisgICAgICAgIGNvcmVzcG9uZHMgdG8gdGhlIEVDTUFTY3JpcHQgc3RhbmRhcmQuCisK KyAgICAgICAgRW51bSBRU2NyaXB0VmFsdWVQcml2YXRlOjpTdGF0ZXMgd2FzIHJlbmFtZWQgdG8g U3RhdGUgdG8gb2JleSBRdAorICAgICAgICBjb2Rpbmcgc3R5bGUgcnVsZXMgKCJTdGF0ZXMiIG5h bWUgc3VnZ2VzdHMgdGhhdCBhIHN0YXRlIGNvdWxkCisgICAgICAgIG1peGVkIHRvZ2V0aGVyIHdp dGggYW4gb3RoZXIgc3RhdGUgdXNpbmcgYml0d2lzZSBsb2dpYyBvcGVyYXRvcnMuCisKKyAgICAg ICAgW1F0XSBRU2NyaXB0VmFsdWVQcml2YXRlOjpTdGF0ZXMgaGFzIG5hbWluZyBpc3N1ZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1OTY4CisKKyAg ICAgICAgKiBxdC9hcGkvcXNjcmlwdHZhbHVlX3AuaDoKKyAgICAgICAgKFFTY3JpcHRWYWx1ZVBy aXZhdGU6Oik6CisgICAgICAgIChRU2NyaXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFsdWVQcml2 YXRlKToKKyAgICAgICAgKFFTY3JpcHRWYWx1ZVByaXZhdGU6OmlzQm9vbCk6CisgICAgICAgIChR U2NyaXB0VmFsdWVQcml2YXRlOjppc051bWJlcik6CisgICAgICAgIChRU2NyaXB0VmFsdWVQcml2 YXRlOjppc051bGwpOgorICAgICAgICAoUVNjcmlwdFZhbHVlUHJpdmF0ZTo6aXNTdHJpbmcpOgor ICAgICAgICAoUVNjcmlwdFZhbHVlUHJpdmF0ZTo6aXNVbmRlZmluZWQpOgorICAgICAgICAoUVNj cmlwdFZhbHVlUHJpdmF0ZTo6dG9TdHJpbmcpOgorICAgICAgICAoUVNjcmlwdFZhbHVlUHJpdmF0 ZTo6dG9OdW1iZXIpOgorICAgICAgICAoUVNjcmlwdFZhbHVlUHJpdmF0ZTo6dG9Cb29sKToKKyAg ICAgICAgKFFTY3JpcHRWYWx1ZVByaXZhdGU6OmFzc2lnbkVuZ2luZSk6CisgICAgICAgIChRU2Ny aXB0VmFsdWVQcml2YXRlOjpyZWZpbmVkSlNWYWx1ZSk6CisKIDIwMTAtMDMtMTAgIEtldmluIE9s bGl2aWVyICA8a2V2aW5vQHRoZW9sbGl2aWVycy5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg RXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9KYXZhU2NyaXB0Q29yZS9xdC9hcGkvcXNjcmlwdHZh bHVlX3AuaCBiL0phdmFTY3JpcHRDb3JlL3F0L2FwaS9xc2NyaXB0dmFsdWVfcC5oCmluZGV4IDE4 MmY2MDMuLmU1YzJhODIgMTAwNjQ0Ci0tLSBhL0phdmFTY3JpcHRDb3JlL3F0L2FwaS9xc2NyaXB0 dmFsdWVfcC5oCisrKyBiL0phdmFTY3JpcHRDb3JlL3F0L2FwaS9xc2NyaXB0dmFsdWVfcC5oCkBA IC0zOCwxMCArMzgsMTAgQEAgY2xhc3MgUVNjcmlwdFZhbHVlOwogCiAgIEltcGxlbWVudGF0aW9u IG9mIFFTY3JpcHRWYWx1ZS4KICAgVGhlIGltcGxlbWVudGF0aW9uIGlzIGJhc2VkIG9uIGEgc3Rh dGUgbWFjaGluZS4gVGhlIHN0YXRlcyBuYW1lcyBhcmUgaW5jbHVkZWQgaW4KLSAgUVNjcmlwdFZh bHVlUHJpdmF0ZTo6U3RhdGVzLiBFYWNoIG1ldGhvZCBzaG91bGQgY2hlY2sgZm9yIHRoZSBjdXJy ZW50IHN0YXRlIGFuZCB0aGVuIHBlcmZvcm0gYQorICBRU2NyaXB0VmFsdWVQcml2YXRlOjpTdGF0 ZS4gRWFjaCBtZXRob2Qgc2hvdWxkIGNoZWNrIGZvciB0aGUgY3VycmVudCBzdGF0ZSBhbmQgdGhl biBwZXJmb3JtIGEKICAgY29ycmVjdCBhY3Rpb24uCiAKLSAgU3RhdGVzOgorICBTdGF0ZToKICAg ICBJbnZhbGlkIC0+IFFTVlAgaXMgaW52YWxpZCwgbm8gYXNzdW1wdGlvbnMgc2hvdWxkIGJlIG1h ZGUgYWJvdXQgY2xhc3MgbWVtYmVycyAoYXBhcnQgZnJvbSBtX3ZhbHVlKS4KICAgICBDU3RyaW5n IC0+IFFTVlAgaXMgY3JlYXRlZCBmcm9tIFFTdHJpbmcgb3IgY29uc3QgY2hhciogYW5kIG5vIEpT QyBlbmdpbmUgaGFzIGJlZW4gYXNzb2NpYXRlZCB5ZXQuCiAgICAgICAgIEN1cnJlbnQgdmFsdWUg aXMga2VwdCBpbiBtX3N0cmluZywKQEAgLTUzLDcgKzUzLDcgQEAgY2xhc3MgUVNjcmlwdFZhbHVl OwogICAgICAgICBpcyBrZXB0IGluIG1fbnVtYmVyIChjYXN0IG9mIFFTY3JpcHRWYWx1ZTo6U3Bl Y2lhbFZhbHVlKQogICAgIEpTVmFsdWUgLT4gUVNWUCBpcyBhc3NvY2lhdGVkIHdpdGggZW5naW5l LCBidXQgdGhlcmUgaXMgbm8gaW5mb3JtYXRpb24gYWJvdXQgcmVhbCB0eXBlLCB0aGUgc3RhdGUK ICAgICAgICAgaGF2ZSByZWFsbHkgc2hvcnQgbGl2ZSBjeWNsZS4gTm9ybWFsbHkgaXQgaXMgY3Jl YXRlZCBhcyBhIGZ1bmN0aW9uIGNhbGwgcmVzdWx0LgotICAgIEpTTmF0aXZlIC0+IFFTVlAgaXMg YXNzb2NpYXRlZCB3aXRoIGVuZ2luZSwgYW5kIGl0IGlzIHN1cmUgdGhhdCBpdCBpc24ndCBhIEph dmFTY3JpcHQgb2JqZWN0LgorICAgIEpTUHJpbWl0aXZlIC0+IFFTVlAgaXMgYXNzb2NpYXRlZCB3 aXRoIGVuZ2luZSwgYW5kIGl0IGlzIHN1cmUgdGhhdCBpdCBpc24ndCBhIEphdmFTY3JpcHQgb2Jq ZWN0LgogICAgIEpTT2JqZWN0IC0+IFFTVlAgaXMgYXNzb2NpYXRlZCB3aXRoIGVuZ2luZSwgYW5k IGl0IGlzIHN1cmUgdGhhdCBpdCBpcyBhIEphdmFTY3JpcHQgb2JqZWN0LgogCiAgIEVhY2ggc3Rh dGUga2VlcCBhbGwgbmVjZXNzYXJ5IGluZm9ybWF0aW9uIHRvIGludm9rZSBhbGwgbWV0aG9kcywg aWYgbm90IGl0IHNob3VsZCBiZSBjaGFuZ2VkIHRvCkBAIC0xMTcsMTQgKzExNywxNCBAQCBwdWJs aWM6CiAKIHByaXZhdGU6CiAgICAgLy8gUGxlYXNlLCB1cGRhdGUgY2xhc3MgZG9jdW1lbnRhdGlv biB3aGVuIHlvdSBjaGFuZ2UgdGhlIGVudW0uCi0gICAgZW51bSBTdGF0ZXMgeworICAgIGVudW0g U3RhdGUgewogICAgICAgICBJbnZhbGlkID0gMCwKICAgICAgICAgQ1N0cmluZyA9IDB4MTAwMCwK ICAgICAgICAgQ051bWJlciwKICAgICAgICAgQ0Jvb2wsCiAgICAgICAgIENTcGVjaWFsLAogICAg ICAgICBKU1ZhbHVlID0gMHgyMDAwLCAvLyBKUyB2YWx1ZXMgYXJlIGVxdWFsIG9yIGhpZ2hlciB0 aGVuIHRoaXMgdmFsdWUuCi0gICAgICAgIEpTTmF0aXZlLAorICAgICAgICBKU1ByaW1pdGl2ZSwK ICAgICAgICAgSlNPYmplY3QKICAgICB9IG1fc3RhdGU7CiAgICAgUVNjcmlwdEVuZ2luZVB0ciBt X2VuZ2luZTsKQEAgLTEzNiw3ICsxMzYsNyBAQCBwcml2YXRlOgogICAgIGlubGluZSB2b2lkIHNl dFZhbHVlKEpTVmFsdWVSZWYpOwogCiAgICAgaW5saW5lIGJvb2wgaW5oZXJpdHMoY29uc3QgY2hh ciopOwotICAgIGlubGluZSBTdGF0ZXMgcmVmaW5lZEpTVmFsdWUoKTsKKyAgICBpbmxpbmUgU3Rh dGUgcmVmaW5lZEpTVmFsdWUoKTsKIAogICAgIGlubGluZSBib29sIGlzSlNCYXNlZCgpIGNvbnN0 OwogICAgIGlubGluZSBib29sIGlzTnVtYmVyQmFzZWQoKSBjb25zdDsKQEAgLTIxMCw3ICsyMTAs NyBAQCBRU2NyaXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFsdWVQcml2YXRlKFFTY3JpcHRWYWx1 ZTo6U3BlY2lhbFZhbHVlIHZhbHVlKQogfQogCiBRU2NyaXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0 VmFsdWVQcml2YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmUqIGVuZ2luZSwgYm9vbCB2YWx1ZSkKLSAg ICA6IG1fc3RhdGUoSlNOYXRpdmUpCisgICAgOiBtX3N0YXRlKEpTUHJpbWl0aXZlKQogewogICAg IGlmICghZW5naW5lKSB7CiAgICAgICAgIC8vIHNsb3dlciBwYXRoIHJlaW5pdGlhbGl6YXRpb24K QEAgLTIyNSw3ICsyMjUsNyBAQCBRU2NyaXB0VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFsdWVQcml2 YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmUqIGVuZ2luZSwgYm9vbCB2YWx1ZQogfQogCiBRU2NyaXB0 VmFsdWVQcml2YXRlOjpRU2NyaXB0VmFsdWVQcml2YXRlKGNvbnN0IFFTY3JpcHRFbmdpbmUqIGVu Z2luZSwgaW50IHZhbHVlKQotICAgIDogbV9zdGF0ZShKU05hdGl2ZSkKKyAgICA6IG1fc3RhdGUo SlNQcmltaXRpdmUpCiB7CiAgICAgaWYgKCFlbmdpbmUpIHsKICAgICAgICAgLy8gc2xvd2VyIHBh dGggcmVpbml0aWFsaXphdGlvbgpAQCAtMjQwLDcgKzI0MCw3IEBAIFFTY3JpcHRWYWx1ZVByaXZh dGU6OlFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZSogZW5naW5lLCBpbnQg dmFsdWUpCiB9CiAKIFFTY3JpcHRWYWx1ZVByaXZhdGU6OlFTY3JpcHRWYWx1ZVByaXZhdGUoY29u c3QgUVNjcmlwdEVuZ2luZSogZW5naW5lLCB1aW50IHZhbHVlKQotICAgIDogbV9zdGF0ZShKU05h dGl2ZSkKKyAgICA6IG1fc3RhdGUoSlNQcmltaXRpdmUpCiB7CiAgICAgaWYgKCFlbmdpbmUpIHsK ICAgICAgICAgLy8gc2xvd2VyIHBhdGggcmVpbml0aWFsaXphdGlvbgpAQCAtMjU1LDcgKzI1NSw3 IEBAIFFTY3JpcHRWYWx1ZVByaXZhdGU6OlFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlw dEVuZ2luZSogZW5naW5lLCB1aW50IHZhbHVlCiB9CiAKIFFTY3JpcHRWYWx1ZVByaXZhdGU6OlFT Y3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZSogZW5naW5lLCBxc3JlYWwgdmFs dWUpCi0gICAgOiBtX3N0YXRlKEpTTmF0aXZlKQorICAgIDogbV9zdGF0ZShKU1ByaW1pdGl2ZSkK IHsKICAgICBpZiAoIWVuZ2luZSkgewogICAgICAgICAvLyBzbG93ZXIgcGF0aCByZWluaXRpYWxp emF0aW9uCkBAIC0yNzAsNyArMjcwLDcgQEAgUVNjcmlwdFZhbHVlUHJpdmF0ZTo6UVNjcmlwdFZh bHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5naW5lKiBlbmdpbmUsIHFzcmVhbCB2YWwKIH0KIAog UVNjcmlwdFZhbHVlUHJpdmF0ZTo6UVNjcmlwdFZhbHVlUHJpdmF0ZShjb25zdCBRU2NyaXB0RW5n aW5lKiBlbmdpbmUsIGNvbnN0IFFTdHJpbmcmIHZhbHVlKQotICAgIDogbV9zdGF0ZShKU05hdGl2 ZSkKKyAgICA6IG1fc3RhdGUoSlNQcmltaXRpdmUpCiB7CiAgICAgaWYgKCFlbmdpbmUpIHsKICAg ICAgICAgLy8gc2xvd2VyIHBhdGggcmVpbml0aWFsaXphdGlvbgpAQCAtMjg1LDcgKzI4NSw3IEBA IFFTY3JpcHRWYWx1ZVByaXZhdGU6OlFTY3JpcHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVu Z2luZSogZW5naW5lLCBjb25zdCBRU3RyCiB9CiAKIFFTY3JpcHRWYWx1ZVByaXZhdGU6OlFTY3Jp cHRWYWx1ZVByaXZhdGUoY29uc3QgUVNjcmlwdEVuZ2luZSogZW5naW5lLCBRU2NyaXB0VmFsdWU6 OlNwZWNpYWxWYWx1ZSB2YWx1ZSkKLSAgICA6IG1fc3RhdGUoSlNOYXRpdmUpCisgICAgOiBtX3N0 YXRlKEpTUHJpbWl0aXZlKQogewogICAgIGlmICghZW5naW5lKSB7CiAgICAgICAgIC8vIHNsb3dl ciBwYXRoIHJlaW5pdGlhbGl6YXRpb24KQEAgLTMyNiwxMCArMzI2LDEwIEBAIGJvb2wgUVNjcmlw dFZhbHVlUHJpdmF0ZTo6aXNCb29sKCkKICAgICBjYXNlIENCb29sOgogICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICBjYXNlIEpTVmFsdWU6Ci0gICAgICAgIGlmIChyZWZpbmVkSlNWYWx1ZSgpICE9 IEpTTmF0aXZlKQorICAgICAgICBpZiAocmVmaW5lZEpTVmFsdWUoKSAhPSBKU1ByaW1pdGl2ZSkK ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgLy8gRmFsbC10aHJvdWdoLgotICAg IGNhc2UgSlNOYXRpdmU6CisgICAgY2FzZSBKU1ByaW1pdGl2ZToKICAgICAgICAgcmV0dXJuIEpT VmFsdWVJc0Jvb2xlYW4oY29udGV4dCgpLCB2YWx1ZSgpKTsKICAgICBkZWZhdWx0OgogICAgICAg ICByZXR1cm4gZmFsc2U7CkBAIC0zNDIsMTAgKzM0MiwxMCBAQCBib29sIFFTY3JpcHRWYWx1ZVBy aXZhdGU6OmlzTnVtYmVyKCkKICAgICBjYXNlIENOdW1iZXI6CiAgICAgICAgIHJldHVybiB0cnVl OwogICAgIGNhc2UgSlNWYWx1ZToKLSAgICAgICAgaWYgKHJlZmluZWRKU1ZhbHVlKCkgIT0gSlNO YXRpdmUpCisgICAgICAgIGlmIChyZWZpbmVkSlNWYWx1ZSgpICE9IEpTUHJpbWl0aXZlKQogICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAvLyBGYWxsLXRocm91Z2guCi0gICAgY2Fz ZSBKU05hdGl2ZToKKyAgICBjYXNlIEpTUHJpbWl0aXZlOgogICAgICAgICByZXR1cm4gSlNWYWx1 ZUlzTnVtYmVyKGNvbnRleHQoKSwgdmFsdWUoKSk7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0 dXJuIGZhbHNlOwpAQCAtMzU4LDEwICszNTgsMTAgQEAgYm9vbCBRU2NyaXB0VmFsdWVQcml2YXRl Ojppc051bGwoKQogICAgIGNhc2UgQ1NwZWNpYWw6CiAgICAgICAgIHJldHVybiBtX251bWJlciA9 PSBzdGF0aWNfY2FzdDxpbnQ+KFFTY3JpcHRWYWx1ZTo6TnVsbFZhbHVlKTsKICAgICBjYXNlIEpT VmFsdWU6Ci0gICAgICAgIGlmIChyZWZpbmVkSlNWYWx1ZSgpICE9IEpTTmF0aXZlKQorICAgICAg ICBpZiAocmVmaW5lZEpTVmFsdWUoKSAhPSBKU1ByaW1pdGl2ZSkKICAgICAgICAgICAgIHJldHVy biBmYWxzZTsKICAgICAgICAgLy8gRmFsbC10aHJvdWdoLgotICAgIGNhc2UgSlNOYXRpdmU6Cisg ICAgY2FzZSBKU1ByaW1pdGl2ZToKICAgICAgICAgcmV0dXJuIEpTVmFsdWVJc051bGwoY29udGV4 dCgpLCB2YWx1ZSgpKTsKICAgICBkZWZhdWx0OgogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0z NzQsMTAgKzM3NCwxMCBAQCBib29sIFFTY3JpcHRWYWx1ZVByaXZhdGU6OmlzU3RyaW5nKCkKICAg ICBjYXNlIENTdHJpbmc6CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIGNhc2UgSlNWYWx1ZToK LSAgICAgICAgaWYgKHJlZmluZWRKU1ZhbHVlKCkgIT0gSlNOYXRpdmUpCisgICAgICAgIGlmIChy ZWZpbmVkSlNWYWx1ZSgpICE9IEpTUHJpbWl0aXZlKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNl OwogICAgICAgICAvLyBGYWxsLXRocm91Z2guCi0gICAgY2FzZSBKU05hdGl2ZToKKyAgICBjYXNl IEpTUHJpbWl0aXZlOgogICAgICAgICByZXR1cm4gSlNWYWx1ZUlzU3RyaW5nKGNvbnRleHQoKSwg dmFsdWUoKSk7CiAgICAgZGVmYXVsdDoKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtMzkwLDEw ICszOTAsMTAgQEAgYm9vbCBRU2NyaXB0VmFsdWVQcml2YXRlOjppc1VuZGVmaW5lZCgpCiAgICAg Y2FzZSBDU3BlY2lhbDoKICAgICAgICAgcmV0dXJuIG1fbnVtYmVyID09IHN0YXRpY19jYXN0PGlu dD4oUVNjcmlwdFZhbHVlOjpVbmRlZmluZWRWYWx1ZSk7CiAgICAgY2FzZSBKU1ZhbHVlOgotICAg ICAgICBpZiAocmVmaW5lZEpTVmFsdWUoKSAhPSBKU05hdGl2ZSkKKyAgICAgICAgaWYgKHJlZmlu ZWRKU1ZhbHVlKCkgIT0gSlNQcmltaXRpdmUpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgICAgIC8vIEZhbGwtdGhyb3VnaC4KLSAgICBjYXNlIEpTTmF0aXZlOgorICAgIGNhc2UgSlNQ cmltaXRpdmU6CiAgICAgICAgIHJldHVybiBKU1ZhbHVlSXNVbmRlZmluZWQoY29udGV4dCgpLCB2 YWx1ZSgpKTsKICAgICBkZWZhdWx0OgogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC00NTUsNyAr NDU1LDcgQEAgUVN0cmluZyBRU2NyaXB0VmFsdWVQcml2YXRlOjp0b1N0cmluZygpIGNvbnN0CiAg ICAgY2FzZSBDU3BlY2lhbDoKICAgICAgICAgcmV0dXJuIG1fbnVtYmVyID09IFFTY3JpcHRWYWx1 ZTo6TnVsbFZhbHVlID8gUVN0cmluZzo6ZnJvbUxhdGluMSgibnVsbCIpIDogUVN0cmluZzo6ZnJv bUxhdGluMSgidW5kZWZpbmVkIik7CiAgICAgY2FzZSBKU1ZhbHVlOgotICAgIGNhc2UgSlNOYXRp dmU6CisgICAgY2FzZSBKU1ByaW1pdGl2ZToKICAgICBjYXNlIEpTT2JqZWN0OgogICAgICAgICBy ZXR1cm4gUVNjcmlwdENvbnZlcnRlcjo6dG9TdHJpbmcoSlNWYWx1ZVRvU3RyaW5nQ29weShjb250 ZXh0KCksIHZhbHVlKCksIC8qIGV4Y2VwdGlvbiAqLyAwKSk7CiAgICAgfQpAQCAtNDY4LDcgKzQ2 OCw3IEBAIHFzcmVhbCBRU2NyaXB0VmFsdWVQcml2YXRlOjp0b051bWJlcigpIGNvbnN0CiB7CiAg ICAgc3dpdGNoIChtX3N0YXRlKSB7CiAgICAgY2FzZSBKU1ZhbHVlOgotICAgIGNhc2UgSlNOYXRp dmU6CisgICAgY2FzZSBKU1ByaW1pdGl2ZToKICAgICBjYXNlIEpTT2JqZWN0OgogICAgICAgICBy ZXR1cm4gSlNWYWx1ZVRvTnVtYmVyKGNvbnRleHQoKSwgdmFsdWUoKSwgLyogZXhjZXB0aW9uICov IDApOwogICAgIGNhc2UgQ051bWJlcjoKQEAgLTUwMCw3ICs1MDAsNyBAQCBib29sIFFTY3JpcHRW YWx1ZVByaXZhdGU6OnRvQm9vbCgpIGNvbnN0CiB7CiAgICAgc3dpdGNoIChtX3N0YXRlKSB7CiAg ICAgY2FzZSBKU1ZhbHVlOgotICAgIGNhc2UgSlNOYXRpdmU6CisgICAgY2FzZSBKU1ByaW1pdGl2 ZToKICAgICAgICAgcmV0dXJuIEpTVmFsdWVUb0Jvb2xlYW4oY29udGV4dCgpLCB2YWx1ZSgpKTsK ICAgICBjYXNlIEpTT2JqZWN0OgogICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTYyNyw3ICs2Mjcs NyBAQCBib29sIFFTY3JpcHRWYWx1ZVByaXZhdGU6OmFzc2lnbkVuZ2luZShRU2NyaXB0RW5naW5l UHJpdmF0ZSogZW5naW5lKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogICAgIG1fZW5n aW5lID0gZW5naW5lOwotICAgIG1fc3RhdGUgPSBKU05hdGl2ZTsKKyAgICBtX3N0YXRlID0gSlNQ cmltaXRpdmU7CiAgICAgc2V0VmFsdWUodmFsdWUpOwogICAgIHJldHVybiB0cnVlOwogfQpAQCAt NzE5LDExICs3MTksMTEgQEAgYm9vbCBRU2NyaXB0VmFsdWVQcml2YXRlOjppbmhlcml0cyhjb25z dCBjaGFyKiBuYW1lKQogICBcaW50ZXJuYWwKICAgUmVmaW5lcyB0aGUgc3RhdGUgb2YgdGhpcyBR U2NyaXB0VmFsdWVQcml2YXRlLiBSZXR1cm5zIHRoZSBuZXcgc3RhdGUuCiAqLwotUVNjcmlwdFZh bHVlUHJpdmF0ZTo6U3RhdGVzIFFTY3JpcHRWYWx1ZVByaXZhdGU6OnJlZmluZWRKU1ZhbHVlKCkK K1FTY3JpcHRWYWx1ZVByaXZhdGU6OlN0YXRlIFFTY3JpcHRWYWx1ZVByaXZhdGU6OnJlZmluZWRK U1ZhbHVlKCkKIHsKICAgICBRX0FTU0VSVChtX3N0YXRlID09IEpTVmFsdWUpOwogICAgIGlmICgh SlNWYWx1ZUlzT2JqZWN0KGNvbnRleHQoKSwgdmFsdWUoKSkpIHsKLSAgICAgICAgbV9zdGF0ZSA9 IEpTTmF0aXZlOworICAgICAgICBtX3N0YXRlID0gSlNQcmltaXRpdmU7CiAgICAgfSBlbHNlIHsK ICAgICAgICAgbV9zdGF0ZSA9IEpTT2JqZWN0OwogICAgICAgICAvLyBXZSBhcmUgc3VyZSB0aGF0 IHZhbHVlIGlzIGFuIEpTT2JqZWN0LCBzbyB3ZSBjYW4gY29uc3RfY2FzdCBzYWZlbHkgd2l0aG91 dAo=