46844 2010-09-29 15:02:25 -0700 Make estimateLogicalTopPosition block-flow-aware. 2010-09-29 15:23:14 -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 287146 0 hyatt 2010-09-29 15:02:25 -0700 Make estimateLogicalTopPosition block-flow-aware. 287149 1 69256 hyatt 2010-09-29 15:04:35 -0700 Created attachment 69256 Patch 287163 2 hyatt 2010-09-29 15:23:14 -0700 Fixed in r68696. 69256 2010-09-29 15:04:35 -0700 2010-09-29 15:21:46 -0700 Patch patch.txt text/plain 5918 hyatt SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODY4OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTAtMDktMjkgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Njg0NCwgbWFrZSBlc3RpbWF0ZVZl cnRpY2FsUG9zaXRpb24KKyAgICAgICAgYmxvY2stZmxvdy1hd2FyZS4KKworICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6 ZXN0aW1hdGVMb2dpY2FsVG9wUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxv Y2s6OmNvbGxhcHNlZE1hcmdpbkJlZm9yZUZvckNoaWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckJsb2NrOjpjb2xsYXBzZWRNYXJnaW5BZnRlckZvckNoaWxkKToKKyAgICAgICAgKiByZW5k ZXJpbmcvUmVuZGVyQmxvY2suaDoKKwogMjAxMC0wOS0yOSAgQ2hyaXMgUm9nZXJzICA8Y3JvZ2Vy c0Bnb29nbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUnVzc2VsbC4KSW5k ZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAJKHJldmlzaW9uIDY4Njg3KQorKysgV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjE0LDMzICsx NjE0LDMzIEBAIGludCBSZW5kZXJCbG9jazo6ZXN0aW1hdGVMb2dpY2FsVG9wUG9zaXQKIHsKICAg ICAvLyBGSVhNRTogV2UgbmVlZCB0byBlbGltaW5hdGUgdGhlIGVzdGltYXRpb24gb2YgdmVydGlj YWwgcG9zaXRpb24sIGJlY2F1c2Ugd2hlbiBpdCdzIHdyb25nIHdlIHNvbWV0aW1lcyB0cmlnZ2Vy IGEgcGF0aG9sb2dpY2FsCiAgICAgLy8gcmVsYXlvdXQgaWYgdGhlcmUgYXJlIGludHJ1ZGluZyBm bG9hdHMuCi0gICAgaW50IHlQb3NFc3RpbWF0ZSA9IGhlaWdodCgpOworICAgIGludCBsb2dpY2Fs VG9wRXN0aW1hdGUgPSBsb2dpY2FsSGVpZ2h0KCk7CiAgICAgaWYgKCFtYXJnaW5JbmZvLmNhbkNv bGxhcHNlV2l0aE1hcmdpbkJlZm9yZSgpKSB7Ci0gICAgICAgIGludCBjaGlsZE1hcmdpblRvcCA9 IGNoaWxkLT5zZWxmTmVlZHNMYXlvdXQoKSA/IGNoaWxkLT5tYXJnaW5Ub3AoKSA6IGNoaWxkLT5j b2xsYXBzZWRNYXJnaW5CZWZvcmUoKTsKLSAgICAgICAgeVBvc0VzdGltYXRlICs9IG1heChtYXJn aW5JbmZvLm1hcmdpbigpLCBjaGlsZE1hcmdpblRvcCk7CisgICAgICAgIGludCBjaGlsZE1hcmdp bkJlZm9yZSA9IGNoaWxkLT5zZWxmTmVlZHNMYXlvdXQoKSA/IG1hcmdpbkJlZm9yZUZvckNoaWxk KGNoaWxkKSA6IGNvbGxhcHNlZE1hcmdpbkJlZm9yZUZvckNoaWxkKGNoaWxkKTsKKyAgICAgICAg bG9naWNhbFRvcEVzdGltYXRlICs9IG1heChtYXJnaW5JbmZvLm1hcmdpbigpLCBjaGlsZE1hcmdp bkJlZm9yZSk7CiAgICAgfQogICAgIAogICAgIGJvb2wgcGFnaW5hdGVkID0gdmlldygpLT5sYXlv dXRTdGF0ZSgpLT5pc1BhZ2luYXRlZCgpOwogCi0gICAgLy8gQWRqdXN0IHlQb3NFc3RpbWF0ZSBk b3duIHRvIHRoZSBuZXh0IHBhZ2UgaWYgdGhlIG1hcmdpbnMgYXJlIHNvIGxhcmdlIHRoYXQgd2Ug ZG9uJ3QgZml0IG9uIHRoZSBjdXJyZW50CisgICAgLy8gQWRqdXN0IGxvZ2ljYWxUb3BFc3RpbWF0 ZSBkb3duIHRvIHRoZSBuZXh0IHBhZ2UgaWYgdGhlIG1hcmdpbnMgYXJlIHNvIGxhcmdlIHRoYXQg d2UgZG9uJ3QgZml0IG9uIHRoZSBjdXJyZW50CiAgICAgLy8gcGFnZS4KLSAgICBpZiAocGFnaW5h dGVkICYmIHlQb3NFc3RpbWF0ZSA+IGhlaWdodCgpKQotICAgICAgICB5UG9zRXN0aW1hdGUgPSBt aW4oeVBvc0VzdGltYXRlLCBuZXh0UGFnZVRvcChoZWlnaHQoKSkpOworICAgIGlmIChwYWdpbmF0 ZWQgJiYgbG9naWNhbFRvcEVzdGltYXRlID4gbG9naWNhbEhlaWdodCgpKQorICAgICAgICBsb2dp Y2FsVG9wRXN0aW1hdGUgPSBtaW4obG9naWNhbFRvcEVzdGltYXRlLCBuZXh0UGFnZVRvcChsb2dp Y2FsSGVpZ2h0KCkpKTsKIAotICAgIHlQb3NFc3RpbWF0ZSArPSBnZXRDbGVhckRlbHRhKGNoaWxk LCB5UG9zRXN0aW1hdGUpOworICAgIGxvZ2ljYWxUb3BFc3RpbWF0ZSArPSBnZXRDbGVhckRlbHRh KGNoaWxkLCBsb2dpY2FsVG9wRXN0aW1hdGUpOwogICAgIAogICAgIGlmIChwYWdpbmF0ZWQpIHsK ICAgICAgICAgLy8gSWYgdGhlIG9iamVjdCBoYXMgYSBwYWdlIG9yIGNvbHVtbiBicmVhayB2YWx1 ZSBvZiAiYmVmb3JlIiwgdGhlbiB3ZSBzaG91bGQgc2hpZnQgdG8gdGhlIHRvcCBvZiB0aGUgbmV4 dCBwYWdlLgotICAgICAgICB5UG9zRXN0aW1hdGUgPSBhcHBseUJlZm9yZUJyZWFrKGNoaWxkLCB5 UG9zRXN0aW1hdGUpOworICAgICAgICBsb2dpY2FsVG9wRXN0aW1hdGUgPSBhcHBseUJlZm9yZUJy ZWFrKGNoaWxkLCBsb2dpY2FsVG9wRXN0aW1hdGUpOwogICAgIAogICAgICAgICAvLyBGb3IgcmVw bGFjZWQgZWxlbWVudHMgYW5kIHNjcm9sbGVkIGVsZW1lbnRzLCB3ZSB3YW50IHRvIHNoaWZ0IHRo ZW0gdG8gdGhlIG5leHQgcGFnZSBpZiB0aGV5IGRvbid0IGZpdCBvbiB0aGUgY3VycmVudCBvbmUu Ci0gICAgICAgIHlQb3NFc3RpbWF0ZSA9IGFkanVzdEZvclVuc3BsaXR0YWJsZUNoaWxkKGNoaWxk LCB5UG9zRXN0aW1hdGUpOworICAgICAgICBsb2dpY2FsVG9wRXN0aW1hdGUgPSBhZGp1c3RGb3JV bnNwbGl0dGFibGVDaGlsZChjaGlsZCwgbG9naWNhbFRvcEVzdGltYXRlKTsKICAgICAgICAgCiAg ICAgICAgIGlmICghY2hpbGQtPnNlbGZOZWVkc0xheW91dCgpICYmIGNoaWxkLT5pc1JlbmRlckJs b2NrKCkpCi0gICAgICAgICAgICB5UG9zRXN0aW1hdGUgKz0gdG9SZW5kZXJCbG9jayhjaGlsZCkt PnBhZ2luYXRpb25TdHJ1dCgpOworICAgICAgICAgICAgbG9naWNhbFRvcEVzdGltYXRlICs9IHRv UmVuZGVyQmxvY2soY2hpbGQpLT5wYWdpbmF0aW9uU3RydXQoKTsKICAgICB9CiAKLSAgICByZXR1 cm4geVBvc0VzdGltYXRlOworICAgIHJldHVybiBsb2dpY2FsVG9wRXN0aW1hdGU7CiB9CiAKIHZv aWQgUmVuZGVyQmxvY2s6OmRldGVybWluZUxvZ2ljYWxMZWZ0UG9zaXRpb25Gb3JDaGlsZChSZW5k ZXJCb3gqIGNoaWxkKQpAQCAtNjAyMCw2ICs2MDIwLDQwIEBAIHZvaWQgUmVuZGVyQmxvY2s6OmFk anVzdExpbmVQb3NpdGlvbkZvclAKICAgICB9ICAKIH0KIAoraW50IFJlbmRlckJsb2NrOjpjb2xs YXBzZWRNYXJnaW5CZWZvcmVGb3JDaGlsZChSZW5kZXJCb3gqIGNoaWxkKSBjb25zdAoreworICAg IC8vIElmIHRoZSBjaGlsZCBoYXMgdGhlIHNhbWUgZGlyZWN0aW9uYWxpdHkgYXMgd2UgZG8sIHRo ZW4gd2UgY2FuIGp1c3QgcmV0dXJuIGl0cworICAgIC8vIGNvbGxhcHNlZCBtYXJnaW4uCisgICAg aWYgKCFjaGlsZC0+aXNCbG9ja0Zsb3dSb290KCkpCisgICAgICAgIHJldHVybiBjaGlsZC0+Y29s bGFwc2VkTWFyZ2luQmVmb3JlKCk7CisgICAgCisgICAgLy8gVGhlIGNoaWxkIGhhcyBhIGRpZmZl cmVudCBkaXJlY3Rpb25hbGl0eS4gIElmIHRoZSBjaGlsZCBpcyBwYXJhbGxlbCwgdGhlbiBpdCdz IGp1c3QKKyAgICAvLyBmbGlwcGVkIHJlbGF0aXZlIHRvIHVzLiAgV2UgY2FuIHVzZSB0aGUgY29s bGFwc2VkIG1hcmdpbiBmb3IgdGhlIG9wcG9zaXRlIGVkZ2UuCisgICAgaWYgKGNoaWxkLT5zdHls ZSgpLT5pc1ZlcnRpY2FsQmxvY2tGbG93KCkgPT0gc3R5bGUoKS0+aXNWZXJ0aWNhbEJsb2NrRmxv dygpKQorICAgICAgICByZXR1cm4gY2hpbGQtPmNvbGxhcHNlZE1hcmdpbkFmdGVyKCk7CisgICAg CisgICAgLy8gVGhlIGNoaWxkIGlzIHBlcnBlbmRpY3VsYXIgdG8gdXMsIHdoaWNoIG1lYW5zIGl0 cyBtYXJnaW5zIGRvbid0IGNvbGxhcHNlIGJ1dCBhcmUgb24gdGhlCisgICAgLy8gImxvZ2ljYWwg bGVmdC9yaWdodCIgc2lkZXMgb2YgdGhlIGNoaWxkIGJveC4gIFdlIGNhbiBqdXN0IHJldHVybiB0 aGUgcmF3IG1hcmdpbiBpbiB0aGlzIGNhc2UuICAKKyAgICByZXR1cm4gbWFyZ2luQmVmb3JlRm9y Q2hpbGQoY2hpbGQpOworfQorCitpbnQgUmVuZGVyQmxvY2s6OmNvbGxhcHNlZE1hcmdpbkFmdGVy Rm9yQ2hpbGQoUmVuZGVyQm94KiBjaGlsZCkgY29uc3QKK3sKKyAgICAvLyBJZiB0aGUgY2hpbGQg aGFzIHRoZSBzYW1lIGRpcmVjdGlvbmFsaXR5IGFzIHdlIGRvLCB0aGVuIHdlIGNhbiBqdXN0IHJl dHVybiBpdHMKKyAgICAvLyBjb2xsYXBzZWQgbWFyZ2luLgorICAgIGlmICghY2hpbGQtPmlzQmxv Y2tGbG93Um9vdCgpKQorICAgICAgICByZXR1cm4gY2hpbGQtPmNvbGxhcHNlZE1hcmdpbkFmdGVy KCk7CisgICAgCisgICAgLy8gVGhlIGNoaWxkIGhhcyBhIGRpZmZlcmVudCBkaXJlY3Rpb25hbGl0 eS4gIElmIHRoZSBjaGlsZCBpcyBwYXJhbGxlbCwgdGhlbiBpdCdzIGp1c3QKKyAgICAvLyBmbGlw cGVkIHJlbGF0aXZlIHRvIHVzLiAgV2UgY2FuIHVzZSB0aGUgY29sbGFwc2VkIG1hcmdpbiBmb3Ig dGhlIG9wcG9zaXRlIGVkZ2UuCisgICAgaWYgKGNoaWxkLT5zdHlsZSgpLT5pc1ZlcnRpY2FsQmxv Y2tGbG93KCkgPT0gc3R5bGUoKS0+aXNWZXJ0aWNhbEJsb2NrRmxvdygpKQorICAgICAgICByZXR1 cm4gY2hpbGQtPmNvbGxhcHNlZE1hcmdpbkJlZm9yZSgpOworICAgIAorICAgIC8vIFRoZSBjaGls ZCBpcyBwZXJwZW5kaWN1bGFyIHRvIHVzLCB3aGljaCBtZWFucyBpdHMgbWFyZ2lucyBkb24ndCBj b2xsYXBzZSBidXQgYXJlIG9uIHRoZQorICAgIC8vICJsb2dpY2FsIGxlZnQvcmlnaHQiIHNpZGUg b2YgdGhlIGNoaWxkIGJveC4gIFdlIGNhbiBqdXN0IHJldHVybiB0aGUgcmF3IG1hcmdpbiBpbiB0 aGlzIGNhc2UuICAKKyAgICByZXR1cm4gbWFyZ2luQWZ0ZXJGb3JDaGlsZChjaGlsZCk7Cit9CisK IGludCBSZW5kZXJCbG9jazo6bWFyZ2luQmVmb3JlRm9yQ2hpbGQoUmVuZGVyQm94TW9kZWxPYmpl Y3QqIGNoaWxkKSBjb25zdAogewogICAgIHN3aXRjaCAoc3R5bGUoKS0+YmxvY2tGbG93KCkpIHsK SW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmgKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suaAkocmV2aXNpb24gNjg2ODcpCisrKyBXZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCbG9jay5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODAsNiArMTgwLDgg QEAgcHVibGljOgogICAgIHZvaWQgc2V0TWFyZ2luRW5kRm9yQ2hpbGQoUmVuZGVyQm94KiBjaGls ZCwgaW50KTsKICAgICB2b2lkIHNldE1hcmdpbkJlZm9yZUZvckNoaWxkKFJlbmRlckJveCogY2hp bGQsIGludCk7CiAgICAgdm9pZCBzZXRNYXJnaW5BZnRlckZvckNoaWxkKFJlbmRlckJveCogY2hp bGQsIGludCk7CisgICAgaW50IGNvbGxhcHNlZE1hcmdpbkJlZm9yZUZvckNoaWxkKFJlbmRlckJv eCogY2hpbGQpIGNvbnN0OworICAgIGludCBjb2xsYXBzZWRNYXJnaW5BZnRlckZvckNoaWxkKFJl bmRlckJveCogY2hpbGQpIGNvbnN0OwogCiBwcm90ZWN0ZWQ6CiAgICAgLy8gVGhlc2UgZnVuY3Rp b25zIGFyZSBvbmx5IHVzZWQgaW50ZXJuYWxseSB0byBtYW5pcHVsYXRlIHRoZSByZW5kZXIgdHJl ZSBzdHJ1Y3R1cmUgdmlhIHJlbW92ZS9pbnNlcnQvYXBwZW5kQ2hpbGROb2RlLgo=