97378 2012-09-21 16:28:45 -0700 Update ComplexTextController for 8 bit TextRun changes 2022-02-27 23:32:55 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 99393 1 msaboff msaboff benjamin eric webkit.review.bot oldest_to_newest 725950 0 msaboff 2012-09-21 16:28:45 -0700 Update ComplexTextController so that it works with 8 bit TextRun's. It will need to up convert an 8 bit TextRun to 16 bit data unless we go through some major refactoring of the complex path. 725981 1 165227 msaboff 2012-09-21 16:55:40 -0700 Created attachment 165227 Patch 726230 2 165227 ggaren 2012-09-22 23:30:59 -0700 Comment on attachment 165227 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=165227&action=review > Source/WebCore/platform/graphics/mac/ComplexTextController.cpp:299 > + String stringFor8BitRun = String::make16BitFrom8BitSource(m_run.characters8(), m_run.length()); Why did you choose not to call m_run.characters() here? 726384 3 msaboff 2012-09-23 22:07:04 -0700 (In reply to comment #2) > (From update of attachment 165227 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=165227&action=review > > > Source/WebCore/platform/graphics/mac/ComplexTextController.cpp:299 > > + String stringFor8BitRun = String::make16BitFrom8BitSource(m_run.characters8(), m_run.length()); > > Why did you choose not to call m_run.characters() here? m_run is a TextRun and TextRun doesn't have a characters() method. TextRun stores data in a union of LChar* / UChar* pointers and not a String. 728235 4 165227 ggaren 2012-09-25 23:32:11 -0700 Comment on attachment 165227 Patch r=me 728706 5 msaboff 2012-09-26 10:26:01 -0700 Committed r129664: <http://trac.webkit.org/changeset/129664> 165227 2012-09-21 16:55:40 -0700 2022-02-27 23:32:55 -0800 Patch 97378.patch text/plain 5753 msaboff SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAxMjkyNzMpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA5LTIxICBNaWNoYWVsIFNhYm9mZiAgPG1z YWJvZmZAYXBwbGUuY29tPgorCisgICAgICAgIFVwZGF0ZSBDb21wbGV4VGV4dENvbnRyb2xsZXIg Zm9yIDggYml0IFRleHRSdW4gY2hhbmdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9OTczNzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgY3JlYXRlIG1ldGhvZCB0byBtYWtlIGEgMTYgYml0 IHN0cmluZyBmcm9tIDggYml0IHNvdXJjZSBkYXRhLiAgVGhpcyBpcyB1c2VkIGluIAorICAgICAg ICBDb21wbGV4VGV4dENvbnRyb2xsZXIgd2hlbiB3ZSBoYXZlIExDaGFyKiArIGxlbmd0aCB0ZXh0 IGRhdGEsIGJ1dCB3ZSByZWFsbHkgd2FudCAxNiBiaXQKKyAgICAgICAgZGF0YSBmb3IgdGhlIGNv bXBsZXggdGV4dCByZW5kZXJpbmcgY29kZS4KKworICAgICAgICAqIHd0Zi90ZXh0L1dURlN0cmlu Zy5jcHA6CisgICAgICAgIChXVEY6OlN0cmluZzo6bWFrZTE2Qml0RnJvbThCaXRTb3VyY2UpOgor ICAgICAgICAoV1RGKToKKyAgICAgICAgKiB3dGYvdGV4dC9XVEZTdHJpbmcuaDoKKyAgICAgICAg KFN0cmluZyk6CisKIDIwMTItMDktMjEgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5A ZGlnaWEuY29tPgogCiAgICAgICAgIFtRdF0gRXJyb3Igb3V0IGVhcmx5IGlmIHdlIGRvbid0IGhh dmUgSUNVIGF2YWlsYWJsZQpJbmRleDogU291cmNlL1dURi93dGYvdGV4dC9XVEZTdHJpbmcuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvd3RmL3RleHQvV1RGU3RyaW5nLmNwcAkocmV2aXNp b24gMTI4NzE0KQorKysgU291cmNlL1dURi93dGYvdGV4dC9XVEZTdHJpbmcuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC03NzcsNiArNzc3LDE5IEBAIFN0cmluZyBTdHJpbmc6Om1ha2U4Qml0RnJvbTE2 Qml0U291cmNlKGMKICAgICByZXR1cm4gcmVzdWx0OwogfQogCitTdHJpbmcgU3RyaW5nOjptYWtl MTZCaXRGcm9tOEJpdFNvdXJjZShjb25zdCBMQ2hhciogc291cmNlLCBzaXplX3QgbGVuZ3RoKQor eworICAgIGlmICghbGVuZ3RoKQorICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgCisgICAg VUNoYXIqIGRlc3RpbmF0aW9uOworICAgIFN0cmluZyByZXN1bHQgPSBTdHJpbmc6OmNyZWF0ZVVu aW5pdGlhbGl6ZWQobGVuZ3RoLCBkZXN0aW5hdGlvbik7CisgICAgCisgICAgU3RyaW5nSW1wbDo6 Y29weUNoYXJzKGRlc3RpbmF0aW9uLCBzb3VyY2UsIGxlbmd0aCk7CisgICAgCisgICAgcmV0dXJu IHJlc3VsdDsKK30KKwogU3RyaW5nIFN0cmluZzo6ZnJvbVVURjgoY29uc3QgTENoYXIqIHN0cmlu Z1N0YXJ0LCBzaXplX3QgbGVuZ3RoKQogewogICAgIGlmIChsZW5ndGggPiBudW1lcmljX2xpbWl0 czx1bnNpZ25lZD46Om1heCgpKQpJbmRleDogU291cmNlL1dURi93dGYvdGV4dC9XVEZTdHJpbmcu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0Zi90ZXh0L1dURlN0cmluZy5oCShyZXZpc2lv biAxMjg3MTQpCisrKyBTb3VyY2UvV1RGL3d0Zi90ZXh0L1dURlN0cmluZy5oCSh3b3JraW5nIGNv cHkpCkBAIC00MTQsNiArNDE0LDcgQEAgcHVibGljOgogI2VuZGlmCiAKICAgICBXVEZfRVhQT1JU X1NUUklOR19BUEkgc3RhdGljIFN0cmluZyBtYWtlOEJpdEZyb20xNkJpdFNvdXJjZShjb25zdCBV Q2hhciosIHNpemVfdCk7CisgICAgV1RGX0VYUE9SVF9TVFJJTkdfQVBJIHN0YXRpYyBTdHJpbmcg bWFrZTE2Qml0RnJvbThCaXRTb3VyY2UoY29uc3QgTENoYXIqLCBzaXplX3QpOwogCiAgICAgLy8g U3RyaW5nOjpmcm9tVVRGOCB3aWxsIHJldHVybiBhIG51bGwgc3RyaW5nIGlmCiAgICAgLy8gdGhl IGlucHV0IGRhdGEgY29udGFpbnMgaW52YWxpZCBVVEYtOCBzZXF1ZW5jZXMuCkluZGV4OiBTb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCShyZXZpc2lvbiAxMjkyNzMpCisrKyBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtp bmcgY29weSkKQEAgLTEsMyArMSwyMSBAQAorMjAxMi0wOS0yMSAgTWljaGFlbCBTYWJvZmYgIDxt c2Fib2ZmQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgQ29tcGxleFRleHRDb250cm9sbGVy IGZvciA4IGJpdCBUZXh0UnVuIGNoYW5nZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTk3Mzc4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgU2luY2UgdGhlIENvbXBsZXh0VGV4dENvbnRyb2xsZXIgY29kZSBp cyBwcmltYXJpbHkgdXNlZCBmb3IgVUNoYXIgZGF0YSwganVzdCB1cGNvbnZlcnQgYW4gOCBiaXQK KyAgICAgICAgVGV4dFJ1biBpbnRvIGEgbmV3IFN0cmluZyBhbmQgaG9sZCBvbiB0byB0aGUgU3Ry aW5nIHdpdGggYSB2ZWN0b3IgZm9yIHRoZSBsaWZlIG9mIHRoZSBjb250cm9sbGVyLgorCisgICAg ICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LCB0aGVyZWZvcmUgbm8gbmV3IHRlc3RzLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpDb21wbGV4VGV4dENvbnRyb2xsZXI6OkNvbXBsZXhUZXh0 Q29udHJvbGxlcik6CisgICAgICAgIChXZWJDb3JlOjpDb21wbGV4VGV4dENvbnRyb2xsZXI6OmNv bGxlY3RDb21wbGV4VGV4dFJ1bnMpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL21hYy9D b21wbGV4VGV4dENvbnRyb2xsZXIuaDoKKyAgICAgICAgKENvbXBsZXhUZXh0Q29udHJvbGxlcik6 CisKIDIwMTItMDktMjEgIEtlbmljaGkgSXNoaWJhc2hpICA8YmFzaGlAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFtDaHJvbWl1bV0gVXNlIE9wZW5UeXBlVmVydGljYWxEYXRhIG9uIExpbnV4Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvQ29tcGxleFRleHRDb250 cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9tYWMvQ29tcGxleFRleHRDb250cm9sbGVyLmNwcAkocmV2aXNpb24gMTI4NzE0KQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlci5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTE0Nyw3ICsxNDcsMTEgQEAgQ29tcGxleFRleHRDb250cm9s bGVyOjpDb21wbGV4VGV4dENvbnRybwogICAgICAgICBtX2V4cGFuc2lvblBlck9wcG9ydHVuaXR5 ID0gMDsKICAgICBlbHNlIHsKICAgICAgICAgYm9vbCBpc0FmdGVyRXhwYW5zaW9uID0gbV9hZnRl ckV4cGFuc2lvbjsKLSAgICAgICAgdW5zaWduZWQgZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCA9 IEZvbnQ6OmV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQobV9ydW4uY2hhcmFjdGVyczE2KCksIG1f ZW5kLCBtX3J1bi5sdHIoKSA/IExUUiA6IFJUTCwgaXNBZnRlckV4cGFuc2lvbik7CisgICAgICAg IHVuc2lnbmVkIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQ7CisgICAgICAgIGlmIChtX3J1bi5p czhCaXQoKSkKKyAgICAgICAgICAgIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQgPSBGb250Ojpl eHBhbnNpb25PcHBvcnR1bml0eUNvdW50KG1fcnVuLmNoYXJhY3RlcnM4KCksIG1fZW5kLCBtX3J1 bi5sdHIoKSA/IExUUiA6IFJUTCwgaXNBZnRlckV4cGFuc2lvbik7CisgICAgICAgICBlbHNlCisg ICAgICAgICAgICAgZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCA9IEZvbnQ6OmV4cGFuc2lvbk9w cG9ydHVuaXR5Q291bnQobV9ydW4uY2hhcmFjdGVyczE2KCksIG1fZW5kLCBtX3J1bi5sdHIoKSA/ IExUUiA6IFJUTCwgaXNBZnRlckV4cGFuc2lvbik7CiAgICAgICAgIGlmIChpc0FmdGVyRXhwYW5z aW9uICYmICFtX3J1bi5hbGxvd3NUcmFpbGluZ0V4cGFuc2lvbigpKQogICAgICAgICAgICAgZXhw YW5zaW9uT3Bwb3J0dW5pdHlDb3VudC0tOwogCkBAIC0yODksNyArMjkzLDE0IEBAIHZvaWQgQ29t cGxleFRleHRDb250cm9sbGVyOjpjb2xsZWN0Q29tcGwKICAgICAgICAgcmV0dXJuOwogCiAgICAg Ly8gV2UgYnJlYWsgdXAgZ2x5cGggcnVuIGdlbmVyYXRpb24gZm9yIHRoZSBzdHJpbmcgYnkgRm9u dERhdGEuCi0gICAgY29uc3QgVUNoYXIqIGNwID0gbV9ydW4uY2hhcmFjdGVyczE2KCk7CisgICAg Y29uc3QgVUNoYXIqIGNwOworCisgICAgaWYgKG1fcnVuLmlzOEJpdCgpKSB7CisgICAgICAgIFN0 cmluZyBzdHJpbmdGb3I4Qml0UnVuID0gU3RyaW5nOjptYWtlMTZCaXRGcm9tOEJpdFNvdXJjZSht X3J1bi5jaGFyYWN0ZXJzOCgpLCBtX3J1bi5sZW5ndGgoKSk7CisgICAgICAgIGNwID0gc3RyaW5n Rm9yOEJpdFJ1bi5jaGFyYWN0ZXJzMTYoKTsKKyAgICAgICAgbV9zdHJpbmdzRm9yOEJpdFJ1bnMu YXBwZW5kKHN0cmluZ0ZvcjhCaXRSdW4pOworICAgIH0gZWxzZQorICAgICAgICBjcCA9IG1fcnVu LmNoYXJhY3RlcnMxNigpOwogCiAgICAgaWYgKG1fZm9udC5pc1NtYWxsQ2FwcygpKQogICAgICAg ICBtX3NtYWxsQ2Fwc0J1ZmZlci5yZXNpemUobV9lbmQpOwpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4VGV4dENvbnRy b2xsZXIuaAkocmV2aXNpb24gMTI4NzE0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2 ICszMSw3IEBACiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KICNpbmNsdWRlIDx3dGYvUmV0 YWluUHRyLmg+CiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgorI2luY2x1ZGUgPHd0Zi90ZXh0L1dU RlN0cmluZy5oPgogI2luY2x1ZGUgPHd0Zi91bmljb2RlL1VuaWNvZGUuaD4KIAogdHlwZWRlZiB1 bnNpZ25lZCBzaG9ydCBDR0dseXBoOwpAQCAtMTQzLDYgKzE0NCw3IEBAIHByaXZhdGU6CiAgICAg Ym9vbCBtX21heVVzZU5hdHVyYWxXcml0aW5nRGlyZWN0aW9uOwogICAgIGJvb2wgbV9mb3JUZXh0 RW1waGFzaXM7CiAKKyAgICBWZWN0b3I8U3RyaW5nPiBtX3N0cmluZ3NGb3I4Qml0UnVuczsKICAg ICBWZWN0b3I8VUNoYXIsIDI1Nj4gbV9zbWFsbENhcHNCdWZmZXI7CiAKICAgICAvLyBSZXRhaW4g bGluZXMgcmF0aGVyIHRoYW4gdGhlaXIgcnVucyBmb3IgYmV0dGVyIHBlcmZvcm1hbmNlLgo=