104297 2012-12-06 14:02:32 -0800 [New Multicolumn] Add requires balancing boolean to both column blocks and sets 2013-02-19 22:19:08 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hyatt hyatt eric ojan.autocc webkit.review.bot oldest_to_newest 785237 0 hyatt 2012-12-06 14:02:32 -0800 Add a requiresBalancing boolean to track whether or not a column block will have to balance, and make that default propagate into the one column set we create so far. Eventually sets will toggle the flag independently, so they need their own copy of the boolean. 785242 1 178077 hyatt 2012-12-06 14:06:23 -0800 Created attachment 178077 Patch 837161 2 hyatt 2013-02-19 22:19:08 -0800 This landed many moons ago and never got closed. 178077 2012-12-06 14:06:23 -0800 2012-12-06 14:08:22 -0800 Patch patch.txt text/plain 7256 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzNjg4NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMxIEBACisyMDEyLTEyLTA2ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBbTmV3IE11bHRpY29sdW1uXSBBZGQg cmVxdWlyZXNCYWxhbmNpbmcgYm9vbGVhbnMgdG8gdHJhY2sgd2hpY2ggY29sdW1uIHNldHMgbmVl ZCB0byByZWJhbGFuY2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMDQyOTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGQgcmVxdWlyZXNCYWxhbmNpbmcgYm9vbGVhbnMgdG8gUmVuZGVyTXVsdGlDb2x1 bW5CbG9jayBhbmQgUmVuZGVyTXVsdGlDb2x1bW5TZXQuIEZvciBub3cgdGhlIGZvcm1lciBpcyBq dXN0IHByb3BhZ2F0ZWQKKyAgICAgICAgdG8gdGhlIGxhdHRlciwgYnV0IGV2ZW50dWFsbHkgUmVu ZGVyTXVsdGlDb2x1bW5TZXRzIHdpbGwgaGF2ZSBhIG5vdGlvbiBvZiBiYWxhbmNpbmcgdGhhdCBo YXMgdG8gYmUgaW5kZXBlbmRlbnQgb2YgdGhlCisgICAgICAgIG93bmluZyBibG9jayAoZS5nLiwg bWF5YmUgb25seSB0aGUgbGFzdCBzZXQgcmViYWxhbmNlcywgb3IgbWF5YmUgb25seSBhIHNldCB0 aGF0IGNvbnRhaW5zIHRoZSBjb250ZW50IGJldHdlZW4gdHdvIGZvcmNlZAorICAgICAgICBicmVh a3Mgd2FudHMgdG8gcmViYWxhbmNlLCBldGMuKS4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJNdWx0aUNvbHVtbkJsb2NrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11bHRpQ29s dW1uQmxvY2s6OlJlbmRlck11bHRpQ29sdW1uQmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTXVsdGlDb2x1bW5CbG9jazo6Y2hlY2tGb3JQYWdpbmF0aW9uTG9naWNhbEhlaWdodENoYW5n ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNdWx0aUNvbHVtbkJsb2NrOjplbnN1cmVDb2x1 bW5TZXRzKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5CbG9jay5oOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5CbG9jazo6cmVxdWlyZXNCYWxhbmNp bmcpOgorICAgICAgICAoUmVuZGVyTXVsdGlDb2x1bW5CbG9jayk6CisgICAgICAgICogcmVuZGVy aW5nL1JlbmRlck11bHRpQ29sdW1uU2V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck11 bHRpQ29sdW1uU2V0OjpSZW5kZXJNdWx0aUNvbHVtblNldCk6CisgICAgICAgICogcmVuZGVyaW5n L1JlbmRlck11bHRpQ29sdW1uU2V0Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNdWx0aUNv bHVtblNldDo6cmVxdWlyZXNCYWxhbmNpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTXVs dGlDb2x1bW5TZXQ6OnNldFJlcXVpcmVzQmFsYW5jaW5nKToKKyAgICAgICAgKFJlbmRlck11bHRp Q29sdW1uU2V0KToKKyAgICAgICAgKFdlYkNvcmU6OnRvUmVuZGVyTXVsdGlDb2x1bW5TZXQpOgor ICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMTItMDYgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJl dmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIx MzY4NzEuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5C bG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11 bHRpQ29sdW1uQmxvY2suY3BwCShyZXZpc2lvbiAxMzYwMjkpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5CbG9jay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM5 LDYgKzM5LDcgQEAgUmVuZGVyTXVsdGlDb2x1bW5CbG9jazo6UmVuZGVyTXVsdGlDb2x1bQogICAg ICwgbV9jb2x1bW5Db3VudCgxKQogICAgICwgbV9jb2x1bW5XaWR0aCgwKQogICAgICwgbV9jb2x1 bW5IZWlnaHQoMCkKKyAgICAsIG1fcmVxdWlyZXNCYWxhbmNpbmcoZmFsc2UpCiB7CiB9CiAKQEAg LTgzLDcgKzg0LDggQEAgdm9pZCBSZW5kZXJNdWx0aUNvbHVtbkJsb2NrOjpjaGVja0ZvclBhZwog ICAgIC8vIFdlIGRvbid0IGFjdHVhbGx5IHVwZGF0ZSBhbnkgb2YgdGhlIHZhcmlhYmxlcy4gV2Ug anVzdCBzdWJjbGFzc2VkIHRvIGFkanVzdCBvdXIgY29sdW1uIGhlaWdodC4KICAgICB1cGRhdGVM b2dpY2FsSGVpZ2h0KCk7CiAgICAgTGF5b3V0VW5pdCBuZXdDb250ZW50TG9naWNhbEhlaWdodCA9 IGNvbnRlbnRMb2dpY2FsSGVpZ2h0KCk7Ci0gICAgaWYgKG5ld0NvbnRlbnRMb2dpY2FsSGVpZ2h0 ID4gMCkgeworICAgIG1fcmVxdWlyZXNCYWxhbmNpbmcgPSAhbmV3Q29udGVudExvZ2ljYWxIZWln aHQ7CisgICAgaWYgKCFtX3JlcXVpcmVzQmFsYW5jaW5nKSB7CiAgICAgICAgIC8vIFRoZSByZWdp b25zIHdpbGwgYmUgaW52YWxpZGF0ZWQgd2hlbiB3ZSBsYXkgdGhlbSBvdXQgYW5kIHRoZXkgY2hh bmdlIHNpemUgdG8KICAgICAgICAgLy8gdGhlIG5ldyBjb2x1bW4gaGVpZ2h0LgogICAgICAgICBp ZiAoY29sdW1uSGVpZ2h0KCkgIT0gbmV3Q29udGVudExvZ2ljYWxIZWlnaHQpCkBAIC0xMzcsMTEg KzEzOSwxNiBAQCB2b2lkIFJlbmRlck11bHRpQ29sdW1uQmxvY2s6OmVuc3VyZUNvbHVtCiAgICAg Ly8gRklYTUU6IEZvciBub3cganVzdCBtYWtlIG9uZSBjb2x1bW4gc2V0LiBUaGlzIG1hdGNoZXMg dGhlIG9sZCBtdWx0aS1jb2x1bW4gY29kZS4KICAgICAvLyBSaWdodCBub3cgb3VyIGdvYWwgaXMg anVzdCBmZWF0dXJlIHBhcml0eSB3aXRoIHRoZSBvbGQgbXVsdGktY29sdW1uIGNvZGUgc28gdGhh dCB3ZSBjYW4gc3dpdGNoIG92ZXIgdG8gdGhlCiAgICAgLy8gbmV3IGNvZGUgYXMgc29vbiBhcyBw b3NzaWJsZS4KLSAgICBpZiAoZmxvd1RocmVhZCgpICYmICFmaXJzdENoaWxkKCktPmlzUmVuZGVy TXVsdGlDb2x1bW5TZXQoKSkgewotICAgICAgICBSZW5kZXJNdWx0aUNvbHVtblNldCogY29sdW1u U2V0ID0gbmV3IChyZW5kZXJBcmVuYSgpKSBSZW5kZXJNdWx0aUNvbHVtblNldChkb2N1bWVudCgp LCBmbG93VGhyZWFkKCkpOworICAgIGlmICghZmxvd1RocmVhZCgpKQorICAgICAgICByZXR1cm47 CisKKyAgICBSZW5kZXJNdWx0aUNvbHVtblNldCogY29sdW1uU2V0ID0gZmlyc3RDaGlsZCgpLT5p c1JlbmRlck11bHRpQ29sdW1uU2V0KCkgPyB0b1JlbmRlck11bHRpQ29sdW1uU2V0KGZpcnN0Q2hp bGQoKSkgOiAwOworICAgIGlmICghY29sdW1uU2V0KSB7CisgICAgICAgIGNvbHVtblNldCA9IG5l dyAocmVuZGVyQXJlbmEoKSkgUmVuZGVyTXVsdGlDb2x1bW5TZXQoZG9jdW1lbnQoKSwgZmxvd1Ro cmVhZCgpKTsKICAgICAgICAgY29sdW1uU2V0LT5zZXRTdHlsZShSZW5kZXJTdHlsZTo6Y3JlYXRl QW5vbnltb3VzU3R5bGVXaXRoRGlzcGxheShzdHlsZSgpLCBCTE9DSykpOwogICAgICAgICBSZW5k ZXJCbG9jazo6YWRkQ2hpbGQoY29sdW1uU2V0LCBmaXJzdENoaWxkKCkpOwogICAgIH0KKyAgICBj b2x1bW5TZXQtPnNldFJlcXVpcmVzQmFsYW5jaW5nKHJlcXVpcmVzQmFsYW5jaW5nKCkpOwogfQog CiBjb25zdCBjaGFyKiBSZW5kZXJNdWx0aUNvbHVtbkJsb2NrOjpyZW5kZXJOYW1lKCkgY29uc3QK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkJsb2NrLmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck11bHRpQ29sdW1u QmxvY2suaAkocmV2aXNpb24gMTM2MDI5KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck11bHRpQ29sdW1uQmxvY2suaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsOCBAQCBw dWJsaWM6CiAKICAgICBSZW5kZXJNdWx0aUNvbHVtbkZsb3dUaHJlYWQqIGZsb3dUaHJlYWQoKSBj b25zdCB7IHJldHVybiBtX2Zsb3dUaHJlYWQ7IH0KIAorICAgIGJvb2wgcmVxdWlyZXNCYWxhbmNp bmcoKSBjb25zdCB7IHJldHVybiBtX3JlcXVpcmVzQmFsYW5jaW5nOyB9CisKIHByaXZhdGU6CiAg ICAgdmlydHVhbCBib29sIGlzUmVuZGVyTXVsdGlDb2x1bW5CbG9jaygpIGNvbnN0IHsgcmV0dXJu IHRydWU7IH0KICAgICAKQEAgLTY1LDYgKzY3LDcgQEAgcHJpdmF0ZToKICAgICBMYXlvdXRVbml0 IG1fY29sdW1uV2lkdGg7IC8vIHNpbmNlIGEgbXVsdGktY29sdW1uIGJsb2NrIHRoYXQgaXMgc3Bs aXQgYWNyb3NzIHZhcmlhYmxlIHdpZHRoIHBhZ2VzIG9yIHJlZ2lvbnMgd2lsbCBoYXZlIGRpZmZl cmVudCBjb2x1bW4gY291bnRzIGFuZCB3aWR0aHMgaW4gZWFjaC4KICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIC8vIFRoZXNlIHZhbHVlcyB3aWxsIGJlIGNhY2hlZCAoZXZlbnR1YWxseSkg Zm9yIG11bHRpLWNvbHVtbiBibG9ja3MuCiAgICAgTGF5b3V0VW5pdCBtX2NvbHVtbkhlaWdodDsg Ly8gVGhlIGN1cnJlbnQgY29sdW1uIGhlaWdodC4KKyAgICBib29sIG1fcmVxdWlyZXNCYWxhbmNp bmc7IC8vIFdoZXRoZXIgb3Igbm90IHRoZSBibG9jayBzcGVjaWZpZWQgYW55IGtpbmQgb2YgbG9n aWNhbCBoZWlnaHQuIFdlIGhhdmUgdG8gYmFsYW5jZSBieSBkZWZhdWx0IGlmIGl0IGRpZG4ndC4K IH07CiAKIGlubGluZSBSZW5kZXJNdWx0aUNvbHVtbkJsb2NrKiB0b1JlbmRlck11bHRpQ29sdW1u QmxvY2soUmVuZGVyT2JqZWN0KiBvYmplY3QpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTXVsdGlDb2x1bW5TZXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5jcHAJKHJldmlzaW9uIDEzNjE0NikKKysr IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTQxLDYgKzQxLDcgQEAgUmVuZGVyTXVsdGlDb2x1bW5TZXQ6OlJlbmRlck11 bHRpQ29sdW1uUwogICAgICwgbV9jb21wdXRlZENvbHVtbkNvdW50KDEpCiAgICAgLCBtX2NvbXB1 dGVkQ29sdW1uV2lkdGgoMCkKICAgICAsIG1fY29tcHV0ZWRDb2x1bW5IZWlnaHQoMCkKKyAgICAs IG1fcmVxdWlyZXNCYWxhbmNpbmcoZmFsc2UpCiAgICAgLCBtX21pbmltdW1Db2x1bW5IZWlnaHQo MCkKICAgICAsIG1fZm9yY2VkQnJlYWtzQ291bnQoMCkKICAgICAsIG1fbWF4aW11bURpc3RhbmNl QmV0d2VlbkZvcmNlZEJyZWFrcygwKQpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlck11bHRpQ29sdW1uU2V0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck11bHRpQ29sdW1uU2V0LmgJKHJldmlzaW9uIDEzNjE0NikKKysrIFNvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtblNldC5oCSh3b3JraW5nIGNvcHkpCkBA IC04NCw2ICs4NCw5IEBAIHB1YmxpYzoKICAgICAgICAgbV9mb3JjZWRCcmVha09mZnNldCA9IG9m ZnNldEZyb21GaXJzdFBhZ2U7CiAgICAgfQogCisgICAgYm9vbCByZXF1aXJlc0JhbGFuY2luZygp IGNvbnN0IHsgcmV0dXJuIG1fcmVxdWlyZXNCYWxhbmNpbmc7IH0KKyAgICB2b2lkIHNldFJlcXVp cmVzQmFsYW5jaW5nKGJvb2wgYmFsYW5jaW5nKSB7IG1fcmVxdWlyZXNCYWxhbmNpbmcgPSBiYWxh bmNpbmc7IH0KKwogcHJpdmF0ZToKICAgICB2aXJ0dWFsIHZvaWQgdXBkYXRlTG9naWNhbFdpZHRo KCkgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHVwZGF0ZUxvZ2ljYWxIZWlnaHQoKSBPVkVS UklERTsKQEAgLTEyMSwxMiArMTI0LDI4IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBtX2Nv bXB1dGVkQ29sdW1uSGVpZ2h0OwogICAgIAogICAgIC8vIFRoZSBmb2xsb3dpbmcgdmFyaWFibGVz IGFyZSB1c2VkIHdoZW4gYmFsYW5jaW5nIHRoZSBjb2x1bW4gc2V0LgorICAgIGJvb2wgbV9yZXF1 aXJlc0JhbGFuY2luZzsgLy8gV2hldGhlciBvciBub3QgdGhlIGNvbHVtbnMgaW4gdGhlIGNvbHVt biBzZXQgaGF2ZSB0byBiZSBiYWxhbmNlZCwgaS5lLiwgbWFkZSB0byBiZSBzaW1pbGFyIGxvZ2lj YWwgaGVpZ2h0cy4KICAgICBMYXlvdXRVbml0IG1fbWluaW11bUNvbHVtbkhlaWdodDsKICAgICB1 bnNpZ25lZCBtX2ZvcmNlZEJyZWFrc0NvdW50OyAvLyBGSVhNRTogV2Ugd2lsbCB1bHRpbWF0ZWx5 IG5lZWQgdG8gY2FjaGUgbW9yZSBpbmZvcm1hdGlvbiB0byBiYWxhbmNlIGFyb3VuZCBmb3JjZWQg YnJlYWtzIHByb3Blcmx5LgogICAgIExheW91dFVuaXQgbV9tYXhpbXVtRGlzdGFuY2VCZXR3ZWVu Rm9yY2VkQnJlYWtzOwogICAgIExheW91dFVuaXQgbV9mb3JjZWRCcmVha09mZnNldDsKIH07CiAK K2lubGluZSBSZW5kZXJNdWx0aUNvbHVtblNldCogdG9SZW5kZXJNdWx0aUNvbHVtblNldChSZW5k ZXJPYmplY3QqIG9iamVjdCkKK3sKKyAgICBBU1NFUlQoIW9iamVjdCB8fCBvYmplY3QtPmlzUmVu ZGVyTXVsdGlDb2x1bW5TZXQoKSk7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PFJlbmRlck11bHRp Q29sdW1uU2V0Kj4ob2JqZWN0KTsKK30KKworaW5saW5lIGNvbnN0IFJlbmRlck11bHRpQ29sdW1u U2V0KiB0b1JlbmRlck11bHRpQ29sdW1uU2V0KGNvbnN0IFJlbmRlck9iamVjdCogb2JqZWN0KQor eworICAgIEFTU0VSVCghb2JqZWN0IHx8IG9iamVjdC0+aXNSZW5kZXJNdWx0aUNvbHVtblNldCgp KTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8Y29uc3QgUmVuZGVyTXVsdGlDb2x1bW5TZXQqPihv YmplY3QpOworfQorCisvLyBUaGlzIHdpbGwgY2F0Y2ggYW55b25lIGRvaW5nIGFuIHVubmVjZXNz YXJ5IGNhc3QuCit2b2lkIHRvUmVuZGVyTXVsdGlDb2x1bW5TZXQoY29uc3QgUmVuZGVyTXVsdGlD b2x1bW5TZXQqKTsKKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQogCiAjZW5kaWYgLy8gUmVuZGVy TXVsdGlDb2x1bW5TZXRfaAo=