140817 2015-01-22 23:12:17 -0800 Demote 'line-height' to a low priority property. 2015-01-26 09:52:42 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED https://src.chromium.org/viewvc/blink?view=rev&revision=184629 BlinkMergeCandidate P2 Normal --- 140577 1 cdumez cdumez commit-queue darin kling koivisto oldest_to_newest 1063621 0 cdumez 2015-01-22 23:12:17 -0800 Demote 'line-height' to a low priority property. Our special handling of the 'line-height' property will no longer be required once the 'font' shorthand is expanded in the parser in all cases (also for system fonts). 1064053 1 cdumez 2015-01-25 18:01:30 -0800 Related WebKit commit: https://bugs.webkit.org/show_bug.cgi?id=13174 1064091 2 245330 cdumez 2015-01-25 23:19:11 -0800 Created attachment 245330 Patch 1064166 3 245330 kling 2015-01-26 09:07:05 -0800 Comment on attachment 245330 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=245330&action=review r=me > Source/WebCore/css/StyleResolver.cpp:-2691 > - // FIXME: It would be nice if line-height were less of a special snowflake. I'm so happy to see this comment finally go away :) 1064174 4 245330 commit-queue 2015-01-26 09:52:37 -0800 Comment on attachment 245330 Patch Clearing flags on attachment: 245330 Committed r179119: <http://trac.webkit.org/changeset/179119> 1064175 5 commit-queue 2015-01-26 09:52:42 -0800 All reviewed patches have been landed. Closing bug. 245330 2015-01-25 23:19:11 -0800 2015-01-26 09:52:37 -0800 Patch bug-140817-20150125231913.patch text/plain 11637 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMTc5MTA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2MzMjQwMGU0NGQyZDQy NWJmZDQxZWZjMTdlZTI5ZTExMThlYzY1MS4uZWU0MTUxOTczNWViYTExMWU0ZTExOGMwNzM2YjMx NjFjOGIzZDliZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDE1LTAxLTI1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgRGVtb3RlICdsaW5lLWhlaWdo dCcgdG8gYSBsb3cgcHJpb3JpdHkgcHJvcGVydHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDA4MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBPdXIgc3BlY2lhbCBoYW5kbGluZyBvZiB0aGUgJ2xpbmUt aGVpZ2h0JyBwcm9wZXJ0eSBpcyBubyBsb25nZXIKKyAgICAgICAgcmVxdWlyZWQsIHNpbmNlIHRo ZSAnZm9udCcgc2hvcnRoYW5kIGlzIG5vdyBleHBhbmRlZCBpbiB0aGUgcGFyc2VyCisgICAgICAg IGluIGFsbCBjYXNlcyAoYWxzbyBmb3Igc3lzdGVtIGZvbnRzKS4KKworICAgICAgICBUaGlzIHBh dGNoIGlzIGJhc2VkIG9uIHRoZSBmb2xsb3dpbmcgQmxpbmsgcmV2aXNpb246CisgICAgICAgIGh0 dHBzOi8vc3JjLmNocm9taXVtLm9yZy92aWV3dmMvYmxpbms/cmV2aXNpb249MTg0NjI5JnZpZXc9 cmV2aXNpb24KKworICAgICAgICBObyBuZXcgdGVzdHMsIGFscmVhZHkgY292ZXJlZCBieToKKyAg ICAgICAgZmFzdC9jc3MvZm9udC1zaG9ydGhhbmQtbGluZS1oZWlnaHQuaHRtbAorICAgICAgICBm YXN0L2Nzcy9saW5lLWhlaWdodC1mb250LW9yZGVyLmh0bWwKKworICAgICAgICAqIGNzcy9DU1NQ cm9wZXJ0eU5hbWVzLmluOgorICAgICAgICAqIGNzcy9TdHlsZVJlc29sdmVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlN0eWxlUmVzb2x2ZXI6OnN0eWxlRm9yS2V5ZnJhbWUpOgorICAgICAgICAo V2ViQ29yZTo6U3R5bGVSZXNvbHZlcjo6c3R5bGVGb3JQYWdlKToKKyAgICAgICAgKFdlYkNvcmU6 OlN0eWxlUmVzb2x2ZXI6OmFwcGx5TWF0Y2hlZFByb3BlcnRpZXMpOgorICAgICAgICAoV2ViQ29y ZTo6U3R5bGVSZXNvbHZlcjo6aW5pdGlhbGl6ZUZvbnRTdHlsZSk6CisgICAgICAgIChXZWJDb3Jl OjpTdHlsZVJlc29sdmVyOjpDYXNjYWRlZFByb3BlcnRpZXM6OlByb3BlcnR5OjphcHBseSk6Cisg ICAgICAgICogY3NzL1N0eWxlUmVzb2x2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUmVz b2x2ZXI6OlN0YXRlOjpTdGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjpT dGF0ZTo6c2V0TGluZUhlaWdodFZhbHVlKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlN0 eWxlUmVzb2x2ZXI6OlN0YXRlOjpsaW5lSGVpZ2h0VmFsdWUpOiBEZWxldGVkLgorCisyMDE1LTAx LTI1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKICAgICAgICAgUmVtb3ZlICdm b250JyBzaG9ydGhhbmQgcHJvcGVydHkgc3BlY2lhbCBjYXNpbmcKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MDU3NwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbiBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9D U1NQcm9wZXJ0eU5hbWVzLmluCmluZGV4IDIwN2VmNzRkOWY4YzJkYzMwNDFmNzI5MDk1YWU2NGNl Yzc5NmYwYTcuLmI2MDNmYzc1YmU5ZmI2OTBhMGE4YjkzNDc0NTgwYWNiNWFiYWQ5NzggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCkBAIC0xMTksMTMgKzExOSw2IEBAIHRl eHQtcmVuZGVyaW5nIFtJbmhlcml0ZWQsIEZvbnRQcm9wZXJ0eSwgTmFtZUZvck1ldGhvZHM9VGV4 dFJlbmRlcmluZ01vZGVdCiAtZXB1Yi13cml0aW5nLW1vZGUgPSAtd2Via2l0LXdyaXRpbmctbW9k ZQogem9vbSBbQ3VzdG9tPUFsbF0KIAotLy8gbGluZSBoZWlnaHQgbmVlZHMgdG8gYmUgcmlnaHQg YWZ0ZXIgdGhlIGFib3ZlIGhpZ2gtcHJpb3JpdHkgcHJvcGVydGllcwotI2lmIGRlZmluZWQoRU5B QkxFX0lPU19URVhUX0FVVE9TSVpJTkcpICYmIEVOQUJMRV9JT1NfVEVYVF9BVVRPU0laSU5HCi1s aW5lLWhlaWdodCBbSW5oZXJpdGVkLCBDdXN0b209QWxsXQotI2Vsc2UKLWxpbmUtaGVpZ2h0IFtJ bmhlcml0ZWQsIEdldHRlcj1zcGVjaWZpZWRMaW5lSGVpZ2h0LCBDb25kaXRpb25hbENvbnZlcnRl cj1MaW5lSGVpZ2h0XQotI2VuZGlmCi0KIC8vIEtlZXAgdGhpcyBpbiBiZXR3ZWVuIHRoZSBoaWdo ZXN0IHByaW9yaXR5IHByb3BzIGFuZCB0aGUgbG93ZXIgb25lcy4KIC13ZWJraXQtcnVieS1wb3Np dGlvbiBbSW5oZXJpdGVkXQogCkBAIC0yNDQsNiArMjM3LDExIEBAIGtlcm5pbmcgW0luaGVyaXRl ZCwgU1ZHLCBDb252ZXJ0ZXI9U1ZHTGVuZ3RoXQogbGVmdCBbSW5pdGlhbD1pbml0aWFsT2Zmc2V0 LCBDb252ZXJ0ZXI9TGVuZ3RoT3JBdXRvXQogbGV0dGVyLXNwYWNpbmcgW0luaGVyaXRlZCwgQ29u dmVydGVyPVNwYWNpbmddCiBsaWdodGluZy1jb2xvciBbU1ZHLCBDb252ZXJ0ZXI9U1ZHQ29sb3Jd CisjaWYgZGVmaW5lZChFTkFCTEVfSU9TX1RFWFRfQVVUT1NJWklORykgJiYgRU5BQkxFX0lPU19U RVhUX0FVVE9TSVpJTkcKK2xpbmUtaGVpZ2h0IFtJbmhlcml0ZWQsIEN1c3RvbT1BbGxdCisjZWxz ZQorbGluZS1oZWlnaHQgW0luaGVyaXRlZCwgR2V0dGVyPXNwZWNpZmllZExpbmVIZWlnaHQsIENv bmRpdGlvbmFsQ29udmVydGVyPUxpbmVIZWlnaHRdCisjZW5kaWYKIGxpc3Qtc3R5bGUgW0luaGVy aXRlZCwgTG9uZ2hhbmRzPWxpc3Qtc3R5bGUtdHlwZXxsaXN0LXN0eWxlLXBvc2l0aW9ufGxpc3Qt c3R5bGUtaW1hZ2VdCiBsaXN0LXN0eWxlLWltYWdlIFtJbmhlcml0ZWQsIENvbnZlcnRlcj1TdHls ZUltYWdlPENTU1Byb3BlcnR5TGlzdFN0eWxlSW1hZ2U+XQogbGlzdC1zdHlsZS1wb3NpdGlvbiBb SW5oZXJpdGVkXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuY3BwCmluZGV4IDhiYzExMDkz NTA5M2UyMTg3YzkzYzY2MjA0NDlhZDlmNmRiYWUwMDEuLmY4NmI1YmViZDEwN2ExNDMyNTljNmIy OGRjNTc4MGU5MmE2OWQyMDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJl c29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAKQEAg LTE2OCw3ICsxNjgsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBI VE1MTmFtZXM7CiAKLXN0YXRpYyBjb25zdCBDU1NQcm9wZXJ0eUlEIGZpcnN0TG93UHJpb3JpdHlQ cm9wZXJ0eSA9IHN0YXRpY19jYXN0PENTU1Byb3BlcnR5SUQ+KENTU1Byb3BlcnR5TGluZUhlaWdo dCArIDEpOworc3RhdGljIGNvbnN0IENTU1Byb3BlcnR5SUQgbGFzdEhpZ2hQcmlvcml0eVByb3Bl cnR5ID0gQ1NTUHJvcGVydHlab29tOworc3RhdGljIGNvbnN0IENTU1Byb3BlcnR5SUQgZmlyc3RM b3dQcmlvcml0eVByb3BlcnR5ID0gc3RhdGljX2Nhc3Q8Q1NTUHJvcGVydHlJRD4obGFzdEhpZ2hQ cmlvcml0eVByb3BlcnR5ICsgMSk7CiAKIGNsYXNzIFN0eWxlUmVzb2x2ZXI6OkNhc2NhZGVkUHJv cGVydGllcyB7CiBwdWJsaWM6CkBAIC04MjAsNyArODIxLDYgQEAgUmVmPFJlbmRlclN0eWxlPiBT dHlsZVJlc29sdmVyOjpzdHlsZUZvcktleWZyYW1lKGNvbnN0IFJlbmRlclN0eWxlKiBlbGVtZW50 U3R5bGUKICAgICAvLyBDcmVhdGUgdGhlIHN0eWxlCiAgICAgc3RhdGUuc2V0U3R5bGUoUmVuZGVy U3R5bGU6OmNsb25lKGVsZW1lbnRTdHlsZSkpOwogICAgIHN0YXRlLnNldFBhcmVudFN0eWxlKFJl bmRlclN0eWxlOjpjbG9uZShlbGVtZW50U3R5bGUpKTsKLSAgICBzdGF0ZS5zZXRMaW5lSGVpZ2h0 VmFsdWUoMCk7CiAKICAgICBUZXh0RGlyZWN0aW9uIGRpcmVjdGlvbjsKICAgICBXcml0aW5nTW9k ZSB3cml0aW5nTW9kZTsKQEAgLTgzMSwxNSArODMxLDExIEBAIFJlZjxSZW5kZXJTdHlsZT4gU3R5 bGVSZXNvbHZlcjo6c3R5bGVGb3JLZXlmcmFtZShjb25zdCBSZW5kZXJTdHlsZSogZWxlbWVudFN0 eWxlCiAgICAgQ2FzY2FkZWRQcm9wZXJ0aWVzIGNhc2NhZGUoZGlyZWN0aW9uLCB3cml0aW5nTW9k ZSk7CiAgICAgY2FzY2FkZS5hZGRNYXRjaGVzKHJlc3VsdCwgZmFsc2UsIDAsIHJlc3VsdC5tYXRj aGVkUHJvcGVydGllcy5zaXplKCkgLSAxKTsKIAotICAgIGFwcGx5Q2FzY2FkZWRQcm9wZXJ0aWVz KGNhc2NhZGUsIGZpcnN0Q1NTUHJvcGVydHksIENTU1Byb3BlcnR5TGluZUhlaWdodCk7CisgICAg YXBwbHlDYXNjYWRlZFByb3BlcnRpZXMoY2FzY2FkZSwgZmlyc3RDU1NQcm9wZXJ0eSwgbGFzdEhp Z2hQcmlvcml0eVByb3BlcnR5KTsKIAogICAgIC8vIElmIG91ciBmb250IGdvdCBkaXJ0aWVkLCBn byBhaGVhZCBhbmQgdXBkYXRlIGl0IG5vdy4KICAgICB1cGRhdGVGb250KCk7CiAKLSAgICAvLyBM aW5lLWhlaWdodCBpcyBzZXQgd2hlbiB3ZSBhcmUgc3VyZSB3ZSBkZWNpZGVkIG9uIHRoZSBmb250 LXNpemUKLSAgICBpZiAoc3RhdGUubGluZUhlaWdodFZhbHVlKCkpCi0gICAgICAgIGFwcGx5UHJv cGVydHkoQ1NTUHJvcGVydHlMaW5lSGVpZ2h0LCBzdGF0ZS5saW5lSGVpZ2h0VmFsdWUoKSk7Ci0K ICAgICAvLyBOb3cgZG8gcmVzdCBvZiB0aGUgcHJvcGVydGllcy4KICAgICBhcHBseUNhc2NhZGVk UHJvcGVydGllcyhjYXNjYWRlLCBmaXJzdExvd1ByaW9yaXR5UHJvcGVydHksIGxhc3RDU1NQcm9w ZXJ0eSk7CiAKQEAgLTk5MSw3ICs5ODcsNiBAQCBSZWY8UmVuZGVyU3R5bGU+IFN0eWxlUmVzb2x2 ZXI6OnN0eWxlRm9yUGFnZShpbnQgcGFnZUluZGV4KQogCiAgICAgUGFnZVJ1bGVDb2xsZWN0b3Ig Y29sbGVjdG9yKG1fc3RhdGUsIG1fcnVsZVNldHMpOwogICAgIGNvbGxlY3Rvci5tYXRjaEFsbFBh Z2VSdWxlcyhwYWdlSW5kZXgpOwotICAgIG1fc3RhdGUuc2V0TGluZUhlaWdodFZhbHVlKDApOwog CiAgICAgTWF0Y2hSZXN1bHQmIHJlc3VsdCA9IGNvbGxlY3Rvci5tYXRjaGVkUmVzdWx0KCk7CiAK QEAgLTEwMDIsMTUgKzk5NywxMSBAQCBSZWY8UmVuZGVyU3R5bGU+IFN0eWxlUmVzb2x2ZXI6OnN0 eWxlRm9yUGFnZShpbnQgcGFnZUluZGV4KQogICAgIENhc2NhZGVkUHJvcGVydGllcyBjYXNjYWRl KGRpcmVjdGlvbiwgd3JpdGluZ01vZGUpOwogICAgIGNhc2NhZGUuYWRkTWF0Y2hlcyhyZXN1bHQs IGZhbHNlLCAwLCByZXN1bHQubWF0Y2hlZFByb3BlcnRpZXMuc2l6ZSgpIC0gMSk7CiAKLSAgICBh cHBseUNhc2NhZGVkUHJvcGVydGllcyhjYXNjYWRlLCBmaXJzdENTU1Byb3BlcnR5LCBDU1NQcm9w ZXJ0eUxpbmVIZWlnaHQpOworICAgIGFwcGx5Q2FzY2FkZWRQcm9wZXJ0aWVzKGNhc2NhZGUsIGZp cnN0Q1NTUHJvcGVydHksIGxhc3RIaWdoUHJpb3JpdHlQcm9wZXJ0eSk7CiAKICAgICAvLyBJZiBv dXIgZm9udCBnb3QgZGlydGllZCwgZ28gYWhlYWQgYW5kIHVwZGF0ZSBpdCBub3cuCiAgICAgdXBk YXRlRm9udCgpOwogCi0gICAgLy8gTGluZS1oZWlnaHQgaXMgc2V0IHdoZW4gd2UgYXJlIHN1cmUg d2UgZGVjaWRlZCBvbiB0aGUgZm9udC1zaXplLgotICAgIGlmIChtX3N0YXRlLmxpbmVIZWlnaHRW YWx1ZSgpKQotICAgICAgICBhcHBseVByb3BlcnR5KENTU1Byb3BlcnR5TGluZUhlaWdodCwgbV9z dGF0ZS5saW5lSGVpZ2h0VmFsdWUoKSk7Ci0KICAgICBhcHBseUNhc2NhZGVkUHJvcGVydGllcyhj YXNjYWRlLCBmaXJzdExvd1ByaW9yaXR5UHJvcGVydHksIGxhc3RDU1NQcm9wZXJ0eSk7CiAKICAg ICBjYXNjYWRlLmFwcGx5RGVmZXJyZWRQcm9wZXJ0aWVzKCp0aGlzKTsKQEAgLTE3NTEsNyArMTc0 Miw2IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlNYXRjaGVkUHJvcGVydGllcyhjb25zdCBN YXRjaFJlc3VsdCYgbWF0Y2hSZXN1bHQsIGNvbnN0CiAgICAgICAgIC8vIEZpbmQgb3V0IGlmIHRo ZXJlJ3MgYSAtd2Via2l0LWFwcGVhcmFuY2UgcHJvcGVydHkgaW4gZWZmZWN0IGZyb20gdGhlIFVB IHNoZWV0LgogICAgICAgICAvLyBJZiBzbywgd2UgY2FjaGUgdGhlIGJvcmRlciBhbmQgYmFja2dy b3VuZCBzdHlsZXMgc28gdGhhdCBSZW5kZXJUaGVtZTo6YWRqdXN0U3R5bGUoKQogICAgICAgICAv LyBjYW4gbG9vayBhdCB0aGVtIGxhdGVyIHRvIGZpZ3VyZSBvdXQgaWYgdGhpcyBpcyBhIHN0eWxl ZCBmb3JtIGNvbnRyb2wgb3Igbm90LgotICAgICAgICBzdGF0ZS5zZXRMaW5lSGVpZ2h0VmFsdWUo bnVsbHB0cik7CiAgICAgICAgIENhc2NhZGVkUHJvcGVydGllcyBjYXNjYWRlKGRpcmVjdGlvbiwg d3JpdGluZ01vZGUpOwogICAgICAgICBpZiAoIWNhc2NhZGUuYWRkTWF0Y2hlcyhtYXRjaFJlc3Vs dCwgZmFsc2UsIG1hdGNoUmVzdWx0LnJhbmdlcy5maXJzdFVBUnVsZSwgbWF0Y2hSZXN1bHQucmFu Z2VzLmxhc3RVQVJ1bGUsIGFwcGx5SW5oZXJpdGVkT25seSkKICAgICAgICAgICAgIHx8ICFjYXNj YWRlLmFkZE1hdGNoZXMobWF0Y2hSZXN1bHQsIHRydWUsIG1hdGNoUmVzdWx0LnJhbmdlcy5maXJz dFVBUnVsZSwgbWF0Y2hSZXN1bHQucmFuZ2VzLmxhc3RVQVJ1bGUsIGFwcGx5SW5oZXJpdGVkT25s eSkpCkBAIC0xNzYxLDcgKzE3NTEsNyBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5TWF0Y2hl ZFByb3BlcnRpZXMoY29uc3QgTWF0Y2hSZXN1bHQmIG1hdGNoUmVzdWx0LCBjb25zdAogICAgICAg ICBhZGp1c3RTdHlsZUZvckludGVyQ2hhcmFjdGVyUnVieSgpOwogCiAgICAgICAgIC8vIFN0YXJ0 IGJ5IGFwcGx5aW5nIHByb3BlcnRpZXMgdGhhdCBvdGhlciBwcm9wZXJ0aWVzIG1heSBkZXBlbmQg b24uCi0gICAgICAgIGFwcGx5Q2FzY2FkZWRQcm9wZXJ0aWVzKGNhc2NhZGUsIGZpcnN0Q1NTUHJv cGVydHksIENTU1Byb3BlcnR5TGluZUhlaWdodCk7CisgICAgICAgIGFwcGx5Q2FzY2FkZWRQcm9w ZXJ0aWVzKGNhc2NhZGUsIGZpcnN0Q1NTUHJvcGVydHksIGxhc3RIaWdoUHJpb3JpdHlQcm9wZXJ0 eSk7CiAgICAgCiAgICAgICAgIHVwZGF0ZUZvbnQoKTsKICAgICAgICAgYXBwbHlDYXNjYWRlZFBy b3BlcnRpZXMoY2FzY2FkZSwgZmlyc3RMb3dQcmlvcml0eVByb3BlcnR5LCBsYXN0Q1NTUHJvcGVy dHkpOwpAQCAtMTc3NiwxNSArMTc2NiwxMyBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5TWF0 Y2hlZFByb3BlcnRpZXMoY29uc3QgTWF0Y2hSZXN1bHQmIG1hdGNoUmVzdWx0LCBjb25zdAogICAg ICAgICB8fCAhY2FzY2FkZS5hZGRNYXRjaGVzKG1hdGNoUmVzdWx0LCB0cnVlLCBtYXRjaFJlc3Vs dC5yYW5nZXMuZmlyc3RVQVJ1bGUsIG1hdGNoUmVzdWx0LnJhbmdlcy5sYXN0VUFSdWxlLCBhcHBs eUluaGVyaXRlZE9ubHkpKQogICAgICAgICByZXR1cm4gYXBwbHlNYXRjaGVkUHJvcGVydGllcyht YXRjaFJlc3VsdCwgZWxlbWVudCwgRG9Ob3RVc2VNYXRjaGVkUHJvcGVydGllc0NhY2hlKTsKIAot ICAgIHN0YXRlLnNldExpbmVIZWlnaHRWYWx1ZShudWxscHRyKTsKLQogICAgIGFwcGx5Q2FzY2Fk ZWRQcm9wZXJ0aWVzKGNhc2NhZGUsIENTU1Byb3BlcnR5V2Via2l0UnVieVBvc2l0aW9uLCBDU1NQ cm9wZXJ0eVdlYmtpdFJ1YnlQb3NpdGlvbik7CiAgICAgCiAgICAgLy8gQWRqdXN0IHRoZSBmb250 IHNpemUgdG8gYmUgc21hbGxlciBpZiBydWJ5LXBvc2l0aW9uIGlzIGludGVyLWNoYXJhY3Rlci4K ICAgICBhZGp1c3RTdHlsZUZvckludGVyQ2hhcmFjdGVyUnVieSgpOwogCiAgICAgLy8gU3RhcnQg YnkgYXBwbHlpbmcgcHJvcGVydGllcyB0aGF0IG90aGVyIHByb3BlcnRpZXMgbWF5IGRlcGVuZCBv bi4KLSAgICBhcHBseUNhc2NhZGVkUHJvcGVydGllcyhjYXNjYWRlLCBmaXJzdENTU1Byb3BlcnR5 LCBDU1NQcm9wZXJ0eUxpbmVIZWlnaHQpOworICAgIGFwcGx5Q2FzY2FkZWRQcm9wZXJ0aWVzKGNh c2NhZGUsIGZpcnN0Q1NTUHJvcGVydHksIGxhc3RIaWdoUHJpb3JpdHlQcm9wZXJ0eSk7CiAKICAg ICAvLyBJZiB0aGUgZWZmZWN0aXZlIHpvb20gdmFsdWUgY2hhbmdlcywgd2UgY2FuJ3QgdXNlIHRo ZSBtYXRjaGVkIHByb3BlcnRpZXMgY2FjaGUuIFN0YXJ0IG92ZXIuCiAgICAgaWYgKGNhY2hlSXRl bSAmJiBjYWNoZUl0ZW0tPnJlbmRlclN0eWxlLT5lZmZlY3RpdmVab29tKCkgIT0gc3RhdGUuc3R5 bGUoKS0+ZWZmZWN0aXZlWm9vbSgpKQpAQCAtMTc5MywxMCArMTc4MSw2IEBAIHZvaWQgU3R5bGVS ZXNvbHZlcjo6YXBwbHlNYXRjaGVkUHJvcGVydGllcyhjb25zdCBNYXRjaFJlc3VsdCYgbWF0Y2hS ZXN1bHQsIGNvbnN0CiAgICAgLy8gSWYgb3VyIGZvbnQgZ290IGRpcnRpZWQsIGdvIGFoZWFkIGFu ZCB1cGRhdGUgaXQgbm93LgogICAgIHVwZGF0ZUZvbnQoKTsKIAotICAgIC8vIExpbmUtaGVpZ2h0 IGlzIHNldCB3aGVuIHdlIGFyZSBzdXJlIHdlIGRlY2lkZWQgb24gdGhlIGZvbnQtc2l6ZS4KLSAg ICBpZiAoc3RhdGUubGluZUhlaWdodFZhbHVlKCkpCi0gICAgICAgIGFwcGx5UHJvcGVydHkoQ1NT UHJvcGVydHlMaW5lSGVpZ2h0LCBzdGF0ZS5saW5lSGVpZ2h0VmFsdWUoKSk7Ci0KICAgICAvLyBJ ZiB0aGUgZm9udCBjaGFuZ2VkLCB3ZSBjYW4ndCB1c2UgdGhlIG1hdGNoZWQgcHJvcGVydGllcyBj YWNoZS4gU3RhcnQgb3Zlci4KICAgICBpZiAoY2FjaGVJdGVtICYmIGNhY2hlSXRlbS0+cmVuZGVy U3R5bGUtPmZvbnREZXNjcmlwdGlvbigpICE9IHN0YXRlLnN0eWxlKCktPmZvbnREZXNjcmlwdGlv bigpKQogICAgICAgICByZXR1cm4gYXBwbHlNYXRjaGVkUHJvcGVydGllcyhtYXRjaFJlc3VsdCwg ZWxlbWVudCwgRG9Ob3RVc2VNYXRjaGVkUHJvcGVydGllc0NhY2hlKTsKQEAgLTIwOTksOCArMjA4 Myw2IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6aW5pdGlhbGl6ZUZvbnRTdHlsZShTZXR0aW5ncyog c2V0dGluZ3MpCiAgICAgZm9udERlc2NyaXB0aW9uLnNldE9uZUZhbWlseShzdGFuZGFyZEZhbWls eSk7CiAgICAgZm9udERlc2NyaXB0aW9uLnNldEtleXdvcmRTaXplRnJvbUlkZW50aWZpZXIoQ1NT VmFsdWVNZWRpdW0pOwogICAgIHNldEZvbnRTaXplKGZvbnREZXNjcmlwdGlvbiwgU3R5bGU6OmZv bnRTaXplRm9yS2V5d29yZChDU1NWYWx1ZU1lZGl1bSwgZmFsc2UsIGRvY3VtZW50KCkpKTsKLSAg ICBtX3N0YXRlLnN0eWxlKCktPnNldExpbmVIZWlnaHQoUmVuZGVyU3R5bGU6OmluaXRpYWxMaW5l SGVpZ2h0KCkpOwotICAgIG1fc3RhdGUuc2V0TGluZUhlaWdodFZhbHVlKDApOwogICAgIHNldEZv bnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOwogfQogCkBAIC0yNjg4LDEzICsyNjcwLDYg QEAgdm9pZCBTdHlsZVJlc29sdmVyOjpDYXNjYWRlZFByb3BlcnRpZXM6OlByb3BlcnR5OjphcHBs eShTdHlsZVJlc29sdmVyJiByZXNvbHZlcikKIHsKICAgICBTdGF0ZSYgc3RhdGUgPSByZXNvbHZl ci5zdGF0ZSgpOwogCi0gICAgLy8gRklYTUU6IEl0IHdvdWxkIGJlIG5pY2UgaWYgbGluZS1oZWln aHQgd2VyZSBsZXNzIG9mIGEgc3BlY2lhbCBzbm93Zmxha2UuCi0gICAgaWYgKGlkID09IENTU1By b3BlcnR5TGluZUhlaWdodCkgewotICAgICAgICBpZiAoYXV0byB2YWx1ZSA9IHN0YXRlLnN0eWxl KCktPmluc2lkZUxpbmsoKSA9PSBOb3RJbnNpZGVMaW5rID8gY3NzVmFsdWVbMF0gOiBjc3NWYWx1 ZVtTZWxlY3RvckNoZWNrZXI6Ok1hdGNoTGlua10pCi0gICAgICAgICAgICBzdGF0ZS5zZXRMaW5l SGVpZ2h0VmFsdWUodmFsdWUpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgaWYgKGNz c1ZhbHVlWzBdKSB7CiAgICAgICAgIHN0YXRlLnNldEFwcGx5UHJvcGVydHlUb1JlZ3VsYXJTdHls ZSh0cnVlKTsKICAgICAgICAgc3RhdGUuc2V0QXBwbHlQcm9wZXJ0eVRvVmlzaXRlZExpbmtTdHls ZShmYWxzZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5o IGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUmVzb2x2ZXIuaAppbmRleCA3MzM4NTMyOWNiMjI4 M2Q5NmIzNGQyM2RjYmVjNzQwNzE1NzhlYTk2Li5hYjY1ZWRlZTlkOTYzNzc4M2Q3YTMyMTZlM2Yz MTUwMjI3ODNjMDQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmgKQEAgLTM0NCw3ICsz NDQsNiBAQCBwdWJsaWM6CiAgICAgICAgICAgICAsIG1fZWxlbWVudEFmZmVjdGVkQnlDbGFzc1J1 bGVzKGZhbHNlKQogICAgICAgICAgICAgLCBtX2FwcGx5UHJvcGVydHlUb1JlZ3VsYXJTdHlsZSh0 cnVlKQogICAgICAgICAgICAgLCBtX2FwcGx5UHJvcGVydHlUb1Zpc2l0ZWRMaW5rU3R5bGUoZmFs c2UpCi0gICAgICAgICAgICAsIG1fbGluZUhlaWdodFZhbHVlKG51bGxwdHIpCiAgICAgICAgICAg ICAsIG1fZm9udERpcnR5KGZhbHNlKQogICAgICAgICAgICAgLCBtX2ZvbnRTaXplSGFzVmlld3Bv cnRVbml0cyhmYWxzZSkKICAgICAgICAgICAgICwgbV9oYXNVQUFwcGVhcmFuY2UoZmFsc2UpCkBA IC0zODIsOCArMzgxLDYgQEAgcHVibGljOgogICAgICAgICBWZWN0b3I8UmVmUHRyPFJlZmVyZW5j ZUZpbHRlck9wZXJhdGlvbj4+JiBmaWx0ZXJzV2l0aFBlbmRpbmdTVkdEb2N1bWVudHMoKSB7IHJl dHVybiBtX2ZpbHRlcnNXaXRoUGVuZGluZ1NWR0RvY3VtZW50czsgfQogICAgICAgICBWZWN0b3I8 UmVmUHRyPE1hc2tJbWFnZU9wZXJhdGlvbj4+JiBtYXNrSW1hZ2VzV2l0aFBlbmRpbmdTVkdEb2N1 bWVudHMoKSB7IHJldHVybiBtX21hc2tJbWFnZXNXaXRoUGVuZGluZ1NWR0RvY3VtZW50czsgfQog Ci0gICAgICAgIHZvaWQgc2V0TGluZUhlaWdodFZhbHVlKENTU1ZhbHVlKiB2YWx1ZSkgeyBtX2xp bmVIZWlnaHRWYWx1ZSA9IHZhbHVlOyB9Ci0gICAgICAgIENTU1ZhbHVlKiBsaW5lSGVpZ2h0VmFs dWUoKSB7IHJldHVybiBtX2xpbmVIZWlnaHRWYWx1ZTsgfQogICAgICAgICB2b2lkIHNldEZvbnRE aXJ0eShib29sIGlzRGlydHkpIHsgbV9mb250RGlydHkgPSBpc0RpcnR5OyB9CiAgICAgICAgIGJv b2wgZm9udERpcnR5KCkgY29uc3QgeyByZXR1cm4gbV9mb250RGlydHk7IH0KICAgICAgICAgdm9p ZCBzZXRGb250U2l6ZUhhc1ZpZXdwb3J0VW5pdHMoYm9vbCBoYXNWaWV3cG9ydFVuaXRzKSB7IG1f Zm9udFNpemVIYXNWaWV3cG9ydFVuaXRzID0gaGFzVmlld3BvcnRVbml0czsgfQpAQCAtNDMxLDcg KzQyOCw2IEBAIHB1YmxpYzoKICAgICAgICAgVmVjdG9yPFJlZlB0cjxSZWZlcmVuY2VGaWx0ZXJP cGVyYXRpb24+PiBtX2ZpbHRlcnNXaXRoUGVuZGluZ1NWR0RvY3VtZW50czsKICAgICAgICAgVmVj dG9yPFJlZlB0cjxNYXNrSW1hZ2VPcGVyYXRpb24+PiBtX21hc2tJbWFnZXNXaXRoUGVuZGluZ1NW R0RvY3VtZW50czsKIAotICAgICAgICBDU1NWYWx1ZSogbV9saW5lSGVpZ2h0VmFsdWU7CiAgICAg ICAgIGJvb2wgbV9mb250RGlydHk7CiAgICAgICAgIGJvb2wgbV9mb250U2l6ZUhhc1ZpZXdwb3J0 VW5pdHM7CiAK