46835 2010-09-29 13:07:11 -0700 Patch a few more logicalHeight places. 2010-09-29 13:21:39 -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 287083 0 hyatt 2010-09-29 13:07:11 -0700 Patching a few more places... enough to get the right result out of fast/blockflow/root-lr-basic.html. 287085 1 69243 hyatt 2010-09-29 13:10:18 -0700 Created attachment 69243 Patch 287089 2 hyatt 2010-09-29 13:21:39 -0700 Fixed in r68681. 69243 2010-09-29 13:10:18 -0700 2010-09-29 13:11:28 -0700 Patch patch.txt text/plain 7021 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODY4MCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDktMjkgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjgzNSwgcGF0Y2ggYSBmZXcgbW9y ZSBoZWlnaHQvbG9naWNhbEhlaWdodHMuICBSZW5hbWUgc3RyZXRjaGVzVG9WaWV3SGVpZ2h0Lgor CisgICAgICAgICogcGFnZS9GcmFtZVZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVW aWV3OjpsYXlvdXQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6bGF5b3V0QmxvY2spOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy QmxvY2s6OmxheW91dElubGluZUNoaWxkcmVuKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVy Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWln aHQpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlbmRlckJveDo6c3RyZXRjaGVzVG9WaWV3cG9ydCk6CisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckJveE1vZGVsT2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJveE1vZGVs T2JqZWN0OjpyZWxhdGl2ZVBvc2l0aW9uT2Zmc2V0WSk6CisKIDIwMTAtMDktMjkgIENocmlzIEZs ZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJp biBBZGxlci4KSW5kZXg6IFdlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCShyZXZpc2lvbiA2ODU2MSkKKysrIFdlYkNvcmUv cGFnZS9GcmFtZVZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02ODcsNyArNjg3LDcgQEAgdm9p ZCBGcmFtZVZpZXc6OmxheW91dChib29sIGFsbG93U3VidHJlZQogICAgICAgICAgICAgICAgIHZN b2RlID0gU2Nyb2xsYmFyQWx3YXlzT2ZmOwogICAgICAgICAgICAgICAgIGhNb2RlID0gU2Nyb2xs YmFyQWx3YXlzT2ZmOwogICAgICAgICAgICAgfSBlbHNlIGlmIChib2R5LT5oYXNUYWdOYW1lKGJv ZHlUYWcpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKCFtX2ZpcnN0TGF5b3V0ICYmIG1fc2l6ZS5o ZWlnaHQoKSAhPSBsYXlvdXRIZWlnaHQoKSAmJiBib2R5LT5yZW5kZXJlcigpLT5lbmNsb3NpbmdC b3goKS0+c3RyZXRjaGVzVG9WaWV3SGVpZ2h0KCkpCisgICAgICAgICAgICAgICAgaWYgKCFtX2Zp cnN0TGF5b3V0ICYmIG1fc2l6ZS5oZWlnaHQoKSAhPSBsYXlvdXRIZWlnaHQoKSAmJiBib2R5LT5y ZW5kZXJlcigpLT5lbmNsb3NpbmdCb3goKS0+c3RyZXRjaGVzVG9WaWV3cG9ydCgpKQogICAgICAg ICAgICAgICAgICAgICBib2R5LT5yZW5kZXJlcigpLT5zZXRDaGlsZE5lZWRzTGF5b3V0KHRydWUp OwogICAgICAgICAgICAgICAgIC8vIEl0J3Mgc3VmZmljaWVudCB0byBqdXN0IGNoZWNrIHRoZSBY IG92ZXJmbG93LAogICAgICAgICAgICAgICAgIC8vIHNpbmNlIGl0J3MgaWxsZWdhbCB0byBoYXZl IHZpc2libGUgaW4gb25seSBvbmUgZGlyZWN0aW9uLgpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2suY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmNwcAkocmV2aXNpb24gNjg2NzgpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9j ay5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMjEsNyArMTEyMSw3IEBAIHZvaWQgUmVuZGVyQmxv Y2s6OmxheW91dEJsb2NrKGJvb2wgcmVsYXkKIAogICAgIExheW91dFJlcGFpbnRlciByZXBhaW50 ZXIoKnRoaXMsIG1fZXZlckhhZExheW91dCAmJiBjaGVja0ZvclJlcGFpbnREdXJpbmdMYXlvdXQo KSk7CiAKLSAgICBpbnQgb2xkV2lkdGggPSB3aWR0aCgpOworICAgIGludCBvbGRXaWR0aCA9IGxv Z2ljYWxXaWR0aCgpOwogICAgIGludCBvbGRDb2x1bW5XaWR0aCA9IGRlc2lyZWRDb2x1bW5XaWR0 aCgpOwogCiAgICAgY29tcHV0ZUxvZ2ljYWxXaWR0aCgpOwpJbmRleDogV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwCShyZXZpc2lvbiA2ODU2MSkKKysrIFdlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTg5OSwxMCArODk5LDEwIEBAIHZvaWQgUmVuZGVyQmxvY2s6OmxheW91dElubGluZUNoaWxkcmVu KGIKICAgICB9CiAKICAgICAvLyBOb3cgYWRkIGluIHRoZSBib3R0b20gYm9yZGVyL3BhZGRpbmcu Ci0gICAgc2V0TG9naWNhbEhlaWdodChoZWlnaHQoKSArIHRvQWRkKTsKKyAgICBzZXRMb2dpY2Fs SGVpZ2h0KGxvZ2ljYWxIZWlnaHQoKSArIHRvQWRkKTsKIAogICAgIGlmICghZmlyc3RMaW5lQm94 KCkgJiYgaGFzTGluZUlmRW1wdHkoKSkKLSAgICAgICAgc2V0TG9naWNhbEhlaWdodChoZWlnaHQo KSArIGxpbmVIZWlnaHQodHJ1ZSwgdHJ1ZSkpOworICAgICAgICBzZXRMb2dpY2FsSGVpZ2h0KGxv Z2ljYWxIZWlnaHQoKSArIGxpbmVIZWlnaHQodHJ1ZSwgdHJ1ZSkpOwogCiAgICAgLy8gU2VlIGlm IHdlIGhhdmUgYW55IGxpbmVzIHRoYXQgc3BpbGwgb3V0IG9mIG91ciBibG9jay4gIElmIHdlIGRv LCB0aGVuIHdlIHdpbGwgcG9zc2libHkgbmVlZCB0bwogICAgIC8vIHRydW5jYXRlIHRleHQuCklu ZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAJKHJldmlzaW9uIDY4NjI2KQorKysgV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTcyNiw3ICsxNzI2LDcg QEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KCkKICAgICAvLyBoZWlnaHQg aGFzIG5vdGhpbmcgdG8gYmUgYSBwZXJjZW50YWdlIG9mLCBhbmQgaXQgZW5kcyB1cCBiZWluZyAw LiBUaGF0IGlzIGJhZC4KICAgICBib29sIHBhZ2luYXRlZENvbnRlbnROZWVkc0Jhc2VIZWlnaHQg PSBkb2N1bWVudCgpLT5wcmludGluZygpICYmIGguaXNQZXJjZW50KCkKICAgICAgICAgJiYgKGlz Um9vdCgpIHx8IChpc0JvZHkoKSAmJiBkb2N1bWVudCgpLT5kb2N1bWVudEVsZW1lbnQoKS0+cmVu ZGVyZXIoKS0+c3R5bGUoKS0+bG9naWNhbEhlaWdodCgpLmlzUGVyY2VudCgpKSk7Ci0gICAgaWYg KHN0cmV0Y2hlc1RvVmlld0hlaWdodCgpIHx8IHBhZ2luYXRlZENvbnRlbnROZWVkc0Jhc2VIZWln aHQpIHsKKyAgICBpZiAoc3RyZXRjaGVzVG9WaWV3cG9ydCgpIHx8IHBhZ2luYXRlZENvbnRlbnRO ZWVkc0Jhc2VIZWlnaHQpIHsKICAgICAgICAgLy8gRklYTUU6IEZpbmlzaCBhY2NvdW50aW5nIGZv ciBibG9jayBmbG93IGhlcmUuCiAgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00NjYwMwogICAgICAgICBpbnQgbWFyZ2lucyA9IGNvbGxhcHNlZE1hcmdp bkJlZm9yZSgpICsgY29sbGFwc2VkTWFyZ2luQWZ0ZXIoKTsKSW5kZXg6IFdlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eC5oCShyZXZpc2lvbiA2ODY3OCkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCSh3 b3JraW5nIGNvcHkpCkBAIC0yODcsOSArMjg3LDkgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9p ZCBjb21wdXRlTG9naWNhbFdpZHRoKCk7CiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVMb2dpY2Fs SGVpZ2h0KCk7CiAKLSAgICBib29sIHN0cmV0Y2hlc1RvVmlld0hlaWdodCgpIGNvbnN0CisgICAg Ym9vbCBzdHJldGNoZXNUb1ZpZXdwb3J0KCkgY29uc3QKICAgICB7Ci0gICAgICAgIHJldHVybiBk b2N1bWVudCgpLT5pblF1aXJrc01vZGUoKSAmJiBzdHlsZSgpLT5oZWlnaHQoKS5pc0F1dG8oKSAm JiAhaXNGbG9hdGluZ09yUG9zaXRpb25lZCgpICYmIChpc1Jvb3QoKSB8fCBpc0JvZHkoKSkgJiYg IWlzQmxvY2tGbG93Um9vdCgpOworICAgICAgICByZXR1cm4gZG9jdW1lbnQoKS0+aW5RdWlya3NN b2RlKCkgJiYgc3R5bGUoKS0+bG9naWNhbEhlaWdodCgpLmlzQXV0bygpICYmICFpc0Zsb2F0aW5n T3JQb3NpdGlvbmVkKCkgJiYgKGlzUm9vdCgpIHx8IGlzQm9keSgpKSAmJiAhaXNCbG9ja0Zsb3dS b290KCk7CiAgICAgfQogCiAgICAgdmlydHVhbCBJbnRTaXplIGludHJpbnNpY1NpemUoKSBjb25z dCB7IHJldHVybiBJbnRTaXplKCk7IH0KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJv eE1vZGVsT2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3hNb2RlbE9iamVjdC5jcHAJKHJldmlzaW9uIDY4NTYxKQorKysgV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94TW9kZWxPYmplY3QuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zNDgsMTMgKzM0OCwx MyBAQCBpbnQgUmVuZGVyQm94TW9kZWxPYmplY3Q6OnJlbGF0aXZlUG9zaXRpCiAgICAgaWYgKCFz dHlsZSgpLT50b3AoKS5pc0F1dG8oKQogICAgICAgICAmJiAoIWNvbnRhaW5pbmdCbG9jay0+c3R5 bGUoKS0+aGVpZ2h0KCkuaXNBdXRvKCkKICAgICAgICAgICAgIHx8ICFzdHlsZSgpLT50b3AoKS5p c1BlcmNlbnQoKQotICAgICAgICAgICAgfHwgY29udGFpbmluZ0Jsb2NrLT5zdHJldGNoZXNUb1Zp ZXdIZWlnaHQoKSkpCisgICAgICAgICAgICB8fCBjb250YWluaW5nQmxvY2stPnN0cmV0Y2hlc1Rv Vmlld3BvcnQoKSkpCiAgICAgICAgIHJldHVybiBzdHlsZSgpLT50b3AoKS5jYWxjVmFsdWUoY29u dGFpbmluZ0Jsb2NrLT5hdmFpbGFibGVIZWlnaHQoKSk7CiAKICAgICBpZiAoIXN0eWxlKCktPmJv dHRvbSgpLmlzQXV0bygpCiAgICAgICAgICYmICghY29udGFpbmluZ0Jsb2NrLT5zdHlsZSgpLT5o ZWlnaHQoKS5pc0F1dG8oKQogICAgICAgICAgICAgfHwgIXN0eWxlKCktPmJvdHRvbSgpLmlzUGVy Y2VudCgpCi0gICAgICAgICAgICB8fCBjb250YWluaW5nQmxvY2stPnN0cmV0Y2hlc1RvVmlld0hl aWdodCgpKSkKKyAgICAgICAgICAgIHx8IGNvbnRhaW5pbmdCbG9jay0+c3RyZXRjaGVzVG9WaWV3 cG9ydCgpKSkKICAgICAgICAgcmV0dXJuIC1zdHlsZSgpLT5ib3R0b20oKS5jYWxjVmFsdWUoY29u dGFpbmluZ0Jsb2NrLT5hdmFpbGFibGVIZWlnaHQoKSk7CiAKICAgICByZXR1cm4gMDsKSW5kZXg6 IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VM b2cJKHJldmlzaW9uIDY4NjgwKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTEgQEAKKzIwMTAtMDktMjkgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBw bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NjgzNSwgcGF0Y2ggYSBm ZXcgbW9yZSBoZWlnaHQvbG9naWNhbEhlaWdodHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMv ZmFzdC9ibG9ja2Zsb3cvcm9vdC1sci1iYXNpYy1leHBlY3RlZC50eHQ6CisKIDIwMTAtMDktMjkg IENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBEYXJpbiBBZGxlci4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9mYXN0L2Js b2NrZmxvdy9yb290LWxyLWJhc2ljLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9wbGF0Zm9ybS9tYWMvZmFzdC9ibG9ja2Zsb3cvcm9vdC1sci1iYXNpYy1leHBlY3RlZC50 eHQJKHJldmlzaW9uIDY4Njc4KQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Zhc3QvYmxv Y2tmbG93L3Jvb3QtbHItYmFzaWMtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xLDUg KzEsNSBAQAogbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCiAgIFJlbmRlclZpZXcgYXQgKDAs MCkgc2l6ZSA4MDB4NjAwCi1sYXllciBhdCAoMCwwKSBzaXplIDU5MHg2MDAKK2xheWVyIGF0ICgw LDApIHNpemUgMTA0eDYwMAogICBSZW5kZXJCbG9jayB7SFRNTH0gYXQgKDAsMCkgc2l6ZSAxMDR4 NjAwIFtib3JkZXI6ICgycHggc29saWQgIzAwMDAwMCldCi0gICAgUmVuZGVyQm9keSB7Qk9EWX0g YXQgKDEwLDApIHNpemUgNTgweDU4MAorICAgIFJlbmRlckJvZHkge0JPRFl9IGF0ICgxMCwwKSBz aXplIDB4NTgwCg==