65441 2011-07-31 21:07:10 -0700 Clean up value clamping in CSSStyleSelector and CSSPrimitiveValue. 2011-08-02 19:11:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson darin eric macpherson simon.fraser webkit.review.bot oldest_to_newest 444500 0 macpherson 2011-07-31 21:07:10 -0700 Clean up value clampling in CSSStyleSelector and CSSPrimitiveValue. 444501 1 102472 macpherson 2011-07-31 21:10:08 -0700 Created attachment 102472 Patch 445606 2 102472 simon.fraser 2011-08-02 16:39:32 -0700 Comment on attachment 102472 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102472&action=review > Source/WebCore/css/CSSStyleSelector.cpp:4511 > + m_style->setOpacity(clampTo<float>(primitiveValue->getDoubleValue(), 0.0, 1.0)); Won't this cause warnings in 64-bit builds? You don't need the .0 on the literals. 445639 3 102472 macpherson 2011-08-02 17:38:17 -0700 Comment on attachment 102472 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=102472&action=review >> Source/WebCore/css/CSSStyleSelector.cpp:4511 >> + m_style->setOpacity(clampTo<float>(primitiveValue->getDoubleValue(), 0.0, 1.0)); > > Won't this cause warnings in 64-bit builds? You don't need the .0 on the literals. done. 445650 4 102725 macpherson 2011-08-02 18:02:10 -0700 Created attachment 102725 Patch for landing 445679 5 102725 webkit.review.bot 2011-08-02 19:11:23 -0700 Comment on attachment 102725 Patch for landing Clearing flags on attachment: 102725 Committed r92253: <http://trac.webkit.org/changeset/92253> 445680 6 webkit.review.bot 2011-08-02 19:11:28 -0700 All reviewed patches have been landed. Closing bug. 102472 2011-07-31 21:10:08 -0700 2011-08-02 18:02:03 -0700 Patch bug-65441-20110801141006.patch text/plain 5026 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyMDk1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDctMzEgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBDbGVhbiB1cCB2 YWx1ZSBjbGFtcGxpbmcgaW4gQ1NTU3R5bGVTZWxlY3RvciBhbmQgQ1NTUHJpbWl0aXZlVmFsdWUu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTQ0MQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0 ZXN0cyAvIHJlZmFjdG9yaW5nIG9ubHkuCisKKyAgICAgICAgKiBjc3MvQ1NTUHJpbWl0aXZlVmFs dWUuaDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZhbHVlOjpnZXRGbG9hdFZhbHVl KToKKyAgICAgICAgSW1wbGVtZW50IGluIHRlcm1zIG9mIHRoZSBuZXcgdGVtcGxhdGVkIGdldFZh bHVlKCkuCisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Z2V0SW50VmFsdWUp OgorICAgICAgICBJbXBsZW1lbnQgaW4gdGVybXMgb2YgdGhlIG5ldyB0ZW1wbGF0ZWQgZ2V0VmFs dWUoKS4KKyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZhbHVlOjpnZXRWYWx1ZSk6Cisg ICAgICAgIFRlbXBsYXRlZCBnZXRWYWx1ZSB0aGF0IHdvcmtzIGZvciBhbGwgbnVtZXJpYyB0eXBl cy4KKworICAgICAgICAqIGNzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkNTU1N0eWxlU2VsZWN0b3I6OmFwcGx5UHJvcGVydHkpOgorICAgICAgICBVc2UgZ2V0VmFs dWU8c2hvcnQ+IGluc3RlYWQgb2Ygcm9sbGluZy15b3VyLW93biBjbGFtcCB0byBzaG9ydC4KKwog MjAxMS0wNy0zMSAgRG9taW5pYyBDb29uZXkgIDxkb21pbmljY0BjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgRXZlbnQgdGFyZ2V0IHNldCB0byBudWxsIHBvc3QgZXZlbnQgZGlzcGF0Y2gKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5oCShyZXZpc2lvbiA5MjA5MikKKysr IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcmltaXRpdmVWYWx1ZS5oCSh3b3JraW5nIGNvcHkpCkBA IC0xNTUsMTMgKzE1NSwxNyBAQCBwdWJsaWM6CiAgICAgZG91YmxlIGdldERvdWJsZVZhbHVlKCkg Y29uc3QgeyByZXR1cm4gbV92YWx1ZS5udW07IH0KIAogICAgIHZvaWQgc2V0RmxvYXRWYWx1ZSh1 bnNpZ25lZCBzaG9ydCB1bml0VHlwZSwgZG91YmxlIGZsb2F0VmFsdWUsIEV4Y2VwdGlvbkNvZGUm KTsKLSAgICBmbG9hdCBnZXRGbG9hdFZhbHVlKHVuc2lnbmVkIHNob3J0IHVuaXRUeXBlLCBFeGNl cHRpb25Db2RlJiBlYykgY29uc3QgeyByZXR1cm4gY2xhbXBUb0Zsb2F0KGdldERvdWJsZVZhbHVl KHVuaXRUeXBlLCBlYykpOyB9Ci0gICAgZmxvYXQgZ2V0RmxvYXRWYWx1ZSh1bnNpZ25lZCBzaG9y dCB1bml0VHlwZSkgY29uc3QgeyByZXR1cm4gY2xhbXBUb0Zsb2F0KGdldERvdWJsZVZhbHVlKHVu aXRUeXBlKSk7IH0KLSAgICBmbG9hdCBnZXRGbG9hdFZhbHVlKCkgY29uc3QgeyByZXR1cm4gY2xh bXBUb0Zsb2F0KG1fdmFsdWUubnVtKTsgfQotCi0gICAgaW50IGdldEludFZhbHVlKHVuc2lnbmVk IHNob3J0IHVuaXRUeXBlLCBFeGNlcHRpb25Db2RlJiBlYykgY29uc3QgeyByZXR1cm4gY2xhbXBU b0ludGVnZXIoZ2V0RG91YmxlVmFsdWUodW5pdFR5cGUsIGVjKSk7IH0KLSAgICBpbnQgZ2V0SW50 VmFsdWUodW5zaWduZWQgc2hvcnQgdW5pdFR5cGUpIGNvbnN0IHsgcmV0dXJuIGNsYW1wVG9JbnRl Z2VyKGdldERvdWJsZVZhbHVlKHVuaXRUeXBlKSk7IH0KLSAgICBpbnQgZ2V0SW50VmFsdWUoKSBj b25zdCB7IHJldHVybiBjbGFtcFRvSW50ZWdlcihtX3ZhbHVlLm51bSk7IH0KKyAgICBmbG9hdCBn ZXRGbG9hdFZhbHVlKHVuc2lnbmVkIHNob3J0IHVuaXRUeXBlLCBFeGNlcHRpb25Db2RlJiBlYykg Y29uc3QgeyByZXR1cm4gZ2V0VmFsdWU8ZmxvYXQ+KHVuaXRUeXBlLCBlYyk7IH0KKyAgICBmbG9h dCBnZXRGbG9hdFZhbHVlKHVuc2lnbmVkIHNob3J0IHVuaXRUeXBlKSBjb25zdCB7IHJldHVybiBn ZXRWYWx1ZTxmbG9hdD4odW5pdFR5cGUpOyB9CisgICAgZmxvYXQgZ2V0RmxvYXRWYWx1ZSgpIGNv bnN0IHsgcmV0dXJuIGdldFZhbHVlPGZsb2F0PigpOyB9CisKKyAgICBpbnQgZ2V0SW50VmFsdWUo dW5zaWduZWQgc2hvcnQgdW5pdFR5cGUsIEV4Y2VwdGlvbkNvZGUmIGVjKSBjb25zdCB7IHJldHVy biBnZXRWYWx1ZTxpbnQ+KHVuaXRUeXBlLCBlYyk7IH0KKyAgICBpbnQgZ2V0SW50VmFsdWUodW5z aWduZWQgc2hvcnQgdW5pdFR5cGUpIGNvbnN0IHsgcmV0dXJuIGdldFZhbHVlPGludD4odW5pdFR5 cGUpOyB9CisgICAgaW50IGdldEludFZhbHVlKCkgY29uc3QgeyByZXR1cm4gZ2V0VmFsdWU8aW50 PigpOyB9CisKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBpbmxpbmUgVCBnZXRWYWx1ZSh1bnNp Z25lZCBzaG9ydCB1bml0VHlwZSwgRXhjZXB0aW9uQ29kZSYgZWMpIGNvbnN0IHsgcmV0dXJuIGNs YW1wVG88VD4oZ2V0RG91YmxlVmFsdWUodW5pdFR5cGUsIGVjKSk7IH0KKyAgICB0ZW1wbGF0ZTx0 eXBlbmFtZSBUPiBpbmxpbmUgVCBnZXRWYWx1ZSh1bnNpZ25lZCBzaG9ydCB1bml0VHlwZSkgY29u c3QgeyByZXR1cm4gY2xhbXBUbzxUPihnZXREb3VibGVWYWx1ZSh1bml0VHlwZSkpOyB9CisgICAg dGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIFQgZ2V0VmFsdWUoKSBjb25zdCB7IHJldHVybiBj bGFtcFRvPFQ+KG1fdmFsdWUubnVtKTsgfQogCiAgICAgdm9pZCBzZXRTdHJpbmdWYWx1ZSh1bnNp Z25lZCBzaG9ydCBzdHJpbmdUeXBlLCBjb25zdCBTdHJpbmcmIHN0cmluZ1ZhbHVlLCBFeGNlcHRp b25Db2RlJik7CiAgICAgU3RyaW5nIGdldFN0cmluZ1ZhbHVlKEV4Y2VwdGlvbkNvZGUmKSBjb25z dDsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJldmlzaW9u IDkyMDkyKQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwCSh3b3Jr aW5nIGNvcHkpCkBAIC00NTA4LDcgKzQ1MDgsNyBAQCB2b2lkIENTU1N0eWxlU2VsZWN0b3I6OmFw cGx5UHJvcGVydHkoaW50CiAgICAgICAgIGlmICghcHJpbWl0aXZlVmFsdWUgfHwgcHJpbWl0aXZl VmFsdWUtPnByaW1pdGl2ZVR5cGUoKSAhPSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX05VTUJFUikK ICAgICAgICAgICAgIHJldHVybjsgLy8gRXJyb3IgY2FzZS4KICAgICAgICAgLy8gQ2xhbXAgb3Bh Y2l0eSB0byB0aGUgcmFuZ2UgMC0xCi0gICAgICAgIG1fc3R5bGUtPnNldE9wYWNpdHkobWluKDEu MGYsIG1heCgwLjBmLCBwcmltaXRpdmVWYWx1ZS0+Z2V0RmxvYXRWYWx1ZSgpKSkpOworICAgICAg ICBtX3N0eWxlLT5zZXRPcGFjaXR5KGNsYW1wVG88ZmxvYXQ+KHByaW1pdGl2ZVZhbHVlLT5nZXRE b3VibGVWYWx1ZSgpLCAwLjAsIDEuMCkpOwogICAgICAgICByZXR1cm47CiAgICAgY2FzZSBDU1NQ cm9wZXJ0eVdlYmtpdEJveEFsaWduOgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRfSU5JVElB TF9BTkRfUFJJTUlUSVZFKGJveEFsaWduLCBCb3hBbGlnbikKQEAgLTQ3ODIsNyArNDc4Miw3IEBA IHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICAgICAgaWYgKHBy aW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpID09IENTU1ZhbHVlQXV0bykKICAgICAgICAgICAgIG1f c3R5bGUtPnNldEh5cGhlbmF0aW9uTGltaXRBZnRlcigtMSk7CiAgICAgICAgIGVsc2UKLSAgICAg ICAgICAgIG1fc3R5bGUtPnNldEh5cGhlbmF0aW9uTGltaXRBZnRlcihtaW4ocHJpbWl0aXZlVmFs dWUtPmdldEludFZhbHVlKENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfTlVNQkVSKSwgc3RhdGljX2Nh c3Q8aW50PihudW1lcmljX2xpbWl0czxzaG9ydD46Om1heCgpKSkpOworICAgICAgICAgICAgbV9z dHlsZS0+c2V0SHlwaGVuYXRpb25MaW1pdEFmdGVyKHByaW1pdGl2ZVZhbHVlLT5nZXRWYWx1ZTxz aG9ydD4oQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19OVU1CRVIpKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0SHlwaGVuYXRlTGltaXRCZWZvcmU6IHsK QEAgLTQ3OTAsNyArNDc5MCw3IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0 eShpbnQKICAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpID09IENTU1ZhbHVl QXV0bykKICAgICAgICAgICAgIG1fc3R5bGUtPnNldEh5cGhlbmF0aW9uTGltaXRCZWZvcmUoLTEp OwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX3N0eWxlLT5zZXRIeXBoZW5hdGlvbkxpbWl0 QmVmb3JlKG1pbihwcmltaXRpdmVWYWx1ZS0+Z2V0SW50VmFsdWUoQ1NTUHJpbWl0aXZlVmFsdWU6 OkNTU19OVU1CRVIpLCBzdGF0aWNfY2FzdDxpbnQ+KG51bWVyaWNfbGltaXRzPHNob3J0Pjo6bWF4 KCkpKSk7CisgICAgICAgICAgICBtX3N0eWxlLT5zZXRIeXBoZW5hdGlvbkxpbWl0QmVmb3JlKHBy aW1pdGl2ZVZhbHVlLT5nZXRWYWx1ZTxzaG9ydD4oQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19OVU1C RVIpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0 TG9jYWxlOiB7Cg== 102725 2011-08-02 18:02:10 -0700 2011-08-02 19:11:23 -0700 Patch for landing bug-65441-20110803110207.patch text/plain 5032 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDkyMjQ3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDgtMDIgIEx1a2UgTWFj cGhlcnNvbiAgIDxtYWNwaGVyc29uQGNocm9taXVtLm9yZz4KKworICAgICAgICBDbGVhbiB1cCB2 YWx1ZSBjbGFtcGxpbmcgaW4gQ1NTU3R5bGVTZWxlY3RvciBhbmQgQ1NTUHJpbWl0aXZlVmFsdWUu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTQ0MQor CisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KKworICAgICAgICBObyBuZXcgdGVz dHMgLyByZWZhY3RvcmluZyBvbmx5LgorCisgICAgICAgICogY3NzL0NTU1ByaW1pdGl2ZVZhbHVl Lmg6CisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Z2V0RmxvYXRWYWx1ZSk6 CisgICAgICAgIEltcGxlbWVudCBpbiB0ZXJtcyBvZiB0aGUgbmV3IHRlbXBsYXRlZCBnZXRWYWx1 ZSgpLgorICAgICAgICAoV2ViQ29yZTo6Q1NTUHJpbWl0aXZlVmFsdWU6OmdldEludFZhbHVlKToK KyAgICAgICAgSW1wbGVtZW50IGluIHRlcm1zIG9mIHRoZSBuZXcgdGVtcGxhdGVkIGdldFZhbHVl KCkuCisgICAgICAgIChXZWJDb3JlOjpDU1NQcmltaXRpdmVWYWx1ZTo6Z2V0VmFsdWUpOgorICAg ICAgICBUZW1wbGF0ZWQgZ2V0VmFsdWUgdGhhdCB3b3JrcyBmb3IgYWxsIG51bWVyaWMgdHlwZXMu CisKKyAgICAgICAgKiBjc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5KToKKyAgICAgICAgVXNlIGdldFZhbHVl PHNob3J0PiBpbnN0ZWFkIG9mIHJvbGxpbmcteW91ci1vd24gY2xhbXAgdG8gc2hvcnQuCisKIDIw MTEtMDgtMDIgIE1hcmsgUGlsZ3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAg IFJlbW92ZSBMZWdhY3lEZWZhdWx0T3B0aW9uYWxBcmd1bWVudHMgZmxhZyBmcm9tIEhpc3Rvcnku aWRsCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAkocmV2aXNpb24g OTIyNDcpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAkod29ya2lu ZyBjb3B5KQpAQCAtMTU3LDEzICsxNTcsMTcgQEAgcHVibGljOgogICAgIGRvdWJsZSBnZXREb3Vi bGVWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdmFsdWUubnVtOyB9CiAKICAgICB2b2lkIHNldEZs b2F0VmFsdWUodW5zaWduZWQgc2hvcnQgdW5pdFR5cGUsIGRvdWJsZSBmbG9hdFZhbHVlLCBFeGNl cHRpb25Db2RlJik7Ci0gICAgZmxvYXQgZ2V0RmxvYXRWYWx1ZSh1bnNpZ25lZCBzaG9ydCB1bml0 VHlwZSwgRXhjZXB0aW9uQ29kZSYgZWMpIGNvbnN0IHsgcmV0dXJuIGNsYW1wVG9GbG9hdChnZXRE b3VibGVWYWx1ZSh1bml0VHlwZSwgZWMpKTsgfQotICAgIGZsb2F0IGdldEZsb2F0VmFsdWUodW5z aWduZWQgc2hvcnQgdW5pdFR5cGUpIGNvbnN0IHsgcmV0dXJuIGNsYW1wVG9GbG9hdChnZXREb3Vi bGVWYWx1ZSh1bml0VHlwZSkpOyB9Ci0gICAgZmxvYXQgZ2V0RmxvYXRWYWx1ZSgpIGNvbnN0IHsg cmV0dXJuIGNsYW1wVG9GbG9hdChtX3ZhbHVlLm51bSk7IH0KLQotICAgIGludCBnZXRJbnRWYWx1 ZSh1bnNpZ25lZCBzaG9ydCB1bml0VHlwZSwgRXhjZXB0aW9uQ29kZSYgZWMpIGNvbnN0IHsgcmV0 dXJuIGNsYW1wVG9JbnRlZ2VyKGdldERvdWJsZVZhbHVlKHVuaXRUeXBlLCBlYykpOyB9Ci0gICAg aW50IGdldEludFZhbHVlKHVuc2lnbmVkIHNob3J0IHVuaXRUeXBlKSBjb25zdCB7IHJldHVybiBj bGFtcFRvSW50ZWdlcihnZXREb3VibGVWYWx1ZSh1bml0VHlwZSkpOyB9Ci0gICAgaW50IGdldElu dFZhbHVlKCkgY29uc3QgeyByZXR1cm4gY2xhbXBUb0ludGVnZXIobV92YWx1ZS5udW0pOyB9Cisg ICAgZmxvYXQgZ2V0RmxvYXRWYWx1ZSh1bnNpZ25lZCBzaG9ydCB1bml0VHlwZSwgRXhjZXB0aW9u Q29kZSYgZWMpIGNvbnN0IHsgcmV0dXJuIGdldFZhbHVlPGZsb2F0Pih1bml0VHlwZSwgZWMpOyB9 CisgICAgZmxvYXQgZ2V0RmxvYXRWYWx1ZSh1bnNpZ25lZCBzaG9ydCB1bml0VHlwZSkgY29uc3Qg eyByZXR1cm4gZ2V0VmFsdWU8ZmxvYXQ+KHVuaXRUeXBlKTsgfQorICAgIGZsb2F0IGdldEZsb2F0 VmFsdWUoKSBjb25zdCB7IHJldHVybiBnZXRWYWx1ZTxmbG9hdD4oKTsgfQorCisgICAgaW50IGdl dEludFZhbHVlKHVuc2lnbmVkIHNob3J0IHVuaXRUeXBlLCBFeGNlcHRpb25Db2RlJiBlYykgY29u c3QgeyByZXR1cm4gZ2V0VmFsdWU8aW50Pih1bml0VHlwZSwgZWMpOyB9CisgICAgaW50IGdldElu dFZhbHVlKHVuc2lnbmVkIHNob3J0IHVuaXRUeXBlKSBjb25zdCB7IHJldHVybiBnZXRWYWx1ZTxp bnQ+KHVuaXRUeXBlKTsgfQorICAgIGludCBnZXRJbnRWYWx1ZSgpIGNvbnN0IHsgcmV0dXJuIGdl dFZhbHVlPGludD4oKTsgfQorCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIFQgZ2V0 VmFsdWUodW5zaWduZWQgc2hvcnQgdW5pdFR5cGUsIEV4Y2VwdGlvbkNvZGUmIGVjKSBjb25zdCB7 IHJldHVybiBjbGFtcFRvPFQ+KGdldERvdWJsZVZhbHVlKHVuaXRUeXBlLCBlYykpOyB9CisgICAg dGVtcGxhdGU8dHlwZW5hbWUgVD4gaW5saW5lIFQgZ2V0VmFsdWUodW5zaWduZWQgc2hvcnQgdW5p dFR5cGUpIGNvbnN0IHsgcmV0dXJuIGNsYW1wVG88VD4oZ2V0RG91YmxlVmFsdWUodW5pdFR5cGUp KTsgfQorICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGlubGluZSBUIGdldFZhbHVlKCkgY29uc3Qg eyByZXR1cm4gY2xhbXBUbzxUPihtX3ZhbHVlLm51bSk7IH0KIAogICAgIHZvaWQgc2V0U3RyaW5n VmFsdWUodW5zaWduZWQgc2hvcnQgc3RyaW5nVHlwZSwgY29uc3QgU3RyaW5nJiBzdHJpbmdWYWx1 ZSwgRXhjZXB0aW9uQ29kZSYpOwogICAgIFN0cmluZyBnZXRTdHJpbmdWYWx1ZShFeGNlcHRpb25D b2RlJikgY29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlU2VsZWN0b3IuY3Bw CShyZXZpc2lvbiA5MjI0NykKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9y LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDQ5Niw3ICs0NDk2LDcgQEAgdm9pZCBDU1NTdHlsZVNl bGVjdG9yOjphcHBseVByb3BlcnR5KGludAogICAgICAgICBpZiAoIXByaW1pdGl2ZVZhbHVlIHx8 IHByaW1pdGl2ZVZhbHVlLT5wcmltaXRpdmVUeXBlKCkgIT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNT U19OVU1CRVIpCiAgICAgICAgICAgICByZXR1cm47IC8vIEVycm9yIGNhc2UuCiAgICAgICAgIC8v IENsYW1wIG9wYWNpdHkgdG8gdGhlIHJhbmdlIDAtMQotICAgICAgICBtX3N0eWxlLT5zZXRPcGFj aXR5KG1pbigxLjBmLCBtYXgoMC4wZiwgcHJpbWl0aXZlVmFsdWUtPmdldEZsb2F0VmFsdWUoKSkp KTsKKyAgICAgICAgbV9zdHlsZS0+c2V0T3BhY2l0eShjbGFtcFRvPGZsb2F0PihwcmltaXRpdmVW YWx1ZS0+Z2V0RG91YmxlVmFsdWUoKSwgMCwgMSkpOwogICAgICAgICByZXR1cm47CiAgICAgY2Fz ZSBDU1NQcm9wZXJ0eVdlYmtpdEJveEFsaWduOgogICAgICAgICBIQU5ETEVfSU5IRVJJVF9BTkRf SU5JVElBTF9BTkRfUFJJTUlUSVZFKGJveEFsaWduLCBCb3hBbGlnbikKQEAgLTQ3NzAsNyArNDc3 MCw3IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICAgICAg aWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpID09IENTU1ZhbHVlQXV0bykKICAgICAgICAg ICAgIG1fc3R5bGUtPnNldEh5cGhlbmF0aW9uTGltaXRBZnRlcigtMSk7CiAgICAgICAgIGVsc2UK LSAgICAgICAgICAgIG1fc3R5bGUtPnNldEh5cGhlbmF0aW9uTGltaXRBZnRlcihtaW4ocHJpbWl0 aXZlVmFsdWUtPmdldEludFZhbHVlKENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfTlVNQkVSKSwgc3Rh dGljX2Nhc3Q8aW50PihudW1lcmljX2xpbWl0czxzaG9ydD46Om1heCgpKSkpOworICAgICAgICAg ICAgbV9zdHlsZS0+c2V0SHlwaGVuYXRpb25MaW1pdEFmdGVyKHByaW1pdGl2ZVZhbHVlLT5nZXRW YWx1ZTxzaG9ydD4oQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19OVU1CRVIpKTsKICAgICAgICAgcmV0 dXJuOwogICAgIH0KICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0SHlwaGVuYXRlTGltaXRCZWZv cmU6IHsKQEAgLTQ3NzgsNyArNDc3OCw3IEBAIHZvaWQgQ1NTU3R5bGVTZWxlY3Rvcjo6YXBwbHlQ cm9wZXJ0eShpbnQKICAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpID09IENT U1ZhbHVlQXV0bykKICAgICAgICAgICAgIG1fc3R5bGUtPnNldEh5cGhlbmF0aW9uTGltaXRCZWZv cmUoLTEpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBtX3N0eWxlLT5zZXRIeXBoZW5hdGlv bkxpbWl0QmVmb3JlKG1pbihwcmltaXRpdmVWYWx1ZS0+Z2V0SW50VmFsdWUoQ1NTUHJpbWl0aXZl VmFsdWU6OkNTU19OVU1CRVIpLCBzdGF0aWNfY2FzdDxpbnQ+KG51bWVyaWNfbGltaXRzPHNob3J0 Pjo6bWF4KCkpKSk7CisgICAgICAgICAgICBtX3N0eWxlLT5zZXRIeXBoZW5hdGlvbkxpbWl0QmVm b3JlKHByaW1pdGl2ZVZhbHVlLT5nZXRWYWx1ZTxzaG9ydD4oQ1NTUHJpbWl0aXZlVmFsdWU6OkNT U19OVU1CRVIpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBjYXNlIENTU1Byb3BlcnR5 V2Via2l0TG9jYWxlOiB7Cg==