46786 2010-09-28 23:15:13 -0700 Convert layoutBlockChildren to be block-flow-aware. 2010-09-29 10:15:26 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 46123 1 hyatt hyatt oldest_to_newest 286742 0 hyatt 2010-09-28 23:15:13 -0700 Convert the layoutBlockChildren function (but not any functions it calls) to be block-flow-aware. 286743 1 69163 hyatt 2010-09-28 23:18:03 -0700 Created attachment 69163 Patch 286947 2 hyatt 2010-09-29 10:15:26 -0700 Fixed in r68654. 69163 2010-09-28 23:18:03 -0700 2010-09-29 09:45:15 -0700 Patch patch.txt text/plain 6302 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODYyOCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMDktMjggIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Njc4NiwgY29udmVydCBsYXlvdXRC bG9ja0NoaWxkIChidXQgbm90IGFueSBmdW5jdGlvbnMgaXQgY2FsbHMpCisgICAgICAgIHRvIGJl IGJsb2NrLWZsb3ctYXdhcmUuCisKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxvY2suY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmxheW91dEJsb2NrKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJsb2NrOjpoYW5kbGVBZnRlclNpZGVPZkJsb2NrKToKKyAgICAgICAg KFdlYkNvcmU6OlJlbmRlckJsb2NrOjpsYXlvdXRCbG9ja0NoaWxkcmVuKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyQmxvY2suaDoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQm94Lmg6 CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQpOgor CiAyMDEwLTA5LTI4ICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNvbT4KIAogICAgICAgICBS ZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5jcHAJKHJldmlzaW9uIDY4NjI4KQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2su Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMjA3LDcgKzEyMDcsNyBAQCB2b2lkIFJlbmRlckJsb2Nr OjpsYXlvdXRCbG9jayhib29sIHJlbGF5CiAgICAgICAgIGxheW91dEJsb2NrQ2hpbGRyZW4ocmVs YXlvdXRDaGlsZHJlbiwgbWF4RmxvYXRCb3R0b20pOwogCiAgICAgLy8gRXhwYW5kIG91ciBpbnRy aW5zaWMgaGVpZ2h0IHRvIGVuY29tcGFzcyBmbG9hdHMuCi0gICAgaW50IHRvQWRkID0gYm9yZGVy QWZ0ZXIoKSArIHBhZGRpbmdBZnRlcigpICsgaG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodCgpOyAv LyBGSVhNRTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NjQ1LCBv dmVyZmxvdyBhbmQgYmxvY2stZmxvdy4KKyAgICBpbnQgdG9BZGQgPSBib3JkZXJBZnRlcigpICsg cGFkZGluZ0FmdGVyKCkgKyBzY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCk7CiAgICAgaWYgKGZsb2F0 Qm90dG9tKCkgPiAobG9naWNhbEhlaWdodCgpIC0gdG9BZGQpICYmIGV4cGFuZHNUb0VuY2xvc2VP dmVyaGFuZ2luZ0Zsb2F0cygpKQogICAgICAgICBzZXRMb2dpY2FsSGVpZ2h0KGZsb2F0Qm90dG9t KCkgKyB0b0FkZCk7CiAgICAgCkBAIC0xNzEzLDcgKzE3MTMsNyBAQCB2b2lkIFJlbmRlckJsb2Nr OjpzZXRDb2xsYXBzZWRCb3R0b21NYXJnCiAgICAgfQogfQogCi12b2lkIFJlbmRlckJsb2NrOjpo YW5kbGVCb3R0b21PZkJsb2NrKGludCB0b3AsIGludCBib3R0b20sIE1hcmdpbkluZm8mIG1hcmdp bkluZm8pCit2b2lkIFJlbmRlckJsb2NrOjpoYW5kbGVBZnRlclNpZGVPZkJsb2NrKGludCB0b3As IGludCBib3R0b20sIE1hcmdpbkluZm8mIG1hcmdpbkluZm8pCiB7CiAgICAgbWFyZ2luSW5mby5z ZXRBdEFmdGVyU2lkZU9mQmxvY2sodHJ1ZSk7CiAKQEAgLTE3NTMsMTYgKzE3NTMsMTggQEAgdm9p ZCBSZW5kZXJCbG9jazo6bGF5b3V0QmxvY2tDaGlsZHJlbihibwogICAgICAgICB9CiAgICAgfQog Ci0gICAgaW50IHRvcCA9IGJvcmRlclRvcCgpICsgcGFkZGluZ1RvcCgpOwotICAgIGludCBib3R0 b20gPSBib3JkZXJCb3R0b20oKSArIHBhZGRpbmdCb3R0b20oKSArIGhvcml6b250YWxTY3JvbGxi YXJIZWlnaHQoKTsKKyAgICBpbnQgYmVmb3JlRWRnZSA9IGJvcmRlckJlZm9yZSgpICsgcGFkZGlu Z0JlZm9yZSgpOworICAgIGludCBhZnRlckVkZ2UgPSBib3JkZXJBZnRlcigpICsgcGFkZGluZ0Fm dGVyKCkgKyBzY3JvbGxiYXJMb2dpY2FsSGVpZ2h0KCk7CiAKLSAgICBzZXRMb2dpY2FsSGVpZ2h0 KHRvcCk7CisgICAgc2V0TG9naWNhbEhlaWdodChiZWZvcmVFZGdlKTsKIAogICAgIC8vIFRoZSBt YXJnaW4gc3RydWN0IGNhY2hlcyBhbGwgb3VyIGN1cnJlbnQgbWFyZ2luIGNvbGxhcHNpbmcgc3Rh dGUuICBUaGUgY29tcGFjdCBzdHJ1Y3QgY2FjaGVzIHN0YXRlIHdoZW4gd2UgZW5jb3VudGVyIGNv bXBhY3RzLAotICAgIE1hcmdpbkluZm8gbWFyZ2luSW5mbyh0aGlzLCB0b3AsIGJvdHRvbSk7Cisg ICAgTWFyZ2luSW5mbyBtYXJnaW5JbmZvKHRoaXMsIGJlZm9yZUVkZ2UsIGFmdGVyRWRnZSk7CiAK ICAgICAvLyBGaWVsZHNldHMgbmVlZCB0byBmaW5kIHRoZWlyIGxlZ2VuZCBhbmQgcG9zaXRpb24g aXQgaW5zaWRlIHRoZSBib3JkZXIgb2YgdGhlIG9iamVjdC4KICAgICAvLyBUaGUgbGVnZW5kIHRo ZW4gZ2V0cyBza2lwcGVkIGR1cmluZyBub3JtYWwgbGF5b3V0LgorICAgIC8vIEZJWE1FOiBNYWtl IGZpZWxkc2V0cyB3b3JrIHdpdGggYmxvY2stZmxvdy4KKyAgICAvLyBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY3ODUKICAgICBSZW5kZXJPYmplY3QqIGxlZ2VuZCA9 IGxheW91dExlZ2VuZChyZWxheW91dENoaWxkcmVuKTsKIAogICAgIGludCBwcmV2aW91c0Zsb2F0 Qm90dG9tID0gMDsKQEAgLTE3ODAsMTEgKzE3ODIsMTEgQEAgdm9pZCBSZW5kZXJCbG9jazo6bGF5 b3V0QmxvY2tDaGlsZHJlbihibwogICAgICAgICAvLyBNYWtlIHN1cmUgd2UgbGF5b3V0IGNoaWxk cmVuIGlmIHRoZXkgbmVlZCBpdC4KICAgICAgICAgLy8gRklYTUU6IFRlY2huaWNhbGx5IHBlcmNl bnRhZ2UgaGVpZ2h0IG9iamVjdHMgb25seSBuZWVkIGEgcmVsYXlvdXQgaWYgdGhlaXIgcGVyY2Vu dGFnZSBpc24ndCBnb2luZyB0byBiZSB0dXJuZWQgaW50bwogICAgICAgICAvLyBhbiBhdXRvIHZh bHVlLiAgQWRkIGEgbWV0aG9kIHRvIGRldGVybWluZSB0aGlzLCBzbyB0aGF0IHdlIGNhbiBhdm9p ZCB0aGUgcmVsYXlvdXQuCi0gICAgICAgIGlmIChyZWxheW91dENoaWxkcmVuIHx8ICgoY2hpbGQt PnN0eWxlKCktPmhlaWdodCgpLmlzUGVyY2VudCgpIHx8IGNoaWxkLT5zdHlsZSgpLT5taW5IZWln aHQoKS5pc1BlcmNlbnQoKSB8fCBjaGlsZC0+c3R5bGUoKS0+bWF4SGVpZ2h0KCkuaXNQZXJjZW50 KCkpICYmICFpc1JlbmRlclZpZXcoKSkpCisgICAgICAgIGlmIChyZWxheW91dENoaWxkcmVuIHx8 ICgoY2hpbGQtPnN0eWxlKCktPmxvZ2ljYWxIZWlnaHQoKS5pc1BlcmNlbnQoKSB8fCBjaGlsZC0+ c3R5bGUoKS0+bG9naWNhbE1pbkhlaWdodCgpLmlzUGVyY2VudCgpIHx8IGNoaWxkLT5zdHlsZSgp LT5sb2dpY2FsTWF4SGVpZ2h0KCkuaXNQZXJjZW50KCkpICYmICFpc1JlbmRlclZpZXcoKSkpCiAg ICAgICAgICAgICBjaGlsZC0+c2V0Q2hpbGROZWVkc0xheW91dCh0cnVlLCBmYWxzZSk7CiAKLSAg ICAgICAgLy8gSWYgcmVsYXlvdXRDaGlsZHJlbiBpcyBzZXQgYW5kIHdlIGhhdmUgcGVyY2VudGFn ZSBwYWRkaW5nLCB3ZSBhbHNvIG5lZWQgdG8gaW52YWxpZGF0ZSB0aGUgY2hpbGQncyBwcmVmIHdp ZHRocy4KLSAgICAgICAgaWYgKHJlbGF5b3V0Q2hpbGRyZW4gJiYgKGNoaWxkLT5zdHlsZSgpLT5w YWRkaW5nTGVmdCgpLmlzUGVyY2VudCgpIHx8IGNoaWxkLT5zdHlsZSgpLT5wYWRkaW5nUmlnaHQo KS5pc1BlcmNlbnQoKSkpCisgICAgICAgIC8vIElmIHJlbGF5b3V0Q2hpbGRyZW4gaXMgc2V0IGFu ZCB0aGUgY2hpbGQgaGFzIHBlcmNlbnRhZ2UgcGFkZGluZywgd2UgYWxzbyBuZWVkIHRvIGludmFs aWRhdGUgdGhlIGNoaWxkJ3MgcHJlZiB3aWR0aHMuCisgICAgICAgIGlmIChyZWxheW91dENoaWxk cmVuICYmIChjaGlsZC0+c3R5bGUoKS0+cGFkZGluZ1N0YXJ0KCkuaXNQZXJjZW50KCkgfHwgY2hp bGQtPnN0eWxlKCktPnBhZGRpbmdFbmQoKS5pc1BlcmNlbnQoKSkpCiAgICAgICAgICAgICBjaGls ZC0+c2V0UHJlZmVycmVkTG9naWNhbFdpZHRoc0RpcnR5KHRydWUsIGZhbHNlKTsKIAogICAgICAg ICAvLyBIYW5kbGUgdGhlIGZvdXIgdHlwZXMgb2Ygc3BlY2lhbCBlbGVtZW50cyBmaXJzdC4gIFRo ZXNlIGluY2x1ZGUgcG9zaXRpb25lZCBjb250ZW50LCBmbG9hdGluZyBjb250ZW50LCBjb21wYWN0 cyBhbmQKQEAgLTE3OTgsNyArMTgwMCw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmxheW91dEJsb2Nr Q2hpbGRyZW4oYm8KICAgICAKICAgICAvLyBOb3cgZG8gdGhlIGhhbmRsaW5nIG9mIHRoZSBib3R0 b20gb2YgdGhlIGJsb2NrLCBhZGRpbmcgaW4gb3VyIGJvdHRvbSBib3JkZXIvcGFkZGluZyBhbmQK ICAgICAvLyBkZXRlcm1pbmluZyB0aGUgY29ycmVjdCBjb2xsYXBzZWQgYm90dG9tIG1hcmdpbiBp bmZvcm1hdGlvbi4KLSAgICBoYW5kbGVCb3R0b21PZkJsb2NrKHRvcCwgYm90dG9tLCBtYXJnaW5J bmZvKTsKKyAgICBoYW5kbGVBZnRlclNpZGVPZkJsb2NrKGJlZm9yZUVkZ2UsIGFmdGVyRWRnZSwg bWFyZ2luSW5mbyk7CiB9CiAKIHZvaWQgUmVuZGVyQmxvY2s6OmxheW91dEJsb2NrQ2hpbGQoUmVu ZGVyQm94KiBjaGlsZCwgTWFyZ2luSW5mbyYgbWFyZ2luSW5mbywgaW50JiBwcmV2aW91c0Zsb2F0 Qm90dG9tLCBpbnQmIG1heEZsb2F0Qm90dG9tKQpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyQmxvY2suaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5o CShyZXZpc2lvbiA2ODYyNikKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgJKHdv cmtpbmcgY29weSkKQEAgLTU2OCw3ICs1NjgsNyBAQCBwcml2YXRlOgogICAgIGludCBjbGVhckZs b2F0c0lmTmVlZGVkKFJlbmRlckJveCogY2hpbGQsIE1hcmdpbkluZm8mLCBpbnQgb2xkVG9wUG9z TWFyZ2luLCBpbnQgb2xkVG9wTmVnTWFyZ2luLCBpbnQgeVBvcyk7CiAgICAgaW50IGVzdGltYXRl VmVydGljYWxQb3NpdGlvbihSZW5kZXJCb3gqIGNoaWxkLCBjb25zdCBNYXJnaW5JbmZvJik7CiAg ICAgdm9pZCBkZXRlcm1pbmVIb3Jpem9udGFsUG9zaXRpb24oUmVuZGVyQm94KiBjaGlsZCk7Ci0g ICAgdm9pZCBoYW5kbGVCb3R0b21PZkJsb2NrKGludCB0b3AsIGludCBib3R0b20sIE1hcmdpbklu Zm8mKTsKKyAgICB2b2lkIGhhbmRsZUFmdGVyU2lkZU9mQmxvY2soaW50IHRvcCwgaW50IGJvdHRv bSwgTWFyZ2luSW5mbyYpOwogICAgIHZvaWQgc2V0Q29sbGFwc2VkQm90dG9tTWFyZ2luKGNvbnN0 IE1hcmdpbkluZm8mKTsKICAgICAvLyBFbmQgaGVscGVyIGZ1bmN0aW9ucyBhbmQgc3RydWN0cyB1 c2VkIGJ5IGxheW91dEJsb2NrQ2hpbGRyZW4uCiAKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlckJveC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCShy ZXZpc2lvbiA2ODYyNikKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCSh3b3JraW5n IGNvcHkpCkBAIC0zMTYsNiArMzE2LDcgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBpbnQgdmVy dGljYWxTY3JvbGxiYXJXaWR0aCgpIGNvbnN0OwogICAgIGludCBob3Jpem9udGFsU2Nyb2xsYmFy SGVpZ2h0KCkgY29uc3Q7CisgICAgaW50IHNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7 IHJldHVybiBzdHlsZSgpLT5pc1ZlcnRpY2FsQmxvY2tGbG93KCkgPyBob3Jpem9udGFsU2Nyb2xs YmFySGVpZ2h0KCkgOiB2ZXJ0aWNhbFNjcm9sbGJhcldpZHRoKCk7IH0KICAgICB2aXJ0dWFsIGJv b2wgc2Nyb2xsKFNjcm9sbERpcmVjdGlvbiwgU2Nyb2xsR3JhbnVsYXJpdHksIGZsb2F0IG11bHRp cGxpZXIgPSAxLCBOb2RlKiogc3RvcE5vZGUgPSAwKTsKICAgICBib29sIGNhbkJlU2Nyb2xsZWRB bmRIYXNTY3JvbGxhYmxlQXJlYSgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBjYW5CZVByb2dy YW1hdGljYWxseVNjcm9sbGVkKGJvb2wpIGNvbnN0Owo=