26935 2009-07-02 14:41:36 -0700 [Chromium] Linux: fix complex text rendering with line break characters 2009-07-02 15:41:05 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 agl webkit-unassigned oldest_to_newest 129581 0 agl 2009-07-02 14:41:36 -0700 If the CSS white-space property is inhibiting line breaking, we might find end of-line characters rendered via the complex text path. Fonts don't provide glyphs for these code points so, if we find one, we simulate the space glyph being interposed in this case. Because the input is variable-length per code point, we walk the input in step with the output. 129586 1 32200 agl 2009-07-02 14:47:57 -0700 Created attachment 32200 patch 129591 2 32200 eric 2009-07-02 14:53:51 -0700 Comment on attachment 32200 patch Yay for nice ChangeLogs! :) I believe the { goes on the same line as the enum: +enum +{ Nice use of self-documenting constants, btw. :) Looks fine. I'll ask you in person to make sure we're doing this in a similar manner to the other complex text paths (which I know have similar code). 129593 3 32200 eric 2009-07-02 15:11:04 -0700 Comment on attachment 32200 patch Adam and I discussed this in person and he decided this would require further revision. 129597 4 32201 agl 2009-07-02 15:24:23 -0700 Created attachment 32201 patch After testing with some of the other values that I believed should be substituted for spaces, it seems that treatAsSpace is correct. None of the other values are causing issues. Either they are handled somewhere else, or the font's cmap is handling them. 129599 5 32201 eric 2009-07-02 15:25:34 -0700 Comment on attachment 32201 patch LGTM. 32200 2009-07-02 14:47:57 -0700 2009-07-02 15:11:04 -0700 patch patch text/plain 3962 agl ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmI4MTk3Zi4uYWNkOTFiYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAwOS0wNy0wMiAgQWRhbSBMYW5nbGV5 ICA8YWdsQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ2hyb21pdW0gTGludXg6IGZpeCBjb21wbGV4IHRleHQgcmVuZGVyaW5nIHdp dGggbGluZSBicmVhayBjaGFyYWN0ZXJzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNjkzNQorCisgICAgICAgIElmIHRoZSBDU1Mgd2hpdGUtc3Bh Y2UgcHJvcGVydHkgaXMgaW5oaWJpdGluZyBsaW5lIGJyZWFraW5nLCB3ZSBtaWdodAorICAgICAg ICBmaW5kIGVuZC1vZi1saW5lIGNoYXJhY3RlcnMgcmVuZGVyZWQgdmlhIHRoZSBjb21wbGV4IHRl eHQgcGF0aC4gRm9udHMKKyAgICAgICAgZG9uJ3QgcHJvdmlkZSBnbHlwaHMgZm9yIHRoZXNlIGNv ZGUgcG9pbnRzIHNvLCBpZiB3ZSBmaW5kIG9uZSwgd2UKKyAgICAgICAgc2ltdWxhdGUgdGhlIHNw YWNlIGdseXBoIGJlaW5nIGludGVycG9zZWQgaW4gdGhpcyBjYXNlLiAgQmVjYXVzZSB0aGUKKyAg ICAgICAgaW5wdXQgaXMgdmFyaWFibGUtbGVuZ3RoIHBlciBjb2RlIHBvaW50LCB3ZSB3YWxrIHRo ZSBpbnB1dCBpbiBzdGVwCisgICAgICAgIHdpdGggdGhlIG91dHB1dC4KKworICAgICAgICBDb3Zl cmVkIGJ5OgorICAgICAgICAgICAgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwv YmlkaS1saW5lYnJlYWstMDAyLmh0bWwKKyAgICAgICAgICAgIExheW91dFRlc3RzL2Zhc3QvdGV4 dC9pbnRlcm5hdGlvbmFsL2JpZGktbGluZWJyZWFrLTAwMy5odG1sCisgICAgICAgICAgICBMYXlv dXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9oaW5kaS13aGl0ZXNwYWNlLmh0bWwKKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0hhcmZidXp6U2tpYS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpzdHJpbmdUb0dseXBocyk6CisKIDIwMDktMDctMDIgIERhbiBCZXJu c3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZlIEh5YXR0 IGFuZCBTaW1vbiBGcmFzZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0hhcmZidXp6U2tpYS5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0hhcmZidXp6U2tpYS5jcHAKaW5kZXggOWZkMDllMS4uNjdlZjZlNiAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9IYXJmYnV6elNraWEuY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSGFyZmJ1enpTa2lhLmNwcApA QCAtNDEsNiArNDEsNyBAQAogCiBleHRlcm4gIkMiIHsKICNpbmNsdWRlICJoYXJmYnV6ei1zaGFw ZXIuaCIKKyNpbmNsdWRlICJoYXJmYnV6ei11bmljb2RlLmgiCiB9CiAKIC8vIFRoaXMgZmlsZSBp bXBsZW1lbnRzIHRoZSBjYWxsYmFja3Mgd2hpY2ggSGFyZmJ1enogcmVxdWlyZXMgYnkgdXNpbmcg U2tpYQpAQCAtNTQsNiArNTUsMjYgQEAgc3RhdGljIEhCX0ZpeGVkIFNraWFTY2FsYXJUb0hhcmZi dXp6Rml4ZWQoU2tTY2FsYXIgdmFsdWUpCiAgICAgcmV0dXJuIHZhbHVlICogNjQ7CiB9CiAKK2Vu dW0KK3sKKyAgICBVbmljb2RlTGluZUZlZWQgPSAweDBhLAorICAgIFVuaWNvZGVDYXJyaWFnZVJl dHVybiA9IDB4MGQsCisgICAgVW5pY29kZU5leHRMaW5lID0gMHg4NSwKKyAgICBVbmljb2RlRm9y bUZlZWQgPSAweDBjLAorICAgIFVuaWNvZGVMaW5lU2VwYXJhdG9yID0gMHgyMDI4LAorICAgIFVu aWNvZGVQYXJhZ3JhcGhTZXBhcmF0b3IgPSAweDIwMjksCit9OworCitzdGF0aWMgYm9vbCBpc1Vu aWNvZGVMaW5lQnJlYWtDb2RlUG9pbnQodWludDMyX3QgY29kZVBvaW50KQoreworICAgIHJldHVy biBjb2RlUG9pbnQgPT0gVW5pY29kZUxpbmVGZWVkCisgICAgICAgIHx8IGNvZGVQb2ludCA9PSBV bmljb2RlQ2FycmlhZ2VSZXR1cm4KKyAgICAgICAgfHwgY29kZVBvaW50ID09IFVuaWNvZGVOZXh0 TGluZQorICAgICAgICB8fCBjb2RlUG9pbnQgPT0gVW5pY29kZUZvcm1GZWVkCisgICAgICAgIHx8 IGNvZGVQb2ludCA9PSBVbmljb2RlTGluZVNlcGFyYXRvcgorICAgICAgICB8fCBjb2RlUG9pbnQg PT0gVW5pY29kZVBhcmFncmFwaFNlcGFyYXRvcjsKK30KKwogc3RhdGljIEhCX0Jvb2wgc3RyaW5n VG9HbHlwaHMoSEJfRm9udCBoYkZvbnQsIGNvbnN0IEhCX1VDaGFyMTYqIGNoYXJhY3RlcnMsIGhi X3VpbnQzMiBsZW5ndGgsIEhCX0dseXBoKiBnbHlwaHMsIGhiX3VpbnQzMiogZ2x5cGhzU2l6ZSwg SEJfQm9vbCBpc1JUTCkKIHsKICAgICBGb250UGxhdGZvcm1EYXRhKiBmb250ID0gcmVpbnRlcnBy ZXRfY2FzdDxGb250UGxhdGZvcm1EYXRhKj4oaGJGb250LT51c2VyRGF0YSk7CkBAIC02NSwxMCAr ODYsMjggQEAgc3RhdGljIEhCX0Jvb2wgc3RyaW5nVG9HbHlwaHMoSEJfRm9udCBoYkZvbnQsIGNv bnN0IEhCX1VDaGFyMTYqIGNoYXJhY3RlcnMsIGhiX3UKIAogICAgIC8vIEhCX0dseXBoIGlzIDMy LWJpdCwgYnV0IFNraWEgb3V0cHV0cyBvbmx5IDE2LWJpdCBudW1iZXJzLiBTbyBvdXIKICAgICAv LyB8Z2x5cGhzfCBhcnJheSBuZWVkcyB0byBiZSBjb252ZXJ0ZWQuCisgICAgLy8gQWRkaXRpb25h bGx5LCBpZiB0aGUgQ1NTIHdoaXRlLXNwYWNlIHByb3BlcnR5IGlzIGluaGliaXRpbmcgbGluZQor ICAgIC8vIGJyZWFraW5nLCB3ZSBtaWdodCBmaW5kIGVuZC1vZi1saW5lIGNoYXJhY3RvcnMgcmVu ZGVyZWQgdmlhIHRoZSBjb21wbGV4CisgICAgLy8gdGV4dCBwYXRoLiBGb250cyBkb24ndCBwcm92 aWRlIGdseXBocyBmb3IgdGhlc2UgY29kZSBwb2ludHMgc28sIGlmIHdlCisgICAgLy8gZmluZCBv bmUsIHdlIHNpbXVsYXRlIHRoZSBzcGFjZSBnbHlwaCBiZWluZyBpbnRlcnBvc2VkIGluIHRoaXMg Y2FzZS4KKyAgICAvLyBCZWNhdXNlIHRoZSBpbnB1dCBpcyB2YXJpYWJsZS1sZW5ndGggcGVyIGNv ZGUgcG9pbnQsIHdlIHdhbGsgdGhlIGlucHV0CisgICAgLy8gaW4gc3RlcCB3aXRoIHRoZSBvdXRw dXQuCisgICAgc3NpemVfdCBpbmRleE9mTmV4dENvZGVQb2ludCA9IDA7CisgICAgdWludDE2X3Qg c3BhY2VHbHlwaE51bWJlciA9IDA7CiAgICAgZm9yIChpbnQgaSA9IG51bUdseXBocyAtIDE7IGkg Pj0gMDsgLS1pKSB7CisgICAgICAgIGNvbnN0IHVpbnQzMl90IGN1cnJlbnRDb2RlUG9pbnQgPSB1 dGYxNl90b19jb2RlX3BvaW50KGNoYXJhY3RlcnMsIGxlbmd0aCwgJmluZGV4T2ZOZXh0Q29kZVBv aW50KTsKKwogICAgICAgICB1aW50MTZfdCB2YWx1ZTsKICAgICAgICAgLy8gV2UgdXNlIGEgbWVt Y3B5IHRvIGF2b2lkIGJyZWFraW5nIHN0cmljdCBhbGlhc2luZyBydWxlcy4KICAgICAgICAgbWVt Y3B5KCZ2YWx1ZSwgcmVpbnRlcnByZXRfY2FzdDxjaGFyKj4oZ2x5cGhzKSArIHNpemVvZih1aW50 MTZfdCkgKiBpLCBzaXplb2YodWludDE2X3QpKTsKKworICAgICAgICBpZiAoIXZhbHVlICYmIGlz VW5pY29kZUxpbmVCcmVha0NvZGVQb2ludChjdXJyZW50Q29kZVBvaW50KSkgeworICAgICAgICAg ICAgc3RhdGljIGNvbnN0IHVpbnQxNl90IHNwYWNlVVRGMTYgPSAnICc7CisgICAgICAgICAgICBp ZiAoIXNwYWNlR2x5cGhOdW1iZXIpCisgICAgICAgICAgICAgICAgcGFpbnQudGV4dFRvR2x5cGhz KCZzcGFjZVVURjE2LCBzaXplb2Yoc3BhY2VVVEYxNiksICZzcGFjZUdseXBoTnVtYmVyKTsKKyAg ICAgICAgICAgIHZhbHVlID0gc3BhY2VHbHlwaE51bWJlcjsKKyAgICAgICAgfQorCiAgICAgICAg IGdseXBoc1tpXSA9IHZhbHVlOwogICAgIH0KIAo= 32201 2009-07-02 15:24:23 -0700 2009-07-02 15:25:34 -0700 patch patch text/plain 3282 agl ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmI4MTk3Zi4uYWNkOTFiYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAwOS0wNy0wMiAgQWRhbSBMYW5nbGV5 ICA8YWdsQGdvb2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQ2hyb21pdW0gTGludXg6IGZpeCBjb21wbGV4IHRleHQgcmVuZGVyaW5nIHdp dGggbGluZSBicmVhayBjaGFyYWN0ZXJzLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yNjkzNQorCisgICAgICAgIElmIHRoZSBDU1Mgd2hpdGUtc3Bh Y2UgcHJvcGVydHkgaXMgaW5oaWJpdGluZyBsaW5lIGJyZWFraW5nLCB3ZSBtaWdodAorICAgICAg ICBmaW5kIGVuZC1vZi1saW5lIGNoYXJhY3RlcnMgcmVuZGVyZWQgdmlhIHRoZSBjb21wbGV4IHRl eHQgcGF0aC4gRm9udHMKKyAgICAgICAgZG9uJ3QgcHJvdmlkZSBnbHlwaHMgZm9yIHRoZXNlIGNv ZGUgcG9pbnRzIHNvLCBpZiB3ZSBmaW5kIG9uZSwgd2UKKyAgICAgICAgc2ltdWxhdGUgdGhlIHNw YWNlIGdseXBoIGJlaW5nIGludGVycG9zZWQgaW4gdGhpcyBjYXNlLiAgQmVjYXVzZSB0aGUKKyAg ICAgICAgaW5wdXQgaXMgdmFyaWFibGUtbGVuZ3RoIHBlciBjb2RlIHBvaW50LCB3ZSB3YWxrIHRo ZSBpbnB1dCBpbiBzdGVwCisgICAgICAgIHdpdGggdGhlIG91dHB1dC4KKworICAgICAgICBDb3Zl cmVkIGJ5OgorICAgICAgICAgICAgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwv YmlkaS1saW5lYnJlYWstMDAyLmh0bWwKKyAgICAgICAgICAgIExheW91dFRlc3RzL2Zhc3QvdGV4 dC9pbnRlcm5hdGlvbmFsL2JpZGktbGluZWJyZWFrLTAwMy5odG1sCisgICAgICAgICAgICBMYXlv dXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9oaW5kaS13aGl0ZXNwYWNlLmh0bWwKKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0hhcmZidXp6U2tpYS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpzdHJpbmdUb0dseXBocyk6CisKIDIwMDktMDctMDIgIERhbiBCZXJu c3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZlIEh5YXR0 IGFuZCBTaW1vbiBGcmFzZXIuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0hhcmZidXp6U2tpYS5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2No cm9taXVtL0hhcmZidXp6U2tpYS5jcHAKaW5kZXggOWZkMDllMS4uNjIxZDY3NCAxMDA2NDQKLS0t IGEvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9IYXJmYnV6elNraWEuY3BwCisr KyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSGFyZmJ1enpTa2lhLmNwcApA QCAtMzAsNiArMzAsNyBAQAogCiAjaW5jbHVkZSAiY29uZmlnLmgiCiAKKyNpbmNsdWRlICJGb250 LmgiCiAjaW5jbHVkZSAiRm9udFBsYXRmb3JtRGF0YS5oIgogI2luY2x1ZGUgInd0Zi9Pd25BcnJh eVB0ci5oIgogCkBAIC00MSw2ICs0Miw3IEBACiAKIGV4dGVybiAiQyIgewogI2luY2x1ZGUgImhh cmZidXp6LXNoYXBlci5oIgorI2luY2x1ZGUgImhhcmZidXp6LXVuaWNvZGUuaCIKIH0KIAogLy8g VGhpcyBmaWxlIGltcGxlbWVudHMgdGhlIGNhbGxiYWNrcyB3aGljaCBIYXJmYnV6eiByZXF1aXJl cyBieSB1c2luZyBTa2lhCkBAIC02NSwxMCArNjcsMjkgQEAgc3RhdGljIEhCX0Jvb2wgc3RyaW5n VG9HbHlwaHMoSEJfRm9udCBoYkZvbnQsIGNvbnN0IEhCX1VDaGFyMTYqIGNoYXJhY3RlcnMsIGhi X3UKIAogICAgIC8vIEhCX0dseXBoIGlzIDMyLWJpdCwgYnV0IFNraWEgb3V0cHV0cyBvbmx5IDE2 LWJpdCBudW1iZXJzLiBTbyBvdXIKICAgICAvLyB8Z2x5cGhzfCBhcnJheSBuZWVkcyB0byBiZSBj b252ZXJ0ZWQuCisgICAgLy8gQWRkaXRpb25hbGx5LCBpZiB0aGUgQ1NTIHdoaXRlLXNwYWNlIHBy b3BlcnR5IGlzIGluaGliaXRpbmcgbGluZQorICAgIC8vIGJyZWFraW5nLCB3ZSBtaWdodCBmaW5k IGVuZC1vZi1saW5lIGNoYXJhY3RvcnMgcmVuZGVyZWQgdmlhIHRoZSBjb21wbGV4CisgICAgLy8g dGV4dCBwYXRoLiBGb250cyBkb24ndCBwcm92aWRlIGdseXBocyBmb3IgdGhlc2UgY29kZSBwb2lu dHMgc28sIGlmIHdlCisgICAgLy8gZmluZCBvbmUsIHdlIHNpbXVsYXRlIHRoZSBzcGFjZSBnbHlw aCBiZWluZyBpbnRlcnBvc2VkIGluIHRoaXMgY2FzZS4KKyAgICAvLyBCZWNhdXNlIHRoZSBpbnB1 dCBpcyB2YXJpYWJsZS1sZW5ndGggcGVyIGNvZGUgcG9pbnQsIHdlIHdhbGsgdGhlIGlucHV0Cisg ICAgLy8gaW4gc3RlcCB3aXRoIHRoZSBvdXRwdXQuCisgICAgLy8gRklYTUU6IGl0IHNlZW1zIHRo YXQgdGhpcyBsb2dpYyBpcyBkdXBsaWNhdGVkIGluIENvcmVUZXh0Q29udHJvbGxlciBhbmQgVW5p c2NyaWJlQ29udHJvbGxlcgorICAgIHNzaXplX3QgaW5kZXhPZk5leHRDb2RlUG9pbnQgPSAwOwor ICAgIHVpbnQxNl90IHNwYWNlR2x5cGhOdW1iZXIgPSAwOwogICAgIGZvciAoaW50IGkgPSBudW1H bHlwaHMgLSAxOyBpID49IDA7IC0taSkgeworICAgICAgICBjb25zdCB1aW50MzJfdCBjdXJyZW50 Q29kZVBvaW50ID0gdXRmMTZfdG9fY29kZV9wb2ludChjaGFyYWN0ZXJzLCBsZW5ndGgsICZpbmRl eE9mTmV4dENvZGVQb2ludCk7CisKICAgICAgICAgdWludDE2X3QgdmFsdWU7CiAgICAgICAgIC8v IFdlIHVzZSBhIG1lbWNweSB0byBhdm9pZCBicmVha2luZyBzdHJpY3QgYWxpYXNpbmcgcnVsZXMu CiAgICAgICAgIG1lbWNweSgmdmFsdWUsIHJlaW50ZXJwcmV0X2Nhc3Q8Y2hhcio+KGdseXBocykg KyBzaXplb2YodWludDE2X3QpICogaSwgc2l6ZW9mKHVpbnQxNl90KSk7CisKKyAgICAgICAgaWYg KCF2YWx1ZSAmJiBGb250Ojp0cmVhdEFzU3BhY2UoY3VycmVudENvZGVQb2ludCkpIHsKKyAgICAg ICAgICAgIHN0YXRpYyBjb25zdCB1aW50MTZfdCBzcGFjZVVURjE2ID0gJyAnOworICAgICAgICAg ICAgaWYgKCFzcGFjZUdseXBoTnVtYmVyKQorICAgICAgICAgICAgICAgIHBhaW50LnRleHRUb0ds eXBocygmc3BhY2VVVEYxNiwgc2l6ZW9mKHNwYWNlVVRGMTYpLCAmc3BhY2VHbHlwaE51bWJlcik7 CisgICAgICAgICAgICB2YWx1ZSA9IHNwYWNlR2x5cGhOdW1iZXI7CisgICAgICAgIH0KKwogICAg ICAgICBnbHlwaHNbaV0gPSB2YWx1ZTsKICAgICB9CiAK