81178 2012-03-14 18:08:10 -0700 Prepare RenderObject for FractionalLayoutUnits 2012-03-16 16:05:54 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 leviw leviw darin eae eric jchaffraix simon.fraser webkit.review.bot oldest_to_newest 579000 0 leviw 2012-03-14 18:08:10 -0700 This patch brings prepares RenderObject for FractionalLayoutUnits as a backend for LayoutUnits. This fixes a few compiler errors, adds a flavor of adjustForAbsoluteZoom that directly takes a FractionalLayoutUnit, and reverts outlines to ints. 579015 1 131970 leviw 2012-03-14 18:32:14 -0700 Created attachment 131970 Patch 580984 2 leviw 2012-03-16 14:51:35 -0700 Pingin' those happy reviewers once again. 580991 3 131970 eric 2012-03-16 14:53:57 -0700 Comment on attachment 131970 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=131970&action=review > Source/WebCore/rendering/RenderObject.cpp:1368 > +IntRect RenderObject::pixelSnappedAbsoluteClippedOverflowRect() const > +{ > + return pixelSnappedIntRect(absoluteClippedOverflowRect()); > +} Bleh. Why wouldn't people just call absoluteClippedOverFlowRect().snapped()? 581004 4 131970 leviw 2012-03-16 15:03:37 -0700 Comment on attachment 131970 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=131970&action=review >> Source/WebCore/rendering/RenderObject.cpp:1368 >> +} > > Bleh. Why wouldn't people just call absoluteClippedOverFlowRect().snapped()? Primarily we have this function to export from WebCore. We don't want to expose the LayoutRect version to outside callers. 581066 5 131970 webkit.review.bot 2012-03-16 16:05:50 -0700 Comment on attachment 131970 Patch Clearing flags on attachment: 131970 Committed r111082: <http://trac.webkit.org/changeset/111082> 581067 6 webkit.review.bot 2012-03-16 16:05:54 -0700 All reviewed patches have been landed. Closing bug. 131970 2012-03-14 18:32:14 -0700 2012-03-16 16:05:50 -0700 Patch bug-81178-20120314183213.patch text/plain 6953 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMDgwMSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEyLTAzLTE0ICBMZXZpIFdl aW50cmF1YiAgPGxldml3QGNocm9taXVtLm9yZz4KKworICAgICAgICBQcmVwYXJlIFJlbmRlck9i amVjdCBmb3IgRnJhY3Rpb25hbExheW91dFVuaXRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MTE3OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgcmVhZGllcyBSZW5kZXJPYmplY3QgdG8gZGVhbCB3 aXRoIEZyYWN0aW9uYWxMYXlvdXRVbml0cyBhcyBhIGJhY2tlbmQgZm9yIHRoZQorICAgICAgICBM YXlvdXRVbml0IGFic3RyYWN0aW9uLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gTm8gY2hhbmdl IGluIGJlaGF2aW9yLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnBpeGVsU25hcHBlZEFic29sdXRlQ2xpcHBl ZE92ZXJmbG93UmVjdCk6IENvbnZlbmllbmNlIG1ldGhvZCB0byBiZQorICAgICAgICB1c2VkIGlu c3RlYWQgb2YgYWJzb3VsdXRlQ2xpcHBlZE92ZXJmbG93UmVjdCBpbiBwbGF0Zm9ybSBjb2RlLiBQ bGF0Zm9ybSB1cGRhdGVzIHdpbGwgY29tZQorICAgICAgICBpbiBhIHNlcGFyYXRlIHBhdGNoLgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJPYmplY3Q6OnJlcGFp bnRBZnRlckxheW91dElmTmVlZGVkKTogQm9yZGVycyByZW1haW4gaW50cyB3aGVuIHdlIG1vdmUg dG8KKyAgICAgICAgc3ViLXBpeGVsIGxheW91dC4gVGhpcyBhZGp1c3RzIGJvcmRlciB2YXJpYWJs ZXMgZm9yIHRoaXMsIGFuZCBhZGRzIGNvbXBpbGVyIGZpeGVzIHdoZW4KKyAgICAgICAgdXNpbmcg c3RkOjptYXggYW5kIHN0ZDo6bWluIHdpdGggbWl4ZWQgaW50L0xheW91dFVuaXRzLgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0OjphZGp1c3RSZWN0Rm9yT3V0bGluZUFuZFNoYWRvdyk6 IE91dGxpbmVzLCBsaWtlIGJvcmRlcnMsIHJlbWFpbgorICAgICAgICBpbnRzIGluIHRoZSBuZXcg c3ViLXBpeGVsIHdvcmxkLiBVc2luZyB2YXJpYWJsZXMgdGhhdCByZWZsZWN0IHRoYXQuCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorICAgICAgICAoUmVuZGVyT2JqZWN0KToK KyAgICAgICAgKFdlYkNvcmU6OmFkanVzdEZvckFic29sdXRlWm9vbSk6IEhhbmRsZXMgRnJhY3Rp b25hbExheW91dFVuaXQgdmFsdWVzLiBGbG9vcmluZyBpcyB3aGF0CisgICAgICAgIEphdmFTY3Jp cHQgcmVxdWlyZXMgc2luY2UgdGhpcyBpcyB1c2VkIHdpdGggdmFsdWVzIHRoYXQgbXVzdCByZXR1 cm4gaW50cy4KKyAgICAgICAgKFdlYkNvcmUpOiBBZGRpbmcgRnJhY3Rpb25hbExheW91dFVuaXQu aCB0byBzdXBwb3J0IHRoZSBuZXcgYWRqdXN0ZUZvckFic29sdXRlWm9vbSBtZXRob2QuCisKIDIw MTItMDMtMTQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAg ICBGaXggYnVpbGQuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0 LmNwcAkocmV2aXNpb24gMTEwNzQwKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck9iamVjdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEzNjIsNiArMTM2MiwxMSBAQCB2b2lkIFJl bmRlck9iamVjdDo6cmVwYWludFJlY3RhbmdsZShjb25zCiAgICAgcmVwYWludFVzaW5nQ29udGFp bmVyKHJlcGFpbnRDb250YWluZXIgPyByZXBhaW50Q29udGFpbmVyIDogdmlldywgZGlydHlSZWN0 LCBpbW1lZGlhdGUpOwogfQogCitJbnRSZWN0IFJlbmRlck9iamVjdDo6cGl4ZWxTbmFwcGVkQWJz b2x1dGVDbGlwcGVkT3ZlcmZsb3dSZWN0KCkgY29uc3QKK3sKKyAgICByZXR1cm4gcGl4ZWxTbmFw cGVkSW50UmVjdChhYnNvbHV0ZUNsaXBwZWRPdmVyZmxvd1JlY3QoKSk7Cit9CisKIGJvb2wgUmVu ZGVyT2JqZWN0OjpyZXBhaW50QWZ0ZXJMYXlvdXRJZk5lZWRlZChSZW5kZXJCb3hNb2RlbE9iamVj dCogcmVwYWludENvbnRhaW5lciwgY29uc3QgTGF5b3V0UmVjdCYgb2xkQm91bmRzLCBjb25zdCBM YXlvdXRSZWN0JiBvbGRPdXRsaW5lQm94LCBjb25zdCBMYXlvdXRSZWN0KiBuZXdCb3VuZHNQdHIs IGNvbnN0IExheW91dFJlY3QqIG5ld091dGxpbmVCb3hSZWN0UHRyKQogewogICAgIFJlbmRlclZp ZXcqIHYgPSB2aWV3KCk7CkBAIC0xNDM1LDE0ICsxNDQwLDE0IEBAIGJvb2wgUmVuZGVyT2JqZWN0 OjpyZXBhaW50QWZ0ZXJMYXlvdXRJZk4KICAgICAgICAgTGF5b3V0VW5pdCBzaGFkb3dSaWdodDsK ICAgICAgICAgc3R5bGUoKS0+Z2V0Qm94U2hhZG93SG9yaXpvbnRhbEV4dGVudChzaGFkb3dMZWZ0 LCBzaGFkb3dSaWdodCk7CiAKLSAgICAgICAgTGF5b3V0VW5pdCBib3JkZXJSaWdodCA9IGlzQm94 KCkgPyB0b1JlbmRlckJveCh0aGlzKS0+Ym9yZGVyUmlnaHQoKSA6IHplcm9MYXlvdXRVbml0Owor ICAgICAgICBpbnQgYm9yZGVyUmlnaHQgPSBpc0JveCgpID8gdG9SZW5kZXJCb3godGhpcyktPmJv cmRlclJpZ2h0KCkgOiAwOwogICAgICAgICBMYXlvdXRVbml0IGJveFdpZHRoID0gaXNCb3goKSA/ IHRvUmVuZGVyQm94KHRoaXMpLT53aWR0aCgpIDogemVyb0xheW91dFVuaXQ7Ci0gICAgICAgIExh eW91dFVuaXQgYm9yZGVyV2lkdGggPSBtYXg8TGF5b3V0VW5pdD4oLW91dGxpbmVTdHlsZS0+b3V0 bGluZU9mZnNldCgpLCBtYXgoYm9yZGVyUmlnaHQsIG1heDxMYXlvdXRVbml0PihzdHlsZSgpLT5i b3JkZXJUb3BSaWdodFJhZGl1cygpLndpZHRoKCkuY2FsY1ZhbHVlKGJveFdpZHRoKSwgc3R5bGUo KS0+Ym9yZGVyQm90dG9tUmlnaHRSYWRpdXMoKS53aWR0aCgpLmNhbGNWYWx1ZShib3hXaWR0aCkp KSkgKyBtYXgob3csIHNoYWRvd1JpZ2h0KTsKKyAgICAgICAgTGF5b3V0VW5pdCBib3JkZXJXaWR0 aCA9IG1heDxMYXlvdXRVbml0Pigtb3V0bGluZVN0eWxlLT5vdXRsaW5lT2Zmc2V0KCksIG1heDxM YXlvdXRVbml0Pihib3JkZXJSaWdodCwgbWF4PExheW91dFVuaXQ+KHN0eWxlKCktPmJvcmRlclRv cFJpZ2h0UmFkaXVzKCkud2lkdGgoKS5jYWxjVmFsdWUoYm94V2lkdGgpLCBzdHlsZSgpLT5ib3Jk ZXJCb3R0b21SaWdodFJhZGl1cygpLndpZHRoKCkuY2FsY1ZhbHVlKGJveFdpZHRoKSkpKSArIG1h eDxMYXlvdXRVbml0Pihvdywgc2hhZG93UmlnaHQpOwogICAgICAgICBMYXlvdXRSZWN0IHJpZ2h0 UmVjdChuZXdPdXRsaW5lQm94LngoKSArIG1pbihuZXdPdXRsaW5lQm94LndpZHRoKCksIG9sZE91 dGxpbmVCb3gud2lkdGgoKSkgLSBib3JkZXJXaWR0aCwKICAgICAgICAgICAgIG5ld091dGxpbmVC b3gueSgpLAogICAgICAgICAgICAgd2lkdGggKyBib3JkZXJXaWR0aCwKICAgICAgICAgICAgIG1h eChuZXdPdXRsaW5lQm94LmhlaWdodCgpLCBvbGRPdXRsaW5lQm94LmhlaWdodCgpKSk7Ci0gICAg ICAgIExheW91dFVuaXQgcmlnaHQgPSBtaW4obmV3Qm91bmRzLm1heFgoKSwgb2xkQm91bmRzLm1h eFgoKSk7CisgICAgICAgIExheW91dFVuaXQgcmlnaHQgPSBtaW48TGF5b3V0VW5pdD4obmV3Qm91 bmRzLm1heFgoKSwgb2xkQm91bmRzLm1heFgoKSk7CiAgICAgICAgIGlmIChyaWdodFJlY3QueCgp IDwgcmlnaHQpIHsKICAgICAgICAgICAgIHJpZ2h0UmVjdC5zZXRXaWR0aChtaW4ocmlnaHRSZWN0 LndpZHRoKCksIHJpZ2h0IC0gcmlnaHRSZWN0LngoKSkpOwogICAgICAgICAgICAgcmVwYWludFVz aW5nQ29udGFpbmVyKHJlcGFpbnRDb250YWluZXIsIHJpZ2h0UmVjdCk7CkBAIC0xNDU0LDkgKzE0 NTksOSBAQCBib29sIFJlbmRlck9iamVjdDo6cmVwYWludEFmdGVyTGF5b3V0SWZOCiAgICAgICAg IExheW91dFVuaXQgc2hhZG93Qm90dG9tOwogICAgICAgICBzdHlsZSgpLT5nZXRCb3hTaGFkb3dW ZXJ0aWNhbEV4dGVudChzaGFkb3dUb3AsIHNoYWRvd0JvdHRvbSk7CiAKLSAgICAgICAgTGF5b3V0 VW5pdCBib3JkZXJCb3R0b20gPSBpc0JveCgpID8gdG9SZW5kZXJCb3godGhpcyktPmJvcmRlckJv dHRvbSgpIDogemVyb0xheW91dFVuaXQ7CisgICAgICAgIGludCBib3JkZXJCb3R0b20gPSBpc0Jv eCgpID8gdG9SZW5kZXJCb3godGhpcyktPmJvcmRlckJvdHRvbSgpIDogMDsKICAgICAgICAgTGF5 b3V0VW5pdCBib3hIZWlnaHQgPSBpc0JveCgpID8gdG9SZW5kZXJCb3godGhpcyktPmhlaWdodCgp IDogemVyb0xheW91dFVuaXQ7Ci0gICAgICAgIExheW91dFVuaXQgYm9yZGVySGVpZ2h0ID0gbWF4 PExheW91dFVuaXQ+KC1vdXRsaW5lU3R5bGUtPm91dGxpbmVPZmZzZXQoKSwgbWF4KGJvcmRlckJv dHRvbSwgbWF4PExheW91dFVuaXQ+KHN0eWxlKCktPmJvcmRlckJvdHRvbUxlZnRSYWRpdXMoKS5o ZWlnaHQoKS5jYWxjVmFsdWUoYm94SGVpZ2h0KSwgc3R5bGUoKS0+Ym9yZGVyQm90dG9tUmlnaHRS YWRpdXMoKS5oZWlnaHQoKS5jYWxjVmFsdWUoYm94SGVpZ2h0KSkpKSArIG1heChvdywgc2hhZG93 Qm90dG9tKTsKKyAgICAgICAgTGF5b3V0VW5pdCBib3JkZXJIZWlnaHQgPSBtYXg8TGF5b3V0VW5p dD4oLW91dGxpbmVTdHlsZS0+b3V0bGluZU9mZnNldCgpLCBtYXg8TGF5b3V0VW5pdD4oYm9yZGVy Qm90dG9tLCBtYXg8TGF5b3V0VW5pdD4oc3R5bGUoKS0+Ym9yZGVyQm90dG9tTGVmdFJhZGl1cygp LmhlaWdodCgpLmNhbGNWYWx1ZShib3hIZWlnaHQpLCBzdHlsZSgpLT5ib3JkZXJCb3R0b21SaWdo dFJhZGl1cygpLmhlaWdodCgpLmNhbGNWYWx1ZShib3hIZWlnaHQpKSkpICsgbWF4PExheW91dFVu aXQ+KG93LCBzaGFkb3dCb3R0b20pOwogICAgICAgICBMYXlvdXRSZWN0IGJvdHRvbVJlY3QobmV3 T3V0bGluZUJveC54KCksCiAgICAgICAgICAgICBtaW4obmV3T3V0bGluZUJveC5tYXhZKCksIG9s ZE91dGxpbmVCb3gubWF4WSgpKSAtIGJvcmRlckhlaWdodCwKICAgICAgICAgICAgIG1heChuZXdP dXRsaW5lQm94LndpZHRoKCksIG9sZE91dGxpbmVCb3gud2lkdGgoKSksCkBAIC0yNzAxLDcgKzI3 MDYsNyBAQCBpbnQgUmVuZGVyT2JqZWN0OjpuZXh0T2Zmc2V0KGludCBjdXJyZW50CiAKIHZvaWQg UmVuZGVyT2JqZWN0OjphZGp1c3RSZWN0Rm9yT3V0bGluZUFuZFNoYWRvdyhMYXlvdXRSZWN0JiBy ZWN0KSBjb25zdAogewotICAgIExheW91dFVuaXQgb3V0bGluZVNpemUgPSBvdXRsaW5lU3R5bGVG b3JSZXBhaW50KCktPm91dGxpbmVTaXplKCk7CisgICAgaW50IG91dGxpbmVTaXplID0gb3V0bGlu ZVN0eWxlRm9yUmVwYWludCgpLT5vdXRsaW5lU2l6ZSgpOwogICAgIGlmIChjb25zdCBTaGFkb3dE YXRhKiBib3hTaGFkb3cgPSBzdHlsZSgpLT5ib3hTaGFkb3coKSkgewogICAgICAgICBib3hTaGFk b3ctPmFkanVzdFJlY3RGb3JTaGFkb3cocmVjdCwgb3V0bGluZVNpemUpOwogICAgICAgICByZXR1 cm47CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCShyZXZpc2lv biAxMTA3NDApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmgJKHdv cmtpbmcgY29weSkKQEAgLTI5LDYgKzI5LDcgQEAKICNpbmNsdWRlICJDYWNoZWRJbWFnZS5oIgog I2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRWxlbWVudC5oIgorI2luY2x1ZGUgIkZy YWN0aW9uYWxMYXlvdXRVbml0LmgiCiAjaW5jbHVkZSAiRmxvYXRRdWFkLmgiCiAjaW5jbHVkZSAi TGF5b3V0VHlwZXMuaCIKICNpbmNsdWRlICJQYWludFBoYXNlLmgiCkBAIC03MTcsNiArNzE4LDcg QEAgcHVibGljOgogICAgIHsKICAgICAgICAgcmV0dXJuIGNsaXBwZWRPdmVyZmxvd1JlY3RGb3JS ZXBhaW50KDApOwogICAgIH0KKyAgICBJbnRSZWN0IHBpeGVsU25hcHBlZEFic29sdXRlQ2xpcHBl ZE92ZXJmbG93UmVjdCgpIGNvbnN0OwogICAgIHZpcnR1YWwgTGF5b3V0UmVjdCBjbGlwcGVkT3Zl cmZsb3dSZWN0Rm9yUmVwYWludChSZW5kZXJCb3hNb2RlbE9iamVjdCogcmVwYWludENvbnRhaW5l cikgY29uc3Q7CiAgICAgdmlydHVhbCBMYXlvdXRSZWN0IHJlY3RXaXRoT3V0bGluZUZvclJlcGFp bnQoUmVuZGVyQm94TW9kZWxPYmplY3QqIHJlcGFpbnRDb250YWluZXIsIExheW91dFVuaXQgb3V0 bGluZVdpZHRoKSBjb25zdDsKIApAQCAtMTE0MSw2ICsxMTQzLDExIEBAIGlubGluZSBpbnQgYWRq dXN0Rm9yQWJzb2x1dGVab29tKGludCB2YWwKICAgICByZXR1cm4gYWRqdXN0Rm9yQWJzb2x1dGVa b29tKHZhbHVlLCByZW5kZXJlci0+c3R5bGUoKSk7CiB9CiAKK2lubGluZSBpbnQgYWRqdXN0Rm9y QWJzb2x1dGVab29tKEZyYWN0aW9uYWxMYXlvdXRVbml0IHZhbHVlLCBSZW5kZXJPYmplY3QqIHJl bmRlcmVyKQoreworICAgIHJldHVybiBhZGp1c3RGb3JBYnNvbHV0ZVpvb20odmFsdWUuZmxvb3Io KSwgcmVuZGVyZXItPnN0eWxlKCkpOworfQorCiBpbmxpbmUgdm9pZCBhZGp1c3RGbG9hdFF1YWRG b3JBYnNvbHV0ZVpvb20oRmxvYXRRdWFkJiBxdWFkLCBSZW5kZXJPYmplY3QqIHJlbmRlcmVyKQog ewogICAgIGZsb2F0IHpvb20gPSByZW5kZXJlci0+c3R5bGUoKS0+ZWZmZWN0aXZlWm9vbSgpOwo=