74561 2011-12-14 16:49:56 -0800 Implement CSS line-height property in CSSStyleApplyProperty. 2011-12-18 19:50:31 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 macpherson macpherson kling macpherson webkit.review.bot oldest_to_newest 521466 0 macpherson 2011-12-14 16:49:56 -0800 Implement CSS line-height property in CSSStyleApplyProperty. 521475 1 119331 macpherson 2011-12-14 16:55:12 -0800 Created attachment 119331 Patch 523668 2 119331 webkit.review.bot 2011-12-18 19:50:27 -0800 Comment on attachment 119331 Patch Clearing flags on attachment: 119331 Committed r103212: <http://trac.webkit.org/changeset/103212> 523669 3 webkit.review.bot 2011-12-18 19:50:31 -0800 All reviewed patches have been landed. Closing bug. 119331 2011-12-14 16:55:12 -0800 2011-12-18 19:50:27 -0800 Patch bug-74561-20111215115510.patch text/plain 7075 macpherson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMjg0OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDExLTEyLTE0ICBMdWtlIE1h Y3BoZXJzb24gICA8bWFjcGhlcnNvbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IENTUyBsaW5lLWhlaWdodCBwcm9wZXJ0eSBpbiBDU1NTdHlsZUFwcGx5UHJvcGVydHkuCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NDU2MQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAv IHJlZmFjdG9yaW5nIG9ubHkuCisKKyAgICAgICAgKiBjc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaDoK KyAgICAgICAgKFdlYkNvcmU6OkNTU1ByaW1pdGl2ZVZhbHVlOjppc051bWJlcik6CisgICAgICAg ICogY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBcHBs eVByb3BlcnR5TGluZUhlaWdodDo6YXBwbHlWYWx1ZSk6CisgICAgICAgIChXZWJDb3JlOjpBcHBs eVByb3BlcnR5TGluZUhlaWdodDo6Y3JlYXRlSGFuZGxlcik6CisgICAgICAgIChXZWJDb3JlOjpD U1NTdHlsZUFwcGx5UHJvcGVydHk6OkNTU1N0eWxlQXBwbHlQcm9wZXJ0eSk6CisgICAgICAgICog Y3NzL0NTU1N0eWxlU2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTU3R5bGVTZWxl Y3Rvcjo6YXBwbHlQcm9wZXJ0eSk6CisKIDIwMTEtMTItMTQgIEVucmljYSBDYXN1Y2NpICA8ZW5y aWNhQGFwcGxlLmNvbT4KIAogICAgICAgICBOZWVkIGEgd2F5IHRvIHByb2R1Y2UgbGVhbmVyIG1h cmt1cCB3aGVuIHBhc3RpbmcgYSBmcmFnbWVudCBjb250YWluaW5nIHZlcmJvc2UgbWFya3VwCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJpbWl0aXZlVmFsdWUuaAkocmV2aXNpb24gMTAyODM3 KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1ByaW1pdGl2ZVZhbHVlLmgJKHdvcmtpbmcgY29w eSkKQEAgLTEyMSw2ICsxMjEsNyBAQCBwdWJsaWM6CiAKICAgICBib29sIGlzTGVuZ3RoKCkgY29u c3QgeyByZXR1cm4gaXNVbml0VHlwZUxlbmd0aChtX3ByaW1pdGl2ZVVuaXRUeXBlKTsgfQogICAg IGJvb2wgaXNQZXJjZW50YWdlKCkgY29uc3QgeyByZXR1cm4gbV9wcmltaXRpdmVVbml0VHlwZSA9 PSBDU1NQcmltaXRpdmVWYWx1ZTo6Q1NTX1BFUkNFTlRBR0U7IH0KKyAgICBib29sIGlzTnVtYmVy KCkgY29uc3QgeyByZXR1cm4gbV9wcmltaXRpdmVVbml0VHlwZSA9PSBDU1NQcmltaXRpdmVWYWx1 ZTo6Q1NTX05VTUJFUjsgfQogCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8Q1NTUHJpbWl0aXZlVmFs dWU+IGNyZWF0ZUlkZW50aWZpZXIoaW50IGlkZW50aWZpZXIpIHsgcmV0dXJuIGFkb3B0UmVmKG5l dyBDU1NQcmltaXRpdmVWYWx1ZShpZGVudGlmaWVyKSk7IH0KICAgICBzdGF0aWMgUGFzc1JlZlB0 cjxDU1NQcmltaXRpdmVWYWx1ZT4gY3JlYXRlQ29sb3IodW5zaWduZWQgcmdiVmFsdWUpIHsgcmV0 dXJuIGFkb3B0UmVmKG5ldyBDU1NQcmltaXRpdmVWYWx1ZShyZ2JWYWx1ZSkpOyB9CkluZGV4OiBT b3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVBcHBseVByb3BlcnR5LmNwcAkocmV2aXNpb24g MTAyODM3KQorKysgU291cmNlL1dlYkNvcmUvY3NzL0NTU1N0eWxlQXBwbHlQcm9wZXJ0eS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTg4OSw2ICs4ODksNDIgQEAgcHVibGljOgogICAgIH0KIH07CiAK K2NsYXNzIEFwcGx5UHJvcGVydHlMaW5lSGVpZ2h0IHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgdm9p ZCBhcHBseVZhbHVlKENTU1N0eWxlU2VsZWN0b3IqIHNlbGVjdG9yLCBDU1NWYWx1ZSogdmFsdWUp CisgICAgeworICAgICAgICBpZiAoIXZhbHVlLT5pc1ByaW1pdGl2ZVZhbHVlKCkpCisgICAgICAg ICAgICByZXR1cm47CisKKyAgICAgICAgQ1NTUHJpbWl0aXZlVmFsdWUqIHByaW1pdGl2ZVZhbHVl ID0gc3RhdGljX2Nhc3Q8Q1NTUHJpbWl0aXZlVmFsdWUqPih2YWx1ZSk7CisgICAgICAgIExlbmd0 aCBsaW5lSGVpZ2h0OworCisgICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+Z2V0SWRlbnQoKSA9 PSBDU1NWYWx1ZU5vcm1hbCkKKyAgICAgICAgICAgIGxpbmVIZWlnaHQgPSBMZW5ndGgoLTEwMC4w LCBQZXJjZW50KTsKKyAgICAgICAgZWxzZSBpZiAocHJpbWl0aXZlVmFsdWUtPmlzTGVuZ3RoKCkp IHsKKyAgICAgICAgICAgIGRvdWJsZSBtdWx0aXBsaWVyID0gc2VsZWN0b3ItPnN0eWxlKCktPmVm ZmVjdGl2ZVpvb20oKTsKKyAgICAgICAgICAgIGlmIChzZWxlY3Rvci0+c3R5bGUoKS0+dGV4dFNp emVBZGp1c3QoKSkgeworICAgICAgICAgICAgICAgIGlmIChGcmFtZSogZnJhbWUgPSBzZWxlY3Rv ci0+ZG9jdW1lbnQoKS0+ZnJhbWUoKSkKKyAgICAgICAgICAgICAgICAgICAgbXVsdGlwbGllciAq PSBmcmFtZS0+dGV4dFpvb21GYWN0b3IoKTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGxp bmVIZWlnaHQgPSBwcmltaXRpdmVWYWx1ZS0+Y29tcHV0ZUxlbmd0aDxMZW5ndGg+KHNlbGVjdG9y LT5zdHlsZSgpLCBzZWxlY3Rvci0+cm9vdEVsZW1lbnRTdHlsZSgpLCBtdWx0aXBsaWVyKTsKKyAg ICAgICAgfSBlbHNlIGlmIChwcmltaXRpdmVWYWx1ZS0+aXNQZXJjZW50YWdlKCkpIHsKKyAgICAg ICAgICAgIC8vIEZJWE1FOiBwZXJjZW50YWdlIHNob3VsZCBub3QgYmUgcmVzdHJpY3RlZCB0byBh biBpbnRlZ2VyIGhlcmUuCisgICAgICAgICAgICBsaW5lSGVpZ2h0ID0gTGVuZ3RoKChzZWxlY3Rv ci0+c3R5bGUoKS0+Zm9udFNpemUoKSAqIHByaW1pdGl2ZVZhbHVlLT5nZXRJbnRWYWx1ZSgpKSAv IDEwMCwgRml4ZWQpOworICAgICAgICB9IGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5pc051bWJl cigpKSB7CisgICAgICAgICAgICAvLyBGSVhNRTogbnVtYmVyIGFuZCBwZXJjZW50YWdlIHZhbHVl cyBzaG91bGQgcHJvZHVjZSB0aGUgc2FtZSB0eXBlIG9mIExlbmd0aCAoaWUuIEZpeGVkIG9yIFBl cmNlbnQpLgorICAgICAgICAgICAgbGluZUhlaWdodCA9IExlbmd0aChwcmltaXRpdmVWYWx1ZS0+ Z2V0RG91YmxlVmFsdWUoKSAqIDEwMC4wLCBQZXJjZW50KTsKKyAgICAgICAgfSBlbHNlCisgICAg ICAgICAgICByZXR1cm47CisgICAgICAgIHNlbGVjdG9yLT5zdHlsZSgpLT5zZXRMaW5lSGVpZ2h0 KGxpbmVIZWlnaHQpOworICAgIH0KKyAgICBzdGF0aWMgUHJvcGVydHlIYW5kbGVyIGNyZWF0ZUhh bmRsZXIoKQorICAgIHsKKyAgICAgICAgUHJvcGVydHlIYW5kbGVyIGhhbmRsZXIgPSBBcHBseVBy b3BlcnR5RGVmYXVsdEJhc2U8TGVuZ3RoLCAmUmVuZGVyU3R5bGU6OmxpbmVIZWlnaHQsIExlbmd0 aCwgJlJlbmRlclN0eWxlOjpzZXRMaW5lSGVpZ2h0LCBMZW5ndGgsICZSZW5kZXJTdHlsZTo6aW5p dGlhbExpbmVIZWlnaHQ+OjpjcmVhdGVIYW5kbGVyKCk7CisgICAgICAgIHJldHVybiBQcm9wZXJ0 eUhhbmRsZXIoaGFuZGxlci5pbmhlcml0RnVuY3Rpb24oKSwgaGFuZGxlci5pbml0aWFsRnVuY3Rp b24oKSwgJmFwcGx5VmFsdWUpOworICAgIH0KK307CisKIGNsYXNzIEFwcGx5UHJvcGVydHlQYWdl U2l6ZSB7CiBwcml2YXRlOgogICAgIHN0YXRpYyBMZW5ndGggbW1MZW5ndGgoZG91YmxlIG1tKSB7 IHJldHVybiBDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlKG1tLCBDU1NQcmltaXRpdmVWYWx1ZTo6 Q1NTX01NKS0+Y29tcHV0ZUxlbmd0aDxMZW5ndGg+KDAsIDApOyB9CkBAIC0xNTU4LDYgKzE1OTQs OCBAQCBDU1NTdHlsZUFwcGx5UHJvcGVydHk6OkNTU1N0eWxlQXBwbHlQcm9wCiAKICAgICBzZXRQ cm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVydHlUZXh0SW5kZW50LCBBcHBseVByb3BlcnR5TGVuZ3Ro PCZSZW5kZXJTdHlsZTo6dGV4dEluZGVudCwgJlJlbmRlclN0eWxlOjpzZXRUZXh0SW5kZW50LCAm UmVuZGVyU3R5bGU6OmluaXRpYWxUZXh0SW5kZW50Pjo6Y3JlYXRlSGFuZGxlcigpKTsKIAorICAg IHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUxpbmVIZWlnaHQsIEFwcGx5UHJvcGVydHlM aW5lSGVpZ2h0OjpjcmVhdGVIYW5kbGVyKCkpOworCiAgICAgc2V0UHJvcGVydHlIYW5kbGVyKENT U1Byb3BlcnR5TGlzdFN0eWxlSW1hZ2UsIEFwcGx5UHJvcGVydHlTdHlsZUltYWdlPCZSZW5kZXJT dHlsZTo6bGlzdFN0eWxlSW1hZ2UsICZSZW5kZXJTdHlsZTo6c2V0TGlzdFN0eWxlSW1hZ2UsICZS ZW5kZXJTdHlsZTo6aW5pdGlhbExpc3RTdHlsZUltYWdlLCBDU1NQcm9wZXJ0eUxpc3RTdHlsZUlt YWdlPjo6Y3JlYXRlSGFuZGxlcigpKTsKICAgICBzZXRQcm9wZXJ0eUhhbmRsZXIoQ1NTUHJvcGVy dHlMaXN0U3R5bGVQb3NpdGlvbiwgQXBwbHlQcm9wZXJ0eURlZmF1bHQ8RUxpc3RTdHlsZVBvc2l0 aW9uLCAmUmVuZGVyU3R5bGU6Omxpc3RTdHlsZVBvc2l0aW9uLCBFTGlzdFN0eWxlUG9zaXRpb24s ICZSZW5kZXJTdHlsZTo6c2V0TGlzdFN0eWxlUG9zaXRpb24sIEVMaXN0U3R5bGVQb3NpdGlvbiwg JlJlbmRlclN0eWxlOjppbml0aWFsTGlzdFN0eWxlUG9zaXRpb24+OjpjcmVhdGVIYW5kbGVyKCkp OwogICAgIHNldFByb3BlcnR5SGFuZGxlcihDU1NQcm9wZXJ0eUxpc3RTdHlsZVR5cGUsIEFwcGx5 UHJvcGVydHlEZWZhdWx0PEVMaXN0U3R5bGVUeXBlLCAmUmVuZGVyU3R5bGU6Omxpc3RTdHlsZVR5 cGUsIEVMaXN0U3R5bGVUeXBlLCAmUmVuZGVyU3R5bGU6OnNldExpc3RTdHlsZVR5cGUsIEVMaXN0 U3R5bGVUeXBlLCAmUmVuZGVyU3R5bGU6OmluaXRpYWxMaXN0U3R5bGVUeXBlPjo6Y3JlYXRlSGFu ZGxlcigpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTU3R5bGVTZWxlY3Rvci5jcHAJKHJl dmlzaW9uIDEwMjgzNykKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NTdHlsZVNlbGVjdG9yLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjc2MCwzMyArMjc2MCw2IEBAIHZvaWQgQ1NTU3R5bGVTZWxl Y3Rvcjo6YXBwbHlQcm9wZXJ0eShpbnQKICAgICBjYXNlIENTU1Byb3BlcnR5T3JwaGFuczoKICAg ICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUxfQU5EX1BSSU1JVElWRShvcnBoYW5zLCBP cnBoYW5zKQogICAgICAgICByZXR1cm47Ci0vLyBsZW5ndGgsIHBlcmNlbnQsIG51bWJlcgotICAg IGNhc2UgQ1NTUHJvcGVydHlMaW5lSGVpZ2h0OgotICAgIHsKLSAgICAgICAgSEFORExFX0lOSEVS SVRfQU5EX0lOSVRJQUwobGluZUhlaWdodCwgTGluZUhlaWdodCkKLSAgICAgICAgaWYgKCFwcmlt aXRpdmVWYWx1ZSkKLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgTGVuZ3RoIGxpbmVIZWln aHQ7Ci0gICAgICAgIGludCB0eXBlID0gcHJpbWl0aXZlVmFsdWUtPnByaW1pdGl2ZVR5cGUoKTsK LSAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVlLT5nZXRJZGVudCgpID09IENTU1ZhbHVlTm9ybWFs KQotICAgICAgICAgICAgbGluZUhlaWdodCA9IExlbmd0aCgtMTAwLjAsIFBlcmNlbnQpOwotICAg ICAgICBlbHNlIGlmIChDU1NQcmltaXRpdmVWYWx1ZTo6aXNVbml0VHlwZUxlbmd0aCh0eXBlKSkg ewotICAgICAgICAgICAgZG91YmxlIG11bHRpcGxpZXIgPSB6b29tRmFjdG9yOwotICAgICAgICAg ICAgaWYgKG1fc3R5bGUtPnRleHRTaXplQWRqdXN0KCkpIHsKLSAgICAgICAgICAgICAgICBpZiAo RnJhbWUqIGZyYW1lID0gbV9jaGVja2VyLmRvY3VtZW50KCktPmZyYW1lKCkpCi0gICAgICAgICAg ICAgICAgICAgIG11bHRpcGxpZXIgKj0gZnJhbWUtPnRleHRab29tRmFjdG9yKCk7Ci0gICAgICAg ICAgICB9Ci0gICAgICAgICAgICBsaW5lSGVpZ2h0ID0gcHJpbWl0aXZlVmFsdWUtPmNvbXB1dGVM ZW5ndGg8TGVuZ3RoPihzdHlsZSgpLCBtX3Jvb3RFbGVtZW50U3R5bGUsIG11bHRpcGxpZXIpOwot ICAgICAgICB9IGVsc2UgaWYgKHR5cGUgPT0gQ1NTUHJpbWl0aXZlVmFsdWU6OkNTU19QRVJDRU5U QUdFKQotICAgICAgICAgICAgbGluZUhlaWdodCA9IExlbmd0aCgobV9zdHlsZS0+Zm9udFNpemUo KSAqIHByaW1pdGl2ZVZhbHVlLT5nZXRJbnRWYWx1ZSgpKSAvIDEwMCwgRml4ZWQpOwotICAgICAg ICBlbHNlIGlmICh0eXBlID09IENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfTlVNQkVSKQotICAgICAg ICAgICAgbGluZUhlaWdodCA9IExlbmd0aChwcmltaXRpdmVWYWx1ZS0+Z2V0RG91YmxlVmFsdWUo KSAqIDEwMC4wLCBQZXJjZW50KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgcmV0dXJuOwot ICAgICAgICBtX3N0eWxlLT5zZXRMaW5lSGVpZ2h0KGxpbmVIZWlnaHQpOwotICAgICAgICByZXR1 cm47Ci0gICAgfQotCiAvLyByZWN0CiAgICAgY2FzZSBDU1NQcm9wZXJ0eUNsaXA6CiAgICAgewpA QCAtMzg0MSw2ICszODE0LDcgQEAgdm9pZCBDU1NTdHlsZVNlbGVjdG9yOjphcHBseVByb3BlcnR5 KGludAogICAgIGNhc2UgQ1NTUHJvcGVydHlCb3R0b206CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdp ZHRoOgogICAgIGNhc2UgQ1NTUHJvcGVydHlNaW5XaWR0aDoKKyAgICBjYXNlIENTU1Byb3BlcnR5 TGluZUhlaWdodDoKICAgICBjYXNlIENTU1Byb3BlcnR5TGlzdFN0eWxlOgogICAgIGNhc2UgQ1NT UHJvcGVydHlMaXN0U3R5bGVJbWFnZToKICAgICBjYXNlIENTU1Byb3BlcnR5TGlzdFN0eWxlUG9z aXRpb246Cg==