121979 2013-09-26 14:10:43 -0700 Don't mutate style in RenderCombineText 2013-09-26 15:32:43 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 933691 0 koivisto 2013-09-26 14:10:43 -0700 Text renderers should always have the same style as the parent. 933693 1 212745 koivisto 2013-09-26 14:15:04 -0700 Created attachment 212745 patch 933696 2 212745 kling 2013-09-26 14:19:49 -0700 Comment on attachment 212745 patch This isn't too beautiful, but it looks correct to me. 933744 3 koivisto 2013-09-26 15:32:43 -0700 http://trac.webkit.org/changeset/156500 212745 2013-09-26 14:15:04 -0700 2013-09-26 14:19:49 -0700 patch text-combine-style.patch text/plain 6597 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjQ5NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEzLTA5LTI2ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBEb24ndCBtdXRhdGUgc3R5bGUg aW4gUmVuZGVyQ29tYmluZVRleHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEyMTk3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRleHQgcmVuZGVyZXJzIHNob3VsZCBhbHdheXMgaGF2ZSB0aGUgc2FtZSBz dHlsZSBhcyB0aGUgcGFyZW50LgorCisgICAgICAgICogcmVuZGVyaW5nL0lubGluZVRleHRCb3gu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Zm9udFRvVXNlKToKKyAgICAgICAgKFdlYkNvcmU6Oklu bGluZVRleHRCb3g6OmxvY2FsU2VsZWN0aW9uUmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxp bmVUZXh0Qm94OjpwYWludCk6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94OjpvZmZz ZXRGb3JQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpJbmxpbmVUZXh0Qm94Ojpwb3NpdGlv bkZvck9mZnNldCk6CisgICAgICAgIAorICAgICAgICAgICAgU2VsZWN0IHRoZSBtb2RpZmllZCBm b250IGZvciB0ZXh0LWNvbWJpbmUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQ29tYmlu ZVRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQ29tYmluZVRleHQ6OnN0eWxlRGlk Q2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckNvbWJpbmVUZXh0Ojpjb21iaW5lVGV4 dCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckNvbWJpbmVUZXh0Lmg6CisgICAgICAgIAor ICAgICAgICAgICAgTW92ZSB0aGUgdGV4dC1jb21iaW5lIHNwZWNpZmljIGZvbnQgc3R5bGUgdG8g YSBtZW1iZXIgb2YgaXRzIG93bi4KKwogMjAxMy0wOS0yNiAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBQYXNzV2Vhay5oCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZVRleHRCb3guY3BwCShyZXZpc2lvbiAxNTY0NDgp CisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE4OSw2ICsxODksMTYgQEAgc3RhdGljIHZvaWQgYWRqdXN0Q2hhcmFjdGVyc0Fu ZExlbmd0aEZvcgogICAgIGxlbmd0aCArPSBoeXBoZW5TdHJpbmcubGVuZ3RoKCk7CiB9CiAKK3N0 YXRpYyBjb25zdCBGb250JiBmb250VG9Vc2UoY29uc3QgUmVuZGVyU3R5bGUmIHN0eWxlLCBjb25z dCBSZW5kZXJUZXh0JiByZW5kZXJlcikKK3sKKyAgICBpZiAoc3R5bGUuaGFzVGV4dENvbWJpbmUo KSAmJiByZW5kZXJlci5pc0NvbWJpbmVUZXh0KCkpIHsKKyAgICAgICAgY29uc3QgUmVuZGVyQ29t YmluZVRleHQmIHRleHRDb21iaW5lUmVuZGVyZXIgPSB0b1JlbmRlckNvbWJpbmVUZXh0KHJlbmRl cmVyKTsKKyAgICAgICAgaWYgKHRleHRDb21iaW5lUmVuZGVyZXIuaXNDb21iaW5lZCgpKQorICAg ICAgICAgICAgcmV0dXJuIHRleHRDb21iaW5lUmVuZGVyZXIudGV4dENvbWJpbmVGb250KCk7Cisg ICAgfQorICAgIHJldHVybiBzdHlsZS5mb250KCk7Cit9CisKIExheW91dFJlY3QgSW5saW5lVGV4 dEJveDo6bG9jYWxTZWxlY3Rpb25SZWN0KGludCBzdGFydFBvcywgaW50IGVuZFBvcykKIHsKICAg ICBpbnQgc1BvcyA9IG1heChzdGFydFBvcyAtIG1fc3RhcnQsIDApOwpAQCAtMjAyLDcgKzIxMiw3 IEBAIExheW91dFJlY3QgSW5saW5lVGV4dEJveDo6bG9jYWxTZWxlY3Rpb24KICAgICBMYXlvdXRV bml0IHNlbFRvcCA9IHNlbGVjdGlvblRvcCgpOwogICAgIExheW91dFVuaXQgc2VsSGVpZ2h0ID0g c2VsZWN0aW9uSGVpZ2h0KCk7CiAgICAgUmVuZGVyU3R5bGUqIHN0eWxlVG9Vc2UgPSByZW5kZXJl cigpLnN0eWxlKGlzRmlyc3RMaW5lU3R5bGUoKSk7Ci0gICAgY29uc3QgRm9udCYgZm9udCA9IHN0 eWxlVG9Vc2UtPmZvbnQoKTsKKyAgICBjb25zdCBGb250JiBmb250ID0gZm9udFRvVXNlKCpzdHls ZVRvVXNlLCByZW5kZXJlcigpKTsKIAogICAgIEJ1ZmZlckZvckFwcGVuZGluZ0h5cGhlbiBjaGFy YWN0ZXJzV2l0aEh5cGhlbjsKICAgICBib29sIHJlc3BlY3RIeXBoZW4gPSBlUG9zID09IG1fbGVu ICYmIGhhc0h5cGhlbigpOwpAQCAtNjYwLDcgKzY3MCw3IEBAIHZvaWQgSW5saW5lVGV4dEJveDo6 cGFpbnQoUGFpbnRJbmZvJiBwYWkKICAgICB9CiAKICAgICAvLyBTZXQgb3VyIGZvbnQuCi0gICAg Y29uc3QgRm9udCYgZm9udCA9IHN0eWxlVG9Vc2UtPmZvbnQoKTsKKyAgICBjb25zdCBGb250JiBm b250ID0gZm9udFRvVXNlKCpzdHlsZVRvVXNlLCByZW5kZXJlcigpKTsKIAogICAgIEZsb2F0UG9p bnQgdGV4dE9yaWdpbiA9IEZsb2F0UG9pbnQoYm94T3JpZ2luLngoKSwgYm94T3JpZ2luLnkoKSAr IGZvbnQuZm9udE1ldHJpY3MoKS5hc2NlbnQoKSk7CiAKQEAgLTE1NDQsNyArMTU1NCw3IEBAIGlu dCBJbmxpbmVUZXh0Qm94OjpvZmZzZXRGb3JQb3NpdGlvbihmbG8KICAgICBGb250Q2FjaGVQdXJn ZVByZXZlbnRlciBmb250Q2FjaGVQdXJnZVByZXZlbnRlcjsKIAogICAgIFJlbmRlclN0eWxlKiBz dHlsZSA9IHJlbmRlcmVyKCkuc3R5bGUoaXNGaXJzdExpbmVTdHlsZSgpKTsKLSAgICBjb25zdCBG b250JiBmb250ID0gc3R5bGUtPmZvbnQoKTsKKyAgICBjb25zdCBGb250JiBmb250ID0gZm9udFRv VXNlKCpzdHlsZSwgcmVuZGVyZXIoKSk7CiAgICAgcmV0dXJuIGZvbnQub2Zmc2V0Rm9yUG9zaXRp b24oY29uc3RydWN0VGV4dFJ1bihzdHlsZSwgZm9udCksIGxpbmVPZmZzZXQgLSBsb2dpY2FsTGVm dCgpLCBpbmNsdWRlUGFydGlhbEdseXBocyk7CiB9CiAKQEAgLTE1NjAsNyArMTU3MCw3IEBAIGZs b2F0IElubGluZVRleHRCb3g6OnBvc2l0aW9uRm9yT2Zmc2V0KGkKIAogICAgIFJlbmRlclN0eWxl KiBzdHlsZVRvVXNlID0gcmVuZGVyZXIoKS5zdHlsZShpc0ZpcnN0TGluZVN0eWxlKCkpOwogICAg IEFTU0VSVChzdHlsZVRvVXNlKTsKLSAgICBjb25zdCBGb250JiBmb250ID0gc3R5bGVUb1VzZS0+ Zm9udCgpOworICAgIGNvbnN0IEZvbnQmIGZvbnQgPSBmb250VG9Vc2UoKnN0eWxlVG9Vc2UsIHJl bmRlcmVyKCkpOwogICAgIGludCBmcm9tID0gIWlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSA/IG9m ZnNldCAtIG1fc3RhcnQgOiAwOwogICAgIGludCB0byA9ICFpc0xlZnRUb1JpZ2h0RGlyZWN0aW9u KCkgPyBtX2xlbiA6IG9mZnNldCAtIG1fc3RhcnQ7CiAgICAgLy8gRklYTUU6IERvIHdlIG5lZWQg dG8gYWRkIHJpZ2h0QmVhcmluZyBoZXJlPwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckNvbWJpbmVUZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQ29tYmluZVRleHQuY3BwCShyZXZpc2lvbiAxNTY0NDgpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQ29tYmluZVRleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0zOCw3ICszOCw5IEBAIFJlbmRlckNvbWJpbmVUZXh0OjpSZW5kZXJDb21iaW5lVGV4dChUZXgK IAogdm9pZCBSZW5kZXJDb21iaW5lVGV4dDo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNl IGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSkKIHsKLSAgICBzZXRTdHlsZUludGVy bmFsKFJlbmRlclN0eWxlOjpjbG9uZShzdHlsZSgpKSk7CisgICAgLy8gRklYTUU6IFRoaXMgaXMg cHJldHR5IGhhY2tpc2guCisgICAgbV9jb21iaW5lRm9udFN0eWxlID0gUmVuZGVyU3R5bGU6OmNs b25lKHN0eWxlKCkpOworCiAgICAgUmVuZGVyVGV4dDo6c3R5bGVEaWRDaGFuZ2UoZGlmZiwgb2xk U3R5bGUpOwogCiAgICAgaWYgKG1faXNDb21iaW5lZCkgewpAQCAtMTEwLDcgKzExMiw3IEBAIHZv aWQgUmVuZGVyQ29tYmluZVRleHQ6OmNvbWJpbmVUZXh0KCkKICAgICBGb250U2VsZWN0b3IqIGZv bnRTZWxlY3RvciA9IHN0eWxlKCktPmZvbnQoKS5mb250U2VsZWN0b3IoKTsKIAogICAgIGlmICht X2lzQ29tYmluZWQpCi0gICAgICAgIHNob3VsZFVwZGF0ZUZvbnQgPSBzdHlsZSgpLT5zZXRGb250 RGVzY3JpcHRpb24oZGVzY3JpcHRpb24pOyAvLyBOZWVkIHRvIGNoYW5nZSBmb250IG9yaWVudGF0 aW9uIHRvIGhvcml6b250YWwuCisgICAgICAgIHNob3VsZFVwZGF0ZUZvbnQgPSBtX2NvbWJpbmVG b250U3R5bGUtPnNldEZvbnREZXNjcmlwdGlvbihkZXNjcmlwdGlvbik7IC8vIE5lZWQgdG8gY2hh bmdlIGZvbnQgb3JpZW50YXRpb24gdG8gaG9yaXpvbnRhbC4KICAgICBlbHNlIHsKICAgICAgICAg Ly8gTmVlZCB0byB0cnkgY29tcHJlc3NlZCBnbHlwaHMuCiAgICAgICAgIHN0YXRpYyBjb25zdCBG b250V2lkdGhWYXJpYW50IHdpZHRoVmFyaWFudHNbXSA9IHsgSGFsZldpZHRoLCBUaGlyZFdpZHRo LCBRdWFydGVyV2lkdGggfTsKQEAgLTEyNCwxNyArMTI2LDE3IEBAIHZvaWQgUmVuZGVyQ29tYmlu ZVRleHQ6OmNvbWJpbmVUZXh0KCkKICAgICAgICAgICAgICAgICBtX2lzQ29tYmluZWQgPSB0cnVl OwogCiAgICAgICAgICAgICAgICAgLy8gUmVwbGFjZSBteSBmb250IHdpdGggdGhlIG5ldyBvbmUu Ci0gICAgICAgICAgICAgICAgc2hvdWxkVXBkYXRlRm9udCA9IHN0eWxlKCktPnNldEZvbnREZXNj cmlwdGlvbihkZXNjcmlwdGlvbik7CisgICAgICAgICAgICAgICAgc2hvdWxkVXBkYXRlRm9udCA9 IG1fY29tYmluZUZvbnRTdHlsZS0+c2V0Rm9udERlc2NyaXB0aW9uKGRlc2NyaXB0aW9uKTsKICAg ICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KIAog ICAgIGlmICghbV9pc0NvbWJpbmVkKQotICAgICAgICBzaG91bGRVcGRhdGVGb250ID0gc3R5bGUo KS0+c2V0Rm9udERlc2NyaXB0aW9uKG9yaWdpbmFsRm9udCgpLmZvbnREZXNjcmlwdGlvbigpKTsK KyAgICAgICAgc2hvdWxkVXBkYXRlRm9udCA9IG1fY29tYmluZUZvbnRTdHlsZS0+c2V0Rm9udERl c2NyaXB0aW9uKG9yaWdpbmFsRm9udCgpLmZvbnREZXNjcmlwdGlvbigpKTsKIAogICAgIGlmIChz aG91bGRVcGRhdGVGb250KQotICAgICAgICBzdHlsZSgpLT5mb250KCkudXBkYXRlKGZvbnRTZWxl Y3Rvcik7CisgICAgICAgIG1fY29tYmluZUZvbnRTdHlsZS0+Zm9udCgpLnVwZGF0ZShmb250U2Vs ZWN0b3IpOwogCiAgICAgaWYgKG1faXNDb21iaW5lZCkgewogICAgICAgICBERUZJTkVfU1RBVElD X0xPQ0FMKFN0cmluZywgb2JqZWN0UmVwbGFjZW1lbnRDaGFyYWN0ZXJTdHJpbmcsICgmb2JqZWN0 UmVwbGFjZW1lbnRDaGFyYWN0ZXIsIDEpKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJDb21iaW5lVGV4dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJDb21iaW5lVGV4dC5oCShyZXZpc2lvbiAxNTY0NDgpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQ29tYmluZVRleHQuaAkod29ya2luZyBjb3B5KQpAQCAtNDAs NiArNDAsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0NvbWJpbmVkKCkgY29uc3QgeyByZXR1cm4g bV9pc0NvbWJpbmVkOyB9CiAgICAgZmxvYXQgY29tYmluZWRUZXh0V2lkdGgoY29uc3QgRm9udCYg Zm9udCkgY29uc3QgeyByZXR1cm4gZm9udC5zaXplKCk7IH0KICAgICBjb25zdCBGb250JiBvcmln aW5hbEZvbnQoKSBjb25zdCB7IHJldHVybiBwYXJlbnQoKS0+c3R5bGUoKS0+Zm9udCgpOyB9Cisg ICAgY29uc3QgRm9udCYgdGV4dENvbWJpbmVGb250KCkgY29uc3QgeyByZXR1cm4gbV9jb21iaW5l Rm9udFN0eWxlLT5mb250KCk7IH0KIAogcHJpdmF0ZToKICAgICB2b2lkIG5vZGUoKSBjb25zdCBX VEZfREVMRVRFRF9GVU5DVElPTjsKQEAgLTUwLDYgKzUxLDcgQEAgcHJpdmF0ZToKICAgICB2aXJ0 dWFsIHZvaWQgc3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlLCBjb25zdCBSZW5kZXJTdHls ZSogb2xkU3R5bGUpOwogICAgIHZpcnR1YWwgdm9pZCBzZXRUZXh0SW50ZXJuYWwoY29uc3QgU3Ry aW5nJikgT1ZFUlJJREU7CiAKKyAgICBSZWZQdHI8UmVuZGVyU3R5bGU+IG1fY29tYmluZUZvbnRT dHlsZTsKICAgICBmbG9hdCBtX2NvbWJpbmVkVGV4dFdpZHRoOwogICAgIGJvb2wgbV9pc0NvbWJp bmVkIDogMTsKICAgICBib29sIG1fbmVlZHNGb250VXBkYXRlIDogMTsK