60789 2011-05-13 12:44:04 -0700 Switch itemBoundingBoxRect to use IntPoint 2011-05-25 20:14:56 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60783 60318 1 leviw leviw darin eae eric simon.fraser oldest_to_newest 403757 0 leviw 2011-05-13 12:44:04 -0700 Another low-level low-impact tx/ty conversion :) 410082 1 leviw 2011-05-25 17:56:37 -0700 s/IntSize/IntPoint/ 410085 2 94895 leviw 2011-05-25 17:58:16 -0700 Created attachment 94895 Patch 410092 3 94895 eric 2011-05-25 18:06:31 -0700 Comment on attachment 94895 Patch Ok 410145 4 94895 leviw 2011-05-25 20:13:36 -0700 Comment on attachment 94895 Patch Clearing flags on attachment: 94895 Committed r87352: <http://trac.webkit.org/changeset/87352> 410146 5 leviw 2011-05-25 20:14:56 -0700 All reviewed patches have been landed. Closing bug. 94895 2011-05-25 17:58:16 -0700 2011-05-25 20:13:36 -0700 Patch bug-60789-20110525175815.patch text/plain 6964 leviw SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg3MzQwKQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTEtMDUtMjUgIExldmkgV2Vp bnRyYXViICA8bGV2aXdAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBpdGVtQm91bmRpbmdCb3hSZWN0IHRvIHVzZSBJ bnRQb2ludAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NjA3ODkKKworICAgICAgICBDaGFuZ2luZyBpdGVtQm91bmRpbmdCb3hSZWN0IHRvIHVzZSBhbiBJ bnRQb2ludCByZXByZXNlbnRpbmcgdGhlIG9mZnNldAorICAgICAgICB0byBiZSBhZGRlZCB0b3Qg aGUgYm94IHJlY3QgaW5zdGVhZCBvZiBhIHBhaXIgb2YgaW50cy4KKworICAgICAgICBObyBuZXcg dGVzdHMgc2luY2UgdGhpcyBpcyBqdXN0IHJlZmFjdG9yaW5nLgorCisgICAgICAgICogYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5TGlzdEJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpBY2Nl c3NpYmlsaXR5TGlzdEJveDo6ZWxlbWVudEFjY2Vzc2liaWxpdHlIaXRUZXN0KToKKyAgICAgICAg KiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlMaXN0Qm94T3B0aW9uLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlMaXN0Qm94T3B0aW9uOjplbGVtZW50UmVjdCk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGlzdEJveDo6aXRlbUJvdW5kaW5nQm94UmVjdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJMaXN0Qm94OjphZGRGb2N1c1JpbmdSZWN0cyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJM aXN0Qm94OjpwYWludEl0ZW1Gb3JlZ3JvdW5kKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxp c3RCb3g6OnBhaW50SXRlbUJhY2tncm91bmQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGlz dEJveDo6bm9kZUF0UG9pbnQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJMaXN0Qm94Lmg6 CisKIDIwMTEtMDUtMjUgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IERpcmsgU2NodWx6ZS4KSW5kZXg6IFNvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3RCb3guY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3RCb3guY3BwCShyZXZp c2lvbiA4NzMzNCkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0 eUxpc3RCb3guY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzksNyArMTc5LDcgQEAgQWNjZXNzaWJp bGl0eU9iamVjdCogQWNjZXNzaWJpbGl0eUxpc3RCbwogICAgIEFjY2Vzc2liaWxpdHlPYmplY3Qq IGxpc3RCb3hPcHRpb24gPSAwOwogICAgIHVuc2lnbmVkIGxlbmd0aCA9IG1fY2hpbGRyZW4uc2l6 ZSgpOwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBsZW5ndGg7IGkrKykgewotICAgICAg ICBJbnRSZWN0IHJlY3QgPSB0b1JlbmRlckxpc3RCb3gobV9yZW5kZXJlciktPml0ZW1Cb3VuZGlu Z0JveFJlY3QocGFyZW50UmVjdC54KCksIHBhcmVudFJlY3QueSgpLCBpKTsKKyAgICAgICAgSW50 UmVjdCByZWN0ID0gdG9SZW5kZXJMaXN0Qm94KG1fcmVuZGVyZXIpLT5pdGVtQm91bmRpbmdCb3hS ZWN0KHBhcmVudFJlY3QubG9jYXRpb24oKSwgaSk7CiAgICAgICAgIC8vIFRoZSBjYXN0IHRvIEhU TUxFbGVtZW50IGJlbG93IGlzIHNhZmUgYmVjYXVzZSB0aGUgb25seSBvdGhlciBwb3NzaWJsZSBs aXN0SXRlbSB0eXBlCiAgICAgICAgIC8vIHdvdWxkIGJlIGEgV01MRWxlbWVudCwgYnV0IFdNTCBi dWlsZHMgZG9uJ3QgdXNlIGFjY2Vzc2liaWxpdHkgZmVhdHVyZXMgYXQgYWxsLgogICAgICAgICBp ZiAocmVjdC5jb250YWlucyhwb2ludCkpIHsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQWNjZXNzaWJpbGl0eUxpc3RCb3hPcHRpb24uY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eUxpc3RCb3hPcHRpb24uY3BwCShy ZXZpc2lvbiA4NzMzNCkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eUxpc3RCb3hPcHRpb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDAsNyArMTAwLDcgQEAg SW50UmVjdCBBY2Nlc3NpYmlsaXR5TGlzdEJveE9wdGlvbjo6ZWxlbQogICAgIEludFJlY3QgcGFy ZW50UmVjdCA9IGxpc3RCb3hSZW5kZXJlci0+ZG9jdW1lbnQoKS0+YXhPYmplY3RDYWNoZSgpLT5n ZXRPckNyZWF0ZShsaXN0Qm94UmVuZGVyZXIpLT5ib3VuZGluZ0JveFJlY3QoKTsKICAgICBpbnQg aW5kZXggPSBsaXN0Qm94T3B0aW9uSW5kZXgoKTsKICAgICBpZiAoaW5kZXggIT0gLTEpCi0gICAg ICAgIHJlY3QgPSB0b1JlbmRlckxpc3RCb3gobGlzdEJveFJlbmRlcmVyKS0+aXRlbUJvdW5kaW5n Qm94UmVjdChwYXJlbnRSZWN0LngoKSwgcGFyZW50UmVjdC55KCksIGluZGV4KTsKKyAgICAgICAg cmVjdCA9IHRvUmVuZGVyTGlzdEJveChsaXN0Qm94UmVuZGVyZXIpLT5pdGVtQm91bmRpbmdCb3hS ZWN0KHBhcmVudFJlY3QubG9jYXRpb24oKSwgaW5kZXgpOwogICAgIAogICAgIHJldHVybiByZWN0 OwogfQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcAko cmV2aXNpb24gODczMzQpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJv eC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0OSwxMCArMjQ5LDEwIEBAIGludCBSZW5kZXJMaXN0 Qm94OjpiYXNlbGluZVBvc2l0aW9uKEZvbnQKICAgICByZXR1cm4gUmVuZGVyQm94OjpiYXNlbGlu ZVBvc2l0aW9uKGJhc2VsaW5lVHlwZSwgZmlyc3RMaW5lLCBsaW5lRGlyZWN0aW9uLCBsaW5lUG9z aXRpb25Nb2RlKSAtIGJhc2VsaW5lQWRqdXN0bWVudDsKIH0KIAotSW50UmVjdCBSZW5kZXJMaXN0 Qm94OjppdGVtQm91bmRpbmdCb3hSZWN0KGludCB0eCwgaW50IHR5LCBpbnQgaW5kZXgpCitJbnRS ZWN0IFJlbmRlckxpc3RCb3g6Oml0ZW1Cb3VuZGluZ0JveFJlY3QoY29uc3QgSW50UG9pbnQmIGFk ZGl0aW9uYWxPZmZzZXQsIGludCBpbmRleCkKIHsKLSAgICByZXR1cm4gSW50UmVjdCh0eCArIGJv cmRlckxlZnQoKSArIHBhZGRpbmdMZWZ0KCksCi0gICAgICAgICAgICAgICAgICAgdHkgKyBib3Jk ZXJUb3AoKSArIHBhZGRpbmdUb3AoKSArIGl0ZW1IZWlnaHQoKSAqIChpbmRleCAtIG1faW5kZXhP ZmZzZXQpLAorICAgIHJldHVybiBJbnRSZWN0KGFkZGl0aW9uYWxPZmZzZXQueCgpICsgYm9yZGVy TGVmdCgpICsgcGFkZGluZ0xlZnQoKSwKKyAgICAgICAgICAgICAgICAgICBhZGRpdGlvbmFsT2Zm c2V0LnkoKSArIGJvcmRlclRvcCgpICsgcGFkZGluZ1RvcCgpICsgaXRlbUhlaWdodCgpICogKGlu ZGV4IC0gbV9pbmRleE9mZnNldCksCiAgICAgICAgICAgICAgICAgICAgY29udGVudFdpZHRoKCks IGl0ZW1IZWlnaHQoKSk7CiB9CiAgICAgCkBAIC0zMDksNyArMzA5LDcgQEAgdm9pZCBSZW5kZXJM aXN0Qm94OjphZGRGb2N1c1JpbmdSZWN0cyhWZQogICAgIC8vIEZvY3VzIHRoZSBsYXN0IHNlbGVj dGVkIGl0ZW0uCiAgICAgaW50IHNlbGVjdGVkSXRlbSA9IHNlbGVjdC0+YWN0aXZlU2VsZWN0aW9u RW5kTGlzdEluZGV4KCk7CiAgICAgaWYgKHNlbGVjdGVkSXRlbSA+PSAwKSB7Ci0gICAgICAgIHJl Y3RzLmFwcGVuZChpdGVtQm91bmRpbmdCb3hSZWN0KGFkZGl0aW9uYWxPZmZzZXQueCgpLCBhZGRp dGlvbmFsT2Zmc2V0LnkoKSwgc2VsZWN0ZWRJdGVtKSk7CisgICAgICAgIHJlY3RzLmFwcGVuZChp dGVtQm91bmRpbmdCb3hSZWN0KGFkZGl0aW9uYWxPZmZzZXQsIHNlbGVjdGVkSXRlbSkpOwogICAg ICAgICByZXR1cm47CiAgICAgfQogCkBAIC0zMTksNyArMzE5LDcgQEAgdm9pZCBSZW5kZXJMaXN0 Qm94OjphZGRGb2N1c1JpbmdSZWN0cyhWZQogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgc2l6ZTsg KytpKSB7CiAgICAgICAgIE9wdGlvbkVsZW1lbnQqIG9wdGlvbkVsZW1lbnQgPSB0b09wdGlvbkVs ZW1lbnQobGlzdEl0ZW1zW2ldKTsKICAgICAgICAgaWYgKG9wdGlvbkVsZW1lbnQgJiYgIW9wdGlv bkVsZW1lbnQtPmRpc2FibGVkKCkpIHsKLSAgICAgICAgICAgIHJlY3RzLmFwcGVuZChpdGVtQm91 bmRpbmdCb3hSZWN0KGFkZGl0aW9uYWxPZmZzZXQueCgpLCBhZGRpdGlvbmFsT2Zmc2V0LnkoKSwg aSkpOworICAgICAgICAgICAgcmVjdHMuYXBwZW5kKGl0ZW1Cb3VuZGluZ0JveFJlY3QoYWRkaXRp b25hbE9mZnNldCwgaSkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAgfQpA QCAtMzkyLDcgKzM5Miw3IEBAIHZvaWQgUmVuZGVyTGlzdEJveDo6cGFpbnRJdGVtRm9yZWdyb3Vu ZCgKICAgICBjb25zdCBVQ2hhciogc3RyaW5nID0gaXRlbVRleHQuY2hhcmFjdGVycygpOwogICAg IFRleHRSdW4gdGV4dFJ1bihzdHJpbmcsIGxlbmd0aCwgZmFsc2UsIDAsIDAsIFRleHRSdW46OkFs bG93VHJhaWxpbmdFeHBhbnNpb24sIGl0ZW1TdHlsZS0+ZGlyZWN0aW9uKCksIGl0ZW1TdHlsZS0+ dW5pY29kZUJpZGkoKSA9PSBPdmVycmlkZSk7CiAgICAgRm9udCBpdGVtRm9udCA9IHN0eWxlKCkt PmZvbnQoKTsKLSAgICBJbnRSZWN0IHIgPSBpdGVtQm91bmRpbmdCb3hSZWN0KHR4LCB0eSwgbGlz dEluZGV4KTsKKyAgICBJbnRSZWN0IHIgPSBpdGVtQm91bmRpbmdCb3hSZWN0KEludFBvaW50KHR4 LCB0eSksIGxpc3RJbmRleCk7CiAgICAgci5tb3ZlKGl0ZW1PZmZzZXRGb3JBbGlnbm1lbnQodGV4 dFJ1biwgaXRlbVN0eWxlLCBpdGVtRm9udCwgcikpOwogCiAgICAgaWYgKGlzT3B0aW9uR3JvdXBF bGVtZW50KGVsZW1lbnQpKSB7CkBAIC00MjYsNyArNDI2LDcgQEAgdm9pZCBSZW5kZXJMaXN0Qm94 OjpwYWludEl0ZW1CYWNrZ3JvdW5kKAogICAgIC8vIERyYXcgdGhlIGJhY2tncm91bmQgZm9yIHRo aXMgbGlzdCBib3ggaXRlbQogICAgIGlmICghZWxlbWVudC0+cmVuZGVyU3R5bGUoKSB8fCBlbGVt ZW50LT5yZW5kZXJTdHlsZSgpLT52aXNpYmlsaXR5KCkgIT0gSElEREVOKSB7CiAgICAgICAgIENv bG9yU3BhY2UgY29sb3JTcGFjZSA9IGVsZW1lbnQtPnJlbmRlclN0eWxlKCkgPyBlbGVtZW50LT5y ZW5kZXJTdHlsZSgpLT5jb2xvclNwYWNlKCkgOiBzdHlsZSgpLT5jb2xvclNwYWNlKCk7Ci0gICAg ICAgIEludFJlY3QgaXRlbVJlY3QgPSBpdGVtQm91bmRpbmdCb3hSZWN0KHR4LCB0eSwgbGlzdElu ZGV4KTsKKyAgICAgICAgSW50UmVjdCBpdGVtUmVjdCA9IGl0ZW1Cb3VuZGluZ0JveFJlY3QoSW50 UG9pbnQodHgsIHR5KSwgbGlzdEluZGV4KTsKICAgICAgICAgaXRlbVJlY3QuaW50ZXJzZWN0KGNv bnRyb2xDbGlwUmVjdCh0eCwgdHkpKTsKICAgICAgICAgcGFpbnRJbmZvLmNvbnRleHQtPmZpbGxS ZWN0KGl0ZW1SZWN0LCBiYWNrQ29sb3IsIGNvbG9yU3BhY2UpOwogICAgIH0KQEAgLTY3Myw3ICs2 NzMsNyBAQCBib29sIFJlbmRlckxpc3RCb3g6Om5vZGVBdFBvaW50KGNvbnN0IEhpCiAgICAgdHgg Kz0gdGhpcy0+eCgpOwogICAgIHR5ICs9IHRoaXMtPnkoKTsKICAgICBmb3IgKGludCBpID0gMDsg aSA8IHNpemU7ICsraSkgewotICAgICAgICBpZiAoaXRlbUJvdW5kaW5nQm94UmVjdCh0eCwgdHks IGkpLmNvbnRhaW5zKHBvaW50SW5Db250YWluZXIpKSB7CisgICAgICAgIGlmIChpdGVtQm91bmRp bmdCb3hSZWN0KEludFBvaW50KHR4LCB0eSksIGkpLmNvbnRhaW5zKHBvaW50SW5Db250YWluZXIp KSB7CiAgICAgICAgICAgICBpZiAoRWxlbWVudCogbm9kZSA9IGxpc3RJdGVtc1tpXSkgewogICAg ICAgICAgICAgICAgIHJlc3VsdC5zZXRJbm5lck5vZGUobm9kZSk7CiAgICAgICAgICAgICAgICAg aWYgKCFyZXN1bHQuaW5uZXJOb25TaGFyZWROb2RlKCkpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJMaXN0Qm94LmgJKHJldmlzaW9uIDg3MzM0KQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guaAkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYs NyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRPcHRpb25zQ2hhbmdlZChib29sIGNoYW5nZWQpIHsg bV9vcHRpb25zQ2hhbmdlZCA9IGNoYW5nZWQ7IH0KIAogICAgIGludCBsaXN0SW5kZXhBdE9mZnNl dChpbnQgeCwgaW50IHkpOwotICAgIEludFJlY3QgaXRlbUJvdW5kaW5nQm94UmVjdChpbnQgdHgs IGludCB0eSwgaW50IGluZGV4KTsKKyAgICBJbnRSZWN0IGl0ZW1Cb3VuZGluZ0JveFJlY3QoY29u c3QgSW50UG9pbnQmLCBpbnQgaW5kZXgpOwogCiAgICAgYm9vbCBzY3JvbGxUb1JldmVhbEVsZW1l bnRBdExpc3RJbmRleChpbnQgaW5kZXgpOwogICAgIGJvb2wgbGlzdEluZGV4SXNWaXNpYmxlKGlu dCBpbmRleCk7Cg==