99883 2012-10-19 16:14:53 -0700 Replace calls to updateLogicalHeight with calls to computeLogicalHeight 2012-10-19 18:43:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony eric ojan webkit.review.bot oldest_to_newest 746735 0 tony 2012-10-19 16:14:53 -0700 Replace calls to updateLogicalHeight with calls to computeLogicalHeight 746737 1 169717 tony 2012-10-19 16:19:49 -0700 Created attachment 169717 Patch 746831 2 169717 webkit.review.bot 2012-10-19 18:43:09 -0700 Comment on attachment 169717 Patch Clearing flags on attachment: 169717 Committed r131971: <http://trac.webkit.org/changeset/131971> 746832 3 webkit.review.bot 2012-10-19 18:43:12 -0700 All reviewed patches have been landed. Closing bug. 169717 2012-10-19 16:19:49 -0700 2012-10-19 18:43:09 -0700 Patch bug-99883-20121019161832.patch text/plain 6052 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTMxOTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGYxOGM4YWNmZGRjNDE0 YmNkM2U3NjQzYTI1M2RjMmRjMGY3YjdiNi4uZWE4MDBiY2UzY2UyZGM0NjZiZTE5M2ExMDg2YWZk YTgxNzZmYzg2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEwLTE5ICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmVwbGFjZSBjYWxscyB0byB1 cGRhdGVMb2dpY2FsSGVpZ2h0IHdpdGggY2FsbHMgdG8gY29tcHV0ZUxvZ2ljYWxIZWlnaHQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk5ODgzCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW4gUmVuZGVyQm94 IGFuZCBSZW5kZXJCbG9jaywgc3dpdGNoIHRvIHVzaW5nIGNvbXB1dGVMb2dpY2FsSGVpZ2h0IGlu c3RlYWQgb2YKKyAgICAgICAgc2F2aW5nIHRoZSBvbGQgaGVpZ2h0LCBjYWxsaW5nIHVwZGF0ZSBs b2dpY2FsIGhlaWdodCwgdGhlbiByZXN0b3JpbmcgdGhlIG9sZCBoZWlnaHQuCisKKyAgICAgICAg Tm8gbmV3IHRlc3RzLCB0aGlzIGlzIGp1c3QgYSByZWZhY3RvcmluZy4KKworICAgICAgICAqIHJl bmRlcmluZy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6 Y29tcHV0ZUJsb2NrUHJlZmVycmVkTG9naWNhbFdpZHRocyk6IFNpbXBsZSByZXBsYWNlLgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Qm94Ojpjb21wdXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQpOiBBZGp1c3QgZm9yIGNvbnRlbnQg aGVpZ2h0LgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb21wdXRlUmVwbGFjZWRMb2dp Y2FsSGVpZ2h0VXNpbmcpOiBBZGp1c3QgZm9yIGNvbnRlbnQgaGVpZ2h0LgorICAgICAgICAoV2Vi Q29yZTo6UmVuZGVyQm94OjphdmFpbGFibGVMb2dpY2FsSGVpZ2h0VXNpbmcpOiBBZGp1c3QgZm9y IGNvbnRlbnQgaGVpZ2h0LgorCiAyMDEyLTEwLTE5ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5 QHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEzMTkxNS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9jay5jcHAgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCmluZGV4IGY1ZWM0NDllNmRk NTgyM2VjNDI4NjUwZjhkMTUzMTYxZjlhMzZiODIuLjZlMTA4N2QzNTczMmJhMmZhZWFhMWM4MmI5 MGVmOGEwYjE3NWQ0MTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJCbG9jay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrLmNw cApAQCAtNjA5NCwxMSArNjA5NCw5IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1dGVCbG9ja1By ZWZlcnJlZExvZ2ljYWxXaWR0aHMoKQogICAgICAgICBMYXlvdXRVbml0IGNoaWxkTWluUHJlZmVy cmVkTG9naWNhbFdpZHRoLCBjaGlsZE1heFByZWZlcnJlZExvZ2ljYWxXaWR0aDsKICAgICAgICAg aWYgKGNoaWxkLT5pc0JveCgpICYmIGNoaWxkLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICE9 IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpIHsKICAgICAgICAgICAgIFJlbmRlckJveCogY2hp bGRCb3ggPSB0b1JlbmRlckJveChjaGlsZCk7Ci0gICAgICAgICAgICBMYXlvdXRVbml0IG9sZEhl aWdodCA9IGNoaWxkQm94LT5sb2dpY2FsSGVpZ2h0KCk7Ci0gICAgICAgICAgICBjaGlsZEJveC0+ c2V0TG9naWNhbEhlaWdodChjaGlsZEJveC0+Ym9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQo KSk7Ci0gICAgICAgICAgICBjaGlsZEJveC0+dXBkYXRlTG9naWNhbEhlaWdodCgpOwotICAgICAg ICAgICAgY2hpbGRNaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBjaGlsZE1heFByZWZlcnJlZExv Z2ljYWxXaWR0aCA9IGNoaWxkQm94LT5sb2dpY2FsSGVpZ2h0KCk7Ci0gICAgICAgICAgICBjaGls ZEJveC0+c2V0TG9naWNhbEhlaWdodChvbGRIZWlnaHQpOworICAgICAgICAgICAgTG9naWNhbEV4 dGVudENvbXB1dGVkVmFsdWVzIGNvbXB1dGVkVmFsdWVzOworICAgICAgICAgICAgY2hpbGRCb3gt PmNvbXB1dGVMb2dpY2FsSGVpZ2h0KGNoaWxkQm94LT5ib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhl aWdodCgpLCAwLCBjb21wdXRlZFZhbHVlcyk7CisgICAgICAgICAgICBjaGlsZE1pblByZWZlcnJl ZExvZ2ljYWxXaWR0aCA9IGNoaWxkTWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gY29tcHV0ZWRW YWx1ZXMubV9leHRlbnQ7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICBjaGlsZE1pblBy ZWZlcnJlZExvZ2ljYWxXaWR0aCA9IGNoaWxkLT5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKTsK ICAgICAgICAgICAgIGNoaWxkTWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gY2hpbGQtPm1heFBy ZWZlcnJlZExvZ2ljYWxXaWR0aCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNw cAppbmRleCA3ODk2MGRjZTg5ZDk4OGQ5N2MyMGU1Yjc5Mzk3ZDU0NjhkNDdlZjIxLi43NzkyNzdk MTRlNTIxNTc2MGJiNjVkZmNhOGM5NmY0YjVjZDA0MjJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQm94LmNwcApAQCAtMjIxMywxMCArMjIxMyw5IEBAIExheW91dFVuaXQgUmVuZGVy Qm94Ojpjb21wdXRlUGVyY2VudGFnZUxvZ2ljYWxIZWlnaHQoY29uc3QgTGVuZ3RoJiBoZWlnaHQp IGNvbnN0CiAgICAgfSBlbHNlIGlmIChjYi0+aXNSZW5kZXJWaWV3KCkgfHwgaXNPdXRPZkZsb3dQ b3NpdGlvbmVkV2l0aFNwZWNpZmllZEhlaWdodCkgewogICAgICAgICAvLyBEb24ndCBhbGxvdyB0 aGlzIHRvIGFmZmVjdCB0aGUgYmxvY2snIGhlaWdodCgpIG1lbWJlciB2YXJpYWJsZSwgc2luY2Ug dGhpcwogICAgICAgICAvLyBjYW4gZ2V0IGNhbGxlZCB3aGlsZSB0aGUgYmxvY2sgaXMgc3RpbGwg bGF5aW5nIG91dCBpdHMga2lkcy4KLSAgICAgICAgTGF5b3V0VW5pdCBvbGRIZWlnaHQgPSBjYi0+ bG9naWNhbEhlaWdodCgpOwotICAgICAgICBjYi0+dXBkYXRlTG9naWNhbEhlaWdodCgpOwotICAg ICAgICBhdmFpbGFibGVIZWlnaHQgPSBjYi0+Y29udGVudExvZ2ljYWxIZWlnaHQoKTsKLSAgICAg ICAgY2ItPnNldExvZ2ljYWxIZWlnaHQob2xkSGVpZ2h0KTsKKyAgICAgICAgTG9naWNhbEV4dGVu dENvbXB1dGVkVmFsdWVzIGNvbXB1dGVkVmFsdWVzOworICAgICAgICBjYi0+Y29tcHV0ZUxvZ2lj YWxIZWlnaHQoY2ItPmxvZ2ljYWxIZWlnaHQoKSwgMCwgY29tcHV0ZWRWYWx1ZXMpOworICAgICAg ICBhdmFpbGFibGVIZWlnaHQgPSBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCAtIGNiLT5ib3JkZXJB bmRQYWRkaW5nTG9naWNhbEhlaWdodCgpIC0gY2ItPnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKTsK ICAgICB9CiAKICAgICBpZiAoYXZhaWxhYmxlSGVpZ2h0ID09IC0xKQpAQCAtMjMxMiwxMCArMjMx MSwxMCBAQCBMYXlvdXRVbml0IFJlbmRlckJveDo6Y29tcHV0ZVJlcGxhY2VkTG9naWNhbEhlaWdo dFVzaW5nKFNpemVUeXBlIHNpemVUeXBlLCBMZW5ndAogICAgICAgICAgICAgaWYgKGNiLT5pc091 dE9mRmxvd1Bvc2l0aW9uZWQoKSAmJiBjYi0+c3R5bGUoKS0+aGVpZ2h0KCkuaXNBdXRvKCkgJiYg IShjYi0+c3R5bGUoKS0+dG9wKCkuaXNBdXRvKCkgfHwgY2ItPnN0eWxlKCktPmJvdHRvbSgpLmlz QXV0bygpKSkgewogICAgICAgICAgICAgICAgIEFTU0VSVChjYi0+aXNSZW5kZXJCbG9jaygpKTsK ICAgICAgICAgICAgICAgICBSZW5kZXJCbG9jayogYmxvY2sgPSB0b1JlbmRlckJsb2NrKGNiKTsK LSAgICAgICAgICAgICAgICBMYXlvdXRVbml0IG9sZEhlaWdodCA9IGJsb2NrLT5oZWlnaHQoKTsK LSAgICAgICAgICAgICAgICBibG9jay0+dXBkYXRlTG9naWNhbEhlaWdodCgpOwotICAgICAgICAg ICAgICAgIExheW91dFVuaXQgbmV3SGVpZ2h0ID0gYmxvY2stPmFkanVzdENvbnRlbnRCb3hMb2dp Y2FsSGVpZ2h0Rm9yQm94U2l6aW5nKGJsb2NrLT5jb250ZW50SGVpZ2h0KCkpOwotICAgICAgICAg ICAgICAgIGJsb2NrLT5zZXRIZWlnaHQob2xkSGVpZ2h0KTsKKyAgICAgICAgICAgICAgICBMb2dp Y2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgY29tcHV0ZWRWYWx1ZXM7CisgICAgICAgICAgICAgICAg YmxvY2stPmNvbXB1dGVMb2dpY2FsSGVpZ2h0KGJsb2NrLT5sb2dpY2FsSGVpZ2h0KCksIDAsIGNv bXB1dGVkVmFsdWVzKTsKKyAgICAgICAgICAgICAgICBMYXlvdXRVbml0IG5ld0NvbnRlbnRIZWln aHQgPSBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCAtIGJsb2NrLT5ib3JkZXJBbmRQYWRkaW5nTG9n aWNhbEhlaWdodCgpIC0gYmxvY2stPnNjcm9sbGJhckxvZ2ljYWxIZWlnaHQoKTsKKyAgICAgICAg ICAgICAgICBMYXlvdXRVbml0IG5ld0hlaWdodCA9IGJsb2NrLT5hZGp1c3RDb250ZW50Qm94TG9n aWNhbEhlaWdodEZvckJveFNpemluZyhuZXdDb250ZW50SGVpZ2h0KTsKICAgICAgICAgICAgICAg ICByZXR1cm4gYWRqdXN0Q29udGVudEJveExvZ2ljYWxIZWlnaHRGb3JCb3hTaXppbmcodmFsdWVG b3JMZW5ndGgobG9naWNhbEhlaWdodCwgbmV3SGVpZ2h0KSk7CiAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAKQEAgLTIzODcsMTEgKzIzODYsMTAgQEAgTGF5b3V0VW5pdCBSZW5kZXJCb3g6OmF2 YWlsYWJsZUxvZ2ljYWxIZWlnaHRVc2luZyhjb25zdCBMZW5ndGgmIGgpIGNvbnN0CiAgICAgLy8g aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NTAwCiAgICAgaWYgKGlz UmVuZGVyQmxvY2soKSAmJiBpc091dE9mRmxvd1Bvc2l0aW9uZWQoKSAmJiBzdHlsZSgpLT5oZWln aHQoKS5pc0F1dG8oKSAmJiAhKHN0eWxlKCktPnRvcCgpLmlzQXV0bygpIHx8IHN0eWxlKCktPmJv dHRvbSgpLmlzQXV0bygpKSkgewogICAgICAgICBSZW5kZXJCbG9jayogYmxvY2sgPSBjb25zdF9j YXN0PFJlbmRlckJsb2NrKj4odG9SZW5kZXJCbG9jayh0aGlzKSk7Ci0gICAgICAgIExheW91dFVu aXQgb2xkSGVpZ2h0ID0gYmxvY2stPmxvZ2ljYWxIZWlnaHQoKTsKLSAgICAgICAgYmxvY2stPnVw ZGF0ZUxvZ2ljYWxIZWlnaHQoKTsKLSAgICAgICAgTGF5b3V0VW5pdCBuZXdIZWlnaHQgPSBibG9j ay0+YWRqdXN0Q29udGVudEJveExvZ2ljYWxIZWlnaHRGb3JCb3hTaXppbmcoYmxvY2stPmNvbnRl bnRMb2dpY2FsSGVpZ2h0KCkpOwotICAgICAgICBibG9jay0+c2V0TG9naWNhbEhlaWdodChvbGRI ZWlnaHQpOwotICAgICAgICByZXR1cm4gYWRqdXN0Q29udGVudEJveExvZ2ljYWxIZWlnaHRGb3JC b3hTaXppbmcobmV3SGVpZ2h0KTsKKyAgICAgICAgTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVz IGNvbXB1dGVkVmFsdWVzOworICAgICAgICBibG9jay0+Y29tcHV0ZUxvZ2ljYWxIZWlnaHQoYmxv Y2stPmxvZ2ljYWxIZWlnaHQoKSwgMCwgY29tcHV0ZWRWYWx1ZXMpOworICAgICAgICBMYXlvdXRV bml0IG5ld0NvbnRlbnRIZWlnaHQgPSBjb21wdXRlZFZhbHVlcy5tX2V4dGVudCAtIGJsb2NrLT5i b3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpIC0gYmxvY2stPnNjcm9sbGJhckxvZ2ljYWxI ZWlnaHQoKTsKKyAgICAgICAgcmV0dXJuIGFkanVzdENvbnRlbnRCb3hMb2dpY2FsSGVpZ2h0Rm9y Qm94U2l6aW5nKG5ld0NvbnRlbnRIZWlnaHQpOwogICAgIH0KIAogICAgIC8vIEZJWE1FOiBUaGlz IGlzIHdyb25nIGlmIHRoZSBjb250YWluaW5nQmxvY2sgaGFzIGEgcGVycGVuZGljdWxhciB3cml0 aW5nIG1vZGUuCg==