60592 2011-05-10 15:41:41 -0700 Convert RenderFlexibleBox to use IntPoint/IntSize instead of x,y/w,h pairs 2011-05-11 10:32:57 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P3 Enhancement --- 60318 1 eae webkit-unassigned abarth commit-queue eric simon.fraser webkit.review.bot oldest_to_newest 401580 0 eae 2011-05-10 15:41:41 -0700 Convert RenderFlexibleBox to use IntPoint instead of x,y pairs and IntSize instead of width,height pairs. 401672 1 93056 eae 2011-05-10 17:38:55 -0700 Created attachment 93056 Patch 401758 2 93056 eric 2011-05-10 22:11:08 -0700 Comment on attachment 93056 Patch LGTM. The + IntSize(0, offset) stuff reads a little strangely, but this looks like an improvement. 401810 3 93056 commit-queue 2011-05-11 00:11:29 -0700 Comment on attachment 93056 Patch Clearing flags on attachment: 93056 Committed r86222: <http://trac.webkit.org/changeset/86222> 401811 4 commit-queue 2011-05-11 00:11:33 -0700 All reviewed patches have been landed. Closing bug. 401861 5 webkit.review.bot 2011-05-11 02:07:14 -0700 http://trac.webkit.org/changeset/86222 might have broken Windows XP Debug (Tests) 402026 6 93056 darin 2011-05-11 09:20:04 -0700 Comment on attachment 93056 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=93056&action=review > Source/WebCore/rendering/RenderFlexibleBox.h:53 > + void placeChild(RenderBox* child, IntPoint location); Normally we’d use const IntPoint& instead of just IntPoint to avoid extra constructor overhead. 402069 7 eric 2011-05-11 10:15:03 -0700 Ah, true. My apologies for not catching that. Thank you Darin. 402092 8 eae 2011-05-11 10:32:57 -0700 Thanks Darin, I'll upload a patch for that later today, bug 60640. 93056 2011-05-10 17:38:55 -0700 2011-05-11 09:20:04 -0700 Patch 60592.patch text/plain 5764 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDg2MTk5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDUtMTAgIEVtaWwgQSBF a2x1bmQgIDxlYWVAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENvbnZlcnQgUmVuZGVyRmxleGlibGVCb3ggdG8gdXNlIEludFBv aW50L0ludFNpemUgaW5zdGVhZCBvZiB4LHkvdyxoIHBhaXJzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MDU5MgorCisgICAgICAgIFJlZmFjdG9yaW5n LCBjb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckZsZXhpYmxlQm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94Ojps YXlvdXRCbG9jayk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0 SG9yaXpvbnRhbEJveCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6bGF5 b3V0VmVydGljYWxCb3gpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRmxleGlibGVCb3g6OnBs YWNlQ2hpbGQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oOgorCiAy MDExLTA1LTEwICBDaHJpcyBHdWlsbG9yeSAgPGNocmlzLmd1aWxsb3J5QGdvb2dsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgSmFtZXMgUm9iaW5zb24uCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAJKHJldmlzaW9uIDg2MTgwKQor KysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjA5LDE3ICsyMDksMTYgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5 b3V0QmxvY2soYm9vbAogICAgIExheW91dFJlcGFpbnRlciByZXBhaW50ZXIoKnRoaXMsIGNoZWNr Rm9yUmVwYWludER1cmluZ0xheW91dCgpKTsKICAgICBMYXlvdXRTdGF0ZU1haW50YWluZXIgc3Rh dGVQdXNoZXIodmlldygpLCB0aGlzLCBJbnRTaXplKHgoKSwgeSgpKSwgaGFzVHJhbnNmb3JtKCkg fHwgaGFzUmVmbGVjdGlvbigpIHx8IHN0eWxlKCktPmlzRmxpcHBlZEJsb2Nrc1dyaXRpbmdNb2Rl KCkpOwogCi0gICAgaW50IHByZXZpb3VzV2lkdGggPSB3aWR0aCgpOwotICAgIGludCBwcmV2aW91 c0hlaWdodCA9IGhlaWdodCgpOworICAgIEludFNpemUgcHJldmlvdXNTaXplID0gc2l6ZSgpOwog CiAgICAgY29tcHV0ZUxvZ2ljYWxXaWR0aCgpOwogICAgIGNvbXB1dGVMb2dpY2FsSGVpZ2h0KCk7 CiAKICAgICBtX292ZXJmbG93LmNsZWFyKCk7CiAKLSAgICBpZiAocHJldmlvdXNXaWR0aCAhPSB3 aWR0aCgpIHx8IHByZXZpb3VzSGVpZ2h0ICE9IGhlaWdodCgpIHx8Ci0gICAgICAgIChwYXJlbnQo KS0+aXNGbGV4aWJsZUJveCgpICYmIHBhcmVudCgpLT5zdHlsZSgpLT5ib3hPcmllbnQoKSA9PSBI T1JJWk9OVEFMICYmCi0gICAgICAgICBwYXJlbnQoKS0+c3R5bGUoKS0+Ym94QWxpZ24oKSA9PSBC U1RSRVRDSCkpCisgICAgaWYgKHByZXZpb3VzU2l6ZSAhPSBzaXplKCkKKyAgICAgICAgfHwgKHBh cmVudCgpLT5pc0ZsZXhpYmxlQm94KCkgJiYgcGFyZW50KCktPnN0eWxlKCktPmJveE9yaWVudCgp ID09IEhPUklaT05UQUwKKyAgICAgICAgJiYgcGFyZW50KCktPnN0eWxlKCktPmJveEFsaWduKCkg PT0gQlNUUkVUQ0gpKQogICAgICAgICByZWxheW91dENoaWxkcmVuID0gdHJ1ZTsKIAogICAgIHNl dEhlaWdodCgwKTsKQEAgLTI0NCw3ICsyNDMsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94Ojps YXlvdXRCbG9jayhib29sCiAgICAgaW50IG9sZENsaWVudEFmdGVyRWRnZSA9IGNsaWVudExvZ2lj YWxCb3R0b20oKTsKICAgICBjb21wdXRlTG9naWNhbEhlaWdodCgpOwogCi0gICAgaWYgKHByZXZp b3VzSGVpZ2h0ICE9IGhlaWdodCgpKQorICAgIGlmIChwcmV2aW91c1NpemUuaGVpZ2h0KCkgIT0g aGVpZ2h0KCkpCiAgICAgICAgIHJlbGF5b3V0Q2hpbGRyZW4gPSB0cnVlOwogCiAgICAgbGF5b3V0 UG9zaXRpb25lZE9iamVjdHMocmVsYXlvdXRDaGlsZHJlbiB8fCBpc1Jvb3QoKSk7CkBAIC00NDIs NyArNDQxLDcgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5b3V0SG9yaXpvbnRhbAogICAg ICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgcGxh Y2VDaGlsZChjaGlsZCwgeFBvcywgY2hpbGRZKTsKKyAgICAgICAgICAgIHBsYWNlQ2hpbGQoY2hp bGQsIEludFBvaW50KHhQb3MsIGNoaWxkWSkpOwogCiAgICAgICAgICAgICB4UG9zICs9IGNoaWxk LT53aWR0aCgpICsgY2hpbGQtPm1hcmdpblJpZ2h0KCk7CiAgICAgICAgIH0KQEAgLTU2Nyw3ICs1 NjYsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRIb3Jpem9udGFsCiAgICAgICAg ICAgICAgICAgICAgIHJlbWFpbmluZ1NwYWNlIC09IChyZW1haW5pbmdTcGFjZS90b3RhbENoaWxk cmVuKTsKICAgICAgICAgICAgICAgICAgICAgLS10b3RhbENoaWxkcmVuOwogCi0gICAgICAgICAg ICAgICAgICAgIHBsYWNlQ2hpbGQoY2hpbGQsIGNoaWxkLT54KCkgKyBvZmZzZXQsIGNoaWxkLT55 KCkpOworICAgICAgICAgICAgICAgICAgICBwbGFjZUNoaWxkKGNoaWxkLCBjaGlsZC0+bG9jYXRp b24oKSArIEludFNpemUob2Zmc2V0LCAwKSk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAg ICAgfQogICAgICAgICB9IGVsc2UgewpAQCAtNTc5LDcgKzU3OCw3IEBAIHZvaWQgUmVuZGVyRmxl eGlibGVCb3g6OmxheW91dEhvcml6b250YWwKICAgICAgICAgICAgICAgICBpZiAoY2hpbGQtPmlz UG9zaXRpb25lZCgpKQogICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICAg ICAgICAgIHBsYWNlQ2hpbGQoY2hpbGQsIGNoaWxkLT54KCkgKyBvZmZzZXQsIGNoaWxkLT55KCkp OworICAgICAgICAgICAgICAgIHBsYWNlQ2hpbGQoY2hpbGQsIGNoaWxkLT5sb2NhdGlvbigpICsg SW50U2l6ZShvZmZzZXQsIDApKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgIH0KQEAg LTY3Miw3ICs2NzEsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRWZXJ0aWNhbEJv CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIFBsYWNlIHRoZSBjaGlsZC4KLSAgICAg ICAgICAgIHBsYWNlQ2hpbGQoY2hpbGQsIGNoaWxkWCwgaGVpZ2h0KCkpOworICAgICAgICAgICAg cGxhY2VDaGlsZChjaGlsZCwgSW50UG9pbnQoY2hpbGRYLCBoZWlnaHQoKSkpOwogICAgICAgICAg ICAgc2V0SGVpZ2h0KGhlaWdodCgpICsgY2hpbGQtPmhlaWdodCgpICsgY2hpbGQtPm1hcmdpbkJv dHRvbSgpKTsKICAgICAgICAgfQogCkBAIC04MTAsNyArODA5LDcgQEAgdm9pZCBSZW5kZXJGbGV4 aWJsZUJveDo6bGF5b3V0VmVydGljYWxCbwogICAgICAgICAgICAgICAgICAgICBvZmZzZXQgKz0g cmVtYWluaW5nU3BhY2UvdG90YWxDaGlsZHJlbjsKICAgICAgICAgICAgICAgICAgICAgcmVtYWlu aW5nU3BhY2UgLT0gKHJlbWFpbmluZ1NwYWNlL3RvdGFsQ2hpbGRyZW4pOwogICAgICAgICAgICAg ICAgICAgICAtLXRvdGFsQ2hpbGRyZW47Ci0gICAgICAgICAgICAgICAgICAgIHBsYWNlQ2hpbGQo Y2hpbGQsIGNoaWxkLT54KCksIGNoaWxkLT55KCkgKyBvZmZzZXQpOworICAgICAgICAgICAgICAg ICAgICBwbGFjZUNoaWxkKGNoaWxkLCBjaGlsZC0+bG9jYXRpb24oKSArIEludFNpemUoMCwgb2Zm c2V0KSk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2Ug ewpAQCAtODIxLDcgKzgyMCw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dFZlcnRp Y2FsQm8KICAgICAgICAgICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9IGl0ZXJhdG9yLmZpcnN0 KCk7IGNoaWxkOyBjaGlsZCA9IGl0ZXJhdG9yLm5leHQoKSkgewogICAgICAgICAgICAgICAgIGlm IChjaGlsZC0+aXNQb3NpdGlvbmVkKCkpCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwot ICAgICAgICAgICAgICAgIHBsYWNlQ2hpbGQoY2hpbGQsIGNoaWxkLT54KCksIGNoaWxkLT55KCkg KyBvZmZzZXQpOworICAgICAgICAgICAgICAgIHBsYWNlQ2hpbGQoY2hpbGQsIGNoaWxkLT5sb2Nh dGlvbigpICsgSW50U2l6ZSgwLCBvZmZzZXQpKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQog ICAgIH0KQEAgLTkzNCwxMiArOTMzLDEyIEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmFwcGx5 TGluZUNsYW1wKEYKICAgICB9CiB9CiAKLXZvaWQgUmVuZGVyRmxleGlibGVCb3g6OnBsYWNlQ2hp bGQoUmVuZGVyQm94KiBjaGlsZCwgaW50IHgsIGludCB5KQordm9pZCBSZW5kZXJGbGV4aWJsZUJv eDo6cGxhY2VDaGlsZChSZW5kZXJCb3gqIGNoaWxkLCBJbnRQb2ludCBsb2NhdGlvbikKIHsKLSAg ICBJbnRSZWN0IG9sZFJlY3QoY2hpbGQtPngoKSwgY2hpbGQtPnkoKSAsIGNoaWxkLT53aWR0aCgp LCBjaGlsZC0+aGVpZ2h0KCkpOworICAgIEludFJlY3Qgb2xkUmVjdCA9IGNoaWxkLT5mcmFtZVJl Y3QoKTsKIAogICAgIC8vIFBsYWNlIHRoZSBjaGlsZC4KLSAgICBjaGlsZC0+c2V0TG9jYXRpb24o eCwgeSk7CisgICAgY2hpbGQtPnNldExvY2F0aW9uKGxvY2F0aW9uKTsKIAogICAgIC8vIElmIHRo ZSBjaGlsZCBtb3ZlZCwgd2UgaGF2ZSB0byByZXBhaW50IGl0IGFzIHdlbGwgYXMgYW55IGZsb2F0 aW5nL3Bvc2l0aW9uZWQKICAgICAvLyBkZXNjZW5kYW50cy4gIEFuIGV4Y2VwdGlvbiBpcyBpZiB3 ZSBuZWVkIGEgbGF5b3V0LiAgSW4gdGhpcyBjYXNlLCB3ZSBrbm93IHdlJ3JlIGdvaW5nIHRvCklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAkocmV2 aXNpb24gODYxODApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC b3guaAkod29ya2luZyBjb3B5KQpAQCAtNTAsNyArNTAsNyBAQCBwdWJsaWM6CiAgICAgdmlydHVh bCBib29sIGlzRmxleGluZ0NoaWxkcmVuKCkgY29uc3QgeyByZXR1cm4gbV9mbGV4aW5nQ2hpbGRy ZW47IH0KICAgICB2aXJ0dWFsIGJvb2wgaXNTdHJldGNoaW5nQ2hpbGRyZW4oKSBjb25zdCB7IHJl dHVybiBtX3N0cmV0Y2hpbmdDaGlsZHJlbjsgfQogCi0gICAgdm9pZCBwbGFjZUNoaWxkKFJlbmRl ckJveCogY2hpbGQsIGludCB4LCBpbnQgeSk7CisgICAgdm9pZCBwbGFjZUNoaWxkKFJlbmRlckJv eCogY2hpbGQsIEludFBvaW50IGxvY2F0aW9uKTsKIAogcHJvdGVjdGVkOgogICAgIGludCBhbGxv d2VkQ2hpbGRGbGV4KFJlbmRlckJveCogY2hpbGQsIGJvb2wgZXhwYW5kaW5nLCB1bnNpZ25lZCBn cm91cCk7Cg==