87759 2012-05-29 11:01:48 -0700 [New Multicolumn] Pull the initial page logical height setup into its own virtual function 2012-05-29 11:15:30 -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 636238 0 hyatt 2012-05-29 11:01:48 -0700 Pull the initial page logical height setup into its own virtual function. This will allow RenderMultiColumnBlock to do the setup in the derived class (and also makes layoutBlock a little cleaner in the base class even for the old multi-column layout). 636240 1 144587 hyatt 2012-05-29 11:04:02 -0700 Created attachment 144587 Patch 636242 2 144587 hyatt 2012-05-29 11:05:20 -0700 Comment on attachment 144587 Patch The diff for this looks really funny for anyone reviewing. The code that actually got pulled into the helper function doesn't show up in the diff, since it chose to show the movement of the layoutBlock code instead. I recommend looking at the current source to understand what I did here. 636244 3 webkit.review.bot 2012-05-29 11:06:26 -0700 Attachment 144587 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/rendering/RenderBlock.cpp:1399: One space before end of line comments [whitespace/comments] [5] Source/WebCore/rendering/RenderBlock.cpp:1399: Should have only a single space after a punctuation in a comment. [whitespace/comments] [5] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 636253 4 hyatt 2012-05-29 11:15:30 -0700 Landed in r118808. 144587 2012-05-29 11:04:02 -0700 2012-05-29 11:06:31 -0700 Patch patch.txt text/plain 4815 hyatt SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExODgwNikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA1LTI5ICBEYXZpZCBI eWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODc3NTkKKyAgICAgICAgCisgICAgICAgIFB1bGwgdGhlIGluaXRp YWwgcGFnZSBsb2dpY2FsIGhlaWdodCBjaGVja2luZyBmb3IgY29sdW1ucyBpbnRvIGl0cyBvd24g c2VwYXJhdGUgZnVuY3Rpb24uIFRoaXMKKyAgICAgICAgd2lsbCBhbGxvdyB0aGUgZGVyaXZlZCBS ZW5kZXJNdWx0aUNvbHVtbkJsb2NrIGNsYXNzIHRvIGRvIGl0cyBvd24gc2V0dXAgdGhlcmUuIEl0 IGFsc28gaGFzIHRoZQorICAgICAgICBlZmZlY3Qgb2YgY2xlYW5pbmcgdXAgbGF5b3V0QmxvY2sg ZXZlbiBmb3IgdGhlIGV4aXN0aW5nIGNvZGUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNoZWNrRm9yUGFnaW5hdGlvbkxvZ2ljYWxIZWlnaHRD aGFuZ2UpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9j azo6bGF5b3V0QmxvY2spOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5oOgorICAg ICAgICAoUmVuZGVyQmxvY2spOgorCiAyMDEyLTA1LTI5ICBWaWN0b3IgQ2FyYnVuZSAgPHZpY3Rv ckByb3NlZHUub3JnPgogCiAgICAgICAgIFVwZGF0ZSBjdWUgZXZlbnQgZGlzcGF0Y2hpbmcgZm9y IHplcm8gYW5kIG5lZ2F0aXZlIGR1cmF0aW9uIGN1ZXMKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkocmV2aXNpb24gMTE4NTUxKQorKysgU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM3NiwyOSAr MTM3Niw4IEBAIGJvb2wgUmVuZGVyQmxvY2s6OnJlY29tcHV0ZUxvZ2ljYWxXaWR0aCgKICAgICBy ZXR1cm4gb2xkV2lkdGggIT0gbG9naWNhbFdpZHRoKCkgfHwgb2xkQ29sdW1uV2lkdGggIT0gZGVz aXJlZENvbHVtbldpZHRoKCk7CiB9CiAKLXZvaWQgUmVuZGVyQmxvY2s6OmxheW91dEJsb2NrKGJv b2wgcmVsYXlvdXRDaGlsZHJlbiwgTGF5b3V0VW5pdCBwYWdlTG9naWNhbEhlaWdodCkKK3ZvaWQg UmVuZGVyQmxvY2s6OmNoZWNrRm9yUGFnaW5hdGlvbkxvZ2ljYWxIZWlnaHRDaGFuZ2UoTGF5b3V0 VW5pdCYgcGFnZUxvZ2ljYWxIZWlnaHQsIGJvb2wmIHBhZ2VMb2dpY2FsSGVpZ2h0Q2hhbmdlZCwg Ym9vbCYgaGFzU3BlY2lmaWVkUGFnZUxvZ2ljYWxIZWlnaHQpCiB7Ci0gICAgQVNTRVJUKG5lZWRz TGF5b3V0KCkpOwotCi0gICAgaWYgKGlzSW5saW5lKCkgJiYgIWlzSW5saW5lQmxvY2tPcklubGlu ZVRhYmxlKCkpIC8vIElubGluZSA8Zm9ybT5zIGluc2lkZSB2YXJpb3VzIHRhYmxlIGVsZW1lbnRz IGNhbgotICAgICAgICByZXR1cm47ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAvLyBjYXVzZSB1cyB0byBjb21lIGluIGhlcmUuICBKdXN0IGJhaWwuCi0KLSAgICBpZiAoIXJl bGF5b3V0Q2hpbGRyZW4gJiYgc2ltcGxpZmllZExheW91dCgpKQotICAgICAgICByZXR1cm47Ci0K LSAgICBMYXlvdXRSZXBhaW50ZXIgcmVwYWludGVyKCp0aGlzLCBldmVySGFkTGF5b3V0KCkgJiYg Y2hlY2tGb3JSZXBhaW50RHVyaW5nTGF5b3V0KCkpOwotCi0gICAgaWYgKHJlY29tcHV0ZUxvZ2lj YWxXaWR0aCgpKQotICAgICAgICByZWxheW91dENoaWxkcmVuID0gdHJ1ZTsKLQotICAgIG1fb3Zl cmZsb3cuY2xlYXIoKTsKLQotICAgIGNsZWFyRmxvYXRzKCk7Ci0KLSAgICBMYXlvdXRVbml0IHBy ZXZpb3VzSGVpZ2h0ID0gbG9naWNhbEhlaWdodCgpOwotICAgIHNldExvZ2ljYWxIZWlnaHQoWkVS T19MQVlPVVRfVU5JVCk7Ci0gICAgYm9vbCBoYXNTcGVjaWZpZWRQYWdlTG9naWNhbEhlaWdodCA9 IGZhbHNlOwotICAgIGJvb2wgcGFnZUxvZ2ljYWxIZWlnaHRDaGFuZ2VkID0gZmFsc2U7CiAgICAg Q29sdW1uSW5mbyogY29sSW5mbyA9IGNvbHVtbkluZm8oKTsKICAgICBpZiAoaGFzQ29sdW1ucygp KSB7CiAgICAgICAgIGlmICghcGFnZUxvZ2ljYWxIZWlnaHQpIHsKQEAgLTE0MjIsMTAgKzE0MDEs MzcgQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5b3V0QmxvY2soYm9vbCByZWxheQogCiAgICAgICAg IGNvbEluZm8tPnNldFBhZ2luYXRpb25Vbml0KHBhZ2luYXRpb25Vbml0KCkpOwogICAgIH0KK30K Kwordm9pZCBSZW5kZXJCbG9jazo6bGF5b3V0QmxvY2soYm9vbCByZWxheW91dENoaWxkcmVuLCBM YXlvdXRVbml0IHBhZ2VMb2dpY2FsSGVpZ2h0KQoreworICAgIEFTU0VSVChuZWVkc0xheW91dCgp KTsKKworICAgIGlmIChpc0lubGluZSgpICYmICFpc0lubGluZUJsb2NrT3JJbmxpbmVUYWJsZSgp KSAvLyBJbmxpbmUgPGZvcm0+cyBpbnNpZGUgdmFyaW91cyB0YWJsZSBlbGVtZW50cyBjYW4KKyAg ICAgICAgcmV0dXJuOyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gY2F1 c2UgdXMgdG8gY29tZSBpbiBoZXJlLiAgSnVzdCBiYWlsLgorCisgICAgaWYgKCFyZWxheW91dENo aWxkcmVuICYmIHNpbXBsaWZpZWRMYXlvdXQoKSkKKyAgICAgICAgcmV0dXJuOworCisgICAgTGF5 b3V0UmVwYWludGVyIHJlcGFpbnRlcigqdGhpcywgZXZlckhhZExheW91dCgpICYmIGNoZWNrRm9y UmVwYWludER1cmluZ0xheW91dCgpKTsKKworICAgIGlmIChyZWNvbXB1dGVMb2dpY2FsV2lkdGgo KSkKKyAgICAgICAgcmVsYXlvdXRDaGlsZHJlbiA9IHRydWU7CisKKyAgICBtX292ZXJmbG93LmNs ZWFyKCk7CisKKyAgICBjbGVhckZsb2F0cygpOworCisgICAgTGF5b3V0VW5pdCBwcmV2aW91c0hl aWdodCA9IGxvZ2ljYWxIZWlnaHQoKTsKKyAgICBzZXRMb2dpY2FsSGVpZ2h0KFpFUk9fTEFZT1VU X1VOSVQpOworCisgICAgYm9vbCBwYWdlTG9naWNhbEhlaWdodENoYW5nZWQgPSBmYWxzZTsKKyAg ICBib29sIGhhc1NwZWNpZmllZFBhZ2VMb2dpY2FsSGVpZ2h0ID0gZmFsc2U7CisgICAgY2hlY2tG b3JQYWdpbmF0aW9uTG9naWNhbEhlaWdodENoYW5nZShwYWdlTG9naWNhbEhlaWdodCwgcGFnZUxv Z2ljYWxIZWlnaHRDaGFuZ2VkLCBoYXNTcGVjaWZpZWRQYWdlTG9naWNhbEhlaWdodCk7CiAKICAg ICBSZW5kZXJWaWV3KiByZW5kZXJWaWV3ID0gdmlldygpOwogICAgIFJlbmRlclN0eWxlKiBzdHls ZVRvVXNlID0gc3R5bGUoKTsKLSAgICBMYXlvdXRTdGF0ZU1haW50YWluZXIgc3RhdGVQdXNoZXIo cmVuZGVyVmlldywgdGhpcywgbG9jYXRpb25PZmZzZXQoKSwgaGFzQ29sdW1ucygpIHx8IGhhc1Ry YW5zZm9ybSgpIHx8IGhhc1JlZmxlY3Rpb24oKSB8fCBzdHlsZVRvVXNlLT5pc0ZsaXBwZWRCbG9j a3NXcml0aW5nTW9kZSgpLCBwYWdlTG9naWNhbEhlaWdodCwgcGFnZUxvZ2ljYWxIZWlnaHRDaGFu Z2VkLCBjb2xJbmZvKTsKKyAgICBMYXlvdXRTdGF0ZU1haW50YWluZXIgc3RhdGVQdXNoZXIocmVu ZGVyVmlldywgdGhpcywgbG9jYXRpb25PZmZzZXQoKSwgaGFzQ29sdW1ucygpIHx8IGhhc1RyYW5z Zm9ybSgpIHx8IGhhc1JlZmxlY3Rpb24oKSB8fCBzdHlsZVRvVXNlLT5pc0ZsaXBwZWRCbG9ja3NX cml0aW5nTW9kZSgpLCBwYWdlTG9naWNhbEhlaWdodCwgcGFnZUxvZ2ljYWxIZWlnaHRDaGFuZ2Vk LCBjb2x1bW5JbmZvKCkpOwogCiAgICAgaWYgKGluUmVuZGVyRmxvd1RocmVhZCgpKSB7CiAgICAg ICAgIC8vIFJlZ2lvbnMgY2hhbmdpbmcgd2lkdGhzIGNhbiBmb3JjZSB1cyB0byByZWxheW91dCBv dXIgY2hpbGRyZW4uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAko cmV2aXNpb24gMTE4NTUxKQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2Nr LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ2OCw2ICs0NjgsOSBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2 b2lkIGNvbXB1dGVJbml0aWFsUmVnaW9uUmFuZ2VGb3JCbG9jaygpOwogICAgIHZvaWQgY29tcHV0 ZVJlZ2lvblJhbmdlRm9yQmxvY2soKTsKKyAgICAKKyAgICB2aXJ0dWFsIHZvaWQgY2hlY2tGb3JQ YWdpbmF0aW9uTG9naWNhbEhlaWdodENoYW5nZShMYXlvdXRVbml0JiBwYWdlTG9naWNhbEhlaWdo dCwgYm9vbCYgcGFnZUxvZ2ljYWxIZWlnaHRDaGFuZ2VkLCBib29sJiBoYXNTcGVjaWZpZWRQYWdl TG9naWNhbEhlaWdodCk7CisgICAgCiBwcml2YXRlOgogICAgIHZpcnR1YWwgUmVuZGVyT2JqZWN0 Q2hpbGRMaXN0KiB2aXJ0dWFsQ2hpbGRyZW4oKSB7IHJldHVybiBjaGlsZHJlbigpOyB9CiAgICAg dmlydHVhbCBjb25zdCBSZW5kZXJPYmplY3RDaGlsZExpc3QqIHZpcnR1YWxDaGlsZHJlbigpIGNv bnN0IHsgcmV0dXJuIGNoaWxkcmVuKCk7IH0K