103657 2012-11-29 11:58:55 -0800 [New Multicolumn] Add minimum column height and forced break tracking to column sets 2012-11-29 12:12:01 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt eric ojan webkit.review.bot oldest_to_newest 779272 0 hyatt 2012-11-29 11:58:55 -0800 Add minimum column height and forced break tracking to column sets. These are the same variables that are in the ColumnInfo struct. This patch is just adding them without setting them yet. 779275 1 176776 hyatt 2012-11-29 11:59:52 -0800 Created attachment 176776 Patch 779282 2 176776 simon.fraser 2012-11-29 12:02:14 -0800 Comment on attachment 176776 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=176776&action=review > Source/WebCore/rendering/RenderMultiColumnSet.h:67 > + int forcedBreaks() const { return m_forcedBreaks; } Is this a count of forced breaks, or the locations of the breaks? It should be renamed to clarify. 779295 3 hyatt 2012-11-29 12:12:01 -0800 Landed in r136146. 176776 2012-11-29 11:59:52 -0800 2012-11-29 12:02:14 -0800 Patch patch.txt text/plain 3801 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNjE0MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEyLTExLTI5ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBbTmV3IE11bHRpY29sdW1uXSBBZGQg bWluaW11bSBjb2x1bW4gaGVpZ2h0IHRyYWNraW5nIGFuZCBmb3JjZWQgYnJlYWsgdHJhY2tpbmcg dG8gY29sdW1uIHNldHMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDM2NTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJNdWx0aUNvbHVtblNldDo6UmVuZGVyTXVsdGlDb2x1bW5TZXQpOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5oOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyTXVsdGlDb2x1bW5TZXQ6OnVwZGF0ZU1pbmltdW1Db2x1bW5IZWlnaHQpOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5TZXQ6Om1pbmltdW1Db2x1bW5IZWlnaHQp OgorICAgICAgICAoUmVuZGVyTXVsdGlDb2x1bW5TZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTXVsdGlDb2x1bW5TZXQ6OmZvcmNlZEJyZWFrcyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJNdWx0aUNvbHVtblNldDo6Zm9yY2VkQnJlYWtPZmZzZXQpOgorICAgICAgICAoV2ViQ29yZTo6 UmVuZGVyTXVsdGlDb2x1bW5TZXQ6Om1heGltdW1EaXN0YW5jZUJldHdlZW5Gb3JjZWRCcmVha3Mp OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5TZXQ6OmNsZWFyRm9yY2VkQnJl YWtzKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29sdW1uU2V0OjphZGRGb3JjZWRC cmVhayk6CisKIDIwMTItMTEtMjkgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAog ICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTI3NzE4ODU+IFN1cHBvcnQgcnVieS1wb3NpdGlvbjog e2JlZm9yZSwgYWZ0ZXJ9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVs dGlDb2x1bW5TZXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJNdWx0aUNvbHVtblNldC5jcHAJKHJldmlzaW9uIDEzNjAyOSkKKysrIFNvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQxLDYgKzQxLDEwIEBAIFJlbmRlck11bHRpQ29sdW1uU2V0OjpSZW5kZXJNdWx0aUNvbHVtblMK ICAgICAsIG1fY29tcHV0ZWRDb2x1bW5Db3VudCgxKQogICAgICwgbV9jb21wdXRlZENvbHVtbldp ZHRoKDApCiAgICAgLCBtX2NvbXB1dGVkQ29sdW1uSGVpZ2h0KDApCisgICAgLCBtX21pbmltdW1D b2x1bW5IZWlnaHQoMCkKKyAgICAsIG1fZm9yY2VkQnJlYWtzKDApCisgICAgLCBtX21heGltdW1E aXN0YW5jZUJldHdlZW5Gb3JjZWRCcmVha3MoMCkKKyAgICAsIG1fZm9yY2VkQnJlYWtPZmZzZXQo MCkKIHsKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29s dW1uU2V0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11 bHRpQ29sdW1uU2V0LmgJKHJldmlzaW9uIDEzNjAyOSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5oCSh3b3JraW5nIGNvcHkpCkBAIC02MSw2ICs2MSwy OSBAQCBwdWJsaWM6CiAgICAgICAgIG1fY29tcHV0ZWRDb2x1bW5IZWlnaHQgPSBoZWlnaHQ7CiAg ICAgfQogCisgICAgdm9pZCB1cGRhdGVNaW5pbXVtQ29sdW1uSGVpZ2h0KExheW91dFVuaXQgaGVp Z2h0KSB7IG1fbWluaW11bUNvbHVtbkhlaWdodCA9IHN0ZDo6bWF4KGhlaWdodCwgbV9taW5pbXVt Q29sdW1uSGVpZ2h0KTsgfQorICAgIExheW91dFVuaXQgbWluaW11bUNvbHVtbkhlaWdodCgpIGNv bnN0IHsgcmV0dXJuIG1fbWluaW11bUNvbHVtbkhlaWdodDsgfQorCisgICAgaW50IGZvcmNlZEJy ZWFrcygpIGNvbnN0IHsgcmV0dXJuIG1fZm9yY2VkQnJlYWtzOyB9CisgICAgTGF5b3V0VW5pdCBm b3JjZWRCcmVha09mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fZm9yY2VkQnJlYWtPZmZzZXQ7IH0K KyAgICBMYXlvdXRVbml0IG1heGltdW1EaXN0YW5jZUJldHdlZW5Gb3JjZWRCcmVha3MoKSBjb25z dCB7IHJldHVybiBtX21heGltdW1EaXN0YW5jZUJldHdlZW5Gb3JjZWRCcmVha3M7IH0KKyAgICB2 b2lkIGNsZWFyRm9yY2VkQnJlYWtzKCkKKyAgICB7IAorICAgICAgICBtX2ZvcmNlZEJyZWFrcyA9 IDA7CisgICAgICAgIG1fbWF4aW11bURpc3RhbmNlQmV0d2VlbkZvcmNlZEJyZWFrcyA9IDA7Cisg ICAgICAgIG1fZm9yY2VkQnJlYWtPZmZzZXQgPSAwOworICAgIH0KKyAgICB2b2lkIGFkZEZvcmNl ZEJyZWFrKExheW91dFVuaXQgb2Zmc2V0RnJvbUZpcnN0UGFnZSkKKyAgICB7IAorICAgICAgICBB U1NFUlQoIWNvbXB1dGVkQ29sdW1uSGVpZ2h0KCkpOworICAgICAgICBMYXlvdXRVbml0IGRpc3Rh bmNlRnJvbUxhc3RCcmVhayA9IG9mZnNldEZyb21GaXJzdFBhZ2UgLSBtX2ZvcmNlZEJyZWFrT2Zm c2V0OworICAgICAgICBpZiAoIWRpc3RhbmNlRnJvbUxhc3RCcmVhaykKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgbV9mb3JjZWRCcmVha3MrKzsKKyAgICAgICAgbV9tYXhpbXVtRGlzdGFu Y2VCZXR3ZWVuRm9yY2VkQnJlYWtzID0gc3RkOjptYXgobV9tYXhpbXVtRGlzdGFuY2VCZXR3ZWVu Rm9yY2VkQnJlYWtzLCBkaXN0YW5jZUZyb21MYXN0QnJlYWspOworICAgICAgICBtX2ZvcmNlZEJy ZWFrT2Zmc2V0ID0gb2Zmc2V0RnJvbUZpcnN0UGFnZTsKKyAgICB9CisKIHByaXZhdGU6CiAgICAg dmlydHVhbCB2b2lkIHVwZGF0ZUxvZ2ljYWxXaWR0aCgpIE9WRVJSSURFOwogICAgIHZpcnR1YWwg dm9pZCB1cGRhdGVMb2dpY2FsSGVpZ2h0KCkgT1ZFUlJJREU7CkBAIC05Niw2ICsxMTksMTIgQEAg cHJpdmF0ZToKICAgICB1bnNpZ25lZCBtX2NvbXB1dGVkQ29sdW1uQ291bnQ7CiAgICAgTGF5b3V0 VW5pdCBtX2NvbXB1dGVkQ29sdW1uV2lkdGg7CiAgICAgTGF5b3V0VW5pdCBtX2NvbXB1dGVkQ29s dW1uSGVpZ2h0OworICAgIAorICAgIC8vIFRoZSBmb2xsb3dpbmcgdmFyaWFibGVzIGFyZSB1c2Vk IHdoZW4gYmFsYW5jaW5nIHRoZSBjb2x1bW4gc2V0LgorICAgIExheW91dFVuaXQgbV9taW5pbXVt Q29sdW1uSGVpZ2h0OworICAgIHVuc2lnbmVkIG1fZm9yY2VkQnJlYWtzOyAvLyBGSVhNRTogV2Ug d2lsbCB1bHRpbWF0ZWx5IG5lZWQgdG8gY2FjaGUgbW9yZSBpbmZvcm1hdGlvbiB0byBiYWxhbmNl IGFyb3VuZCBmb3JjZWQgYnJlYWtzIHByb3Blcmx5LgorICAgIExheW91dFVuaXQgbV9tYXhpbXVt RGlzdGFuY2VCZXR3ZWVuRm9yY2VkQnJlYWtzOworICAgIExheW91dFVuaXQgbV9mb3JjZWRCcmVh a09mZnNldDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK