95593 2012-08-31 11:11:22 -0700 [New Multicolumn] Implement column repainting 2012-08-31 11:51:21 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt eric webkit.review.bot oldest_to_newest 709818 0 hyatt 2012-08-31 11:11:22 -0700 Implement column repainting. This code significantly improves over the old column code in that it can actually issue unique repaints for each column rather than doing a fuzzy unite (which is often bad when the invalidation only spans the bottom of column one and the top of column 2). 709821 1 161737 hyatt 2012-08-31 11:12:50 -0700 Created attachment 161737 Patch 709840 2 161737 mitz 2012-08-31 11:32:28 -0700 Comment on attachment 161737 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=161737&action=review > Source/WebCore/rendering/RenderMultiColumnSet.cpp:124 > + return floor(static_cast<float>(offset - flowThreadLogicalTop) / computedColumnHeight()); You should use floorf with a float, but here you’re returning an unsigned so you don’t need to floor at all. > Source/WebCore/rendering/RenderMultiColumnSet.cpp:341 > + LayoutUnit repaintLogicalBottom = (isHorizontalWritingMode() ? flowThreadRepaintRect.maxY() : flowThreadRepaintRect.maxX()) - 1; We should find a better way than subtracting 1 for representing “inside”. 709852 3 hyatt 2012-08-31 11:51:21 -0700 Fixed in r127297. 161737 2012-08-31 11:12:50 -0700 2012-08-31 11:32:28 -0700 Patch patch.txt text/plain 5703 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEyNzI5MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA4LTMxICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBbTmV3IE11bHRpY29sdW1uXSBJbXBs ZW1lbnQgY29sdW1uIHJlcGFpbnRpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD05NTU5MworCisgICAgICAgIE1ha2UgdGhlIG5ldyBjb2x1bW5zIHJl cGFpbnQgcHJvcGVybHkuIE5vdGUgdGhpcyBjb2RlIGlzIGEgc2lnbmlmaWNhbnQgaW1wcm92ZW1l bnQgb3ZlciB0aGUKKyAgICAgICAgb2xkIG11bHRpY29sdW1uIGNvZGUgaW4gdGhhdCByZXBhaW50 cyBhcmUgcHJvcGVybHkgaXNzdWVkIHBlci1jb2x1bW4sIGkuZS4sIG5vIG1vcmUgZnV6enkKKyAg ICAgICAgdW5pdGluZyBvZiByZWN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0 aUNvbHVtblNldC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNdWx0aUNvbHVtblNldDo6 Y29sdW1uSW5kZXhBdE9mZnNldCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlck11bHRpQ29sdW1uU2V0OjpyZXBhaW50Rmxvd1RocmVhZENvbnRlbnQpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5oOgorCiAyMDEyLTA4LTMxICBE YXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBbTmV3IE11bHRpY29sdW1u XSBSZWZhY3RvciBmbG93IHRocmVhZCByZXBhaW50aW5nLgpJbmRleDogU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1uU2V0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwCShyZXZpc2lvbiAxMjcy NzgpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMDgsNiArMTA4LDIyIEBAIExheW91dFJlY3QgUmVuZGVyTXVs dGlDb2x1bW5TZXQ6OmNvbHVtblIKICAgICByZXR1cm4gTGF5b3V0UmVjdChjb2xMb2dpY2FsVG9w LCBjb2xMb2dpY2FsTGVmdCwgY29sTG9naWNhbEhlaWdodCwgY29sTG9naWNhbFdpZHRoKTsKIH0K IAordW5zaWduZWQgUmVuZGVyTXVsdGlDb2x1bW5TZXQ6OmNvbHVtbkluZGV4QXRPZmZzZXQoTGF5 b3V0VW5pdCBvZmZzZXQpIGNvbnN0Cit7CisgICAgTGF5b3V0UmVjdCBwb3J0aW9uUmVjdChmbG93 VGhyZWFkUG9ydGlvblJlY3QoKSk7CisgICAgTGF5b3V0VW5pdCBmbG93VGhyZWFkTG9naWNhbFRv cCA9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBwb3J0aW9uUmVjdC55KCkgOiBwb3J0aW9u UmVjdC54KCk7CisgICAgTGF5b3V0VW5pdCBmbG93VGhyZWFkTG9naWNhbEJvdHRvbSA9IGlzSG9y aXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBwb3J0aW9uUmVjdC5tYXhZKCkgOiBwb3J0aW9uUmVjdC5t YXhYKCk7CisgICAgCisgICAgLy8gSGFuZGxlIHRoZSBvZmZzZXQgYmVpbmcgb3V0IG9mIHJhbmdl LgorICAgIGlmIChvZmZzZXQgPCBmbG93VGhyZWFkTG9naWNhbFRvcCkKKyAgICAgICAgcmV0dXJu IDA7CisgICAgaWYgKG9mZnNldCA+PSBmbG93VGhyZWFkTG9naWNhbEJvdHRvbSkKKyAgICAgICAg cmV0dXJuIGNvbHVtbkNvdW50KCkgLSAxOworICAgIAorICAgIC8vIEp1c3QgZGl2aWRlIGJ5IHRo ZSBjb2x1bW4gaGVpZ2h0IHRvIGRldGVybWluZSB0aGUgY29ycmVjdCBjb2x1bW4uCisgICAgcmV0 dXJuIGZsb29yKHN0YXRpY19jYXN0PGZsb2F0PihvZmZzZXQgLSBmbG93VGhyZWFkTG9naWNhbFRv cCkgLyBjb21wdXRlZENvbHVtbkhlaWdodCgpKTsKK30KKwogTGF5b3V0UmVjdCBSZW5kZXJNdWx0 aUNvbHVtblNldDo6Zmxvd1RocmVhZFBvcnRpb25SZWN0QXQodW5zaWduZWQgaW5kZXgpIGNvbnN0 CiB7CiAgICAgTGF5b3V0UmVjdCBwb3J0aW9uUmVjdCA9IGZsb3dUaHJlYWRQb3J0aW9uUmVjdCgp OwpAQCAtMzA1LDYgKzMyMSw0NCBAQCBib29sIFJlbmRlck11bHRpQ29sdW1uU2V0Ojpub2RlQXRQ b2ludChjCiAgICAgcmV0dXJuICFyZXN1bHQuYWRkTm9kZVRvUmVjdEJhc2VkVGVzdFJlc3VsdChu b2RlKCksIGxvY2F0aW9uSW5Db250YWluZXIsIGJvdW5kc1JlY3QpOwogfQogCit2b2lkIFJlbmRl ck11bHRpQ29sdW1uU2V0OjpyZXBhaW50Rmxvd1RocmVhZENvbnRlbnQoY29uc3QgTGF5b3V0UmVj dCYgcmVwYWludFJlY3QsIGJvb2wgaW1tZWRpYXRlKSBjb25zdAoreworICAgIC8vIEZpZ3VyZSBv dXQgdGhlIHN0YXJ0IGFuZCBlbmQgY29sdW1ucyBhbmQgb25seSBjaGVjayB3aXRoaW4gdGhhdCBy YW5nZSBzbyB0aGF0IHdlIGRvbid0IHdhbGsgdGhlCisgICAgLy8gZW50aXJlIGNvbHVtbiBzZXQu IFB1dCB0aGUgcmVwYWludCByZWN0IGludG8gZmxvdyB0aHJlYWQgY29vcmRpbmF0ZXMgYnkgZmxp cHBpbmcgaXQgZmlyc3QuCisgICAgTGF5b3V0UmVjdCBmbG93VGhyZWFkUmVwYWludFJlY3QocmVw YWludFJlY3QpOworICAgIGZsb3dUaHJlYWQoKS0+ZmxpcEZvcldyaXRpbmdNb2RlKGZsb3dUaHJl YWRSZXBhaW50UmVjdCk7CisgICAgCisgICAgLy8gTm93IHdlIGNhbiBjb21wYXJlIHRoaXMgcmVj dCB3aXRoIHRoZSBmbG93IHRocmVhZCBwb3J0aW9ucyBvd25lZCBieSBlYWNoIGNvbHVtbi4gRmly c3QgbGV0J3MKKyAgICAvLyBqdXN0IHNlZSBpZiB0aGUgcmVwYWludCByZWN0IGludGVyc2VjdHMg b3VyIGZsb3cgdGhyZWFkIHBvcnRpb24gYXQgYWxsLgorICAgIExheW91dFJlY3QgY2xpcHBlZFJl Y3QoZmxvd1RocmVhZFJlcGFpbnRSZWN0KTsKKyAgICBjbGlwcGVkUmVjdC5pbnRlcnNlY3QoUmVu ZGVyUmVnaW9uOjpmbG93VGhyZWFkUG9ydGlvbk92ZXJmbG93UmVjdCgpKTsKKyAgICBpZiAoY2xp cHBlZFJlY3QuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisgICAgCisgICAgLy8gTm93IHdl IGtub3cgd2UgaW50ZXJzZWN0IGF0IGxlYXN0IG9uZSBjb2x1bW4uIExldCdzIGZpZ3VyZSBvdXQg dGhlIGxvZ2ljYWwgdG9wIGFuZCBsb2dpY2FsCisgICAgLy8gYm90dG9tIG9mIHRoZSBhcmVhIHdl J3JlIHJlcGFpbnRpbmcuCisgICAgTGF5b3V0VW5pdCByZXBhaW50TG9naWNhbFRvcCA9IGlzSG9y aXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBmbG93VGhyZWFkUmVwYWludFJlY3QueSgpIDogZmxvd1Ro cmVhZFJlcGFpbnRSZWN0LngoKTsKKyAgICBMYXlvdXRVbml0IHJlcGFpbnRMb2dpY2FsQm90dG9t ID0gKGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBmbG93VGhyZWFkUmVwYWludFJlY3QubWF4 WSgpIDogZmxvd1RocmVhZFJlcGFpbnRSZWN0Lm1heFgoKSkgLSAxOworICAgIAorICAgIHVuc2ln bmVkIHN0YXJ0Q29sdW1uID0gY29sdW1uSW5kZXhBdE9mZnNldChyZXBhaW50TG9naWNhbFRvcCk7 CisgICAgdW5zaWduZWQgZW5kQ29sdW1uID0gY29sdW1uSW5kZXhBdE9mZnNldChyZXBhaW50TG9n aWNhbEJvdHRvbSk7CisgICAgCisgICAgTGF5b3V0VW5pdCBjb2xHYXAgPSBjb2x1bW5HYXAoKTsK KyAgICB1bnNpZ25lZCBjb2xDb3VudCA9IGNvbHVtbkNvdW50KCk7CisgICAgZm9yICh1bnNpZ25l ZCBpID0gc3RhcnRDb2x1bW47IGkgPD0gZW5kQ29sdW1uOyBpKyspIHsKKyAgICAgICAgTGF5b3V0 UmVjdCBjb2xSZWN0ID0gY29sdW1uUmVjdEF0KGkpOworICAgICAgICAKKyAgICAgICAgLy8gR2V0 IHRoZSBwb3J0aW9uIG9mIHRoZSBmbG93IHRocmVhZCB0aGF0IGNvcnJlc3BvbmRzIHRvIHRoaXMg Y29sdW1uLgorICAgICAgICBMYXlvdXRSZWN0IGZsb3dUaHJlYWRQb3J0aW9uID0gZmxvd1RocmVh ZFBvcnRpb25SZWN0QXQoaSk7CisgICAgICAgIAorICAgICAgICAvLyBOb3cgZ2V0IHRoZSBvdmVy ZmxvdyByZWN0IHRoYXQgY29ycmVzcG9uZHMgdG8gdGhlIGNvbHVtbi4KKyAgICAgICAgTGF5b3V0 UmVjdCBmbG93VGhyZWFkT3ZlcmZsb3dQb3J0aW9uID0gZmxvd1RocmVhZFBvcnRpb25PdmVyZmxv d1JlY3QoZmxvd1RocmVhZFBvcnRpb24sIGksIGNvbENvdW50LCBjb2xHYXApOworCisgICAgICAg IC8vIERvIGEgcmVwYWludCBmb3IgdGhpcyBzcGVjaWZpYyBjb2x1bW4uCisgICAgICAgIHJlcGFp bnRGbG93VGhyZWFkQ29udGVudFJlY3RhbmdsZShyZXBhaW50UmVjdCwgaW1tZWRpYXRlLCBmbG93 VGhyZWFkUG9ydGlvbiwgZmxvd1RocmVhZE92ZXJmbG93UG9ydGlvbiwgY29sUmVjdC5sb2NhdGlv bigpKTsKKyAgICB9Cit9CisKIGNvbnN0IGNoYXIqIFJlbmRlck11bHRpQ29sdW1uU2V0OjpyZW5k ZXJOYW1lKCkgY29uc3QKIHsgICAgCiAgICAgcmV0dXJuICJSZW5kZXJNdWx0aUNvbHVtblNldCI7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5T ZXQuaAkocmV2aXNpb24gMTI3Mjc4KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ck11bHRpQ29sdW1uU2V0LmgJKHdvcmtpbmcgY29weSkKQEAgLTc2LDYgKzc2LDggQEAgcHJpdmF0 ZToKICAgICAvLyBGSVhNRTogVGhpcyB3aWxsIGNoYW5nZSBvbmNlIHdlIGhhdmUgY29sdW1uIHNl dHMgY29uc3RyYWluZWQgYnkgZW5jbG9zaW5nIHBhZ2VzLCBldGMuCiAgICAgdmlydHVhbCBMYXlv dXRVbml0IGxvZ2ljYWxIZWlnaHRPZkFsbEZsb3dUaHJlYWRDb250ZW50KCkgY29uc3QgT1ZFUlJJ REUgeyByZXR1cm4gbV9jb21wdXRlZENvbHVtbkhlaWdodDsgfQogICAgIAorICAgIHZpcnR1YWwg dm9pZCByZXBhaW50Rmxvd1RocmVhZENvbnRlbnQoY29uc3QgTGF5b3V0UmVjdCYgcmVwYWludFJl Y3QsIGJvb2wgaW1tZWRpYXRlKSBjb25zdCBPVkVSUklERTsKKwogICAgIHZpcnR1YWwgY29uc3Qg Y2hhciogcmVuZGVyTmFtZSgpIGNvbnN0OwogICAgIAogICAgIHZvaWQgcGFpbnRDb2x1bW5SdWxl cyhQYWludEluZm8mLCBjb25zdCBMYXlvdXRQb2ludCYgcGFpbnRPZmZzZXQpOwpAQCAtODcsNyAr ODksOSBAQCBwcml2YXRlOgogCiAgICAgTGF5b3V0UmVjdCBmbG93VGhyZWFkUG9ydGlvblJlY3RB dCh1bnNpZ25lZCBpbmRleCkgY29uc3Q7CiAgICAgTGF5b3V0UmVjdCBmbG93VGhyZWFkUG9ydGlv bk92ZXJmbG93UmVjdChjb25zdCBMYXlvdXRSZWN0JiBmbG93VGhyZWFkUG9ydGlvbiwgdW5zaWdu ZWQgaW5kZXgsIHVuc2lnbmVkIGNvbENvdW50LCBpbnQgY29sR2FwKSBjb25zdDsKLQorICAgIAor ICAgIHVuc2lnbmVkIGNvbHVtbkluZGV4QXRPZmZzZXQoTGF5b3V0VW5pdCkgY29uc3Q7CisgICAg CiAgICAgdW5zaWduZWQgbV9jb21wdXRlZENvbHVtbkNvdW50OwogICAgIExheW91dFVuaXQgbV9j b21wdXRlZENvbHVtbldpZHRoOwogICAgIExheW91dFVuaXQgbV9jb21wdXRlZENvbHVtbkhlaWdo dDsK