67869 2011-09-09 15:34:35 -0700 Improve hit testing at boundaries of bidi text 2011-09-12 10:31:52 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 57340 1 rniwa webkit-unassigned eric hyatt mitz playmobil xji oldest_to_newest 465062 0 rniwa 2011-09-09 15:34:35 -0700 We need to improve createVisiblePositionAfterAdjustingOffsetForBiDi in order to resolve the bug 57340. 465169 1 rniwa 2011-09-09 18:45:27 -0700 On second thought, the change I had locally would diverge the behavior of WebKit from that of NSTextView so I probably shouldn't do it. 465665 2 107063 rniwa 2011-09-12 10:31:52 -0700 Created attachment 107063 work in progress 107063 2011-09-12 10:31:52 -0700 2011-09-12 10:31:52 -0700 work in progress wip67869 text/plain 5243 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAJKHJldmlzaW9uIDk0 ODYzKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC01MjYsMjMgKzUyNiw0MiBAQAogICAgIGlmIChvZmZzZXQgJiYgc3RhdGljX2Nh c3Q8dW5zaWduZWQ+KG9mZnNldCkgPCBib3gtPmxlbigpKQogICAgICAgICByZXR1cm4gY3JlYXRl VmlzaWJsZVBvc2l0aW9uRm9yQm94KGJveCwgYm94LT5zdGFydCgpICsgb2Zmc2V0LCBzaG91bGRB ZmZpbml0eUJlRG93bnN0cmVhbSk7CiAKKyAgICBUZXh0RGlyZWN0aW9uIGJsb2NrRGlyZWN0aW9u ID0gYm94LT5yZW5kZXJlcigpLT5jb250YWluaW5nQmxvY2soKS0+c3R5bGUoKS0+ZGlyZWN0aW9u KCk7CiAgICAgYm9vbCBwb3NpdGlvbklzQXRTdGFydE9mQm94ID0gIW9mZnNldDsKICAgICBpZiAo cG9zaXRpb25Jc0F0U3RhcnRPZkJveCA9PSBib3gtPmlzTGVmdFRvUmlnaHREaXJlY3Rpb24oKSkg ewogICAgICAgICAvLyBvZmZzZXQgaXMgb24gdGhlIGxlZnQgZWRnZQogCiAgICAgICAgIGNvbnN0 IElubGluZUJveCogcHJldkJveCA9IGJveC0+cHJldkxlYWZDaGlsZCgpOwotICAgICAgICBpZiAo KHByZXZCb3ggJiYgcHJldkJveC0+YmlkaUxldmVsKCkgPT0gYm94LT5iaWRpTGV2ZWwoKSkKLSAg ICAgICAgICAgIHx8IGJveC0+cmVuZGVyZXIoKS0+Y29udGFpbmluZ0Jsb2NrKCktPnN0eWxlKCkt PmRpcmVjdGlvbigpID09IGJveC0+ZGlyZWN0aW9uKCkpIC8vIEZJWE1FOiBsZWZ0IG9uIDEyQ0JB CisgICAgICAgIGlmIChwcmV2Qm94ICYmIHByZXZCb3gtPmJpZGlMZXZlbCgpID09IGJveC0+Ymlk aUxldmVsKCkpCiAgICAgICAgICAgICByZXR1cm4gY3JlYXRlVmlzaWJsZVBvc2l0aW9uRm9yQm94 KGJveCwgYm94LT5jYXJldExlZnRtb3N0T2Zmc2V0KCksIHNob3VsZEFmZmluaXR5QmVEb3duc3Ry ZWFtKTsKIAotICAgICAgICBpZiAocHJldkJveCAmJiBwcmV2Qm94LT5iaWRpTGV2ZWwoKSA+IGJv eC0+YmlkaUxldmVsKCkpIHsKLSAgICAgICAgICAgIC8vIGUuZy4gbGVmdCBvZiBCIGluIGFEQzEy QkFiCisgICAgICAgIHVuc2lnbmVkIGNoYXIgYmlkaUxldmVsT25MZWZ0ID0gcHJldkJveCA/IHBy ZXZCb3gtPmJpZGlMZXZlbCgpIDogKGJsb2NrRGlyZWN0aW9uID09IExUUiA/IDAgOiAxKTsKKyAg ICAgICAgaWYgKGJsb2NrRGlyZWN0aW9uID09IGJveC0+ZGlyZWN0aW9uKCkpIHsKKyAgICAgICAg ICAgIGlmIChiaWRpTGV2ZWxPbkxlZnQgPCBib3gtPmJpZGlMZXZlbCgpKSB7CisgICAgICAgICAg ICAgICAgLy8gZS5nLiBsZWZ0IG9uIDEyQ0JBICgxMiBhcHBlYXJzIGFmdGVyIEFCQyBpbiBsb2dp Y2FsIG9yZGVyKQorICAgICAgICAgICAgICAgIGNvbnN0IElubGluZUJveCogcmlnaHRtb3N0Qm94 OworICAgICAgICAgICAgICAgIGNvbnN0IElubGluZUJveCogbmV4dEJveCA9IGJveDsKKyAgICAg ICAgICAgICAgICBkbyB7CisgICAgICAgICAgICAgICAgICAgIHJpZ2h0bW9zdEJveCA9IG5leHRC b3g7CisgICAgICAgICAgICAgICAgICAgIG5leHRCb3ggPSByaWdodG1vc3RCb3gtPm5leHRMZWFm Q2hpbGQoKTsKKyAgICAgICAgICAgICAgICB9IHdoaWxlIChuZXh0Qm94ICYmIG5leHRCb3gtPmJp ZGlMZXZlbCgpID4gYmlkaUxldmVsT25MZWZ0KTsKKyAgICAgICAgICAgICAgICByZXR1cm4gY3Jl YXRlVmlzaWJsZVBvc2l0aW9uRm9yQm94KHJpZ2h0bW9zdEJveCwgYm94LT5pc0xlZnRUb1JpZ2h0 RGlyZWN0aW9uKCkgPyByaWdodG1vc3RCb3gtPmNhcmV0TWluT2Zmc2V0KCkgOiByaWdodG1vc3RC b3gtPmNhcmV0TWF4T2Zmc2V0KCksIHNob3VsZEFmZmluaXR5QmVEb3duc3RyZWFtKTsKKyAgICAg ICAgICAgIH0KKworICAgICAgICAgICAgcmV0dXJuIGNyZWF0ZVZpc2libGVQb3NpdGlvbkZvckJv eChib3gsIGJveC0+Y2FyZXRMZWZ0bW9zdE9mZnNldCgpLCBzaG91bGRBZmZpbml0eUJlRG93bnN0 cmVhbSk7CisgICAgICAgIH0KKworICAgICAgICBpZiAoYmlkaUxldmVsT25MZWZ0ID4gYm94LT5i aWRpTGV2ZWwoKSkgeworICAgICAgICAgICAgLy8gZS5nLiBsZWZ0IG9mIEIgaW4gYURDMTJCQWIg KEFCMTJDRCBpcyBhIFJUTCBydW4pCiAgICAgICAgICAgICBjb25zdCBJbmxpbmVCb3gqIGxlZnRt b3N0Qm94OwogICAgICAgICAgICAgZG8gewogICAgICAgICAgICAgICAgIGxlZnRtb3N0Qm94ID0g cHJldkJveDsKICAgICAgICAgICAgICAgICBwcmV2Qm94ID0gbGVmdG1vc3RCb3gtPnByZXZMZWFm Q2hpbGQoKTsKICAgICAgICAgICAgIH0gd2hpbGUgKHByZXZCb3ggJiYgcHJldkJveC0+YmlkaUxl dmVsKCkgPiBib3gtPmJpZGlMZXZlbCgpKTsKLSAgICAgICAgICAgIHJldHVybiBjcmVhdGVWaXNp YmxlUG9zaXRpb25Gb3JCb3gobGVmdG1vc3RCb3gsIGxlZnRtb3N0Qm94LT5jYXJldFJpZ2h0bW9z dE9mZnNldCgpLCBzaG91bGRBZmZpbml0eUJlRG93bnN0cmVhbSk7CisgICAgICAgICAgICBpZiAo cHJldkJveCkKKyAgICAgICAgICAgICAgICByZXR1cm4gY3JlYXRlVmlzaWJsZVBvc2l0aW9uRm9y Qm94KGxlZnRtb3N0Qm94LCBsZWZ0bW9zdEJveC0+Y2FyZXRSaWdodG1vc3RPZmZzZXQoKSwgc2hv dWxkQWZmaW5pdHlCZURvd25zdHJlYW0pOworICAgICAgICAgICAgLy8gZS5nLiBsZWZ0IG9mIEMg aW4gMTJDQkEKKyAgICAgICAgICAgIHJldHVybiBjcmVhdGVWaXNpYmxlUG9zaXRpb25Gb3JCb3go Ym94LCBib3gtPmNhcmV0TGVmdG1vc3RPZmZzZXQoKSwgc2hvdWxkQWZmaW5pdHlCZURvd25zdHJl YW0pOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKCFwcmV2Qm94IHx8IHByZXZCb3gtPmJpZGlM ZXZlbCgpIDwgYm94LT5iaWRpTGV2ZWwoKSkgewpAQCAtNTYwLDIwICs1NzksMzYgQEAKICAgICAg ICAgcmV0dXJuIGNyZWF0ZVZpc2libGVQb3NpdGlvbkZvckJveChib3gsIGJveC0+Y2FyZXRSaWdo dG1vc3RPZmZzZXQoKSwgc2hvdWxkQWZmaW5pdHlCZURvd25zdHJlYW0pOwogICAgIH0KIAorICAg IC8vIG9mZnNldCBpcyBvbiB0aGUgcmlnaHQgZWRnZQogICAgIGNvbnN0IElubGluZUJveCogbmV4 dEJveCA9IGJveC0+bmV4dExlYWZDaGlsZCgpOwotICAgIGlmICgobmV4dEJveCAmJiBuZXh0Qm94 LT5iaWRpTGV2ZWwoKSA9PSBib3gtPmJpZGlMZXZlbCgpKQotICAgICAgICB8fCBib3gtPnJlbmRl cmVyKCktPmNvbnRhaW5pbmdCbG9jaygpLT5zdHlsZSgpLT5kaXJlY3Rpb24oKSA9PSBib3gtPmRp cmVjdGlvbigpKQorICAgIGlmIChuZXh0Qm94ICYmIG5leHRCb3gtPmJpZGlMZXZlbCgpID09IGJv eC0+YmlkaUxldmVsKCkpCiAgICAgICAgIHJldHVybiBjcmVhdGVWaXNpYmxlUG9zaXRpb25Gb3JC b3goYm94LCBib3gtPmNhcmV0UmlnaHRtb3N0T2Zmc2V0KCksIHNob3VsZEFmZmluaXR5QmVEb3du c3RyZWFtKTsKIAotICAgIC8vIG9mZnNldCBpcyBvbiB0aGUgcmlnaHQgZWRnZQotICAgIGlmIChu ZXh0Qm94ICYmIG5leHRCb3gtPmJpZGlMZXZlbCgpID4gYm94LT5iaWRpTGV2ZWwoKSkgeworICAg IHVuc2lnbmVkIGNoYXIgYmlkaUxldmVsT25SaWdodCA9IG5leHRCb3ggPyBuZXh0Qm94LT5iaWRp TGV2ZWwoKSA6IChibG9ja0RpcmVjdGlvbiA9PSBMVFIgPyAwIDogMSk7CisgICAgaWYgKGJveC0+ cmVuZGVyZXIoKS0+Y29udGFpbmluZ0Jsb2NrKCktPnN0eWxlKCktPmRpcmVjdGlvbigpID09IGJv eC0+ZGlyZWN0aW9uKCkpIHsKKyAgICAgICAgaWYgKGJpZGlMZXZlbE9uUmlnaHQgPCBib3gtPmJp ZGlMZXZlbCgpKSB7CisgICAgICAgICAgICBjb25zdCBJbmxpbmVCb3gqIGxlZnRtb3N0Qm94Owor ICAgICAgICAgICAgY29uc3QgSW5saW5lQm94KiBuZXh0Qm94ID0gYm94OworICAgICAgICAgICAg ZG8geworICAgICAgICAgICAgICAgIGxlZnRtb3N0Qm94ID0gbmV4dEJveDsKKyAgICAgICAgICAg ICAgICBuZXh0Qm94ID0gbGVmdG1vc3RCb3gtPnByZXZMZWFmQ2hpbGQoKTsKKyAgICAgICAgICAg IH0gd2hpbGUgKG5leHRCb3ggJiYgbmV4dEJveC0+YmlkaUxldmVsKCkgPiBiaWRpTGV2ZWxPblJp Z2h0KTsKKyAgICAgICAgICAgIHJldHVybiBjcmVhdGVWaXNpYmxlUG9zaXRpb25Gb3JCb3gobGVm dG1vc3RCb3gsIGJveC0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID8gbGVmdG1vc3RCb3gtPmNh cmV0TWF4T2Zmc2V0KCkgOiBsZWZ0bW9zdEJveC0+Y2FyZXRNaW5PZmZzZXQoKSwgc2hvdWxkQWZm aW5pdHlCZURvd25zdHJlYW0pOworICAgICAgICB9CisKKyAgICAgICAgcmV0dXJuIGNyZWF0ZVZp c2libGVQb3NpdGlvbkZvckJveChib3gsIGJveC0+Y2FyZXRSaWdodG1vc3RPZmZzZXQoKSwgc2hv dWxkQWZmaW5pdHlCZURvd25zdHJlYW0pOworICAgIH0KKyAgICAKKyAgICBpZiAoYmlkaUxldmVs T25SaWdodCA+IGJveC0+YmlkaUxldmVsKCkpIHsKICAgICAgICAgLy8gZS5nLiByaWdodCBvZiBD IGluIGFEQzEyQkFiCiAgICAgICAgIGNvbnN0IElubGluZUJveCogcmlnaHRtb3N0Qm94OwogICAg ICAgICBkbyB7CiAgICAgICAgICAgICByaWdodG1vc3RCb3ggPSBuZXh0Qm94OwogICAgICAgICAg ICAgbmV4dEJveCA9IHJpZ2h0bW9zdEJveC0+bmV4dExlYWZDaGlsZCgpOwogICAgICAgICB9IHdo aWxlIChuZXh0Qm94ICYmIG5leHRCb3gtPmJpZGlMZXZlbCgpID4gYm94LT5iaWRpTGV2ZWwoKSk7 Ci0gICAgICAgIHJldHVybiBjcmVhdGVWaXNpYmxlUG9zaXRpb25Gb3JCb3gocmlnaHRtb3N0Qm94 LCByaWdodG1vc3RCb3gtPmNhcmV0TGVmdG1vc3RPZmZzZXQoKSwgc2hvdWxkQWZmaW5pdHlCZURv d25zdHJlYW0pOworICAgICAgICBpZiAobmV4dEJveCkKKyAgICAgICAgICAgIHJldHVybiBjcmVh dGVWaXNpYmxlUG9zaXRpb25Gb3JCb3gocmlnaHRtb3N0Qm94LCByaWdodG1vc3RCb3gtPmNhcmV0 TGVmdG1vc3RPZmZzZXQoKSwgc2hvdWxkQWZmaW5pdHlCZURvd25zdHJlYW0pOworICAgICAgICBy ZXR1cm4gY3JlYXRlVmlzaWJsZVBvc2l0aW9uRm9yQm94KGJveCwgYm94LT5jYXJldFJpZ2h0bW9z dE9mZnNldCgpLCBzaG91bGRBZmZpbml0eUJlRG93bnN0cmVhbSk7CiAgICAgfQogCiAgICAgaWYg KCFuZXh0Qm94IHx8IG5leHRCb3gtPmJpZGlMZXZlbCgpIDwgYm94LT5iaWRpTGV2ZWwoKSkgewo=