140462 2015-01-14 13:29:22 -0800 Get rid of custom StyleBuilder code for 'line-height' CSS property 2015-01-15 09:20:49 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez commit-queue darin kling koivisto sam oldest_to_newest 1061288 0 cdumez 2015-01-14 13:29:22 -0800 Get rid of custom StyleBuilder code for 'line-height' CSS property by using a conditional converter. 1061323 1 244644 cdumez 2015-01-14 14:58:40 -0800 Created attachment 244644 Patch 1061434 2 244669 cdumez 2015-01-14 17:43:30 -0800 Created attachment 244669 Patch 1061558 3 244669 commit-queue 2015-01-15 09:20:44 -0800 Comment on attachment 244669 Patch Clearing flags on attachment: 244669 Committed r178512: <http://trac.webkit.org/changeset/178512> 1061559 4 commit-queue 2015-01-15 09:20:49 -0800 All reviewed patches have been landed. Closing bug. 244644 2015-01-14 14:58:40 -0800 2015-01-14 17:43:30 -0800 Patch bug-140462-20150114145846.patch text/plain 7491 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTIwOTAzNTE2MTVjZDI4 NzE0OTJmZDM1OTdiOGNkNTAxODNkMTIyYS4uMDdkZGE4MTZlNDMyZWQ2OTk3NDlhNTE4YjYyYWIx MmI3ZmQ3YzhhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTAxLTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgR2V0IHJpZCBvZiBjdXN0b20g U3R5bGVCdWlsZGVyIGNvZGUgZm9yICdsaW5lLWhlaWdodCcgQ1NTIHByb3BlcnR5CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA0NjIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBHZXQgcmlkIG9mIGN1c3Rv bSBTdHlsZUJ1aWxkZXIgY29kZSBmb3IgJ2xpbmUtaGVpZ2h0JyBDU1MgcHJvcGVydHkgYnkKKyAg ICAgICAgdXNpbmcgYSBjb25kaXRpb25hbCBjb252ZXJ0ZXIuCisKKyAgICAgICAgKiBjc3MvQ1NT UHJvcGVydHlOYW1lcy5pbjoKKyAgICAgICAgKiBjc3MvU3R5bGVCdWlsZGVyQ29udmVydGVyLmg6 CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRMaW5lSGVp Z2h0KToKKyAgICAgICAgKiBjc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmg6CisgICAgICAgIChXZWJD b3JlOjpTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVMaW5lSGVpZ2h0KToKKyAgICAgICAg KFdlYkNvcmU6OlN0eWxlQnVpbGRlckN1c3RvbTo6Y29udmVydExpbmVIZWlnaHQpOiBEZWxldGVk LgorCiAyMDE1LTAxLTE0ICBCYXJ0bG9taWVqIEdhamRhICA8Yi5nYWpkYUBzYW1zdW5nLmNvbT4K IAogICAgICAgICBbTVNFXSBJbXBsZW1lbnQgcGVyIFRyYWNrQnVmZmVyIGJ1ZmZlcmVkLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4gYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgppbmRleCAxYmQ0ZGQ4ZTBmODg5YzA3NDQ1 NWI5NDEzZGQ4MjMyNDIyN2JiMzIyLi4wODJiM2NjN2YyOTUxMDYyMTIxNjIyYTAyMjMzNzg1M2Y1 Njc4MGVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5p bgorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgpAQCAtMTIxLDcg KzEyMSw3IEBAIHpvb20gW0N1c3RvbT1BbGxdCiAjaWYgZGVmaW5lZChFTkFCTEVfSU9TX1RFWFRf QVVUT1NJWklORykgJiYgRU5BQkxFX0lPU19URVhUX0FVVE9TSVpJTkcKIGxpbmUtaGVpZ2h0IFtJ bmhlcml0ZWQsIEN1c3RvbT1BbGxdCiAjZWxzZQotbGluZS1oZWlnaHQgW0luaGVyaXRlZCwgR2V0 dGVyPXNwZWNpZmllZExpbmVIZWlnaHQsIEN1c3RvbT1WYWx1ZV0KK2xpbmUtaGVpZ2h0IFtJbmhl cml0ZWQsIEdldHRlcj1zcGVjaWZpZWRMaW5lSGVpZ2h0LCBDb25kaXRpb25hbENvbnZlcnRlcj1M aW5lSGVpZ2h0XQogI2VuZGlmCiAKIC8vIEtlZXAgdGhpcyBpbiBiZXR3ZWVuIHRoZSBoaWdoZXN0 IHByaW9yaXR5IHByb3BzIGFuZCB0aGUgbG93ZXIgb25lcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9T dHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaAppbmRleCAyZjU5YzNjZGRlZjg0NzA4NDE2YzgzNzQ0YzBm OWFkNGE3NTUwZTcxLi44OGZiOTRkMWU4MzE4NmRlZjBkN2FiMjBhYjhkM2Y4ZGNlNWRjMjJmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ29udmVydGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5oCkBAIC0xMjMsNiAr MTIzLDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBDb2xvciBjb252ZXJ0U1ZHQ29sb3IoU3R5bGVS ZXNvbHZlciYsIENTU1ZhbHVlJik7CiAgICAgc3RhdGljIEVHbHlwaE9yaWVudGF0aW9uIGNvbnZl cnRHbHlwaE9yaWVudGF0aW9uKFN0eWxlUmVzb2x2ZXImLCBDU1NWYWx1ZSYpOwogICAgIHN0YXRp YyBFR2x5cGhPcmllbnRhdGlvbiBjb252ZXJ0R2x5cGhPcmllbnRhdGlvbk9yQXV0byhTdHlsZVJl c29sdmVyJiwgQ1NTVmFsdWUmKTsKKyAgICBzdGF0aWMgT3B0aW9uYWw8TGVuZ3RoPiBjb252ZXJ0 TGluZUhlaWdodChTdHlsZVJlc29sdmVyJiwgQ1NTVmFsdWUmLCBmbG9hdCBtdWx0aXBsaWVyID0g MS5mKTsKIAogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgU3R5bGVCdWlsZGVyQ3VzdG9tOwpA QCAtMTIxMSw2ICsxMjEyLDI5IEBAIGlubGluZSBFR2x5cGhPcmllbnRhdGlvbiBTdHlsZUJ1aWxk ZXJDb252ZXJ0ZXI6OmNvbnZlcnRHbHlwaE9yaWVudGF0aW9uT3JBdXRvKFN0CiAgICAgcmV0dXJu IGNvbnZlcnRHbHlwaE9yaWVudGF0aW9uKHN0eWxlUmVzb2x2ZXIsIHZhbHVlKTsKIH0KIAoraW5s aW5lIE9wdGlvbmFsPExlbmd0aD4gU3R5bGVCdWlsZGVyQ29udmVydGVyOjpjb252ZXJ0TGluZUhl aWdodChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUsIGZsb2F0 IG11bHRpcGxpZXIpCit7CisgICAgYXV0byYgcHJpbWl0aXZlVmFsdWUgPSBkb3duY2FzdDxDU1NQ cmltaXRpdmVWYWx1ZT4odmFsdWUpOworICAgIGlmIChwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlE KCkgPT0gQ1NTVmFsdWVOb3JtYWwpCisgICAgICAgIHJldHVybiBSZW5kZXJTdHlsZTo6aW5pdGlh bExpbmVIZWlnaHQoKTsKKworICAgIGlmIChwcmltaXRpdmVWYWx1ZS5pc0xlbmd0aCgpKSB7Cisg ICAgICAgIExlbmd0aCBsZW5ndGggPSBwcmltaXRpdmVWYWx1ZS5jb21wdXRlTGVuZ3RoPExlbmd0 aD4oU3R5bGVCdWlsZGVyQ29udmVydGVyOjpjc3N0b0xlbmd0aENvbnZlcnNpb25EYXRhV2l0aFRl eHRab29tRmFjdG9yKHN0eWxlUmVzb2x2ZXIpKTsKKyAgICAgICAgaWYgKG11bHRpcGxpZXIgIT0g MS5mKQorICAgICAgICAgICAgbGVuZ3RoID0gTGVuZ3RoKGxlbmd0aC52YWx1ZSgpICogbXVsdGlw bGllciwgRml4ZWQpOworICAgICAgICByZXR1cm4gbGVuZ3RoOworICAgIH0KKyAgICBpZiAocHJp bWl0aXZlVmFsdWUuaXNQZXJjZW50YWdlKCkpIHsKKyAgICAgICAgLy8gRklYTUU6IHBlcmNlbnRh Z2Ugc2hvdWxkIG5vdCBiZSByZXN0cmljdGVkIHRvIGFuIGludGVnZXIgaGVyZS4KKyAgICAgICAg cmV0dXJuIExlbmd0aCgoc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5jb21wdXRlZEZvbnRTaXplKCkg KiBwcmltaXRpdmVWYWx1ZS5nZXRJbnRWYWx1ZSgpKSAvIDEwMCwgRml4ZWQpOworICAgIH0KKyAg ICBpZiAocHJpbWl0aXZlVmFsdWUuaXNOdW1iZXIoKSkgeworICAgICAgICAvLyBGSVhNRTogbnVt YmVyIGFuZCBwZXJjZW50YWdlIHZhbHVlcyBzaG91bGQgcHJvZHVjZSB0aGUgc2FtZSB0eXBlIG9m IExlbmd0aCAoaWUuIEZpeGVkIG9yIFBlcmNlbnQpLgorICAgICAgICByZXR1cm4gTGVuZ3RoKHBy aW1pdGl2ZVZhbHVlLmdldERvdWJsZVZhbHVlKCkgKiBtdWx0aXBsaWVyICogMTAwLjAsIFBlcmNl bnQpOworICAgIH0KKyAgICByZXR1cm4gTnVsbG9wdDsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQogCiAjZW5kaWYgLy8gU3R5bGVCdWlsZGVyQ29udmVydGVyX2gKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZUJ1aWxkZXJDdXN0b20uaAppbmRleCAwMzBiMjJkNWQ3MDE5MDZmM2MxNTIwMGI4OWQ4 MjRiYzkxNzg1NjlhLi42MWZjNjYxZjM4NTYzOWZiYzMwNTNhMjliMmU5NDc1YzI3ZTJhYmZlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCkBAIC0xMTYsOSArMTE2LDYg QEAgcHVibGljOgogICAgIC8vIEN1c3RvbSBoYW5kbGluZyBvZiB2YWx1ZSBzZXR0aW5nIG9ubHku CiAgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZUJhc2VsaW5lU2hpZnQoU3R5bGVSZXNvbHZlciYs IENTU1ZhbHVlJik7CiAgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZURpcmVjdGlvbihTdHlsZVJl c29sdmVyJiwgQ1NTVmFsdWUmKTsKLSNpZiAhRU5BQkxFKElPU19URVhUX0FVVE9TSVpJTkcpCi0g ICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZUxpbmVIZWlnaHQoU3R5bGVSZXNvbHZlciYsIENTU1Zh bHVlJik7Ci0jZW5kaWYKICAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlVmVydGljYWxBbGlnbihT dHlsZVJlc29sdmVyJiwgQ1NTVmFsdWUmKTsKICNpZiBFTkFCTEUoREFTSEJPQVJEX1NVUFBPUlQp CiAgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZVdlYmtpdERhc2hib2FyZFJlZ2lvbihTdHlsZVJl c29sdmVyJiwgQ1NTVmFsdWUmKTsKQEAgLTEzNCw3ICsxMzEsNiBAQCBwdWJsaWM6CiAKIHByaXZh dGU6CiAgICAgc3RhdGljIHZvaWQgcmVzZXRFZmZlY3RpdmVab29tKFN0eWxlUmVzb2x2ZXImKTsK LSAgICBzdGF0aWMgYm9vbCBjb252ZXJ0TGluZUhlaWdodChTdHlsZVJlc29sdmVyJiwgY29uc3Qg Q1NTVmFsdWUmLCBMZW5ndGgmLCBmbG9hdCBtdWx0aXBsaWVyID0gMS5mKTsKIAogICAgIHN0YXRp YyBMZW5ndGggbW1MZW5ndGgoZG91YmxlIG1tKTsKICAgICBzdGF0aWMgTGVuZ3RoIGluY2hMZW5n dGgoZG91YmxlIGluY2gpOwpAQCAtNjA2LDMyICs2MDIsNiBAQCBERUZJTkVfQk9SREVSX0lNQUdF X01PRElGSUVSX0hBTkRMRVIoV2Via2l0TWFza0JveEltYWdlLCBSZXBlYXQpCiBERUZJTkVfQk9S REVSX0lNQUdFX01PRElGSUVSX0hBTkRMRVIoV2Via2l0TWFza0JveEltYWdlLCBTbGljZSkKIERF RklORV9CT1JERVJfSU1BR0VfTU9ESUZJRVJfSEFORExFUihXZWJraXRNYXNrQm94SW1hZ2UsIFdp ZHRoKQogCi1pbmxpbmUgYm9vbCBTdHlsZUJ1aWxkZXJDdXN0b206OmNvbnZlcnRMaW5lSGVpZ2h0 KFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIGNvbnN0IENTU1ZhbHVlJiB2YWx1ZSwgTGVu Z3RoJiBsZW5ndGgsIGZsb2F0IG11bHRpcGxpZXIpCi17Ci0gICAgYXV0byYgcHJpbWl0aXZlVmFs dWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4odmFsdWUpOwotICAgIGlmIChwcmltaXRp dmVWYWx1ZS5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVOb3JtYWwpIHsKLSAgICAgICAgbGVuZ3Ro ID0gUmVuZGVyU3R5bGU6OmluaXRpYWxMaW5lSGVpZ2h0KCk7Ci0gICAgICAgIHJldHVybiB0cnVl OwotICAgIH0KLSAgICBpZiAocHJpbWl0aXZlVmFsdWUuaXNMZW5ndGgoKSkgewotICAgICAgICBs ZW5ndGggPSBwcmltaXRpdmVWYWx1ZS5jb21wdXRlTGVuZ3RoPExlbmd0aD4oU3R5bGVCdWlsZGVy Q29udmVydGVyOjpjc3N0b0xlbmd0aENvbnZlcnNpb25EYXRhV2l0aFRleHRab29tRmFjdG9yKHN0 eWxlUmVzb2x2ZXIpKTsKLSAgICAgICAgaWYgKG11bHRpcGxpZXIgIT0gMS5mKQotICAgICAgICAg ICAgbGVuZ3RoID0gTGVuZ3RoKGxlbmd0aC52YWx1ZSgpICogbXVsdGlwbGllciwgRml4ZWQpOwot ICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgaWYgKHByaW1pdGl2ZVZhbHVlLmlzUGVy Y2VudGFnZSgpKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBwZXJjZW50YWdlIHNob3VsZCBub3QgYmUg cmVzdHJpY3RlZCB0byBhbiBpbnRlZ2VyIGhlcmUuCi0gICAgICAgIGxlbmd0aCA9IExlbmd0aCgo c3R5bGVSZXNvbHZlci5zdHlsZSgpLT5jb21wdXRlZEZvbnRTaXplKCkgKiBwcmltaXRpdmVWYWx1 ZS5nZXRJbnRWYWx1ZSgpKSAvIDEwMCwgRml4ZWQpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAg ICB9Ci0gICAgaWYgKHByaW1pdGl2ZVZhbHVlLmlzTnVtYmVyKCkpIHsKLSAgICAgICAgLy8gRklY TUU6IG51bWJlciBhbmQgcGVyY2VudGFnZSB2YWx1ZXMgc2hvdWxkIHByb2R1Y2UgdGhlIHNhbWUg dHlwZSBvZiBMZW5ndGggKGllLiBGaXhlZCBvciBQZXJjZW50KS4KLSAgICAgICAgbGVuZ3RoID0g TGVuZ3RoKHByaW1pdGl2ZVZhbHVlLmdldERvdWJsZVZhbHVlKCkgKiBtdWx0aXBsaWVyICogMTAw LjAsIFBlcmNlbnQpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgcmV0dXJuIGZh bHNlOwotfQotCiAjaWYgRU5BQkxFKElPU19URVhUX0FVVE9TSVpJTkcpCiAKIGlubGluZSB2b2lk IFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbmhlcml0TGluZUhlaWdodChTdHlsZVJlc29sdmVy JiBzdHlsZVJlc29sdmVyKQpAQCAtNjQ4LDI0ICs2MTgsMTMgQEAgaW5saW5lIHZvaWQgU3R5bGVC dWlsZGVyQ3VzdG9tOjphcHBseUluaXRpYWxMaW5lSGVpZ2h0KFN0eWxlUmVzb2x2ZXImIHN0eWxl UmVzb2wKIAogaW5saW5lIHZvaWQgU3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlTGluZUhl aWdodChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCiB7Ci0g ICAgTGVuZ3RoIGxpbmVIZWlnaHQ7CiAgICAgZmxvYXQgbXVsdGlwbGllciA9IHN0eWxlUmVzb2x2 ZXIuc3R5bGUoKS0+dGV4dFNpemVBZGp1c3QoKS5pc1BlcmNlbnRhZ2UoKSA/IHN0eWxlUmVzb2x2 ZXIuc3R5bGUoKS0+dGV4dFNpemVBZGp1c3QoKS5tdWx0aXBsaWVyKCkgOiAxLmY7Ci0gICAgaWYg KCFjb252ZXJ0TGluZUhlaWdodChzdHlsZVJlc29sdmVyLCB2YWx1ZSwgbGluZUhlaWdodCwgbXVs dGlwbGllcikpCi0gICAgICAgIHJldHVybjsKLQotICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+ c2V0TGluZUhlaWdodChsaW5lSGVpZ2h0KTsKLSAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNl dFNwZWNpZmllZExpbmVIZWlnaHQobGluZUhlaWdodCk7Ci19Ci0KLSNlbHNlCi0KLWlubGluZSB2 b2lkIFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlWYWx1ZUxpbmVIZWlnaHQoU3R5bGVSZXNvbHZl ciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVlKQotewotICAgIExlbmd0aCBsaW5lSGVp Z2h0OwotICAgIGlmICghY29udmVydExpbmVIZWlnaHQoc3R5bGVSZXNvbHZlciwgdmFsdWUsIGxp bmVIZWlnaHQpKQorICAgIE9wdGlvbmFsPExlbmd0aD4gbGluZUhlaWdodCA9IFN0eWxlQnVpbGRl ckNvbnZlcnRlcjo6Y29udmVydExpbmVIZWlnaHQoc3R5bGVSZXNvbHZlciwgdmFsdWUsIG11bHRp cGxpZXIpOworICAgIGlmICghbGluZUhlaWdodCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgc3R5 bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRMaW5lSGVpZ2h0KGxpbmVIZWlnaHQpOworICAgIHN0eWxl UmVzb2x2ZXIuc3R5bGUoKS0+c2V0TGluZUhlaWdodChsaW5lSGVpZ2h0LnZhbHVlKCkpOworICAg IHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0U3BlY2lmaWVkTGluZUhlaWdodChsaW5lSGVpZ2h0 LnZhbHVlKCkpOwogfQogCiAjZW5kaWYK 244669 2015-01-14 17:43:30 -0800 2015-01-15 09:20:44 -0800 Patch bug-140462-20150114145846.patch text/plain 7491 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc4NDM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTIwOTAzNTE2MTVjZDI4 NzE0OTJmZDM1OTdiOGNkNTAxODNkMTIyYS4uMDdkZGE4MTZlNDMyZWQ2OTk3NDlhNTE4YjYyYWIx MmI3ZmQ3YzhhYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE1LTAxLTE0ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgR2V0IHJpZCBvZiBjdXN0b20g U3R5bGVCdWlsZGVyIGNvZGUgZm9yICdsaW5lLWhlaWdodCcgQ1NTIHByb3BlcnR5CisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA0NjIKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBHZXQgcmlkIG9mIGN1c3Rv bSBTdHlsZUJ1aWxkZXIgY29kZSBmb3IgJ2xpbmUtaGVpZ2h0JyBDU1MgcHJvcGVydHkgYnkKKyAg ICAgICAgdXNpbmcgYSBjb25kaXRpb25hbCBjb252ZXJ0ZXIuCisKKyAgICAgICAgKiBjc3MvQ1NT UHJvcGVydHlOYW1lcy5pbjoKKyAgICAgICAgKiBjc3MvU3R5bGVCdWlsZGVyQ29udmVydGVyLmg6 CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxkZXJDb252ZXJ0ZXI6OmNvbnZlcnRMaW5lSGVp Z2h0KToKKyAgICAgICAgKiBjc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmg6CisgICAgICAgIChXZWJD b3JlOjpTdHlsZUJ1aWxkZXJDdXN0b206OmFwcGx5VmFsdWVMaW5lSGVpZ2h0KToKKyAgICAgICAg KFdlYkNvcmU6OlN0eWxlQnVpbGRlckN1c3RvbTo6Y29udmVydExpbmVIZWlnaHQpOiBEZWxldGVk LgorCiAyMDE1LTAxLTE0ICBCYXJ0bG9taWVqIEdhamRhICA8Yi5nYWpkYUBzYW1zdW5nLmNvbT4K IAogICAgICAgICBbTVNFXSBJbXBsZW1lbnQgcGVyIFRyYWNrQnVmZmVyIGJ1ZmZlcmVkLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU1Byb3BlcnR5TmFtZXMuaW4gYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgppbmRleCAxYmQ0ZGQ4ZTBmODg5YzA3NDQ1 NWI5NDEzZGQ4MjMyNDIyN2JiMzIyLi4wODJiM2NjN2YyOTUxMDYyMTIxNjIyYTAyMjMzNzg1M2Y1 Njc4MGVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5p bgorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgpAQCAtMTIxLDcg KzEyMSw3IEBAIHpvb20gW0N1c3RvbT1BbGxdCiAjaWYgZGVmaW5lZChFTkFCTEVfSU9TX1RFWFRf QVVUT1NJWklORykgJiYgRU5BQkxFX0lPU19URVhUX0FVVE9TSVpJTkcKIGxpbmUtaGVpZ2h0IFtJ bmhlcml0ZWQsIEN1c3RvbT1BbGxdCiAjZWxzZQotbGluZS1oZWlnaHQgW0luaGVyaXRlZCwgR2V0 dGVyPXNwZWNpZmllZExpbmVIZWlnaHQsIEN1c3RvbT1WYWx1ZV0KK2xpbmUtaGVpZ2h0IFtJbmhl cml0ZWQsIEdldHRlcj1zcGVjaWZpZWRMaW5lSGVpZ2h0LCBDb25kaXRpb25hbENvbnZlcnRlcj1M aW5lSGVpZ2h0XQogI2VuZGlmCiAKIC8vIEtlZXAgdGhpcyBpbiBiZXR3ZWVuIHRoZSBoaWdoZXN0 IHByaW9yaXR5IHByb3BzIGFuZCB0aGUgbG93ZXIgb25lcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9T dHlsZUJ1aWxkZXJDb252ZXJ0ZXIuaAppbmRleCAyZjU5YzNjZGRlZjg0NzA4NDE2YzgzNzQ0YzBm OWFkNGE3NTUwZTcxLi44OGZiOTRkMWU4MzE4NmRlZjBkN2FiMjBhYjhkM2Y4ZGNlNWRjMjJmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ29udmVydGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckNvbnZlcnRlci5oCkBAIC0xMjMsNiAr MTIzLDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBDb2xvciBjb252ZXJ0U1ZHQ29sb3IoU3R5bGVS ZXNvbHZlciYsIENTU1ZhbHVlJik7CiAgICAgc3RhdGljIEVHbHlwaE9yaWVudGF0aW9uIGNvbnZl cnRHbHlwaE9yaWVudGF0aW9uKFN0eWxlUmVzb2x2ZXImLCBDU1NWYWx1ZSYpOwogICAgIHN0YXRp YyBFR2x5cGhPcmllbnRhdGlvbiBjb252ZXJ0R2x5cGhPcmllbnRhdGlvbk9yQXV0byhTdHlsZVJl c29sdmVyJiwgQ1NTVmFsdWUmKTsKKyAgICBzdGF0aWMgT3B0aW9uYWw8TGVuZ3RoPiBjb252ZXJ0 TGluZUhlaWdodChTdHlsZVJlc29sdmVyJiwgQ1NTVmFsdWUmLCBmbG9hdCBtdWx0aXBsaWVyID0g MS5mKTsKIAogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgU3R5bGVCdWlsZGVyQ3VzdG9tOwpA QCAtMTIxMSw2ICsxMjEyLDI5IEBAIGlubGluZSBFR2x5cGhPcmllbnRhdGlvbiBTdHlsZUJ1aWxk ZXJDb252ZXJ0ZXI6OmNvbnZlcnRHbHlwaE9yaWVudGF0aW9uT3JBdXRvKFN0CiAgICAgcmV0dXJu IGNvbnZlcnRHbHlwaE9yaWVudGF0aW9uKHN0eWxlUmVzb2x2ZXIsIHZhbHVlKTsKIH0KIAoraW5s aW5lIE9wdGlvbmFsPExlbmd0aD4gU3R5bGVCdWlsZGVyQ29udmVydGVyOjpjb252ZXJ0TGluZUhl aWdodChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUsIGZsb2F0 IG11bHRpcGxpZXIpCit7CisgICAgYXV0byYgcHJpbWl0aXZlVmFsdWUgPSBkb3duY2FzdDxDU1NQ cmltaXRpdmVWYWx1ZT4odmFsdWUpOworICAgIGlmIChwcmltaXRpdmVWYWx1ZS5nZXRWYWx1ZUlE KCkgPT0gQ1NTVmFsdWVOb3JtYWwpCisgICAgICAgIHJldHVybiBSZW5kZXJTdHlsZTo6aW5pdGlh bExpbmVIZWlnaHQoKTsKKworICAgIGlmIChwcmltaXRpdmVWYWx1ZS5pc0xlbmd0aCgpKSB7Cisg ICAgICAgIExlbmd0aCBsZW5ndGggPSBwcmltaXRpdmVWYWx1ZS5jb21wdXRlTGVuZ3RoPExlbmd0 aD4oU3R5bGVCdWlsZGVyQ29udmVydGVyOjpjc3N0b0xlbmd0aENvbnZlcnNpb25EYXRhV2l0aFRl eHRab29tRmFjdG9yKHN0eWxlUmVzb2x2ZXIpKTsKKyAgICAgICAgaWYgKG11bHRpcGxpZXIgIT0g MS5mKQorICAgICAgICAgICAgbGVuZ3RoID0gTGVuZ3RoKGxlbmd0aC52YWx1ZSgpICogbXVsdGlw bGllciwgRml4ZWQpOworICAgICAgICByZXR1cm4gbGVuZ3RoOworICAgIH0KKyAgICBpZiAocHJp bWl0aXZlVmFsdWUuaXNQZXJjZW50YWdlKCkpIHsKKyAgICAgICAgLy8gRklYTUU6IHBlcmNlbnRh Z2Ugc2hvdWxkIG5vdCBiZSByZXN0cmljdGVkIHRvIGFuIGludGVnZXIgaGVyZS4KKyAgICAgICAg cmV0dXJuIExlbmd0aCgoc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5jb21wdXRlZEZvbnRTaXplKCkg KiBwcmltaXRpdmVWYWx1ZS5nZXRJbnRWYWx1ZSgpKSAvIDEwMCwgRml4ZWQpOworICAgIH0KKyAg ICBpZiAocHJpbWl0aXZlVmFsdWUuaXNOdW1iZXIoKSkgeworICAgICAgICAvLyBGSVhNRTogbnVt YmVyIGFuZCBwZXJjZW50YWdlIHZhbHVlcyBzaG91bGQgcHJvZHVjZSB0aGUgc2FtZSB0eXBlIG9m IExlbmd0aCAoaWUuIEZpeGVkIG9yIFBlcmNlbnQpLgorICAgICAgICByZXR1cm4gTGVuZ3RoKHBy aW1pdGl2ZVZhbHVlLmdldERvdWJsZVZhbHVlKCkgKiBtdWx0aXBsaWVyICogMTAwLjAsIFBlcmNl bnQpOworICAgIH0KKyAgICByZXR1cm4gTnVsbG9wdDsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQogCiAjZW5kaWYgLy8gU3R5bGVCdWlsZGVyQ29udmVydGVyX2gKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaCBiL1NvdXJjZS9XZWJDb3JlL2Nz cy9TdHlsZUJ1aWxkZXJDdXN0b20uaAppbmRleCAwMzBiMjJkNWQ3MDE5MDZmM2MxNTIwMGI4OWQ4 MjRiYzkxNzg1NjlhLi42MWZjNjYxZjM4NTYzOWZiYzMwNTNhMjliMmU5NDc1YzI3ZTJhYmZlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmgKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCkBAIC0xMTYsOSArMTE2LDYg QEAgcHVibGljOgogICAgIC8vIEN1c3RvbSBoYW5kbGluZyBvZiB2YWx1ZSBzZXR0aW5nIG9ubHku CiAgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZUJhc2VsaW5lU2hpZnQoU3R5bGVSZXNvbHZlciYs IENTU1ZhbHVlJik7CiAgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZURpcmVjdGlvbihTdHlsZVJl c29sdmVyJiwgQ1NTVmFsdWUmKTsKLSNpZiAhRU5BQkxFKElPU19URVhUX0FVVE9TSVpJTkcpCi0g ICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZUxpbmVIZWlnaHQoU3R5bGVSZXNvbHZlciYsIENTU1Zh bHVlJik7Ci0jZW5kaWYKICAgICBzdGF0aWMgdm9pZCBhcHBseVZhbHVlVmVydGljYWxBbGlnbihT dHlsZVJlc29sdmVyJiwgQ1NTVmFsdWUmKTsKICNpZiBFTkFCTEUoREFTSEJPQVJEX1NVUFBPUlQp CiAgICAgc3RhdGljIHZvaWQgYXBwbHlWYWx1ZVdlYmtpdERhc2hib2FyZFJlZ2lvbihTdHlsZVJl c29sdmVyJiwgQ1NTVmFsdWUmKTsKQEAgLTEzNCw3ICsxMzEsNiBAQCBwdWJsaWM6CiAKIHByaXZh dGU6CiAgICAgc3RhdGljIHZvaWQgcmVzZXRFZmZlY3RpdmVab29tKFN0eWxlUmVzb2x2ZXImKTsK LSAgICBzdGF0aWMgYm9vbCBjb252ZXJ0TGluZUhlaWdodChTdHlsZVJlc29sdmVyJiwgY29uc3Qg Q1NTVmFsdWUmLCBMZW5ndGgmLCBmbG9hdCBtdWx0aXBsaWVyID0gMS5mKTsKIAogICAgIHN0YXRp YyBMZW5ndGggbW1MZW5ndGgoZG91YmxlIG1tKTsKICAgICBzdGF0aWMgTGVuZ3RoIGluY2hMZW5n dGgoZG91YmxlIGluY2gpOwpAQCAtNjA2LDMyICs2MDIsNiBAQCBERUZJTkVfQk9SREVSX0lNQUdF X01PRElGSUVSX0hBTkRMRVIoV2Via2l0TWFza0JveEltYWdlLCBSZXBlYXQpCiBERUZJTkVfQk9S REVSX0lNQUdFX01PRElGSUVSX0hBTkRMRVIoV2Via2l0TWFza0JveEltYWdlLCBTbGljZSkKIERF RklORV9CT1JERVJfSU1BR0VfTU9ESUZJRVJfSEFORExFUihXZWJraXRNYXNrQm94SW1hZ2UsIFdp ZHRoKQogCi1pbmxpbmUgYm9vbCBTdHlsZUJ1aWxkZXJDdXN0b206OmNvbnZlcnRMaW5lSGVpZ2h0 KFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIGNvbnN0IENTU1ZhbHVlJiB2YWx1ZSwgTGVu Z3RoJiBsZW5ndGgsIGZsb2F0IG11bHRpcGxpZXIpCi17Ci0gICAgYXV0byYgcHJpbWl0aXZlVmFs dWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4odmFsdWUpOwotICAgIGlmIChwcmltaXRp dmVWYWx1ZS5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVOb3JtYWwpIHsKLSAgICAgICAgbGVuZ3Ro ID0gUmVuZGVyU3R5bGU6OmluaXRpYWxMaW5lSGVpZ2h0KCk7Ci0gICAgICAgIHJldHVybiB0cnVl OwotICAgIH0KLSAgICBpZiAocHJpbWl0aXZlVmFsdWUuaXNMZW5ndGgoKSkgewotICAgICAgICBs ZW5ndGggPSBwcmltaXRpdmVWYWx1ZS5jb21wdXRlTGVuZ3RoPExlbmd0aD4oU3R5bGVCdWlsZGVy Q29udmVydGVyOjpjc3N0b0xlbmd0aENvbnZlcnNpb25EYXRhV2l0aFRleHRab29tRmFjdG9yKHN0 eWxlUmVzb2x2ZXIpKTsKLSAgICAgICAgaWYgKG11bHRpcGxpZXIgIT0gMS5mKQotICAgICAgICAg ICAgbGVuZ3RoID0gTGVuZ3RoKGxlbmd0aC52YWx1ZSgpICogbXVsdGlwbGllciwgRml4ZWQpOwot ICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgaWYgKHByaW1pdGl2ZVZhbHVlLmlzUGVy Y2VudGFnZSgpKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBwZXJjZW50YWdlIHNob3VsZCBub3QgYmUg cmVzdHJpY3RlZCB0byBhbiBpbnRlZ2VyIGhlcmUuCi0gICAgICAgIGxlbmd0aCA9IExlbmd0aCgo c3R5bGVSZXNvbHZlci5zdHlsZSgpLT5jb21wdXRlZEZvbnRTaXplKCkgKiBwcmltaXRpdmVWYWx1 ZS5nZXRJbnRWYWx1ZSgpKSAvIDEwMCwgRml4ZWQpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAg ICB9Ci0gICAgaWYgKHByaW1pdGl2ZVZhbHVlLmlzTnVtYmVyKCkpIHsKLSAgICAgICAgLy8gRklY TUU6IG51bWJlciBhbmQgcGVyY2VudGFnZSB2YWx1ZXMgc2hvdWxkIHByb2R1Y2UgdGhlIHNhbWUg dHlwZSBvZiBMZW5ndGggKGllLiBGaXhlZCBvciBQZXJjZW50KS4KLSAgICAgICAgbGVuZ3RoID0g TGVuZ3RoKHByaW1pdGl2ZVZhbHVlLmdldERvdWJsZVZhbHVlKCkgKiBtdWx0aXBsaWVyICogMTAw LjAsIFBlcmNlbnQpOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgcmV0dXJuIGZh bHNlOwotfQotCiAjaWYgRU5BQkxFKElPU19URVhUX0FVVE9TSVpJTkcpCiAKIGlubGluZSB2b2lk IFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlJbmhlcml0TGluZUhlaWdodChTdHlsZVJlc29sdmVy JiBzdHlsZVJlc29sdmVyKQpAQCAtNjQ4LDI0ICs2MTgsMTMgQEAgaW5saW5lIHZvaWQgU3R5bGVC dWlsZGVyQ3VzdG9tOjphcHBseUluaXRpYWxMaW5lSGVpZ2h0KFN0eWxlUmVzb2x2ZXImIHN0eWxl UmVzb2wKIAogaW5saW5lIHZvaWQgU3R5bGVCdWlsZGVyQ3VzdG9tOjphcHBseVZhbHVlTGluZUhl aWdodChTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCiB7Ci0g ICAgTGVuZ3RoIGxpbmVIZWlnaHQ7CiAgICAgZmxvYXQgbXVsdGlwbGllciA9IHN0eWxlUmVzb2x2 ZXIuc3R5bGUoKS0+dGV4dFNpemVBZGp1c3QoKS5pc1BlcmNlbnRhZ2UoKSA/IHN0eWxlUmVzb2x2 ZXIuc3R5bGUoKS0+dGV4dFNpemVBZGp1c3QoKS5tdWx0aXBsaWVyKCkgOiAxLmY7Ci0gICAgaWYg KCFjb252ZXJ0TGluZUhlaWdodChzdHlsZVJlc29sdmVyLCB2YWx1ZSwgbGluZUhlaWdodCwgbXVs dGlwbGllcikpCi0gICAgICAgIHJldHVybjsKLQotICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+ c2V0TGluZUhlaWdodChsaW5lSGVpZ2h0KTsKLSAgICBzdHlsZVJlc29sdmVyLnN0eWxlKCktPnNl dFNwZWNpZmllZExpbmVIZWlnaHQobGluZUhlaWdodCk7Ci19Ci0KLSNlbHNlCi0KLWlubGluZSB2 b2lkIFN0eWxlQnVpbGRlckN1c3RvbTo6YXBwbHlWYWx1ZUxpbmVIZWlnaHQoU3R5bGVSZXNvbHZl ciYgc3R5bGVSZXNvbHZlciwgQ1NTVmFsdWUmIHZhbHVlKQotewotICAgIExlbmd0aCBsaW5lSGVp Z2h0OwotICAgIGlmICghY29udmVydExpbmVIZWlnaHQoc3R5bGVSZXNvbHZlciwgdmFsdWUsIGxp bmVIZWlnaHQpKQorICAgIE9wdGlvbmFsPExlbmd0aD4gbGluZUhlaWdodCA9IFN0eWxlQnVpbGRl ckNvbnZlcnRlcjo6Y29udmVydExpbmVIZWlnaHQoc3R5bGVSZXNvbHZlciwgdmFsdWUsIG11bHRp cGxpZXIpOworICAgIGlmICghbGluZUhlaWdodCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgc3R5 bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRMaW5lSGVpZ2h0KGxpbmVIZWlnaHQpOworICAgIHN0eWxl UmVzb2x2ZXIuc3R5bGUoKS0+c2V0TGluZUhlaWdodChsaW5lSGVpZ2h0LnZhbHVlKCkpOworICAg IHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0U3BlY2lmaWVkTGluZUhlaWdodChsaW5lSGVpZ2h0 LnZhbHVlKCkpOwogfQogCiAjZW5kaWYK