110165 2013-02-18 16:24:32 -0800 Merge handleSpecialChild into layoutBlockChildren 2013-02-20 10:28:31 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa eric esprehn hyatt jchaffraix ojan.autocc robert webkit.review.bot oldest_to_newest 835821 0 rniwa 2013-02-18 16:24:32 -0800 The name handleSpecialChild is extremely vague and doesn't communicate at all what it's handling and what "special" children are. Since this function is only called by layoutBlockChildren, we can merge into layoutBlockChildren altogether. In fact, handlePositionedChild and handleFloatingChild can also be merged into layoutBlockChildren. That allows us to remove outdated comment in layoutBlockChildren that says: // Handle the four types of special elements first. These include positioned content, floating content, compacts and // run-ins. When we encounter these four types of objects, we don't actually lay them out as normal flow blocks. which at this point is only half true. 835824 1 188960 rniwa 2013-02-18 16:28:47 -0800 Created attachment 188960 Cleanup 835906 2 rniwa 2013-02-18 19:44:10 -0800 Committed r143290: <http://trac.webkit.org/changeset/143290> 837553 3 eric 2013-02-20 10:28:31 -0800 Thanks. 188960 2013-02-18 16:28:47 -0800 2013-02-18 19:30:24 -0800 Cleanup bug-110165-20130218162510.patch text/plain 4021 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0MzI3NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAyLTE4ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1lcmdlIGhhbmRsZVNwZWNpYWxD aGlsZCBpbnRvIGxheW91dEJsb2NrQ2hpbGRyZW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExMDE2NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE1lcmdlIGhhbmRsZVNwZWNpYWxDaGlsZCwgaGFuZGxlUG9z aXRpb25lZENoaWxkLCBhbmQgaGFuZGxlRmxvYXRpbmdDaGlsZCBpbnRvIGxheW91dEJsb2NrQ2hp bGRyZW4KKyAgICAgICAgdG8gbWFrZSB0aGUgc2VtYW50aWNzIG9mIHRoZSBjb2RlIGNsZWFyIGFu ZCB0byBnZXQgcmlkIG9mIHRoZSBvdXRkYXRlZCBjb21tZW50IGFib3V0IGhvdyB0aGVyZSBhcmUK KyAgICAgICAgZm91ciB0eXBlcyBvZiBmb3VyIHR5cGVzIG9mIHNwZWNpYWwgY2hpbGRyZW4uCisK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyQmxvY2s6OmxheW91dEJsb2NrQ2hpbGRyZW4pOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJCbG9jay5oOgorICAgICAgICAoUmVuZGVyQmxvY2spOgorCiAyMDEzLTAyLTE4ICBwZWF2 b0BvdXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgogCiAgICAgICAgIFtDdXJsXSBUaGUg ZnVuY3Rpb24gY29va2llc0ZvckRPTSgpIGRvZXMgbm90IGJlaGF2ZSBjb3JyZWN0bHkuCkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHJldmlzaW9uIDE0MzI1 MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTE3OTQsMzQgKzE3OTQsNiBAQCB2b2lkIFJlbmRlckJsb2NrOjphZGp1c3RGbG9h dGluZ0Jsb2NrKGNvCiAgICAgc2V0TG9naWNhbEhlaWdodChsb2dpY2FsSGVpZ2h0KCkgLSBtYXJn aW5PZmZzZXQpOwogfQogCi1ib29sIFJlbmRlckJsb2NrOjpoYW5kbGVTcGVjaWFsQ2hpbGQoUmVu ZGVyQm94KiBjaGlsZCwgY29uc3QgTWFyZ2luSW5mbyYgbWFyZ2luSW5mbykKLXsKLSAgICAvLyBI YW5kbGUgaW4gdGhlIGdpdmVuIG9yZGVyCi0gICAgcmV0dXJuIGhhbmRsZVBvc2l0aW9uZWRDaGls ZChjaGlsZCwgbWFyZ2luSW5mbykKLSAgICAgICAgfHwgaGFuZGxlRmxvYXRpbmdDaGlsZChjaGls ZCwgbWFyZ2luSW5mbyk7Ci19Ci0KLQotYm9vbCBSZW5kZXJCbG9jazo6aGFuZGxlUG9zaXRpb25l ZENoaWxkKFJlbmRlckJveCogY2hpbGQsIGNvbnN0IE1hcmdpbkluZm8mIG1hcmdpbkluZm8pCi17 Ci0gICAgaWYgKGNoaWxkLT5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkgewotICAgICAgICBjaGls ZC0+Y29udGFpbmluZ0Jsb2NrKCktPmluc2VydFBvc2l0aW9uZWRPYmplY3QoY2hpbGQpOwotICAg ICAgICBhZGp1c3RQb3NpdGlvbmVkQmxvY2soY2hpbGQsIG1hcmdpbkluZm8pOwotICAgICAgICBy ZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgcmV0dXJuIGZhbHNlOwotfQotCi1ib29sIFJlbmRlckJs b2NrOjpoYW5kbGVGbG9hdGluZ0NoaWxkKFJlbmRlckJveCogY2hpbGQsIGNvbnN0IE1hcmdpbklu Zm8mIG1hcmdpbkluZm8pCi17Ci0gICAgaWYgKGNoaWxkLT5pc0Zsb2F0aW5nKCkpIHsKLSAgICAg ICAgaW5zZXJ0RmxvYXRpbmdPYmplY3QoY2hpbGQpOwotICAgICAgICBhZGp1c3RGbG9hdGluZ0Js b2NrKG1hcmdpbkluZm8pOwotICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9Ci0gICAgcmV0dXJu IGZhbHNlOwotfQotCiBzdGF0aWMgdm9pZCBkZXN0cm95UnVuSW4oUmVuZGVyQm94TW9kZWxPYmpl Y3QqIHJ1bkluKQogewogICAgIEFTU0VSVChydW5Jbi0+aXNSdW5JbigpKTsKQEAgLTI0NTAsMTAg KzI0MjIsMTYgQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5b3V0QmxvY2tDaGlsZHJlbihibwogCiAg ICAgICAgIHVwZGF0ZUJsb2NrQ2hpbGREaXJ0eUJpdHNCZWZvcmVMYXlvdXQocmVsYXlvdXRDaGls ZHJlbiwgY2hpbGQpOwogCi0gICAgICAgIC8vIEhhbmRsZSB0aGUgZm91ciB0eXBlcyBvZiBzcGVj aWFsIGVsZW1lbnRzIGZpcnN0LiAgVGhlc2UgaW5jbHVkZSBwb3NpdGlvbmVkIGNvbnRlbnQsIGZs b2F0aW5nIGNvbnRlbnQsIGNvbXBhY3RzIGFuZAotICAgICAgICAvLyBydW4taW5zLiAgV2hlbiB3 ZSBlbmNvdW50ZXIgdGhlc2UgZm91ciB0eXBlcyBvZiBvYmplY3RzLCB3ZSBkb24ndCBhY3R1YWxs eSBsYXkgdGhlbSBvdXQgYXMgbm9ybWFsIGZsb3cgYmxvY2tzLgotICAgICAgICBpZiAoaGFuZGxl U3BlY2lhbENoaWxkKGNoaWxkLCBtYXJnaW5JbmZvKSkKKyAgICAgICAgaWYgKGNoaWxkLT5pc091 dE9mRmxvd1Bvc2l0aW9uZWQoKSkgeworICAgICAgICAgICAgY2hpbGQtPmNvbnRhaW5pbmdCbG9j aygpLT5pbnNlcnRQb3NpdGlvbmVkT2JqZWN0KGNoaWxkKTsKKyAgICAgICAgICAgIGFkanVzdFBv c2l0aW9uZWRCbG9jayhjaGlsZCwgbWFyZ2luSW5mbyk7CiAgICAgICAgICAgICBjb250aW51ZTsK KyAgICAgICAgfQorICAgICAgICBpZiAoY2hpbGQtPmlzRmxvYXRpbmcoKSkgeworICAgICAgICAg ICAgaW5zZXJ0RmxvYXRpbmdPYmplY3QoY2hpbGQpOworICAgICAgICAgICAgYWRqdXN0RmxvYXRp bmdCbG9jayhtYXJnaW5JbmZvKTsKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CiAK ICAgICAgICAgLy8gTGF5IG91dCB0aGUgY2hpbGQuCiAgICAgICAgIGxheW91dEJsb2NrQ2hpbGQo Y2hpbGQsIG1hcmdpbkluZm8sIHByZXZpb3VzRmxvYXRMb2dpY2FsQm90dG9tLCBtYXhGbG9hdExv Z2ljYWxCb3R0b20pOwpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJ KHJldmlzaW9uIDE0MzI1MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDIwLDkgKzEwMjAsNiBAQCBwcml2YXRlOgogICAgIHZv aWQgbGF5b3V0QmxvY2tDaGlsZChSZW5kZXJCb3gqIGNoaWxkLCBNYXJnaW5JbmZvJiwgTGF5b3V0 VW5pdCYgcHJldmlvdXNGbG9hdExvZ2ljYWxCb3R0b20sIExheW91dFVuaXQmIG1heEZsb2F0TG9n aWNhbEJvdHRvbSk7CiAgICAgdm9pZCBhZGp1c3RQb3NpdGlvbmVkQmxvY2soUmVuZGVyQm94KiBj aGlsZCwgY29uc3QgTWFyZ2luSW5mbyYpOwogICAgIHZvaWQgYWRqdXN0RmxvYXRpbmdCbG9jayhj b25zdCBNYXJnaW5JbmZvJik7Ci0gICAgYm9vbCBoYW5kbGVTcGVjaWFsQ2hpbGQoUmVuZGVyQm94 KiBjaGlsZCwgY29uc3QgTWFyZ2luSW5mbyYpOwotICAgIGJvb2wgaGFuZGxlRmxvYXRpbmdDaGls ZChSZW5kZXJCb3gqIGNoaWxkLCBjb25zdCBNYXJnaW5JbmZvJik7Ci0gICAgYm9vbCBoYW5kbGVQ b3NpdGlvbmVkQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCwgY29uc3QgTWFyZ2luSW5mbyYpOwogCiAg ICAgUmVuZGVyQm94TW9kZWxPYmplY3QqIGNyZWF0ZVJlcGxhY2VtZW50UnVuSW4oUmVuZGVyQm94 TW9kZWxPYmplY3QqIHJ1bkluKTsKICAgICB2b2lkIG1vdmVSdW5JblVuZGVyU2libGluZ0Jsb2Nr SWZOZWVkZWQoUmVuZGVyT2JqZWN0KiBydW5Jbik7Cg==