58216 2011-04-10 23:07:27 -0700 Remove safeFloatToInt() in FloatRect.cpp and replace with working version of clampToInteger() 2011-05-23 15:34:01 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 61135 1 simon.fraser mdelaney7 barraclough mdelaney7 oldest_to_newest 383037 0 simon.fraser 2011-04-10 23:07:27 -0700 In r83422 I attempted to replace the safeFloatToInt() in FloatRect.app with a call to clampToInteger(float), but that gives the wrong result if the input is already INT_MAX. 408385 1 94499 mdelaney7 2011-05-23 15:20:31 -0700 Created attachment 94499 Patch 408397 2 mdelaney7 2011-05-23 15:34:01 -0700 Committed r87103: <http://trac.webkit.org/changeset/87103> 94499 2011-05-23 15:20:31 -0700 2011-05-23 15:30:51 -0700 Patch bug-58216-20110523152030.patch text/plain 4291 mdelaney7 SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gODcxMDEpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTEtMDUtMjMgIE1hdHRoZXcgRGVsYW5leSAgPG1kZWxhbmV5QGFwcGxlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgc2FmZUZs b2F0VG9JbnQoKSBpbiBGbG9hdFJlY3QuY3BwIGFuZCByZXBsYWNlIHdpdGggd29ya2luZyB2ZXJz aW9uIG9mIGNsYW1wVG9JbnRlZ2VyKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTU4MjE2CisKKyAgICAgICAgKiB3dGYvTWF0aEV4dHJhcy5oOgorICAg ICAgICAoY2xhbXBUb0ludGVnZXIpOgorICAgICAgICAoY2xhbXBUb1Bvc2l0aXZlSW50ZWdlcik6 CisKIDIwMTEtMDUtMjMgIFJ1YmVuICA8Y2hyb21pdW1AaHlicmlkc291cmNlLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3Jl L3d0Zi9NYXRoRXh0cmFzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3d0 Zi9NYXRoRXh0cmFzLmgJKHJldmlzaW9uIDg2ODg3KQorKysgU291cmNlL0phdmFTY3JpcHRDb3Jl L3d0Zi9NYXRoRXh0cmFzLmgJKHdvcmtpbmcgY29weSkKQEAgLTIyMCwxNyArMjIwLDI3IEBAIGlu bGluZSBpbnQgY2xhbXBUb1Bvc2l0aXZlSW50ZWdlcihkb3VibGUKICAgICByZXR1cm4gc3RhdGlj X2Nhc3Q8aW50PihzdGQ6Om1heDxkb3VibGU+KHN0ZDo6bWluKGQsIG1heEludEFzRG91YmxlKSwg MCkpOwogfQogCi1pbmxpbmUgaW50IGNsYW1wVG9JbnRlZ2VyKGZsb2F0IGQpCitpbmxpbmUgaW50 IGNsYW1wVG9JbnRlZ2VyKGZsb2F0IHgpCiB7Ci0gICAgY29uc3QgZmxvYXQgbWluSW50QXNGbG9h dCA9IHN0YXRpY19jYXN0PGZsb2F0PihzdGQ6Om51bWVyaWNfbGltaXRzPGludD46Om1pbigpKTsK LSAgICBjb25zdCBmbG9hdCBtYXhJbnRBc0Zsb2F0ID0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHN0ZDo6 bnVtZXJpY19saW1pdHM8aW50Pjo6bWF4KCkpOwotICAgIHJldHVybiBzdGF0aWNfY2FzdDxpbnQ+ KHN0ZDo6bWF4KHN0ZDo6bWluKGQsIG1heEludEFzRmxvYXQpLCBtaW5JbnRBc0Zsb2F0KSk7Cisg ICAgc3RhdGljIGNvbnN0IGludCBzX2ludE1heCA9IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50Pjo6 bWF4KCk7CisgICAgc3RhdGljIGNvbnN0IGludCBzX2ludE1pbiA9IHN0ZDo6bnVtZXJpY19saW1p dHM8aW50Pjo6bWluKCk7CisgICAgCisgICAgaWYgKHggPj0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHNf aW50TWF4KSkKKyAgICAgICAgcmV0dXJuIHNfaW50TWF4OworICAgIGlmICh4IDwgc3RhdGljX2Nh c3Q8ZmxvYXQ+KHNfaW50TWluKSkKKyAgICAgICAgcmV0dXJuIHNfaW50TWluOworICAgIHJldHVy biBzdGF0aWNfY2FzdDxpbnQ+KHgpOwogfQogCi1pbmxpbmUgaW50IGNsYW1wVG9Qb3NpdGl2ZUlu dGVnZXIoZmxvYXQgZCkKK2lubGluZSBpbnQgY2xhbXBUb1Bvc2l0aXZlSW50ZWdlcihmbG9hdCB4 KQogewotICAgIGNvbnN0IGZsb2F0IG1heEludEFzRmxvYXQgPSBzdGF0aWNfY2FzdDxmbG9hdD4o c3RkOjpudW1lcmljX2xpbWl0czxpbnQ+OjptYXgoKSk7Ci0gICAgcmV0dXJuIHN0YXRpY19jYXN0 PGludD4oc3RkOjptYXg8ZmxvYXQ+KHN0ZDo6bWluKGQsIG1heEludEFzRmxvYXQpLCAwKSk7Cisg ICAgc3RhdGljIGNvbnN0IGludCBzX2ludE1heCA9IHN0ZDo6bnVtZXJpY19saW1pdHM8aW50Pjo6 bWF4KCk7CisgICAgCisgICAgaWYgKHggPj0gc3RhdGljX2Nhc3Q8ZmxvYXQ+KHNfaW50TWF4KSkK KyAgICAgICAgcmV0dXJuIHNfaW50TWF4OworICAgIGlmICh4IDwgMCkKKyAgICAgICAgcmV0dXJu IDA7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PGludD4oeCk7CiB9CiAKIGlubGluZSBpbnQgY2xh bXBUb0ludGVnZXIodW5zaWduZWQgdmFsdWUpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA4NzEw MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsx LDE1IEBACisyMDExLTA1LTIzICBNYXR0aGV3IERlbGFuZXkgIDxtZGVsYW5leUBhcHBsZS5jb20+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3Zl IHNhZmVGbG9hdFRvSW50KCkgaW4gRmxvYXRSZWN0LmNwcCBhbmQgcmVwbGFjZSB3aXRoIHdvcmtp bmcgdmVyc2lvbiBvZiBjbGFtcFRvSW50ZWdlcigpCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODIxNgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhl IFNWRyB0ZXN0cyBtYXNrLWV4Y2Vzc2l2ZS1tYWxsb2Muc3ZnIGFuZCBwYXR0ZXJuLWV4Y2Vzc2l2 ZS1tYWxsb2Muc3ZnIGV4ZXJjaXNlIHRoaXMgY29kZSBwYXRoLgorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvRmxvYXRSZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmVuY2xvc2luZ0lu dFJlY3QpOgorCiAyMDExLTA1LTIzICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0UmVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRmxvYXRSZWN0LmNwcAkocmV2aXNpb24gODY4ODcpCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJlY3QuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xODIsMTggKzE4Miw2IEBAIHZvaWQgRmxvYXRSZWN0OjpmaXRUb1BvaW50cyhj b25zdCBGbG9hdFAKICAgICBzZXRMb2NhdGlvbkFuZFNpemVGcm9tRWRnZXMobGVmdCwgdG9wLCBy aWdodCwgYm90dG9tKTsKIH0KIAotc3RhdGljIGlubGluZSBpbnQgc2FmZUZsb2F0VG9JbnQoZmxv YXQgeCkKLXsKLSAgICBzdGF0aWMgY29uc3QgaW50IHNfaW50TWF4ID0gc3RkOjpudW1lcmljX2xp bWl0czxpbnQ+OjptYXgoKTsKLSAgICBzdGF0aWMgY29uc3QgaW50IHNfaW50TWluID0gc3RkOjpu dW1lcmljX2xpbWl0czxpbnQ+OjptaW4oKTsKLQotICAgIGlmICh4ID49IHN0YXRpY19jYXN0PGZs b2F0PihzX2ludE1heCkpCi0gICAgICAgIHJldHVybiBzX2ludE1heDsKLSAgICBpZiAoeCA8IHN0 YXRpY19jYXN0PGZsb2F0PihzX2ludE1pbikpCi0gICAgICAgIHJldHVybiBzX2ludE1pbjsKLSAg ICByZXR1cm4gc3RhdGljX2Nhc3Q8aW50Pih4KTsKLX0KLQogSW50UmVjdCBlbmNsb3NpbmdJbnRS ZWN0KGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKIHsKICAgICBmbG9hdCBsZWZ0ID0gZmxvb3JmKHJl Y3QueCgpKTsKQEAgLTIwMSw4ICsxODksOCBAQCBJbnRSZWN0IGVuY2xvc2luZ0ludFJlY3QoY29u c3QgRmxvYXRSZWN0CiAgICAgZmxvYXQgd2lkdGggPSBjZWlsZihyZWN0Lm1heFgoKSkgLSBsZWZ0 OwogICAgIGZsb2F0IGhlaWdodCA9IGNlaWxmKHJlY3QubWF4WSgpKSAtIHRvcDsKICAgICAKLSAg ICByZXR1cm4gSW50UmVjdChzYWZlRmxvYXRUb0ludChsZWZ0KSwgc2FmZUZsb2F0VG9JbnQodG9w KSwgCi0gICAgICAgICAgICAgICAgICAgc2FmZUZsb2F0VG9JbnQod2lkdGgpLCBzYWZlRmxvYXRU b0ludChoZWlnaHQpKTsKKyAgICByZXR1cm4gSW50UmVjdChjbGFtcFRvSW50ZWdlcihsZWZ0KSwg Y2xhbXBUb0ludGVnZXIodG9wKSwgCisgICAgICAgICAgICAgICAgICAgY2xhbXBUb0ludGVnZXIo d2lkdGgpLCBjbGFtcFRvSW50ZWdlcihoZWlnaHQpKTsKIH0KIAogRmxvYXRSZWN0IG1hcFJlY3Qo Y29uc3QgRmxvYXRSZWN0JiByLCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsIGNvbnN0IEZsb2F0 UmVjdCYgZGVzdFJlY3QpCg==