3545 2005-06-15 09:06:56 -0700 Incorrect reordering and mirroring in visually-ordered Hebrew 2005-11-04 00:29:04 -0800 1 1 1 Unclassified WebKit Layout and Rendering 412 Mac OS X 10.4 CLOSED FIXED P2 Normal --- 1 mitz rjw oldest_to_newest 12118 0 mitz 2005-06-15 09:06:56 -0700 Summary: Under certain conditions, reordering of the letters or Unicode mirroring occurs in visually- ordered Hebrew, instead of plain left-to-right ordering and no mirroring. To reproduce: Open the testcase in Safari and in Firefox Expected: Safari should render it like Firefox does (that is, characters should be rendered from left to right unchanged and in the order in which they appear in the source). Actual: Line 1: the full stop (.) and Hebrew letter Bet are rendered in the wrong order. Line 2: the left parenthesis is rendered as a right parenthesis. Line 3: the letter a and the Hebrew letter Aleph are rendered in the wrong order. Line 4: there is no space between the hyphen-minus (-) and the Hebrew letter Aleph. See screenshots for expected and actual. Analysis: Currently visual ordering is accomplished by reversing the order of characters prior to drawing, assuming ATSUI will re-reverse. The problem is that sometimes ATSUI's transformation is not as trivial, and includes more complex reordering and mirroring. The proposed patch accomplishes visual ordering by enclosing the text between Unicode LRO and PDF characters instead of reversing it. The LRO effectively tells ATSUI not to do any re-ordering or mirroring but just render visually from left to right. Since this is a rendering-only (not layout) bug, there's no layout test. 12119 1 2362 mitz 2005-06-15 09:08:06 -0700 Created attachment 2362 testcase 12120 2 2363 mitz 2005-06-15 09:09:36 -0700 Created attachment 2363 actual rendering 12121 3 2364 mitz 2005-06-15 09:10:08 -0700 Created attachment 2364 expected rendering 12124 4 2366 mitz 2005-06-15 09:25:05 -0700 Created attachment 2366 Proposed patch 12131 5 nickshanks 2005-06-15 10:01:20 -0700 With the current ToT, not having applied this patch, I see line 2 rendered correctly not as shown or described above. 12135 6 mitz 2005-06-15 10:16:21 -0700 (In reply to comment #5) > With the current ToT, not having applied this patch, I see line 2 rendered correctly not as shown or > described above. Could this be due to the ATSUI issue mentioned in <http://bugzilla.opendarwin.org/show_bug.cgi? id=3435#c6>? I took the screenshot with the Standard font set to Lucida Grande 14. 12300 7 2366 rjw 2005-06-16 16:11:16 -0700 Comment on attachment 2366 Proposed patch Looks good. It would be better to replace 0x202D and 0x202C with a #define. 12397 8 2417 mitz 2005-06-16 23:24:30 -0700 Created attachment 2417 revised patch Replaced 0x202C and 0x202D with a #define as suggested by rjw. 12450 9 2417 rjw 2005-06-17 10:13:36 -0700 Comment on attachment 2417 revised patch Good to go. I'll commit. Thanks Mitz. 12593 10 c.petersen87 2005-06-18 23:13:48 -0700 Reporter, please mark this bug as Verified if this issue has been fixed in the latest TOT Webkit. 2362 2005-06-15 09:08:06 -0700 2005-06-15 09:08:06 -0700 testcase visualRendering.html text/html 411 mitz PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEgVHJhbnNpdGlvbmFs Ly9FTiIgCiJodHRwOi8vd3d3LnczLm9yZy9UUi9odG1sNC9sb29zZS5kdGQiPgo8aHRtbD4NCjxo ZWFkPg0KPE1FVEEgSFRUUC1FUVVJVj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7 IGNoYXJzZXQ9aXNvLTg4NTktOCI+Cjx0aXRsZT5WaXN1YWwgSGVicmV3IHJlbmRlcmluZzwvdGl0 bGU+DQo8L2hlYWQ+DQo8Ym9keT4NCjxwPjxhIGhyZWY9IiI+JiN4MDVkMTsuPC9hPiYjeDA1ZDA7 PC9wPgo8cD4mI3gwNWQxOygmI3gwNWQwOzwvcD4KPHA+JiN4MDVkMTsoYSYjeDA1ZDA7PC9wPgo8 cD48c3Bhbj4mI3gwNWQxOzwvc3Bhbj4gLTxzcGFuPiAmI3gwNWQwOzwvc3Bhbj48L3A+CjwvYm9k eT4KPC9odG1sPg0K 2363 2005-06-15 09:09:36 -0700 2005-06-15 09:09:36 -0700 actual rendering 3545 actual.png image/png 1700 mitz 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 2364 2005-06-15 09:10:08 -0700 2005-06-15 09:10:08 -0700 expected rendering 3545 expected.png image/png 1669 mitz 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 KXepGAAAAABJRU5ErkJggg== 2366 2005-06-15 09:25:05 -0700 2005-06-16 23:24:30 -0700 Proposed patch 3545_patch.txt text/plain 2039 mitz SW5kZXg6IC4vV2ViS2l0L1dlYkNvcmVTdXBwb3J0LnN1YnByb2ovV2ViVGV4dFJlbmRlcmVyLm0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYktpdC9XZWJDb3JlU3VwcG9ydC5zdWJw cm9qL1dlYlRleHRSZW5kZXJlci5tLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE3MgpkaWZmIC1w IC11IC1yMS4xNzIgLi9XZWJLaXQvV2ViQ29yZVN1cHBvcnQuc3VicHJvai9XZWJUZXh0UmVuZGVy ZXIubQotLS0gLi9XZWJLaXQvV2ViQ29yZVN1cHBvcnQuc3VicHJvai9XZWJUZXh0UmVuZGVyZXIu bQkyMDA1LzA2LzA3IDAwOjU0OjA2CTEuMTcyCisrKyAuL1dlYktpdC9XZWJDb3JlU3VwcG9ydC5z dWJwcm9qL1dlYlRleHRSZW5kZXJlci5tCTIwMDUvMDYvMTUgMTY6MjQ6NTMKQEAgLTE1NzAsMTYg KzE1NzAsMTUgQEAgc3RhdGljIGNvbnN0IGNoYXIgKmpvaW5pbmdOYW1lc1tdID0gewogc3RhdGlj IFdlYkNvcmVUZXh0UnVuIHJldmVyc2VDaGFyYWN0ZXJzSW5SdW4oY29uc3QgV2ViQ29yZVRleHRS dW4gKnJ1bikKIHsKICAgICBXZWJDb3JlVGV4dFJ1biBzd2FwcGVkUnVuOwotICAgIHVuc2lnbmVk IGludCBpOwogICAgIAotICAgIFVuaUNoYXIgKnN3YXBwZWRDaGFyYWN0ZXJzID0gKFVuaUNoYXIg KiltYWxsb2Moc2l6ZW9mKFVuaUNoYXIpKnJ1bi0+bGVuZ3RoKTsKLSAgICBmb3IgKGkgPSAwOyBp IDwgcnVuLT5sZW5ndGg7IGkrKykgewotICAgICAgICBzd2FwcGVkQ2hhcmFjdGVyc1tpXSA9IHJ1 bi0+Y2hhcmFjdGVyc1tydW4tPmxlbmd0aC1pLTFdOwotICAgIH0KKyAgICBVbmlDaGFyICpzd2Fw cGVkQ2hhcmFjdGVycyA9IChVbmlDaGFyICopbWFsbG9jKHNpemVvZihVbmlDaGFyKSoocnVuLT5s ZW5ndGgrMikpOworICAgIG1lbWNweShzd2FwcGVkQ2hhcmFjdGVycysxLCBydW4tPmNoYXJhY3Rl cnMsIHNpemVvZihVbmlDaGFyKSpydW4tPmxlbmd0aCk7CisgICAgc3dhcHBlZFJ1bi5mcm9tID0g cnVuLT5mcm9tOworICAgIHN3YXBwZWRSdW4udG8gPSAocnVuLT50byA9PSAtMSA/IC0xIDogcnVu LT50bysyKTsKKyAgICBzd2FwcGVkUnVuLmxlbmd0aCA9IHJ1bi0+bGVuZ3RoKzI7CisgICAgc3dh cHBlZENoYXJhY3RlcnNbKHN3YXBwZWRSdW4uZnJvbSA9PSAtMSA/IDAgOiBzd2FwcGVkUnVuLmZy b20pXSA9IDB4MjAyRDsgICAvLyBsZWZ0LXRvLXJpZ2h0IG92ZXJyaWRlCisgICAgc3dhcHBlZENo YXJhY3RlcnNbKHN3YXBwZWRSdW4udG8gPT0gLTEgPyBzd2FwcGVkUnVuLmxlbmd0aCA6ICh1bnNp Z25lZClzd2FwcGVkUnVuLnRvKSAtIDFdID0gMHgyMDJDOyAgLy8gcG9wIGRpcmVjdGlvbmFsIGZv cm1hdHRpbmcKICAgICBzd2FwcGVkUnVuLmNoYXJhY3RlcnMgPSBzd2FwcGVkQ2hhcmFjdGVyczsK LSAgICBzd2FwcGVkUnVuLmZyb20gPSBydW4tPmxlbmd0aCAtIChydW4tPnRvID09IC0xID8gKGlu dClydW4tPmxlbmd0aCA6IHJ1bi0+dG8pOwotICAgIHN3YXBwZWRSdW4udG8gPSBydW4tPmxlbmd0 aCAtIChydW4tPmZyb20gPT0gLTEgPyAwIDogcnVuLT5mcm9tKTsKLSAgICBzd2FwcGVkUnVuLmxl bmd0aCA9IHJ1bi0+bGVuZ3RoOwogCiAgICAgcmV0dXJuIHN3YXBwZWRSdW47CiB9CkBAIC0xNzI0 LDcgKzE3MjMsNyBAQCBzdGF0aWMgV2ViQ29yZVRleHRSdW4gcmV2ZXJzZUNoYXJhY3RlcnNJCiAg ICAgY29uc3QgV2ViQ29yZVRleHRSdW4gKmFSdW4gPSBydW47CiAgICAgV2ViQ29yZVRleHRSdW4g c3dhcHBlZFJ1bjsKICAgICAKLSAgICAvLyBSZXZlcnNlIHRoZSB2aXN1YWxseSBvcmRlcmVkIGNo YXJhY3RlcnMuICBBVFNVIHdpbGwgcmUtcmV2ZXJzZS4gIEljayEKKyAgICAvLyBFbmNsb3NlIGlu IExSTy1QREYgdG8gZm9yY2UgQVRTVSB0byByZW5kZXIgdmlzdWFsbHkuCiAgICAgaWYgKHN0eWxl LT52aXN1YWxseU9yZGVyZWQpIHsKICAgICAgICAgc3dhcHBlZFJ1biA9IHJldmVyc2VDaGFyYWN0 ZXJzSW5SdW4ocnVuKTsKICAgICAgICAgYVJ1biA9ICZzd2FwcGVkUnVuOwo= 2417 2005-06-16 23:24:30 -0700 2005-06-17 10:13:36 -0700 revised patch 3545_patch_r2.txt text/plain 2357 mitz SW5kZXg6IC4vV2ViS2l0L1dlYkNvcmVTdXBwb3J0LnN1YnByb2ovV2ViVGV4dFJlbmRlcmVyLm0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYktpdC9XZWJDb3JlU3VwcG9ydC5zdWJw cm9qL1dlYlRleHRSZW5kZXJlci5tLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjE3MgpkaWZmIC1w IC11IC1yMS4xNzIgLi9XZWJLaXQvV2ViQ29yZVN1cHBvcnQuc3VicHJvai9XZWJUZXh0UmVuZGVy ZXIubQotLS0gLi9XZWJLaXQvV2ViQ29yZVN1cHBvcnQuc3VicHJvai9XZWJUZXh0UmVuZGVyZXIu bQkyMDA1LzA2LzA3IDAwOjU0OjA2CTEuMTcyCisrKyAuL1dlYktpdC9XZWJDb3JlU3VwcG9ydC5z dWJwcm9qL1dlYlRleHRSZW5kZXJlci5tCTIwMDUvMDYvMTcgMDY6MjA6NDIKQEAgLTUyLDYgKzUy LDggQEAKICNkZWZpbmUgU1BBQ0UgMHgwMDIwCiAjZGVmaW5lIE5PX0JSRUFLX1NQQUNFIDB4MDBB MAogI2RlZmluZSBaRVJPX1dJRFRIX1NQQUNFIDB4MjAwQgorI2RlZmluZSBQT1BfRElSRUNUSU9O QUxfRk9STUFUVElORyAweDIwMkMKKyNkZWZpbmUgTEVGVF9UT19SSUdIVF9PVkVSUklERSAweDIw MkQKIAogLy8gTG9zZSBwcmVjaXNpb24gYmV5b25kIDEwMDB0aHMgcGxhY2UuIFRoaXMgaXMgdG8g d29yayBhcm91bmQgYW4gYXBwYXJlbnQKIC8vIGJ1ZyBpbiBDb3JlR3JhcGhpY3Mgd2hlcmUgdGhl cmUgc2VlbSB0byBiZSBzbWFsbCBlcnJvcnMgdG8gc29tZSBtZXRyaWNzLgpAQCAtMTU3MCwxNiAr MTU3MiwxNSBAQCBzdGF0aWMgY29uc3QgY2hhciAqam9pbmluZ05hbWVzW10gPSB7CiBzdGF0aWMg V2ViQ29yZVRleHRSdW4gcmV2ZXJzZUNoYXJhY3RlcnNJblJ1bihjb25zdCBXZWJDb3JlVGV4dFJ1 biAqcnVuKQogewogICAgIFdlYkNvcmVUZXh0UnVuIHN3YXBwZWRSdW47Ci0gICAgdW5zaWduZWQg aW50IGk7CiAgICAgCi0gICAgVW5pQ2hhciAqc3dhcHBlZENoYXJhY3RlcnMgPSAoVW5pQ2hhciAq KW1hbGxvYyhzaXplb2YoVW5pQ2hhcikqcnVuLT5sZW5ndGgpOwotICAgIGZvciAoaSA9IDA7IGkg PCBydW4tPmxlbmd0aDsgaSsrKSB7Ci0gICAgICAgIHN3YXBwZWRDaGFyYWN0ZXJzW2ldID0gcnVu LT5jaGFyYWN0ZXJzW3J1bi0+bGVuZ3RoLWktMV07Ci0gICAgfQorICAgIFVuaUNoYXIgKnN3YXBw ZWRDaGFyYWN0ZXJzID0gKFVuaUNoYXIgKiltYWxsb2Moc2l6ZW9mKFVuaUNoYXIpKihydW4tPmxl bmd0aCsyKSk7CisgICAgbWVtY3B5KHN3YXBwZWRDaGFyYWN0ZXJzKzEsIHJ1bi0+Y2hhcmFjdGVy cywgc2l6ZW9mKFVuaUNoYXIpKnJ1bi0+bGVuZ3RoKTsKKyAgICBzd2FwcGVkUnVuLmZyb20gPSBy dW4tPmZyb207CisgICAgc3dhcHBlZFJ1bi50byA9IChydW4tPnRvID09IC0xID8gLTEgOiBydW4t PnRvKzIpOworICAgIHN3YXBwZWRSdW4ubGVuZ3RoID0gcnVuLT5sZW5ndGgrMjsKKyAgICBzd2Fw cGVkQ2hhcmFjdGVyc1soc3dhcHBlZFJ1bi5mcm9tID09IC0xID8gMCA6IHN3YXBwZWRSdW4uZnJv bSldID0gTEVGVF9UT19SSUdIVF9PVkVSUklERTsKKyAgICBzd2FwcGVkQ2hhcmFjdGVyc1soc3dh cHBlZFJ1bi50byA9PSAtMSA/IHN3YXBwZWRSdW4ubGVuZ3RoIDogKHVuc2lnbmVkKXN3YXBwZWRS dW4udG8pIC0gMV0gPSBQT1BfRElSRUNUSU9OQUxfRk9STUFUVElORzsKICAgICBzd2FwcGVkUnVu LmNoYXJhY3RlcnMgPSBzd2FwcGVkQ2hhcmFjdGVyczsKLSAgICBzd2FwcGVkUnVuLmZyb20gPSBy dW4tPmxlbmd0aCAtIChydW4tPnRvID09IC0xID8gKGludClydW4tPmxlbmd0aCA6IHJ1bi0+dG8p OwotICAgIHN3YXBwZWRSdW4udG8gPSBydW4tPmxlbmd0aCAtIChydW4tPmZyb20gPT0gLTEgPyAw IDogcnVuLT5mcm9tKTsKLSAgICBzd2FwcGVkUnVuLmxlbmd0aCA9IHJ1bi0+bGVuZ3RoOwogCiAg ICAgcmV0dXJuIHN3YXBwZWRSdW47CiB9CkBAIC0xNzI0LDcgKzE3MjUsNyBAQCBzdGF0aWMgV2Vi Q29yZVRleHRSdW4gcmV2ZXJzZUNoYXJhY3RlcnNJCiAgICAgY29uc3QgV2ViQ29yZVRleHRSdW4g KmFSdW4gPSBydW47CiAgICAgV2ViQ29yZVRleHRSdW4gc3dhcHBlZFJ1bjsKICAgICAKLSAgICAv LyBSZXZlcnNlIHRoZSB2aXN1YWxseSBvcmRlcmVkIGNoYXJhY3RlcnMuICBBVFNVIHdpbGwgcmUt cmV2ZXJzZS4gIEljayEKKyAgICAvLyBFbmNsb3NlIGluIExSTy1QREYgdG8gZm9yY2UgQVRTVSB0 byByZW5kZXIgdmlzdWFsbHkuCiAgICAgaWYgKHN0eWxlLT52aXN1YWxseU9yZGVyZWQpIHsKICAg ICAgICAgc3dhcHBlZFJ1biA9IHJldmVyc2VDaGFyYWN0ZXJzSW5SdW4ocnVuKTsKICAgICAgICAg YVJ1biA9ICZzd2FwcGVkUnVuOwo=