54936 2011-02-21 22:14:42 -0800 Clean up: Extract table height adjustment for <caption> into common function 2011-02-24 22:28:59 -0800 1 1 1 Unclassified WebKit Tables 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dbates dbates bdakin hyatt oldest_to_newest 355054 0 dbates 2011-02-21 22:14:42 -0800 We should extract the common code for adjusting the table height for a top- and bottom-positioned <caption> into a shared function so that we can remove duplicate code. 355055 1 83270 dbates 2011-02-21 22:21:46 -0800 Created attachment 83270 Patch 355203 2 83270 tonikitoo 2011-02-22 05:44:22 -0800 Comment on attachment 83270 Patch r=me 357702 3 83270 dbates 2011-02-24 22:28:53 -0800 Comment on attachment 83270 Patch Clearing flags on attachment: 83270 Committed r79663: <http://trac.webkit.org/changeset/79663> 357703 4 dbates 2011-02-24 22:28:59 -0800 All reviewed patches have been landed. Closing bug. 83270 2011-02-21 22:21:46 -0800 2011-02-24 22:28:53 -0800 Patch bug-54936-20110221222144.patch text/plain 4132 dbates SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc5Mjg1KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDItMjEgIERhbmllbCBC YXRlcyAgPGRiYXRlc0ByaW0uY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENsZWFuIHVwOiBFeHRyYWN0IHRhYmxlIGhlaWdodCBhZGp1c3RtZW50 IGZvciA8Y2FwdGlvbj4gaW50byBjb21tb24gZnVuY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0OTM2CisKKyAgICAgICAgV2UgdXNlIHNpbWls YXIgbG9naWMgZm9yIGFkanVzdGluZyB0aGUgaGVpZ2h0IG9mIGEgdGFibGUgd2l0aCByZXNwZWN0 CisgICAgICAgIHRvIGEgdG9wLSBhbmQgYm90dG9tLXBvc2l0aW9uZWQgPGNhcHRpb24+LiBJbnN0 ZWFkLCB3ZSBzaG91bGQgZXh0cmFjdAorICAgICAgICB0aGUgY29tbW9uIGNvZGUgaW50byBhIHNo YXJlZCBmdW5jdGlvbi4KKworICAgICAgICBObyBmdW5jdGlvbmFsaXR5IGNoYW5nZWQuIFNvIG5v IG5ldyB0ZXN0cy4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUYWJsZTo6YWRqdXN0TG9naWNhbEhlaWdodEZvckNhcHRpb24p OiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlOjpsYXlvdXQpOiBFeHRyYWN0 ZWQgY29tbW9uIGNvZGUgdG8gYWRqdXN0IHRhYmxlIGhlaWdodAorICAgICAgICB3aXRoIHJlc3Bl Y3QgdG8gdGhlIDxjYXB0aW9uPiBpbnRvIFJlbmRlclRhYmxlOjphZGp1c3RMb2dpY2FsSGVpZ2h0 Rm9yQ2FwdGlvbigpLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZS5oOgorCiAyMDEx LTAyLTIxICBBZGVsZSBQZXRlcnNvbiAgPGFkZWxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZp ZXdlZCBieSBEYW4gQmVybnN0ZWluLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRhYmxlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGFibGUuY3BwCShyZXZpc2lvbiA3OTE0MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJUYWJsZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI0NSw2ICsyNDUsMTggQEAgdm9p ZCBSZW5kZXJUYWJsZTo6Y29tcHV0ZUxvZ2ljYWxXaWR0aCgpCiAgICAgfQogfQogCit2b2lkIFJl bmRlclRhYmxlOjphZGp1c3RMb2dpY2FsSGVpZ2h0Rm9yQ2FwdGlvbigpCit7CisgICAgQVNTRVJU KG1fY2FwdGlvbik7CisgICAgSW50UmVjdCBjYXB0aW9uUmVjdChtX2NhcHRpb24tPngoKSwgbV9j YXB0aW9uLT55KCksIG1fY2FwdGlvbi0+d2lkdGgoKSwgbV9jYXB0aW9uLT5oZWlnaHQoKSk7CisK KyAgICBtX2NhcHRpb24tPnNldExvZ2ljYWxMb2NhdGlvbihtX2NhcHRpb24tPm1hcmdpblN0YXJ0 KCksIGxvZ2ljYWxIZWlnaHQoKSk7CisgICAgaWYgKCFzZWxmTmVlZHNMYXlvdXQoKSAmJiBtX2Nh cHRpb24tPmNoZWNrRm9yUmVwYWludER1cmluZ0xheW91dCgpKQorICAgICAgICBtX2NhcHRpb24t PnJlcGFpbnREdXJpbmdMYXlvdXRJZk1vdmVkKGNhcHRpb25SZWN0KTsKKworICAgIHNldExvZ2lj YWxIZWlnaHQobG9naWNhbEhlaWdodCgpICsgbV9jYXB0aW9uLT5sb2dpY2FsSGVpZ2h0KCkgKyBt X2NhcHRpb24tPm1hcmdpbkJlZm9yZSgpICsgbV9jYXB0aW9uLT5tYXJnaW5BZnRlcigpKTsKK30K Kwogdm9pZCBSZW5kZXJUYWJsZTo6bGF5b3V0KCkKIHsKICAgICBBU1NFUlQobmVlZHNMYXlvdXQo KSk7CkBAIC0zMDgsMTQgKzMyMCw3IEBAIHZvaWQgUmVuZGVyVGFibGU6OmxheW91dCgpCiAKICAg ICAvLyBGSVhNRTogQ29sbGFwc2UgY2FwdGlvbiBtYXJnaW4uCiAgICAgaWYgKG1fY2FwdGlvbiAm JiBtX2NhcHRpb24tPnN0eWxlKCktPmNhcHRpb25TaWRlKCkgIT0gQ0FQQk9UVE9NKSB7Ci0gICAg ICAgIEludFJlY3QgY2FwdGlvblJlY3QobV9jYXB0aW9uLT54KCksIG1fY2FwdGlvbi0+eSgpLCBt X2NhcHRpb24tPndpZHRoKCksIG1fY2FwdGlvbi0+aGVpZ2h0KCkpOwotCi0gICAgICAgIG1fY2Fw dGlvbi0+c2V0TG9naWNhbExvY2F0aW9uKG1fY2FwdGlvbi0+bWFyZ2luU3RhcnQoKSwgbG9naWNh bEhlaWdodCgpKTsKLSAgICAgICAgaWYgKCFzZWxmTmVlZHNMYXlvdXQoKSAmJiBtX2NhcHRpb24t PmNoZWNrRm9yUmVwYWludER1cmluZ0xheW91dCgpKQotICAgICAgICAgICAgbV9jYXB0aW9uLT5y ZXBhaW50RHVyaW5nTGF5b3V0SWZNb3ZlZChjYXB0aW9uUmVjdCk7Ci0KLSAgICAgICAgc2V0TG9n aWNhbEhlaWdodChsb2dpY2FsSGVpZ2h0KCkgKyBtX2NhcHRpb24tPmxvZ2ljYWxIZWlnaHQoKSAr IG1fY2FwdGlvbi0+bWFyZ2luQmVmb3JlKCkgKyBtX2NhcHRpb24tPm1hcmdpbkFmdGVyKCkpOwot CisgICAgICAgIGFkanVzdExvZ2ljYWxIZWlnaHRGb3JDYXB0aW9uKCk7CiAgICAgICAgIGlmIChs b2dpY2FsSGVpZ2h0KCkgIT0gb2xkVGFibGVMb2dpY2FsVG9wKSB7CiAgICAgICAgICAgICBzZWN0 aW9uTW92ZWQgPSB0cnVlOwogICAgICAgICAgICAgbW92ZWRTZWN0aW9uTG9naWNhbFRvcCA9IG1p bihsb2dpY2FsSGVpZ2h0KCksIG9sZFRhYmxlTG9naWNhbFRvcCk7CkBAIC0zNzAsMTUgKzM3NSw4 IEBAIHZvaWQgUmVuZGVyVGFibGU6OmxheW91dCgpCiAKICAgICBzZXRMb2dpY2FsSGVpZ2h0KGxv Z2ljYWxIZWlnaHQoKSArIGJvcmRlckFuZFBhZGRpbmdBZnRlcik7CiAKLSAgICBpZiAobV9jYXB0 aW9uICYmIG1fY2FwdGlvbi0+c3R5bGUoKS0+Y2FwdGlvblNpZGUoKSA9PSBDQVBCT1RUT00pIHsK LSAgICAgICAgSW50UmVjdCBjYXB0aW9uUmVjdChtX2NhcHRpb24tPngoKSwgbV9jYXB0aW9uLT55 KCksIG1fY2FwdGlvbi0+d2lkdGgoKSwgbV9jYXB0aW9uLT5oZWlnaHQoKSk7Ci0KLSAgICAgICAg bV9jYXB0aW9uLT5zZXRMb2dpY2FsTG9jYXRpb24obV9jYXB0aW9uLT5tYXJnaW5TdGFydCgpLCBs b2dpY2FsSGVpZ2h0KCkpOwotICAgICAgICBpZiAoIXNlbGZOZWVkc0xheW91dCgpICYmIG1fY2Fw dGlvbi0+Y2hlY2tGb3JSZXBhaW50RHVyaW5nTGF5b3V0KCkpCi0gICAgICAgICAgICBtX2NhcHRp b24tPnJlcGFpbnREdXJpbmdMYXlvdXRJZk1vdmVkKGNhcHRpb25SZWN0KTsKLQotICAgICAgICBz ZXRMb2dpY2FsSGVpZ2h0KGxvZ2ljYWxIZWlnaHQoKSArIG1fY2FwdGlvbi0+bG9naWNhbEhlaWdo dCgpICsgbV9jYXB0aW9uLT5tYXJnaW5CZWZvcmUoKSArIG1fY2FwdGlvbi0+bWFyZ2luQWZ0ZXIo KSk7Ci0gICAgfQorICAgIGlmIChtX2NhcHRpb24gJiYgbV9jYXB0aW9uLT5zdHlsZSgpLT5jYXB0 aW9uU2lkZSgpID09IENBUEJPVFRPTSkKKyAgICAgICAgYWRqdXN0TG9naWNhbEhlaWdodEZvckNh cHRpb24oKTsKIAogICAgIGlmIChpc1Bvc2l0aW9uZWQoKSkKICAgICAgICAgY29tcHV0ZUxvZ2lj YWxIZWlnaHQoKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5oCShy ZXZpc2lvbiA3OTE0MCkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJsZS5o CSh3b3JraW5nIGNvcHkpCkBAIC0yMzgsNiArMjM4LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHN1 YnRyYWN0Q2FwdGlvblJlY3QoSW50UmVjdCYpIGNvbnN0OwogCiAgICAgdm9pZCByZWNhbGNTZWN0 aW9ucygpIGNvbnN0OworICAgIHZvaWQgYWRqdXN0TG9naWNhbEhlaWdodEZvckNhcHRpb24oKTsK IAogICAgIG11dGFibGUgVmVjdG9yPGludD4gbV9jb2x1bW5Qb3M7CiAgICAgbXV0YWJsZSBWZWN0 b3I8Q29sdW1uU3RydWN0PiBtX2NvbHVtbnM7Cg==