86904 2012-05-18 14:46:39 -0700 Revert to float method of selection rect alignment for line box tree 2012-05-18 16:57:51 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 85555 1 leviw leviw eae eric webkit.review.bot oldest_to_newest 628101 0 leviw 2012-05-18 14:46:39 -0700 In r117491, we introduced a new method of alignment for the selection rect in the sub-pixel case. It turns out there is at least one case on Mac where this doesn't work with the line box tree. This patch reverts us to the float method for the line box tree, but retains the LayoutRect snapping for gap rects. 628173 1 142802 leviw 2012-05-18 15:46:40 -0700 Created attachment 142802 Patch 628197 2 142802 eric 2012-05-18 15:54:08 -0700 Comment on attachment 142802 Patch OK. 628266 3 142802 webkit.review.bot 2012-05-18 16:57:43 -0700 Comment on attachment 142802 Patch Clearing flags on attachment: 142802 Committed r117659: <http://trac.webkit.org/changeset/117659> 628267 4 webkit.review.bot 2012-05-18 16:57:51 -0700 All reviewed patches have been landed. Closing bug. 142802 2012-05-18 15:46:40 -0700 2012-05-18 16:57:41 -0700 Patch patch text/plain 5710 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExNzYzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA1LTE4ICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZlcnQgdG8gZmxvYXQg bWV0aG9kIG9mIHNlbGVjdGlvbiByZWN0IGFsaWdubWVudCBmb3IgbGluZSBib3ggdHJlZQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY5MDQKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbiByMTE3NDkxLCB3 ZSBpbnRyb2R1Y2VkIGEgbmV3IG1ldGhvZCBvZiBhbGlnbm1lbnQgZm9yIHRoZSBzZWxlY3Rpb24g cmVjdCBpbiB0aGUgc3ViLXBpeGVsIGNhc2UuCisgICAgICAgIEl0IHR1cm5zIG91dCB0aGVyZSBp cyBhdCBsZWFzdCBvbmUgY2FzZSBvbiBNYWMgd2hlcmUgdGhpcyBsZWF2ZXMgYSBnYXAgd2hlbiBw YWludGluZyBzZWxlY3Rpb24gcmVjdHMKKyAgICAgICAgb3JpZ2luYXRpbmcgaW4gdGhlIGxpbmUg Ym94IHRyZWUuIFRoaXMgcGF0Y2ggcmV2ZXJ0cyB1cyB0byB0aGUgZmxvYXQgbWV0aG9kIGZvciB0 aGUgbGluZSBib3ggdHJlZSwKKyAgICAgICAgYnV0IHJldGFpbnMgdGhlIExheW91dFJlY3Qgc25h cHBpbmcgZm9yIGdhcCByZWN0cy4KKworICAgICAgICBObyBuZXcgdGVzdHMuIENvdmVyZWQgYnkg ZXhpc3RpbmcgdGVzdHMgd2l0aCBzdWItcGl4ZWwgbGF5b3V0IGVuYWJsZWQuCisKKyAgICAgICAg KiByZW5kZXJpbmcvRWxsaXBzaXNCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6RWxsaXBzaXNC b3g6OnBhaW50U2VsZWN0aW9uKTogUmUtZW5hYmxpbmcgdGhlIEZsb2F0UmVjdCBmbGF2b3Igb2YK KyAgICAgICAgYWxpZ25TZWxlY3Rpb25SZWN0VG9EZXZpY2VQaXhlbHMgZm9yIHRoZSBsaW5lIGJv eCB0cmVlLgorICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVUZXh0Qm94LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmFsaWduU2VsZWN0aW9uUmVjdFRvRGV2aWNlUGl4ZWxzKTogTW92aW5nIExheW91 dFJlY3QgZmxhdm9yIHRvIFJlbmRlckJsb2NrLgorICAgICAgICAoV2ViQ29yZTo6SW5saW5lVGV4 dEJveDo6cGFpbnRTZWxlY3Rpb24pOiBIYXBwaWx5IGNsZWFyaW5nIHVwIHRoZSBiaWZ1cmNhdGlv biBvZiBhbGdvcml0aG1zIGZvcgorICAgICAgICBzdWItcGl4ZWwgbGF5b3V0LgorICAgICAgICAq IHJlbmRlcmluZy9JbmxpbmVUZXh0Qm94Lmg6IFJlLWVuYWJsaW5nIHRoZSBGbG9hdFJlY3QgZmxh dm9yIG9mIGFsaWduU2VsZWN0aW9uUmVjdFRvRGV2aWNlUGl4ZWxzCisgICAgICAgIGZvciB0aGUg bGluZSBib3ggdHJlZS4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAg ICAgICAoV2ViQ29yZTo6YWxpZ25TZWxlY3Rpb25SZWN0VG9EZXZpY2VQaXhlbHMpOiBSZS1zZWF0 aW5nIHRoZSBMYXlvdXRSZWN0IHZlcnNpb24gb2YKKyAgICAgICAgYWxpZ25TZWxlY3Rpb25SZWN0 VG9EZXZpY2VQaXhlbHMgZm9yIHVzZSB3aXRoIEdhcFJlY3RzLgorCiAyMDEyLTA1LTE4ICBLZXlh ciBIb29kICA8a2V5YXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFN1cHBvcnQgaW1hZ2VTbW9v dGhpbmdFbmFibGVkCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJv eC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVUZXh0Qm94 LmgJKHJldmlzaW9uIDExNzUxNCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9JbmxpbmVU ZXh0Qm94LmgJKHdvcmtpbmcgY29weSkKQEAgLTIxMywxMCArMjEzLDcgQEAKICAgICByZXR1cm4g dG9SZW5kZXJUZXh0KHJlbmRlcmVyKCkpOwogfQogCi12b2lkIGFsaWduU2VsZWN0aW9uUmVjdFRv RGV2aWNlUGl4ZWxzKExheW91dFJlY3QmKTsKLSNpZiAhRU5BQkxFKFNVQlBJWEVMX0xBWU9VVCkK IHZvaWQgYWxpZ25TZWxlY3Rpb25SZWN0VG9EZXZpY2VQaXhlbHMoRmxvYXRSZWN0Jik7Ci0jZW5k aWYKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvSW5saW5lVGV4dEJveC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0lubGluZVRleHRCb3guY3BwCShyZXZpc2lvbiAxMTc1MTQpCisrKyBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvSW5saW5lVGV4dEJveC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTgwNywy MSArODA3LDEyIEBACiAgICAgZVBvcyA9IG1pbihlbmRQb3MgLSBtX3N0YXJ0LCAoaW50KW1fbGVu KTsKIH0KIAotdm9pZCBhbGlnblNlbGVjdGlvblJlY3RUb0RldmljZVBpeGVscyhMYXlvdXRSZWN0 JiByZWN0KQotewotICAgIExheW91dFVuaXQgbWF4WCA9IGZsb29yVG9JbnQocmVjdC5tYXhYKCkp OwotICAgIHJlY3Quc2V0WChmbG9vclRvSW50KHJlY3QueCgpKSk7Ci0gICAgcmVjdC5zZXRXaWR0 aChtYXhYIC0gcmVjdC54KCkpOwotfQotCi0jaWYgIUVOQUJMRShTVUJQSVhFTF9MQVlPVVQpCiB2 b2lkIGFsaWduU2VsZWN0aW9uUmVjdFRvRGV2aWNlUGl4ZWxzKEZsb2F0UmVjdCYgcmVjdCkKIHsK ICAgICBmbG9hdCBtYXhYID0gZmxvb3JmKHJlY3QubWF4WCgpKTsKICAgICByZWN0LnNldFgoZmxv b3JmKHJlY3QueCgpKSk7CiAgICAgcmVjdC5zZXRXaWR0aChyb3VuZGYobWF4WCAtIHJlY3QueCgp KSk7CiB9Ci0jZW5kaWYKIAogdm9pZCBJbmxpbmVUZXh0Qm94OjpwYWludFNlbGVjdGlvbihHcmFw aGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEZsb2F0UG9pbnQmIGJveE9yaWdpbiwgUmVuZGVy U3R5bGUqIHN0eWxlLCBjb25zdCBGb250JiBmb250LCBDb2xvciB0ZXh0Q29sb3IpCiB7CkBAIC04 NjEsMTcgKzg1MiwxMiBAQAogICAgIExheW91dFVuaXQgc2VsZWN0aW9uVG9wID0gcm9vdCgpLT5z ZWxlY3Rpb25Ub3BBZGp1c3RlZEZvclByZWNlZGluZ0Jsb2NrKCk7CiAKICAgICBMYXlvdXRVbml0 IGRlbHRhWSA9IHJlbmRlcmVyKCktPnN0eWxlKCktPmlzRmxpcHBlZExpbmVzV3JpdGluZ01vZGUo KSA/IHNlbGVjdGlvbkJvdHRvbSAtIGxvZ2ljYWxCb3R0b20oKSA6IGxvZ2ljYWxUb3AoKSAtIHNl bGVjdGlvblRvcDsKLSAgICBMYXlvdXRVbml0IHNlbEhlaWdodCA9IG1heDxMYXlvdXRVbml0Pigw LCBzZWxlY3Rpb25Cb3R0b20gLSBzZWxlY3Rpb25Ub3ApOworICAgIExheW91dFVuaXQgc2VsSGVp Z2h0ID0gbWF4PExheW91dFVuaXQ+KFpFUk9fTEFZT1VUX1VOSVQsIHNlbGVjdGlvbkJvdHRvbSAt IHNlbGVjdGlvblRvcCk7CiAKLSNpZiBFTkFCTEUoU1VCUElYRUxfTEFZT1VUKQotICAgIExheW91 dFBvaW50IGxvY2FsT3JpZ2luKGJveE9yaWdpbi54KCksIGJveE9yaWdpbi55KCkgLSBkZWx0YVkp OwotICAgIExheW91dFJlY3QgY2xpcFJlY3QobG9jYWxPcmlnaW4sIExheW91dFNpemUobV9sb2dp Y2FsV2lkdGgsIHNlbEhlaWdodCkpOwotICAgIGFsaWduU2VsZWN0aW9uUmVjdFRvRGV2aWNlUGl4 ZWxzKGNsaXBSZWN0KTsKLSNlbHNlCiAgICAgRmxvYXRQb2ludCBsb2NhbE9yaWdpbihib3hPcmln aW4ueCgpLCBib3hPcmlnaW4ueSgpIC0gZGVsdGFZKTsKICAgICBGbG9hdFJlY3QgY2xpcFJlY3Qo bG9jYWxPcmlnaW4sIEZsb2F0U2l6ZShtX2xvZ2ljYWxXaWR0aCwgc2VsSGVpZ2h0KSk7CiAgICAg YWxpZ25TZWxlY3Rpb25SZWN0VG9EZXZpY2VQaXhlbHMoY2xpcFJlY3QpOwotI2VuZGlmCisKICAg ICBjb250ZXh0LT5jbGlwKGNsaXBSZWN0KTsKIAogICAgIGNvbnRleHQtPmRyYXdIaWdobGlnaHRG b3JUZXh0KGZvbnQsIHRleHRSdW4sIGxvY2FsT3JpZ2luLCBzZWxIZWlnaHQsIGMsIHN0eWxlLT5j b2xvclNwYWNlKCksIHNQb3MsIGVQb3MpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0VsbGlwc2lzQm94LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv RWxsaXBzaXNCb3guY3BwCShyZXZpc2lvbiAxMTc1MTQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvRWxsaXBzaXNCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05Nyw3ICs5Nyw3IEBACiAg ICAgR3JhcGhpY3NDb250ZXh0U3RhdGVTYXZlciBzdGF0ZVNhdmVyKCpjb250ZXh0KTsKICAgICBM YXlvdXRVbml0IHRvcCA9IHJvb3QoKS0+c2VsZWN0aW9uVG9wKCk7CiAgICAgTGF5b3V0VW5pdCBo ID0gcm9vdCgpLT5zZWxlY3Rpb25IZWlnaHQoKTsKLSAgICBMYXlvdXRSZWN0IGNsaXBSZWN0KHgo KSArIHBhaW50T2Zmc2V0LngoKSwgdG9wICsgcGFpbnRPZmZzZXQueSgpLCBtX2xvZ2ljYWxXaWR0 aCwgaCk7CisgICAgRmxvYXRSZWN0IGNsaXBSZWN0KHgoKSArIHBhaW50T2Zmc2V0LngoKSwgdG9w ICsgcGFpbnRPZmZzZXQueSgpLCBtX2xvZ2ljYWxXaWR0aCwgaCk7CiAgICAgYWxpZ25TZWxlY3Rp b25SZWN0VG9EZXZpY2VQaXhlbHMoY2xpcFJlY3QpOwogICAgIGNvbnRleHQtPmNsaXAoY2xpcFJl Y3QpOwogICAgIC8vIEZJWE1FOiBXaHkgaXMgdGhpcyBhbHdheXMgTFRSPyBGaXggYnkgcGFzc2lu ZyBjb3JyZWN0IHRleHQgcnVuIGZsYWdzIGJlbG93LgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiAxMTc1MTQpCisrKyBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzQ2LDYgKzMz NDYsMTMgQEAKICAgICByZXR1cm4gZ2FwUmVjdDsKIH0KIAorc3RhdGljIGlubGluZSB2b2lkIGFs aWduU2VsZWN0aW9uUmVjdFRvRGV2aWNlUGl4ZWxzKExheW91dFJlY3QmIHJlY3QpCit7CisgICAg TGF5b3V0VW5pdCBtYXhYID0gZmxvb3JUb0ludChyZWN0Lm1heFgoKSk7CisgICAgcmVjdC5zZXRY KGZsb29yVG9JbnQocmVjdC54KCkpKTsKKyAgICByZWN0LnNldFdpZHRoKChtYXhYIC0gcmVjdC54 KCkpLnJvdW5kKCkpOworfQorCiBMYXlvdXRSZWN0IFJlbmRlckJsb2NrOjpsb2dpY2FsTGVmdFNl bGVjdGlvbkdhcChSZW5kZXJCbG9jayogcm9vdEJsb2NrLCBjb25zdCBMYXlvdXRQb2ludCYgcm9v dEJsb2NrUGh5c2ljYWxQb3NpdGlvbiwgY29uc3QgTGF5b3V0U2l6ZSYgb2Zmc2V0RnJvbVJvb3RC bG9jaywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFJl bmRlck9iamVjdCogc2VsT2JqLCBMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBMYXlvdXRVbml0IGxv Z2ljYWxUb3AsIExheW91dFVuaXQgbG9naWNhbEhlaWdodCwgY29uc3QgUGFpbnRJbmZvKiBwYWlu dEluZm8pCiB7Cg==