57943 2011-04-06 05:58:04 -0700 Move RenderBlock::positionNewFloatOnLine to RenderBlockLineLayout.cpp 2011-04-06 08:20:21 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) All All RESOLVED FIXED P2 Enhancement --- 57851 1 rniwa webkit-unassigned abarth eric mitz webkit.review.bot oldest_to_newest 380295 0 rniwa 2011-04-06 05:58:04 -0700 positionNewFloatOnLine is only used in RenderBlockLineLayout.cpp. We should move this function to RenderBlockLineLayout.cpp. 380299 1 88404 rniwa 2011-04-06 06:07:45 -0700 Created attachment 88404 cleanup 380300 2 88404 eric 2011-04-06 06:08:56 -0700 Comment on attachment 88404 cleanup Yay simple patches! 380331 3 rniwa 2011-04-06 07:10:16 -0700 Committed r83042: <http://trac.webkit.org/changeset/83042> 380348 4 webkit.review.bot 2011-04-06 07:34:03 -0700 http://trac.webkit.org/changeset/83042 might have broken GTK Linux 64-bit Debug 380385 5 mitz 2011-04-06 08:13:38 -0700 RenderBlock.h used to list functions implemented in RenderBlockLineLayout.cpp in a separate section. Perhaps this is no longer the case. 380386 6 rniwa 2011-04-06 08:17:19 -0700 (In reply to comment #5) > RenderBlock.h used to list functions implemented in RenderBlockLineLayout.cpp in a separate section. Perhaps this is no longer the case. Oops, I missed that. Fixing it now. 380390 7 rniwa 2011-04-06 08:20:21 -0700 Fixed RenderBlock.h in http://trac.webkit.org/changeset/83052. 88404 2011-04-06 06:07:45 -0700 2011-04-06 06:08:56 -0700 cleanup bug-57943-20110406060743.patch text/plain 5746 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMDM5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDQtMDYgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTW92ZSBSZW5kZXJCbG9jazo6cG9zaXRpb25OZXdGbG9hdE9uTGlu ZSB0byBSZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Nzk0MworCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRl ckJsb2NrLmNwcDogUmVtb3ZlZCBwb3NpdGlvbk5ld0Zsb2F0T25MaW5lLgorICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyQmxvY2s6OnBvc2l0aW9uTmV3RmxvYXRPbkxpbmUpOiBNb3ZlZCBmcm9tIFJlbmRlckJsb2Nr LmNwcAorCiAyMDExLTA0LTA2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwCShyZXZpc2lvbiA4MzAzOCkKKysrIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMzMjAsNTkgKzMz MjAsNiBAQCBib29sIFJlbmRlckJsb2NrOjpwb3NpdGlvbk5ld0Zsb2F0cygpCiAgICAgcmV0dXJu IHRydWU7CiB9CiAKLWJvb2wgUmVuZGVyQmxvY2s6OnBvc2l0aW9uTmV3RmxvYXRPbkxpbmUoRmxv YXRpbmdPYmplY3QqIG5ld0Zsb2F0LCBGbG9hdGluZ09iamVjdCogbGFzdEZsb2F0RnJvbVByZXZp b3VzTGluZSwgYm9vbCBmaXJzdExpbmUsIGludCYgbGluZUxlZnRPZmZzZXQsIGludCYgbGluZVJp Z2h0T2Zmc2V0KQotewotICAgIGJvb2wgZGlkUG9zaXRpb24gPSBwb3NpdGlvbk5ld0Zsb2F0cygp OwotICAgIGlmICghZGlkUG9zaXRpb24pCi0gICAgICAgIHJldHVybiBkaWRQb3NpdGlvbjsKLQot ICAgIGludCBibG9ja09mZnNldCA9IGxvZ2ljYWxIZWlnaHQoKTsKLSAgICBpZiAoYmxvY2tPZmZz ZXQgPj0gbG9naWNhbFRvcEZvckZsb2F0KG5ld0Zsb2F0KSAmJiBibG9ja09mZnNldCA8IGxvZ2lj YWxCb3R0b21Gb3JGbG9hdChuZXdGbG9hdCkpIHsKLSAgICAgICAgaWYgKG5ld0Zsb2F0LT50eXBl KCkgPT0gRmxvYXRpbmdPYmplY3Q6OkZsb2F0TGVmdCkKLSAgICAgICAgICAgIGxpbmVMZWZ0T2Zm c2V0ID0gbG9naWNhbFJpZ2h0Rm9yRmxvYXQobmV3RmxvYXQpOwotICAgICAgICBlbHNlCi0gICAg ICAgICAgICBsaW5lUmlnaHRPZmZzZXQgPSBsb2dpY2FsTGVmdEZvckZsb2F0KG5ld0Zsb2F0KTsK LSAgICB9Ci0gICAgCi0gICAgaWYgKCFuZXdGbG9hdC0+bV9wYWdpbmF0aW9uU3RydXQpCi0gICAg ICAgIHJldHVybiBkaWRQb3NpdGlvbjsKLSAgICAgCi0gICAgRmxvYXRpbmdPYmplY3RTZXQmIGZs b2F0aW5nT2JqZWN0U2V0ID0gbV9mbG9hdGluZ09iamVjdHMtPnNldCgpOwotICAgIEFTU0VSVChm bG9hdGluZ09iamVjdFNldC5sYXN0KCkgPT0gbmV3RmxvYXQpOwotCi0gICAgaW50IGZsb2F0TG9n aWNhbFRvcCA9IGxvZ2ljYWxUb3BGb3JGbG9hdChuZXdGbG9hdCk7Ci0gICAgaW50IHBhZ2luYXRp b25TdHJ1dCA9IG5ld0Zsb2F0LT5tX3BhZ2luYXRpb25TdHJ1dDsKLSAgICAKLSAgICBpZiAoZmxv YXRMb2dpY2FsVG9wIC0gcGFnaW5hdGlvblN0cnV0ICE9IGxvZ2ljYWxIZWlnaHQoKSkKLSAgICAg ICAgcmV0dXJuIGRpZFBvc2l0aW9uOwotCi0gICAgRmxvYXRpbmdPYmplY3RTZXRJdGVyYXRvciBp dCA9IGZsb2F0aW5nT2JqZWN0U2V0LmVuZCgpOwotICAgIC0taXQ7IC8vIExhc3QgZmxvYXQgaXMg bmV3RmxvYXQsIHNraXAgdGhhdCBvbmUuCi0gICAgRmxvYXRpbmdPYmplY3RTZXRJdGVyYXRvciBi ZWdpbiA9IGZsb2F0aW5nT2JqZWN0U2V0LmJlZ2luKCk7Ci0gICAgd2hpbGUgKGl0ICE9IGJlZ2lu KSB7Ci0gICAgICAgIC0taXQ7Ci0gICAgICAgIEZsb2F0aW5nT2JqZWN0KiBmID0gKml0OwotICAg ICAgICBpZiAoZiA9PSBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lKQotICAgICAgICAgICAgYnJl YWs7Ci0gICAgICAgIGlmIChsb2dpY2FsVG9wRm9yRmxvYXQoZikgPT0gbG9naWNhbEhlaWdodCgp KSB7Ci0gICAgICAgICAgICBBU1NFUlQoIWYtPm1fcGFnaW5hdGlvblN0cnV0KTsKLSAgICAgICAg ICAgIGYtPm1fcGFnaW5hdGlvblN0cnV0ID0gcGFnaW5hdGlvblN0cnV0OwotICAgICAgICAgICAg UmVuZGVyQm94KiBvID0gZi0+bV9yZW5kZXJlcjsKLSAgICAgICAgICAgIHNldExvZ2ljYWxUb3BG b3JDaGlsZChvLCBsb2dpY2FsVG9wRm9yQ2hpbGQobykgKyBtYXJnaW5CZWZvcmVGb3JDaGlsZChv KSArIHBhZ2luYXRpb25TdHJ1dCk7Ci0gICAgICAgICAgICBpZiAoby0+aXNSZW5kZXJCbG9jaygp KQotICAgICAgICAgICAgICAgIHRvUmVuZGVyQmxvY2sobyktPnNldENoaWxkTmVlZHNMYXlvdXQo dHJ1ZSwgZmFsc2UpOwotICAgICAgICAgICAgby0+bGF5b3V0SWZOZWVkZWQoKTsKLSAgICAgICAg ICAgIHNldExvZ2ljYWxUb3BGb3JGbG9hdChmLCBsb2dpY2FsVG9wRm9yRmxvYXQoZikgKyBmLT5t X3BhZ2luYXRpb25TdHJ1dCk7Ci0gICAgICAgIH0KLSAgICB9Ci0gICAgICAgIAotICAgIHNldExv Z2ljYWxIZWlnaHQoYmxvY2tPZmZzZXQgKyBwYWdpbmF0aW9uU3RydXQpOwotICAgIGxpbmVMZWZ0 T2Zmc2V0ID0gbG9naWNhbExlZnRPZmZzZXRGb3JMaW5lKGxvZ2ljYWxIZWlnaHQoKSwgZmlyc3RM aW5lKTsKLSAgICBsaW5lUmlnaHRPZmZzZXQgPSBsb2dpY2FsUmlnaHRPZmZzZXRGb3JMaW5lKGxv Z2ljYWxIZWlnaHQoKSwgZmlyc3RMaW5lKTsKLQotICAgIHJldHVybiBkaWRQb3NpdGlvbjsKLX0K LQogdm9pZCBSZW5kZXJCbG9jazo6bmV3TGluZShFQ2xlYXIgY2xlYXIpCiB7CiAgICAgcG9zaXRp b25OZXdGbG9hdHMoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j a0xpbmVMYXlvdXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCShyZXZpc2lvbiA4MzAzOCkKKysrIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yMjQ0LDQgKzIyNDQsNTcgQEAgdm9pZCBSZW5kZXJCbG9jazo6Y2hlY2tMaW5lc0ZvclRleHRP dmVyZgogICAgIH0KIH0KIAorYm9vbCBSZW5kZXJCbG9jazo6cG9zaXRpb25OZXdGbG9hdE9uTGlu ZShGbG9hdGluZ09iamVjdCogbmV3RmxvYXQsIEZsb2F0aW5nT2JqZWN0KiBsYXN0RmxvYXRGcm9t UHJldmlvdXNMaW5lLCBib29sIGZpcnN0TGluZSwgaW50JiBsaW5lTGVmdE9mZnNldCwgaW50JiBs aW5lUmlnaHRPZmZzZXQpCit7CisgICAgYm9vbCBkaWRQb3NpdGlvbiA9IHBvc2l0aW9uTmV3Rmxv YXRzKCk7CisgICAgaWYgKCFkaWRQb3NpdGlvbikKKyAgICAgICAgcmV0dXJuIGRpZFBvc2l0aW9u OworCisgICAgaW50IGJsb2NrT2Zmc2V0ID0gbG9naWNhbEhlaWdodCgpOworICAgIGlmIChibG9j a09mZnNldCA+PSBsb2dpY2FsVG9wRm9yRmxvYXQobmV3RmxvYXQpICYmIGJsb2NrT2Zmc2V0IDwg bG9naWNhbEJvdHRvbUZvckZsb2F0KG5ld0Zsb2F0KSkgeworICAgICAgICBpZiAobmV3RmxvYXQt PnR5cGUoKSA9PSBGbG9hdGluZ09iamVjdDo6RmxvYXRMZWZ0KQorICAgICAgICAgICAgbGluZUxl ZnRPZmZzZXQgPSBsb2dpY2FsUmlnaHRGb3JGbG9hdChuZXdGbG9hdCk7CisgICAgICAgIGVsc2UK KyAgICAgICAgICAgIGxpbmVSaWdodE9mZnNldCA9IGxvZ2ljYWxMZWZ0Rm9yRmxvYXQobmV3Rmxv YXQpOworICAgIH0KKworICAgIGlmICghbmV3RmxvYXQtPm1fcGFnaW5hdGlvblN0cnV0KQorICAg ICAgICByZXR1cm4gZGlkUG9zaXRpb247CisKKyAgICBGbG9hdGluZ09iamVjdFNldCYgZmxvYXRp bmdPYmplY3RTZXQgPSBtX2Zsb2F0aW5nT2JqZWN0cy0+c2V0KCk7CisgICAgQVNTRVJUKGZsb2F0 aW5nT2JqZWN0U2V0Lmxhc3QoKSA9PSBuZXdGbG9hdCk7CisKKyAgICBpbnQgZmxvYXRMb2dpY2Fs VG9wID0gbG9naWNhbFRvcEZvckZsb2F0KG5ld0Zsb2F0KTsKKyAgICBpbnQgcGFnaW5hdGlvblN0 cnV0ID0gbmV3RmxvYXQtPm1fcGFnaW5hdGlvblN0cnV0OworCisgICAgaWYgKGZsb2F0TG9naWNh bFRvcCAtIHBhZ2luYXRpb25TdHJ1dCAhPSBsb2dpY2FsSGVpZ2h0KCkpCisgICAgICAgIHJldHVy biBkaWRQb3NpdGlvbjsKKworICAgIEZsb2F0aW5nT2JqZWN0U2V0SXRlcmF0b3IgaXQgPSBmbG9h dGluZ09iamVjdFNldC5lbmQoKTsKKyAgICAtLWl0OyAvLyBMYXN0IGZsb2F0IGlzIG5ld0Zsb2F0 LCBza2lwIHRoYXQgb25lLgorICAgIEZsb2F0aW5nT2JqZWN0U2V0SXRlcmF0b3IgYmVnaW4gPSBm bG9hdGluZ09iamVjdFNldC5iZWdpbigpOworICAgIHdoaWxlIChpdCAhPSBiZWdpbikgeworICAg ICAgICAtLWl0OworICAgICAgICBGbG9hdGluZ09iamVjdCogZiA9ICppdDsKKyAgICAgICAgaWYg KGYgPT0gbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZSkKKyAgICAgICAgICAgIGJyZWFrOworICAg ICAgICBpZiAobG9naWNhbFRvcEZvckZsb2F0KGYpID09IGxvZ2ljYWxIZWlnaHQoKSkgeworICAg ICAgICAgICAgQVNTRVJUKCFmLT5tX3BhZ2luYXRpb25TdHJ1dCk7CisgICAgICAgICAgICBmLT5t X3BhZ2luYXRpb25TdHJ1dCA9IHBhZ2luYXRpb25TdHJ1dDsKKyAgICAgICAgICAgIFJlbmRlckJv eCogbyA9IGYtPm1fcmVuZGVyZXI7CisgICAgICAgICAgICBzZXRMb2dpY2FsVG9wRm9yQ2hpbGQo bywgbG9naWNhbFRvcEZvckNoaWxkKG8pICsgbWFyZ2luQmVmb3JlRm9yQ2hpbGQobykgKyBwYWdp bmF0aW9uU3RydXQpOworICAgICAgICAgICAgaWYgKG8tPmlzUmVuZGVyQmxvY2soKSkKKyAgICAg ICAgICAgICAgICB0b1JlbmRlckJsb2NrKG8pLT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUsIGZh bHNlKTsKKyAgICAgICAgICAgIG8tPmxheW91dElmTmVlZGVkKCk7CisgICAgICAgICAgICBzZXRM b2dpY2FsVG9wRm9yRmxvYXQoZiwgbG9naWNhbFRvcEZvckZsb2F0KGYpICsgZi0+bV9wYWdpbmF0 aW9uU3RydXQpOworICAgICAgICB9CisgICAgfQorCisgICAgc2V0TG9naWNhbEhlaWdodChibG9j a09mZnNldCArIHBhZ2luYXRpb25TdHJ1dCk7CisgICAgbGluZUxlZnRPZmZzZXQgPSBsb2dpY2Fs TGVmdE9mZnNldEZvckxpbmUobG9naWNhbEhlaWdodCgpLCBmaXJzdExpbmUpOworICAgIGxpbmVS aWdodE9mZnNldCA9IGxvZ2ljYWxSaWdodE9mZnNldEZvckxpbmUobG9naWNhbEhlaWdodCgpLCBm aXJzdExpbmUpOworCisgICAgcmV0dXJuIGRpZFBvc2l0aW9uOworfQorCiB9Cg==