83604 2012-04-10 12:21:30 -0700 Clean up multiple RenderedPosition::absoluteRect definitions and correct LayoutUnit usage 2012-04-10 16:44:48 -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 rniwa webkit.review.bot oldest_to_newest 599489 0 leviw 2012-04-10 12:21:30 -0700 There are currently 3 definitions of RenderedPosition::absoluteRect where only one is needed. It also currently returns a LayoutRect despite being in absolute coordinates, which should be integers. 599497 1 136508 leviw 2012-04-10 12:26:17 -0700 Created attachment 136508 Patch 599612 2 136508 jchaffraix 2012-04-10 14:07:09 -0700 Comment on attachment 136508 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=136508&action=review > Source/WebCore/editing/RenderedPosition.cpp:232 > + IntRect localRect = pixelSnappedIntRect(m_renderer->localCaretRect(m_inlineBox, m_offset, extraWidthToEndOfLine)); For people watching at home, the pixelSnappedIntRect confused me a lot and I pinged leviw@ about that. Currently we want to snap our rectangles before calling localToAbsoluteQuad to be consistent across all the painting code. We may lose some precision by doing so (if we have a transform that is not pixel aligned for example), but coherency is better for now. We may relax this requirement later. 599636 3 136508 leviw 2012-04-10 14:19:18 -0700 Comment on attachment 136508 Patch Thanks Julien! 599792 4 136508 webkit.review.bot 2012-04-10 16:44:44 -0700 Comment on attachment 136508 Patch Clearing flags on attachment: 136508 Committed r113792: <http://trac.webkit.org/changeset/113792> 599793 5 webkit.review.bot 2012-04-10 16:44:48 -0700 All reviewed patches have been landed. Closing bug. 136508 2012-04-10 12:26:17 -0700 2012-04-10 16:44:44 -0700 Patch bug-83604-20120410122616.patch text/plain 4701 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMzc1MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA0LTEwICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBDbGVhbiB1cCBtdWx0aXBs ZSBSZW5kZXJlZFBvc2l0aW9uOjphYnNvbHV0ZVJlY3QgZGVmaW5pdGlvbnMgYW5kIGNvcnJlY3Qg TGF5b3V0VW5pdCB1c2FnZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODM2MDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZW1vdmluZyB1bm5lY2Vzc2FyeSBkZWZpbml0aW9ucyBvZiBhYnNvbHV0ZVJlY3Qg YW5kIHJlcGxhY2luZyB0aGVtIHdpdGggYSBzaW5nbGUgcHVibGljCisgICAgICAgIHZlcnNpb24g dGhhdCdzIG1vcmUgZXhwbGljaXQgYWJvdXQgaXRzIGNvbnRyYWN0LgorCisgICAgICAgIEFsc28g Y29ycmVjdGluZyBhIExheW91dFVuaXQgbWlzdXNlLCBhcyByZWN0cyBpbiBhYnNvbHV0ZSBjb29y ZGluYXRlcyBzaG91bGQgYmUgcmV0dXJuZWQKKyAgICAgICAgdXNpbmcgaW50ZWdlcnMsIG5vdCBM YXlvdXRVbml0cy4gU2VlIGh0dHBzOi8vdHJhYy53ZWJraXQub3JnL3dpa2kvTGF5b3V0VW5pdCBm b3IgZGV0YWlscy4KKworICAgICAgICBObyBuZXcgdGVzdHMuIE5vIGNoYW5nZSBpbiBiZWhhdmlv ci4KKworICAgICAgICAqIGVkaXRpbmcvRWRpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVk aXRvcjo6Zmlyc3RSZWN0Rm9yUmFuZ2UpOgorICAgICAgICAqIGVkaXRpbmcvUmVuZGVyZWRQb3Np dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJlZFBvc2l0aW9uOjphYnNvbHV0ZVJl Y3QpOiBQaXhlbCBzbmFwcGluZyB0aGUgbG9jYWwgcmVjdCBiZWZvcmUgY29udmVydGluZworICAg ICAgICB0byBhYnNvbHV0ZSBjb29yZGluYXRlcy4KKyAgICAgICAgKiBlZGl0aW5nL1JlbmRlcmVk UG9zaXRpb24uaDoKKyAgICAgICAgKFJlbmRlcmVkUG9zaXRpb24pOgorCiAyMDEyLTA0LTEwICBE YXZpZCBCYXJ0b24gIDxkYmFydG9uQG1hdGhzY3JpYmUuY29tPgogCiAgICAgICAgIG1zcXJ0J3Mg aW1wbGllZCBtcm93IHNob3VsZCBkbyBvcGVyYXRvciBzdHJldGNoaW5nCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv ZWRpdGluZy9FZGl0b3IuY3BwCShyZXZpc2lvbiAxMTM3MjgpCisrKyBTb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL0VkaXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI1NzUsMTEgKzI1NzUsMTEgQEAg SW50UmVjdCBFZGl0b3I6OmZpcnN0UmVjdEZvclJhbmdlKFJhbmdlKgogICAgIEFTU0VSVChyYW5n ZS0+c3RhcnRDb250YWluZXIoKSk7CiAgICAgQVNTRVJUKHJhbmdlLT5lbmRDb250YWluZXIoKSk7 CiAKLSAgICBMYXlvdXRSZWN0IHN0YXJ0Q2FyZXRSZWN0ID0gUmVuZGVyZWRQb3NpdGlvbihWaXNp YmxlUG9zaXRpb24ocmFuZ2UtPnN0YXJ0UG9zaXRpb24oKSkuZGVlcEVxdWl2YWxlbnQoKSwgRE9X TlNUUkVBTSkuYWJzb2x1dGVSZWN0KGV4dHJhV2lkdGhUb0VuZE9mTGluZSk7CisgICAgSW50UmVj dCBzdGFydENhcmV0UmVjdCA9IFJlbmRlcmVkUG9zaXRpb24oVmlzaWJsZVBvc2l0aW9uKHJhbmdl LT5zdGFydFBvc2l0aW9uKCkpLmRlZXBFcXVpdmFsZW50KCksIERPV05TVFJFQU0pLmFic29sdXRl UmVjdCgmZXh0cmFXaWR0aFRvRW5kT2ZMaW5lKTsKICAgICBpZiAoc3RhcnRDYXJldFJlY3QgPT0g TGF5b3V0UmVjdCgpKQogICAgICAgICByZXR1cm4gSW50UmVjdCgpOwogCi0gICAgTGF5b3V0UmVj dCBlbmRDYXJldFJlY3QgPSBSZW5kZXJlZFBvc2l0aW9uKFZpc2libGVQb3NpdGlvbihyYW5nZS0+ ZW5kUG9zaXRpb24oKSkuZGVlcEVxdWl2YWxlbnQoKSwgVVBTVFJFQU0pLmFic29sdXRlUmVjdCgp OworICAgIEludFJlY3QgZW5kQ2FyZXRSZWN0ID0gUmVuZGVyZWRQb3NpdGlvbihWaXNpYmxlUG9z aXRpb24ocmFuZ2UtPmVuZFBvc2l0aW9uKCkpLmRlZXBFcXVpdmFsZW50KCksIFVQU1RSRUFNKS5h YnNvbHV0ZVJlY3QoKTsKICAgICBpZiAoZW5kQ2FyZXRSZWN0ID09IExheW91dFJlY3QoKSkKICAg ICAgICAgcmV0dXJuIEludFJlY3QoKTsKIApJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9S ZW5kZXJlZFBvc2l0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5n L1JlbmRlcmVkUG9zaXRpb24uY3BwCShyZXZpc2lvbiAxMTM3MjgpCisrKyBTb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL1JlbmRlcmVkUG9zaXRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMjQsMTMg KzIyNCwxMyBAQCBQb3NpdGlvbiBSZW5kZXJlZFBvc2l0aW9uOjpwb3NpdGlvbkF0UmlnCiAgICAg cmV0dXJuIGNyZWF0ZUxlZ2FjeUVkaXRpbmdQb3NpdGlvbihwcmV2TGVhZkNoaWxkKCktPnJlbmRl cmVyKCktPm5vZGUoKSwgcHJldkxlYWZDaGlsZCgpLT5jYXJldFJpZ2h0bW9zdE9mZnNldCgpKTsK IH0KIAotTGF5b3V0UmVjdCBSZW5kZXJlZFBvc2l0aW9uOjphYnNvbHV0ZVJlY3QoTGF5b3V0VW5p dCogZXh0cmFXaWR0aFRvRW5kT2ZMaW5lKSBjb25zdAorSW50UmVjdCBSZW5kZXJlZFBvc2l0aW9u OjphYnNvbHV0ZVJlY3QoTGF5b3V0VW5pdCogZXh0cmFXaWR0aFRvRW5kT2ZMaW5lKSBjb25zdAog ewogICAgIGlmIChpc051bGwoKSkKLSAgICAgICAgcmV0dXJuIExheW91dFJlY3QoKTsKKyAgICAg ICAgcmV0dXJuIEludFJlY3QoKTsKIAotICAgIExheW91dFJlY3QgbG9jYWxSZWN0ID0gbV9yZW5k ZXJlci0+bG9jYWxDYXJldFJlY3QobV9pbmxpbmVCb3gsIG1fb2Zmc2V0LCBleHRyYVdpZHRoVG9F bmRPZkxpbmUpOwotICAgIHJldHVybiBsb2NhbFJlY3QgPT0gTGF5b3V0UmVjdCgpID8gTGF5b3V0 UmVjdCgpIDogbV9yZW5kZXJlci0+bG9jYWxUb0Fic29sdXRlUXVhZChGbG9hdFJlY3QobG9jYWxS ZWN0KSkuZW5jbG9zaW5nQm91bmRpbmdCb3goKTsKKyAgICBJbnRSZWN0IGxvY2FsUmVjdCA9IHBp eGVsU25hcHBlZEludFJlY3QobV9yZW5kZXJlci0+bG9jYWxDYXJldFJlY3QobV9pbmxpbmVCb3gs IG1fb2Zmc2V0LCBleHRyYVdpZHRoVG9FbmRPZkxpbmUpKTsKKyAgICByZXR1cm4gbG9jYWxSZWN0 ID09IEludFJlY3QoKSA/IEludFJlY3QoKSA6IG1fcmVuZGVyZXItPmxvY2FsVG9BYnNvbHV0ZVF1 YWQoRmxvYXRSZWN0KGxvY2FsUmVjdCkpLmVuY2xvc2luZ0JvdW5kaW5nQm94KCk7CiB9CiAKIGJv b2wgcmVuZGVyT2JqZWN0Q29udGFpbnNQb3NpdGlvbihSZW5kZXJPYmplY3QqIHRhcmdldCwgY29u c3QgUG9zaXRpb24mIHBvc2l0aW9uKQpJbmRleDogU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZW5k ZXJlZFBvc2l0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZW5k ZXJlZFBvc2l0aW9uLmgJKHJldmlzaW9uIDExMzcyOCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRp bmcvUmVuZGVyZWRQb3NpdGlvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC02Nyw4ICs2Nyw3IEBAIHB1 YmxpYzoKICAgICBQb3NpdGlvbiBwb3NpdGlvbkF0TGVmdEJvdW5kYXJ5T2ZCaURpUnVuKCkgY29u c3Q7CiAgICAgUG9zaXRpb24gcG9zaXRpb25BdFJpZ2h0Qm91bmRhcnlPZkJpRGlSdW4oKSBjb25z dDsKIAotICAgIExheW91dFJlY3QgYWJzb2x1dGVSZWN0KCkgY29uc3QgeyByZXR1cm4gYWJzb2x1 dGVSZWN0KDApOyB9Ci0gICAgTGF5b3V0UmVjdCBhYnNvbHV0ZVJlY3QoTGF5b3V0VW5pdCYgZXh0 cmFXaWR0aFRvRW5kT2ZMaW5lKSBjb25zdCB7IHJldHVybiBhYnNvbHV0ZVJlY3QoJmV4dHJhV2lk dGhUb0VuZE9mTGluZSk7IH0KKyAgICBJbnRSZWN0IGFic29sdXRlUmVjdChMYXlvdXRVbml0KiBl eHRyYVdpZHRoVG9FbmRPZkxpbmUgPSAwKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBib29sIG9w ZXJhdG9yPT0oY29uc3QgUmVuZGVyZWRQb3NpdGlvbiYpIGNvbnN0IHsgcmV0dXJuIGZhbHNlOyB9 CkBAIC04MSw4ICs4MCw2IEBAIHByaXZhdGU6CiAgICAgYm9vbCBhdExlZnRCb3VuZGFyeU9mQmlk aVJ1bihTaG91bGRNYXRjaEJpZGlMZXZlbCwgdW5zaWduZWQgY2hhciBiaWRpTGV2ZWxPZlJ1bikg Y29uc3Q7CiAgICAgYm9vbCBhdFJpZ2h0Qm91bmRhcnlPZkJpZGlSdW4oU2hvdWxkTWF0Y2hCaWRp TGV2ZWwsIHVuc2lnbmVkIGNoYXIgYmlkaUxldmVsT2ZSdW4pIGNvbnN0OwogCi0gICAgTGF5b3V0 UmVjdCBhYnNvbHV0ZVJlY3QoTGF5b3V0VW5pdCogZXh0cmFXaWR0aFRvRW5kT2ZMaW5lKSBjb25z dDsKLQogICAgIFJlbmRlck9iamVjdCogbV9yZW5kZXJlcjsKICAgICBJbmxpbmVCb3gqIG1faW5s aW5lQm94OwogICAgIGludCBtX29mZnNldDsK