57981 2011-04-06 14:07:44 -0700 Update the CSS3 column width and count algorithm to match the spec. 2011-04-06 14:26:08 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 hyatt hyatt dglazkov webkit.review.bot oldest_to_newest 380812 0 hyatt 2011-04-06 14:07:44 -0700 Update the CSS3 column width and count algorithm to match the spec. I honestly have no idea what the differences are. None of our tests change results. I just want the code to match the pseudo-algorithm in the latest draft. 380817 1 88508 hyatt 2011-04-06 14:09:15 -0700 Created attachment 88508 Patch 380824 2 88508 simon.fraser 2011-04-06 14:13:20 -0700 Comment on attachment 88508 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88508&action=review > Source/WebCore/rendering/RenderBlock.cpp:4215 > + desiredColumnCount = max(1, (int)((float)(availWidth + colGap) / (colWidth + colGap))); To avoid the (int) cast you could use max<int>(). > Source/WebCore/rendering/RenderBlock.cpp:4218 > + desiredColumnCount = min(colCount, (int)((float)(availWidth + colGap) / (colWidth + colGap))); Ditto 380831 3 hyatt 2011-04-06 14:23:06 -0700 Fixed in r83099. 380837 4 webkit.review.bot 2011-04-06 14:26:08 -0700 Attachment 88508 did not build on chromium: Build output: http://queues.webkit.org/results/8348315 88508 2011-04-06 14:09:15 -0700 2011-04-06 14:13:20 -0700 Patch patch.txt text/plain 3360 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgzMDk3KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDQtMDYgIERhdmlkIEh5 YXR0ICA8aHlhdHRAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 Nzk4MQorICAgICAgICAKKyAgICAgICAgVXBkYXRlIHRoZSBjb2x1bW4gY291bnQgYW5kIHdpZHRo IGNvbXB1dGF0aW9uIGFsZ29yaXRobSBmb3IgQ1NTMyBtdWx0aS1jb2x1bW4gbGF5b3V0IAorICAg ICAgICB0byBtYXRjaCB0aGUgcmV2aXNlZCBwc2V1ZG8tYWxnb3JpdGhtIGluIHRoZSBsYXRlc3Qg ZHJhZnQgb2YgdGhlIHNwZWMuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNhbGNDb2x1bW5XaWR0aCk6CisKIDIw MTEtMDQtMDYgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI4MzAzOS4KSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gODMwNzUpCisrKyBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MjA4 LDM0ICs0MjA4LDE1IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNhbGNDb2x1bW5XaWR0aCgpCiAgICAg aW50IGNvbFdpZHRoID0gbWF4KDEsIHN0YXRpY19jYXN0PGludD4oc3R5bGUoKS0+Y29sdW1uV2lk dGgoKSkpOwogICAgIGludCBjb2xDb3VudCA9IG1heCgxLCBzdGF0aWNfY2FzdDxpbnQ+KHN0eWxl KCktPmNvbHVtbkNvdW50KCkpKTsKIAotICAgIGlmIChzdHlsZSgpLT5oYXNBdXRvQ29sdW1uV2lk dGgoKSkgewotICAgICAgICBpZiAoKGNvbENvdW50IC0gMSkgKiBjb2xHYXAgPCBhdmFpbFdpZHRo KSB7Ci0gICAgICAgICAgICBkZXNpcmVkQ29sdW1uQ291bnQgPSBjb2xDb3VudDsKLSAgICAgICAg ICAgIGRlc2lyZWRDb2x1bW5XaWR0aCA9IChhdmFpbFdpZHRoIC0gKGRlc2lyZWRDb2x1bW5Db3Vu dCAtIDEpICogY29sR2FwKSAvIGRlc2lyZWRDb2x1bW5Db3VudDsKLSAgICAgICAgfSBlbHNlIGlm IChjb2xHYXAgPCBhdmFpbFdpZHRoKSB7Ci0gICAgICAgICAgICBkZXNpcmVkQ29sdW1uQ291bnQg PSBhdmFpbFdpZHRoIC8gY29sR2FwOwotICAgICAgICAgICAgaWYgKGRlc2lyZWRDb2x1bW5Db3Vu dCA8IDEpCi0gICAgICAgICAgICAgICAgZGVzaXJlZENvbHVtbkNvdW50ID0gMTsKLSAgICAgICAg ICAgIGRlc2lyZWRDb2x1bW5XaWR0aCA9IChhdmFpbFdpZHRoIC0gKGRlc2lyZWRDb2x1bW5Db3Vu dCAtIDEpICogY29sR2FwKSAvIGRlc2lyZWRDb2x1bW5Db3VudDsKLSAgICAgICAgfQotICAgIH0g ZWxzZSBpZiAoc3R5bGUoKS0+aGFzQXV0b0NvbHVtbkNvdW50KCkpIHsKLSAgICAgICAgaWYgKGNv bFdpZHRoIDwgYXZhaWxXaWR0aCkgewotICAgICAgICAgICAgZGVzaXJlZENvbHVtbkNvdW50ID0g KGF2YWlsV2lkdGggKyBjb2xHYXApIC8gKGNvbFdpZHRoICsgY29sR2FwKTsKLSAgICAgICAgICAg IGlmIChkZXNpcmVkQ29sdW1uQ291bnQgPCAxKQotICAgICAgICAgICAgICAgIGRlc2lyZWRDb2x1 bW5Db3VudCA9IDE7Ci0gICAgICAgICAgICBkZXNpcmVkQ29sdW1uV2lkdGggPSAoYXZhaWxXaWR0 aCAtIChkZXNpcmVkQ29sdW1uQ291bnQgLSAxKSAqIGNvbEdhcCkgLyBkZXNpcmVkQ29sdW1uQ291 bnQ7Ci0gICAgICAgIH0KKyAgICBpZiAoc3R5bGUoKS0+aGFzQXV0b0NvbHVtbldpZHRoKCkgJiYg IXN0eWxlKCktPmhhc0F1dG9Db2x1bW5Db3VudCgpKSB7CisgICAgICAgIGRlc2lyZWRDb2x1bW5D b3VudCA9IGNvbENvdW50OworICAgICAgICBkZXNpcmVkQ29sdW1uV2lkdGggPSBtYXgoMCwgKGF2 YWlsV2lkdGggLSAoKGRlc2lyZWRDb2x1bW5Db3VudCAtIDEpICogY29sR2FwKSkgLyBkZXNpcmVk Q29sdW1uQ291bnQpOworICAgIH0gZWxzZSBpZiAoIXN0eWxlKCktPmhhc0F1dG9Db2x1bW5XaWR0 aCgpICYmIHN0eWxlKCktPmhhc0F1dG9Db2x1bW5Db3VudCgpKSB7CisgICAgICAgIGRlc2lyZWRD b2x1bW5Db3VudCA9IG1heCgxLCAoaW50KSgoZmxvYXQpKGF2YWlsV2lkdGggKyBjb2xHYXApIC8g KGNvbFdpZHRoICsgY29sR2FwKSkpOworICAgICAgICBkZXNpcmVkQ29sdW1uV2lkdGggPSAoKGF2 YWlsV2lkdGggKyBjb2xHYXApIC8gZGVzaXJlZENvbHVtbkNvdW50KSAtIGNvbEdhcDsKICAgICB9 IGVsc2UgewotICAgICAgICAvLyBCb3RoIGFyZSBzZXQuCi0gICAgICAgIGlmIChjb2xDb3VudCAq IGNvbFdpZHRoICsgKGNvbENvdW50IC0gMSkgKiBjb2xHYXAgPD0gYXZhaWxXaWR0aCkgewotICAg ICAgICAgICAgZGVzaXJlZENvbHVtbkNvdW50ID0gY29sQ291bnQ7Ci0gICAgICAgICAgICBkZXNp cmVkQ29sdW1uV2lkdGggPSBjb2xXaWR0aDsKLSAgICAgICAgfSBlbHNlIGlmIChjb2xXaWR0aCA8 IGF2YWlsV2lkdGgpIHsKLSAgICAgICAgICAgIGRlc2lyZWRDb2x1bW5Db3VudCA9IChhdmFpbFdp ZHRoICsgY29sR2FwKSAvIChjb2xXaWR0aCArIGNvbEdhcCk7Ci0gICAgICAgICAgICBpZiAoZGVz aXJlZENvbHVtbkNvdW50IDwgMSkKLSAgICAgICAgICAgICAgICBkZXNpcmVkQ29sdW1uQ291bnQg PSAxOwotICAgICAgICAgICAgZGVzaXJlZENvbHVtbldpZHRoID0gKGF2YWlsV2lkdGggLSAoZGVz aXJlZENvbHVtbkNvdW50IC0gMSkgKiBjb2xHYXApIC8gZGVzaXJlZENvbHVtbkNvdW50OwotICAg ICAgICB9CisgICAgICAgIGRlc2lyZWRDb2x1bW5Db3VudCA9IG1pbihjb2xDb3VudCwgKGludCko KGZsb2F0KShhdmFpbFdpZHRoICsgY29sR2FwKSAvIChjb2xXaWR0aCArIGNvbEdhcCkpKTsKKyAg ICAgICAgZGVzaXJlZENvbHVtbldpZHRoID0gKChhdmFpbFdpZHRoICsgY29sR2FwKSAvIGRlc2ly ZWRDb2x1bW5Db3VudCkgLSBjb2xHYXA7CiAgICAgfQogICAgIHNldERlc2lyZWRDb2x1bW5Db3Vu dEFuZFdpZHRoKGRlc2lyZWRDb2x1bW5Db3VudCwgZGVzaXJlZENvbHVtbldpZHRoKTsKIH0K