83507 2012-04-09 14:30:27 -0700 Clean up LayoutUnit usage in DOMNodeHighlighter 2012-04-09 19:32:41 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw eae eric jchaffraix webkit.review.bot oldest_to_newest 598614 0 leviw 2012-04-09 14:30:27 -0700 Bringing DOMNodeHighlighter in line with the subpixellayout branch. 598621 1 136309 leviw 2012-04-09 14:39:56 -0700 Created attachment 136309 Patch 598626 2 136309 eric 2012-04-09 14:41:48 -0700 Comment on attachment 136309 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136309&action=review > Source/WebCore/ChangeLog:11 > + Ensuring DOMNodeHighlighter uses pixel snapping that matches that done in the RenderTree. Changes include: > + - Reverting drawSubstring to use an IntPoint with pixel snapped values instead of a LayoutPoint. > + - Reverting borderBox to an IntRect since it's in absolute coordinates. See https://trac.webkit.org/wiki/LayoutUnit. > + - Frames are still laid out with integers. Cleaning up mainFrameOffset to reflect that. Nicely stated! 598630 3 136309 leviw 2012-04-09 14:43:48 -0700 Comment on attachment 136309 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136309&action=review >> Source/WebCore/ChangeLog:11 >> + - Frames are still laid out with integers. Cleaning up mainFrameOffset to reflect that. > > Nicely stated! Thanks! 598912 4 136309 webkit.review.bot 2012-04-09 19:32:36 -0700 Comment on attachment 136309 Patch Clearing flags on attachment: 136309 Committed r113663: <http://trac.webkit.org/changeset/113663> 598913 5 webkit.review.bot 2012-04-09 19:32:41 -0700 All reviewed patches have been landed. Closing bug. 136309 2012-04-09 14:39:56 -0700 2012-04-09 19:32:36 -0700 Patch bug-83507-20120409143954.patch text/plain 5637 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzYyMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEyLTA0LTA5ICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBDbGVhbiB1cCBMYXlvdXRV bml0IHVzYWdlIGluIERPTU5vZGVIaWdobGlnaHRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODM1MDcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBFbnN1cmluZyBET01Ob2RlSGlnaGxpZ2h0ZXIgdXNlcyBw aXhlbCBzbmFwcGluZyB0aGF0IG1hdGNoZXMgdGhhdCBkb25lIGluIHRoZSBSZW5kZXJUcmVlLiBD aGFuZ2VzIGluY2x1ZGU6CisgICAgICAgIC0gUmV2ZXJ0aW5nIGRyYXdTdWJzdHJpbmcgdG8gdXNl IGFuIEludFBvaW50IHdpdGggcGl4ZWwgc25hcHBlZCB2YWx1ZXMgaW5zdGVhZCBvZiBhIExheW91 dFBvaW50LgorICAgICAgICAtIFJldmVydGluZyBib3JkZXJCb3ggdG8gYW4gSW50UmVjdCBzaW5j ZSBpdCdzIGluIGFic29sdXRlIGNvb3JkaW5hdGVzLiBTZWUgaHR0cHM6Ly90cmFjLndlYmtpdC5v cmcvd2lraS9MYXlvdXRVbml0LgorICAgICAgICAtIEZyYW1lcyBhcmUgc3RpbGwgbGFpZCBvdXQg d2l0aCBpbnRlZ2Vycy4gQ2xlYW5pbmcgdXAgbWFpbkZyYW1lT2Zmc2V0IHRvIHJlZmxlY3QgdGhh dC4KKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAg ICAgICAqIGluc3BlY3Rvci9ET01Ob2RlSGlnaGxpZ2h0ZXIuY3BwOgorCiAyMDEyLTA0LTA2ICBK YW1lcyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVt XSBUZXh0dXJlIGNvcGllcyBzaG91bGQgaGFwcGVuIGFmdGVyIGluY3JlbWVudGFsIHVwZGF0ZXMg dG8gcHJlc2VydmUgY29tbWl0IGF0b21pY2l0eQpJbmRleDogU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0RPTU5vZGVIaWdobGlnaHRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0RPTU5vZGVIaWdobGlnaHRlci5jcHAJKHJldmlzaW9uIDExMzYwOSkKKysrIFNv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9ET01Ob2RlSGlnaGxpZ2h0ZXIuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC0xNDMsMTYgKzE0MywxNiBAQCB2b2lkIGRyYXdIaWdobGlnaHRGb3JTVkdSZW5kZXJl cihHcmFwaGljCiAgICAgICAgIGRyYXdPdXRsaW5lZFF1YWQoY29udGV4dCwgYWJzb2x1dGVRdWFk c1tpXSwgaGlnaGxpZ2h0RGF0YS0+Y29udGVudCwgQ29sb3I6OnRyYW5zcGFyZW50KTsKIH0KIAot aW5saW5lIExheW91dFNpemUgZnJhbWVUb01haW5GcmFtZU9mZnNldChGcmFtZSogZnJhbWUpCitp bmxpbmUgSW50U2l6ZSBmcmFtZVRvTWFpbkZyYW1lT2Zmc2V0KEZyYW1lKiBmcmFtZSkKIHsKLSAg ICBMYXlvdXRQb2ludCBtYWluRnJhbWVQb2ludCA9IGZyYW1lLT5wYWdlKCktPm1haW5GcmFtZSgp LT52aWV3KCktPnJvb3RWaWV3VG9Db250ZW50cyhmcmFtZS0+dmlldygpLT5jb250ZW50c1RvUm9v dFZpZXcoTGF5b3V0UG9pbnQoKSkpOwotICAgIHJldHVybiB0b0xheW91dFNpemUobWFpbkZyYW1l UG9pbnQpOworICAgIEludFBvaW50IG1haW5GcmFtZVBvaW50ID0gZnJhbWUtPnBhZ2UoKS0+bWFp bkZyYW1lKCktPnZpZXcoKS0+cm9vdFZpZXdUb0NvbnRlbnRzKGZyYW1lLT52aWV3KCktPmNvbnRl bnRzVG9Sb290VmlldyhJbnRQb2ludCgpKSk7CisgICAgcmV0dXJuIHRvU2l6ZShtYWluRnJhbWVQ b2ludCk7CiB9CiAKIGludCBkcmF3U3Vic3RyaW5nKGNvbnN0IFRleHRSdW4mIGdsb2JhbFRleHRS dW4sIGludCBvZmZzZXQsIGludCBsZW5ndGgsIGNvbnN0IENvbG9yJiB0ZXh0Q29sb3IsIGNvbnN0 IEZvbnQmIGZvbnQsIEdyYXBoaWNzQ29udGV4dCYgY29udGV4dCwgY29uc3QgTGF5b3V0UmVjdCYg dGl0bGVSZWN0KQogewogICAgIGNvbnRleHQuc2V0RmlsbENvbG9yKHRleHRDb2xvciwgQ29sb3JT cGFjZURldmljZVJHQik7Ci0gICAgY29udGV4dC5kcmF3VGV4dChmb250LCBnbG9iYWxUZXh0UnVu LCBMYXlvdXRQb2ludCh0aXRsZVJlY3QueCgpICsgcmVjdEluZmxhdGVQeCwgdGl0bGVSZWN0Lnko KSArIGZvbnQuZm9udE1ldHJpY3MoKS5oZWlnaHQoKSksIG9mZnNldCwgb2Zmc2V0ICsgbGVuZ3Ro KTsKKyAgICBjb250ZXh0LmRyYXdUZXh0KGZvbnQsIGdsb2JhbFRleHRSdW4sIEludFBvaW50KHRp dGxlUmVjdC5waXhlbFNuYXBwZWRYKCkgKyByZWN0SW5mbGF0ZVB4LCB0aXRsZVJlY3QucGl4ZWxT bmFwcGVkWSgpICsgZm9udC5mb250TWV0cmljcygpLmhlaWdodCgpKSwgb2Zmc2V0LCBvZmZzZXQg KyBsZW5ndGgpOwogICAgIHJldHVybiBvZmZzZXQgKyBsZW5ndGg7CiB9CiAKQEAgLTIyMiw3ICsy MjIsNyBAQCBUT09MVElQX0ZPTlRfRkFNSUxJRVMoMSwgbmV3IEF0b21pY1N0cmluCiAgICAgfQog fQogCi12b2lkIGRyYXdFbGVtZW50VGl0bGUoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBOb2Rl KiBub2RlLCBSZW5kZXJPYmplY3QqIHJlbmRlcmVyLCBjb25zdCBMYXlvdXRSZWN0JiBib3VuZGlu Z0JveCwgY29uc3QgTGF5b3V0UmVjdCYgYW5jaG9yQm94LCBjb25zdCBGbG9hdFJlY3QmIHZpc2li bGVSZWN0LCBXZWJDb3JlOjpTZXR0aW5ncyogc2V0dGluZ3MpCit2b2lkIGRyYXdFbGVtZW50VGl0 bGUoR3JhcGhpY3NDb250ZXh0JiBjb250ZXh0LCBOb2RlKiBub2RlLCBSZW5kZXJPYmplY3QqIHJl bmRlcmVyLCBjb25zdCBJbnRSZWN0JiBib3VuZGluZ0JveCwgY29uc3QgSW50UmVjdCYgYW5jaG9y Qm94LCBjb25zdCBGbG9hdFJlY3QmIHZpc2libGVSZWN0LCBXZWJDb3JlOjpTZXR0aW5ncyogc2V0 dGluZ3MpCiB7CiAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChDb2xvciwgYmFja2dyb3VuZENvbG9y LCAoMjU1LCAyNTUsIDE5NCkpOwogICAgIERFRklORV9TVEFUSUNfTE9DQUwoQ29sb3IsIHRhZ0Nv bG9yLCAoMTM2LCAxOCwgMTI4KSk7IC8vIFNhbWUgYXMgLndlYmtpdC1odG1sLXRhZy4KQEAgLTI2 OSwxMSArMjY5LDExIEBAIHZvaWQgZHJhd0VsZW1lbnRUaXRsZShHcmFwaGljc0NvbnRleHQmIGMK IAogICAgIFJlbmRlckJveE1vZGVsT2JqZWN0KiBtb2RlbE9iamVjdCA9IHJlbmRlcmVyLT5pc0Jv eE1vZGVsT2JqZWN0KCkgPyB0b1JlbmRlckJveE1vZGVsT2JqZWN0KHJlbmRlcmVyKSA6IDA7CiAK LSAgICBTdHJpbmcgd2lkdGhOdW1iZXJQYXJ0ID0gIiAiICsgU3RyaW5nOjpudW1iZXIobW9kZWxP YmplY3QgPyBhZGp1c3RGb3JBYnNvbHV0ZVpvb20obW9kZWxPYmplY3QtPm9mZnNldFdpZHRoKCks IG1vZGVsT2JqZWN0KSA6IGJvdW5kaW5nQm94LndpZHRoKCkpOworICAgIFN0cmluZyB3aWR0aE51 bWJlclBhcnQgPSAiICIgKyBTdHJpbmc6Om51bWJlcihtb2RlbE9iamVjdCA/IGFkanVzdEZvckFi c29sdXRlWm9vbShtb2RlbE9iamVjdC0+cGl4ZWxTbmFwcGVkT2Zmc2V0V2lkdGgoKSwgbW9kZWxP YmplY3QpIDogYm91bmRpbmdCb3gud2lkdGgoKSk7CiAgICAgbm9kZVRpdGxlLmFwcGVuZCh3aWR0 aE51bWJlclBhcnQpOwogICAgIG5vZGVUaXRsZS5hcHBlbmQocHhTdHJpbmcpOwogICAgIG5vZGVU aXRsZS5hcHBlbmQodGltZXNTdHJpbmcpOwotICAgIFN0cmluZyBoZWlnaHROdW1iZXJQYXJ0ID0g U3RyaW5nOjpudW1iZXIobW9kZWxPYmplY3QgPyBhZGp1c3RGb3JBYnNvbHV0ZVpvb20obW9kZWxP YmplY3QtPm9mZnNldEhlaWdodCgpLCBtb2RlbE9iamVjdCkgOiBib3VuZGluZ0JveC5oZWlnaHQo KSk7CisgICAgU3RyaW5nIGhlaWdodE51bWJlclBhcnQgPSBTdHJpbmc6Om51bWJlcihtb2RlbE9i amVjdCA/IGFkanVzdEZvckFic29sdXRlWm9vbShtb2RlbE9iamVjdC0+cGl4ZWxTbmFwcGVkT2Zm c2V0SGVpZ2h0KCksIG1vZGVsT2JqZWN0KSA6IGJvdW5kaW5nQm94LmhlaWdodCgpKTsKICAgICBu b2RlVGl0bGUuYXBwZW5kKGhlaWdodE51bWJlclBhcnQpOwogICAgIG5vZGVUaXRsZS5hcHBlbmQo cHhTdHJpbmcpOwogCkBAIC0yODMsOSArMjgzLDkgQEAgdm9pZCBkcmF3RWxlbWVudFRpdGxlKEdy YXBoaWNzQ29udGV4dCYgYwogICAgIGZvbnQudXBkYXRlKDApOwogCiAgICAgVGV4dFJ1biBub2Rl VGl0bGVSdW4obm9kZVRpdGxlLnRvU3RyaW5nKCkpOwotICAgIExheW91dFBvaW50IHRpdGxlQmFz ZVBvaW50ID0gTGF5b3V0UG9pbnQoYW5jaG9yQm94LngoKSwgYW5jaG9yQm94Lm1heFkoKSAtIDEp OworICAgIEludFBvaW50IHRpdGxlQmFzZVBvaW50ID0gSW50UG9pbnQoYW5jaG9yQm94LngoKSwg YW5jaG9yQm94Lm1heFkoKSAtIDEpOwogICAgIHRpdGxlQmFzZVBvaW50Lm1vdmUocmVjdEluZmxh dGVQeCwgcmVjdEluZmxhdGVQeCk7Ci0gICAgTGF5b3V0UmVjdCB0aXRsZVJlY3QgPSBlbmNsb3Np bmdMYXlvdXRSZWN0KGZvbnQuc2VsZWN0aW9uUmVjdEZvclRleHQobm9kZVRpdGxlUnVuLCB0aXRs ZUJhc2VQb2ludCwgZm9udEhlaWdodFB4KSk7CisgICAgSW50UmVjdCB0aXRsZVJlY3QgPSBlbmNs b3NpbmdJbnRSZWN0KGZvbnQuc2VsZWN0aW9uUmVjdEZvclRleHQobm9kZVRpdGxlUnVuLCB0aXRs ZUJhc2VQb2ludCwgZm9udEhlaWdodFB4KSk7CiAgICAgdGl0bGVSZWN0LmluZmxhdGUocmVjdElu ZmxhdGVQeCk7CiAKICAgICAvLyBUaGUgaW5pdGlhbCBvZmZzZXRzIG5lZWRlZCB0byBjb21wZW5z YXRlIGZvciBhIDFweC10aGljayBib3JkZXIgc3Ryb2tlICh3aGljaCBpcyBub3QgYSBwYXJ0IG9m IHRoZSByZWN0YW5nbGUpLgpAQCAtMzY4LDEyICszNjgsMTIgQEAgc3RhdGljIHZvaWQgZ2V0T3JE cmF3Tm9kZUhpZ2hsaWdodChHcmFwaAogICAgIGlmICghcmVuZGVyZXIgfHwgIWNvbnRhaW5pbmdG cmFtZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgTGF5b3V0U2l6ZSBtYWluRnJhbWVPZmZzZXQg PSBmcmFtZVRvTWFpbkZyYW1lT2Zmc2V0KGNvbnRhaW5pbmdGcmFtZSk7Ci0gICAgTGF5b3V0UmVj dCBib3VuZGluZ0JveCA9IHJlbmRlcmVyLT5hYnNvbHV0ZUJvdW5kaW5nQm94UmVjdCgpOworICAg IEludFNpemUgbWFpbkZyYW1lT2Zmc2V0ID0gZnJhbWVUb01haW5GcmFtZU9mZnNldChjb250YWlu aW5nRnJhbWUpOworICAgIEludFJlY3QgYm91bmRpbmdCb3ggPSByZW5kZXJlci0+YWJzb2x1dGVC b3VuZGluZ0JveFJlY3QoKTsKIAogICAgIGJvdW5kaW5nQm94Lm1vdmUobWFpbkZyYW1lT2Zmc2V0 KTsKIAotICAgIExheW91dFJlY3QgdGl0bGVBbmNob3JCb3ggPSBib3VuZGluZ0JveDsKKyAgICBJ bnRSZWN0IHRpdGxlQW5jaG9yQm94ID0gYm91bmRpbmdCb3g7CiAKICAgICBGcmFtZVZpZXcqIHZp ZXcgPSBjb250YWluaW5nRnJhbWUtPnBhZ2UoKS0+bWFpbkZyYW1lKCktPnZpZXcoKTsKICAgICBG bG9hdFJlY3QgdmlzaWJsZVJlY3QgPSB2aWV3LT52aXNpYmxlQ29udGVudFJlY3QoKTsK