71525 2011-11-03 17:35:47 -0700 Correct usage of LayoutUnits in RenderImage and SVGImage 2011-11-04 11:27:56 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 63567 1 leviw leviw darin eae eric webkit.review.bot oldest_to_newest 495928 0 leviw 2011-11-03 17:35:47 -0700 Images can only be integrally sized. This addresses issues in the current LayoutUnit usage in RenderImage and SVGImage, as well as fixing uses of integers for overloaded paint methods that hadn't been updated. 495941 1 113594 leviw 2011-11-03 17:40:10 -0700 Created attachment 113594 Patch 496304 2 113594 leviw 2011-11-04 10:56:39 -0700 Comment on attachment 113594 Patch Thanks Darin! 496337 3 113594 webkit.review.bot 2011-11-04 11:27:51 -0700 Comment on attachment 113594 Patch Clearing flags on attachment: 113594 Committed r99303: <http://trac.webkit.org/changeset/99303> 496339 4 webkit.review.bot 2011-11-04 11:27:56 -0700 All reviewed patches have been landed. Closing bug. 113594 2011-11-03 17:40:10 -0700 2011-11-04 11:27:51 -0700 Patch bug-71525-20111103174009.patch text/plain 5353 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk5MjUzKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMTEtMDMgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIENvcnJlY3QgdXNhZ2Ugb2Yg TGF5b3V0VW5pdHMgaW4gUmVuZGVySW1hZ2UgYW5kIFNWR0ltYWdlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MTUyNQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvcnJlY3RpbmcgaW5jb3JyZWN0IHVzYWdl IG9mIExheW91dFVuaXRzIGZvciBpbWFnZSBzaXplcyB0aGF0IHNob3VsZCBiZSBpbnRlZ2VycyBh bmQgZml4aW5nIG92ZXJsb2FkZWQgZnVuY3Rpb25zIHRoYXQKKyAgICAgICAgc2hvdWxkIGJlIHVz aW5nIExheW91dFVuaXRzLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyAtLSBubyBjaGFuZ2UgaW4g YmVoYXZpb3IuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVySW1hZ2U6OmltYWdlRGltZW5zaW9uc0NoYW5nZWQpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVySW1hZ2U6OnBhaW50SW50b1JlY3QpOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVySW1hZ2U6Om5vZGVBdFBvaW50KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlcklt YWdlOjpjb21wdXRlUmVwbGFjZWRMb2dpY2FsV2lkdGgpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJJbWFnZS5oOgorICAgICAgICAqIHN2Zy9ncmFwaGljcy9TVkdJbWFnZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpTVkdJbWFnZUNocm9tZUNsaWVudDo6aW52YWxpZGF0ZUNvbnRlbnRzQW5k V2luZG93KToKKwogMjAxMS0xMS0wMyAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gTm90aWZ5IHNjaGVkdWxlciBvbiBTd2FwQnVmZmVy cyBpbiB0aHJlYWRlZCBjb21wb3NpdG9yIG1vZGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJJbWFnZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckltYWdlLmNwcAkocmV2aXNpb24gOTkwMDYpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVySW1hZ2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTIsNyArMjEyLDcg QEAgdm9pZCBSZW5kZXJJbWFnZTo6aW1hZ2VEaW1lbnNpb25zQ2hhbmdlZAogICAgIH0KIAogICAg IGlmIChzaG91bGRSZXBhaW50KSB7Ci0gICAgICAgIEludFJlY3QgcmVwYWludFJlY3Q7CisgICAg ICAgIExheW91dFJlY3QgcmVwYWludFJlY3Q7CiAgICAgICAgIGlmIChyZWN0KSB7CiAgICAgICAg ICAgICAvLyBUaGUgaW1hZ2UgY2hhbmdlZCByZWN0IGlzIGluIHNvdXJjZSBpbWFnZSBjb29yZGlu YXRlcyAocHJlLXpvb21pbmcpLAogICAgICAgICAgICAgLy8gc28gbWFwIGZyb20gdGhlIGJvdW5k cyBvZiB0aGUgaW1hZ2UgdG8gdGhlIGNvbnRlbnRzQm94LgpAQCAtMzk0LDcgKzM5NCw3IEBAIHZv aWQgUmVuZGVySW1hZ2U6OmFyZWFFbGVtZW50Rm9jdXNDaGFuZ2UKICAgICByZXBhaW50KCk7CiB9 CiAKLXZvaWQgUmVuZGVySW1hZ2U6OnBhaW50SW50b1JlY3QoR3JhcGhpY3NDb250ZXh0KiBjb250 ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQordm9pZCBSZW5kZXJJbWFnZTo6cGFpbnRJbnRvUmVj dChHcmFwaGljc0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IExheW91dFJlY3QmIHJlY3QpCiB7CiAg ICAgaWYgKCFtX2ltYWdlUmVzb3VyY2UtPmhhc0ltYWdlKCkgfHwgbV9pbWFnZVJlc291cmNlLT5l cnJvck9jY3VycmVkKCkgfHwgcmVjdC53aWR0aCgpIDw9IDAgfHwgcmVjdC5oZWlnaHQoKSA8PSAw KQogICAgICAgICByZXR1cm47CkBAIC00NTQsNyArNDU0LDcgQEAgYm9vbCBSZW5kZXJJbWFnZTo6 bm9kZUF0UG9pbnQoY29uc3QgSGl0VAogCiAgICAgaWYgKHRlbXBSZXN1bHQuaW5uZXJOb2RlKCkg JiYgbm9kZSgpKSB7CiAgICAgICAgIGlmIChIVE1MTWFwRWxlbWVudCogbWFwID0gaW1hZ2VNYXAo KSkgewotICAgICAgICAgICAgSW50UmVjdCBjb250ZW50Qm94ID0gY29udGVudEJveFJlY3QoKTsK KyAgICAgICAgICAgIExheW91dFJlY3QgY29udGVudEJveCA9IGNvbnRlbnRCb3hSZWN0KCk7CiAg ICAgICAgICAgICBmbG9hdCBzY2FsZUZhY3RvciA9IDEgLyBzdHlsZSgpLT5lZmZlY3RpdmVab29t KCk7CiAgICAgICAgICAgICBMYXlvdXRQb2ludCBtYXBMb2NhdGlvbihwb2ludEluQ29udGFpbmVy LngoKSAtIGFjY3VtdWxhdGVkT2Zmc2V0LngoKSAtIHRoaXMtPngoKSAtIGNvbnRlbnRCb3gueCgp LCBwb2ludEluQ29udGFpbmVyLnkoKSAtIGFjY3VtdWxhdGVkT2Zmc2V0LnkoKSAtIHRoaXMtPnko KSAtIGNvbnRlbnRCb3gueSgpKTsKICAgICAgICAgICAgIG1hcExvY2F0aW9uLnNjYWxlKHNjYWxl RmFjdG9yLCBzY2FsZUZhY3Rvcik7CkBAIC00OTUsMTMgKzQ5NSwxMyBAQCBMYXlvdXRVbml0IFJl bmRlckltYWdlOjpjb21wdXRlUmVwbGFjZWRMCiAgICAgYm9vbCBoYXNSZWxhdGl2ZVdpZHRoID0g Y29udGVudFJlbmRlcmVyID8gY29udGVudFJlbmRlcmVyLT5zdHlsZSgpLT53aWR0aCgpLmlzUGVy Y2VudCgpIDogbV9pbWFnZVJlc291cmNlLT5pbWFnZUhhc1JlbGF0aXZlV2lkdGgoKTsKICAgICBi b29sIGhhc1JlbGF0aXZlSGVpZ2h0ID0gY29udGVudFJlbmRlcmVyID8gY29udGVudFJlbmRlcmVy LT5zdHlsZSgpLT5oZWlnaHQoKS5pc1BlcmNlbnQoKSA6IG1faW1hZ2VSZXNvdXJjZS0+aW1hZ2VI YXNSZWxhdGl2ZUhlaWdodCgpOwogCi0gICAgTGF5b3V0U2l6ZSBjb250YWluZXJTaXplOworICAg IEludFNpemUgY29udGFpbmVyU2l6ZTsKICAgICBpZiAoaGFzUmVsYXRpdmVXaWR0aCB8fCBoYXNS ZWxhdGl2ZUhlaWdodCkgewogICAgICAgICAvLyBQcm9wYWdhdGUgdGhlIGNvbnRhaW5pbmcgYmxv Y2sgc2l6ZSB0byB0aGUgaW1hZ2UgcmVzb3VyY2UsIG90aGVyd2hpc2Ugd2UgY2FuJ3QgY29tcHV0 ZSBvdXIgb3duIGludHJpbnNpYyBzaXplLCBpZiBpdCdzIHJlbGF0aXZlLgogICAgICAgICBSZW5k ZXJPYmplY3QqIGNvbnRhaW5pbmdCbG9jayA9IGlzUG9zaXRpb25lZCgpID8gY29udGFpbmVyKCkg OiB0aGlzLT5jb250YWluaW5nQmxvY2soKTsKICAgICAgICAgaWYgKGNvbnRhaW5pbmdCbG9jay0+ aXNCb3goKSkgewogICAgICAgICAgICAgUmVuZGVyQm94KiBib3ggPSB0b1JlbmRlckJveChjb250 YWluaW5nQmxvY2spOwotICAgICAgICAgICAgY29udGFpbmVyU2l6ZSA9IExheW91dFNpemUoYm94 LT5hdmFpbGFibGVXaWR0aCgpLCBib3gtPmF2YWlsYWJsZUhlaWdodCgpKTsgLy8gQWxyZWFkeSBj b250YWlucyB6b29taW5nIGluZm9ybWF0aW9uLgorICAgICAgICAgICAgY29udGFpbmVyU2l6ZSA9 IEludFNpemUoYm94LT5hdmFpbGFibGVXaWR0aCgpLCBib3gtPmF2YWlsYWJsZUhlaWdodCgpKTsg Ly8gQWxyZWFkeSBjb250YWlucyB6b29taW5nIGluZm9ybWF0aW9uLgogICAgICAgICB9CiAgICAg fSBlbHNlIHsKICAgICAgICAgLy8gUHJvcGFnYXRlIHRoZSBjdXJyZW50IHpvb21lZCBpbWFnZSBz aXplIHRvIHRoZSBpbWFnZSByZXNvdXJjZSwgb3RoZXJ3aGlzZSB0aGUgaW1hZ2Ugc2l6ZSB3aWxs IHJlbWFpbiB0aGUgc2FtZSBvbi1zY3JlZW4uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVySW1hZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVySW1hZ2UuaAkocmV2aXNpb24gOTkwMDYpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVySW1hZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtNjIsNyArNjIsNyBAQCBwcm90ZWN0 ZWQ6CiAKICAgICB2aXJ0dWFsIHZvaWQgaW1hZ2VDaGFuZ2VkKFdyYXBwZWRJbWFnZVB0ciwgY29u c3QgSW50UmVjdCogPSAwKTsKIAotICAgIHZpcnR1YWwgdm9pZCBwYWludEludG9SZWN0KEdyYXBo aWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmKTsKKyAgICB2aXJ0dWFsIHZvaWQgcGFpbnRJbnRv UmVjdChHcmFwaGljc0NvbnRleHQqLCBjb25zdCBMYXlvdXRSZWN0Jik7CiAgICAgdmlydHVhbCB2 b2lkIHBhaW50KFBhaW50SW5mbyYsIGNvbnN0IExheW91dFBvaW50Jik7CiAKICAgICB2aXJ0dWFs IHZvaWQgaW50cmluc2ljU2l6ZUNoYW5nZWQoKQpAQCAtNzcsNyArNzcsNyBAQCBwcml2YXRlOgog ICAgIHZpcnR1YWwgYm9vbCBpc0ltYWdlKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogICAgIHZp cnR1YWwgYm9vbCBpc1JlbmRlckltYWdlKCkgY29uc3QgeyByZXR1cm4gdHJ1ZTsgfQogCi0gICAg dmlydHVhbCB2b2lkIHBhaW50UmVwbGFjZWQoUGFpbnRJbmZvJiwgY29uc3QgSW50UG9pbnQmKTsK KyAgICB2aXJ0dWFsIHZvaWQgcGFpbnRSZXBsYWNlZChQYWludEluZm8mLCBjb25zdCBMYXlvdXRQ b2ludCYpOwogCiAgICAgdmlydHVhbCBib29sIGJhY2tncm91bmRJc09ic2N1cmVkKCkgY29uc3Q7 CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3N2Zy9ncmFwaGljcy9TVkdJbWFnZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvc3ZnL2dyYXBoaWNzL1NWR0ltYWdlLmNwcAkocmV2aXNp b24gOTkyMjMpCisrKyBTb3VyY2UvV2ViQ29yZS9zdmcvZ3JhcGhpY3MvU1ZHSW1hZ2UuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC03Myw3ICs3Myw3IEBAIHByaXZhdGU6CiAgICAgICAgIG1faW1hZ2Ug PSAwOwogICAgIH0KIAotICAgIHZpcnR1YWwgdm9pZCBpbnZhbGlkYXRlQ29udGVudHNBbmRXaW5k b3coY29uc3QgTGF5b3V0UmVjdCYgciwgYm9vbCkKKyAgICB2aXJ0dWFsIHZvaWQgaW52YWxpZGF0 ZUNvbnRlbnRzQW5kV2luZG93KGNvbnN0IEludFJlY3QmIHIsIGJvb2wpCiAgICAgewogICAgICAg ICBpZiAobV9pbWFnZSAmJiBtX2ltYWdlLT5pbWFnZU9ic2VydmVyKCkpCiAgICAgICAgICAgICBt X2ltYWdlLT5pbWFnZU9ic2VydmVyKCktPmNoYW5nZWRJblJlY3QobV9pbWFnZSwgcik7Cg==