10135 2006-07-27 15:10:32 -0700 Cleanup: remove useless parameters from RenderObject::position() 2006-07-27 22:07:20 -0700 1 1 1 Unclassified WebKit Layout and Rendering 420+ Mac OS X 10.4 RESOLVED FIXED P3 Normal --- 1 mitz webkit-unassigned oldest_to_newest 50988 0 mitz 2006-07-27 15:10:32 -0700 position() has a bunch of parameters that are used only by RenderText and even there you don't need them. 50989 1 9728 mitz 2006-07-27 15:14:15 -0700 Created attachment 9728 Cleanup patch 50990 2 9728 andersca 2006-07-27 15:19:48 -0700 Comment on attachment 9728 Cleanup patch r=me 51011 3 adele 2006-07-27 22:07:20 -0700 Committed revision 15666. 9728 2006-07-27 15:14:15 -0700 2006-07-27 15:19:48 -0700 Cleanup patch position cleanup_r1.patch text/plain 7206 mitz SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNTY1NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMDYtMDctMjggIE1pdHogUGV0dGVsICA8b3BlbmRhcndpbi5vcmdA bWl0enBldHRlbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgLSBodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lk PTEwMTM1CisgICAgICAgICAgQ2xlYW51cDogcmVtb3ZlIHVzZWxlc3MgcGFyYW1ldGVycyBmcm9t IFJlbmRlck9iamVjdDo6cG9zaXRpb24oKQorCisgICAgICAgIE5vIHRlc3QgcG9zc2libGUgKG5v IGZ1bmN0aW9uYWxpdHkgY2hhbmdlKQorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCb3g6OnBvc2l0aW9uKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyQm94Lmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5o OgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Ojpwb3NpdGlvbik6CisgICAgICAgICog cmVuZGVyaW5nL1JlbmRlclRhYmxlUm93Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUYWJs ZVJvdzo6cG9zaXRpb24pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUYWJsZVNlY3Rpb24u aDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRhYmxlU2VjdGlvbjo6cG9zaXRpb24pOgorICAg ICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clRleHQ6OnBvc2l0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGV4dC5oOgorICAg ICAgICAqIHJlbmRlcmluZy9iaWRpLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2Nr Ojpjb25zdHJ1Y3RMaW5lKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckJsb2NrOjpjb21wdXRl VmVydGljYWxQb3NpdGlvbnNGb3JMaW5lKToKKwogMjAwNi0wNy0yNyAgQWxleGFuZGVyIEtlbGxl dHQgIDxseXBhbm92QGtkZS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4uCkluZGV4 OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckJveC5jcHAJKHJldmlzaW9uIDE1NjUzKQorKysgV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQm94LmNwcAkod29ya2luZyBjb3B5KQpAQCAtODEyLDcgKzgxMiw3IEBAIHZv aWQgUmVuZGVyQm94OjpkaXJ0eUxpbmVCb3hlcyhib29sIGZ1bGwKICAgICB9CiB9CiAKLXZvaWQg UmVuZGVyQm94Ojpwb3NpdGlvbihJbmxpbmVCb3gqIGJveCwgaW50IGZyb20sIGludCBsZW4sIGJv b2wgcmV2ZXJzZSwgYm9vbCBvdmVycmlkZSkKK3ZvaWQgUmVuZGVyQm94Ojpwb3NpdGlvbihJbmxp bmVCb3gqIGJveCkKIHsKICAgICBpZiAoaXNQb3NpdGlvbmVkKCkpIHsKICAgICAgICAgLy8gQ2Fj aGUgdGhlIHggcG9zaXRpb24gb25seSBpZiB3ZSB3ZXJlIGFuIElOTElORSB0eXBlIG9yaWdpbmFs bHkuCkluZGV4OiBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAkocmV2aXNpb24gMTU2NTMpCisrKyBXZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJCb3guaAkod29ya2luZyBjb3B5KQpAQCAtODgsNyArODgsNyBAQCBw dWJsaWM6CiAgICAgLy8gc2hpZnRlZC4gLWR3aAogICAgIHZvaWQgY2FsY0hvcml6b250YWxNYXJn aW5zKGNvbnN0IExlbmd0aCYgbWwsIGNvbnN0IExlbmd0aCYgbXIsIGludCBjdyk7CiAKLSAgICB2 aXJ0dWFsIHZvaWQgcG9zaXRpb24oSW5saW5lQm94KiBib3gsIGludCBmcm9tLCBpbnQgbGVuLCBi b29sIHJldmVyc2UsIGJvb2wgb3ZlcnJpZGUpOworICAgIHZpcnR1YWwgdm9pZCBwb3NpdGlvbihJ bmxpbmVCb3gqKTsKICAgICAKICAgICB2aXJ0dWFsIHZvaWQgZGlydHlMaW5lQm94ZXMoYm9vbCBm dWxsTGF5b3V0LCBib29sIGlzUm9vdExpbmVCb3g9ZmFsc2UpOwogCkluZGV4OiBXZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJPYmplY3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJPYmplY3QuaAkocmV2aXNpb24gMTU2NTMpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJPYmplY3QuaAkod29ya2luZyBjb3B5KQpAQCAtNzU3LDcgKzc1Nyw3IEBAIHB1YmxpYzoKICAg ICBib29sIHVzZXNMaW5lV2lkdGgoKSBjb25zdDsKIAogICAgIC8vIHBvc2l0aW9uaW5nIG9mIGlu bGluZSBjaGlsZHJlbiAoYmlkaSkKLSAgICB2aXJ0dWFsIHZvaWQgcG9zaXRpb24oSW5saW5lQm94 KiwgaW50LCBpbnQsIGJvb2wsIGJvb2wpIHt9CisgICAgdmlydHVhbCB2b2lkIHBvc2l0aW9uKElu bGluZUJveCopIHsgfQogCiAgICAgYm9vbCBpc1RyYW5zcGFyZW50KCkgY29uc3QgeyByZXR1cm4g c3R5bGUoKS0+b3BhY2l0eSgpIDwgMS4wZjsgfQogICAgIGZsb2F0IG9wYWNpdHkoKSBjb25zdCB7 IHJldHVybiBzdHlsZSgpLT5vcGFjaXR5KCk7IH0KSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRhYmxlUm93LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGFi bGVSb3cuaAkocmV2aXNpb24gMTU2NTMpCisrKyBXZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUYWJs ZVJvdy5oCSh3b3JraW5nIGNvcHkpCkBAIC00Miw3ICs0Miw3IEBAIHB1YmxpYzoKICAgICB2aXJ0 dWFsIGJvb2wgaXNUYWJsZVJvdygpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFs IHZvaWQgYWRkQ2hpbGQoUmVuZGVyT2JqZWN0KiBjaGlsZCwgUmVuZGVyT2JqZWN0KiBiZWZvcmVD aGlsZCA9IDApOwogICAgIHZpcnR1YWwgc2hvcnQgbGluZUhlaWdodChib29sKSBjb25zdCB7IHJl dHVybiAwOyB9Ci0gICAgdmlydHVhbCB2b2lkIHBvc2l0aW9uKGludCwgaW50LCBpbnQsIGludCwg aW50LCBib29sLCBib29sLCBpbnQpIHsgfQorICAgIHZpcnR1YWwgdm9pZCBwb3NpdGlvbihJbmxp bmVCb3gqKSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0KCk7CiAgICAgdmlydHVhbCBJbnRS ZWN0IGdldEFic29sdXRlUmVwYWludFJlY3QoKTsKICAgICB2aXJ0dWFsIGJvb2wgbm9kZUF0UG9p bnQoTm9kZUluZm8mIGluZm8sIGludCB4LCBpbnQgeSwgaW50IHR4LCBpbnQgdHksIEhpdFRlc3RB Y3Rpb24gYWN0aW9uKTsKSW5kZXg6IFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlv bi5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlvbi5o CShyZXZpc2lvbiAxNTY1MykKKysrIFdlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRhYmxlU2VjdGlv bi5oCSh3b3JraW5nIGNvcHkpCkBAIC01MCw3ICs1MCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IGJvb2wgaXNUYWJsZVNlY3Rpb24oKSBjb25zdCB7IHJldHVybiB0cnVlOyB9CiAKICAgICB2aXJ0 dWFsIHNob3J0IGxpbmVIZWlnaHQoYm9vbCkgY29uc3QgeyByZXR1cm4gMDsgfQotICAgIHZpcnR1 YWwgdm9pZCBwb3NpdGlvbihpbnQsIGludCwgaW50LCBpbnQsIGludCwgYm9vbCwgYm9vbCwgaW50 KSB7fQorICAgIHZpcnR1YWwgdm9pZCBwb3NpdGlvbihJbmxpbmVCb3gqKSB7IH0KIAogI2lmbmRl ZiBOREVCVUcKICAgICB2aXJ0dWFsIHZvaWQgZHVtcChUZXh0U3RyZWFtICpzdHJlYW0sIERlcHJl Y2F0ZWRTdHJpbmcgaW5kID0gIiIpIGNvbnN0OwpJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyVGV4dC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5j cHAJKHJldmlzaW9uIDE1NjUzKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTk1OCwxMiArOTU4LDEyIEBAIElubGluZUJveCogUmVuZGVyVGV4 dDo6Y3JlYXRlSW5saW5lQm94KGIKICAgICByZXR1cm4gdGV4dEJveDsKIH0KIAotdm9pZCBSZW5k ZXJUZXh0Ojpwb3NpdGlvbihJbmxpbmVCb3gqIGJveCwgaW50IGZyb20sIGludCBsZW4sIGJvb2wg cmV2ZXJzZSwgYm9vbCBvdmVycmlkZSkKK3ZvaWQgUmVuZGVyVGV4dDo6cG9zaXRpb24oSW5saW5l Qm94KiBib3gpCiB7CiAgICAgSW5saW5lVGV4dEJveCAqcyA9IHN0YXRpY19jYXN0PElubGluZVRl eHRCb3gqPihib3gpOwogICAgIAogICAgIC8vICMjIyBzaG91bGQgbm90IGJlIG5lZWRlZCEhIQot ICAgIGlmIChsZW4gPT0gMCkgeworICAgIGlmIChzLT5tX2xlbiA9PSAwKSB7CiAgICAgICAgIC8v IFdlIHdhbnQgdGhlIGJveCB0byBiZSBkZXN0cm95ZWQuCiAgICAgICAgIHMtPnJlbW92ZSgpOwog ICAgICAgICBzLT5kZXN0cm95KHJlbmRlckFyZW5hKCkpOwpAQCAtOTcxLDEzICs5NzEsNyBAQCB2 b2lkIFJlbmRlclRleHQ6OnBvc2l0aW9uKElubGluZUJveCogYm94CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAgICAgCi0gICAgcmV2ZXJzZSA9IHJldmVyc2UgJiYgIXN0eWxlKCktPnZpc3VhbGx5 T3JkZXJlZCgpOwotICAgIG1fY29udGFpbnNSZXZlcnNlZFRleHQgfD0gcmV2ZXJzZTsKLQotICAg IHMtPm1fcmV2ZXJzZWQgPSByZXZlcnNlOwotICAgIHMtPm1fZGlyT3ZlcnJpZGUgPSBvdmVycmlk ZSB8fCBzdHlsZSgpLT52aXN1YWxseU9yZGVyZWQoKTsKLSAgICBzLT5tX3N0YXJ0ID0gZnJvbTsK LSAgICBzLT5tX2xlbiA9IGxlbjsKKyAgICBtX2NvbnRhaW5zUmV2ZXJzZWRUZXh0IHw9IHMtPm1f cmV2ZXJzZWQ7CiB9CiAKIHVuc2lnbmVkIGludCBSZW5kZXJUZXh0Ojp3aWR0aCh1bnNpZ25lZCBp bnQgZnJvbSwgdW5zaWduZWQgaW50IGxlbiwgaW50IHhwb3MsIGJvb2wgZmlyc3RMaW5lKSBjb25z dApJbmRleDogV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGV4dC5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHQuaAkocmV2aXNpb24gMTU2NTMpCisrKyBXZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJUZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTgxLDcgKzgxLDcgQEAg cHVibGljOgogICAgIHZpcnR1YWwgdW5zaWduZWQgbGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gc3Ry LT5sZW5ndGgoKTsgfQogICAgIGNvbnN0IFVDaGFyKiB0ZXh0KCkgY29uc3QgeyByZXR1cm4gc3Ry LT5jaGFyYWN0ZXJzKCk7IH0KICAgICB1bnNpZ25lZCBzdHJpbmdMZW5ndGgoKSBjb25zdCB7IHJl dHVybiBzdHItPmxlbmd0aCgpOyB9IC8vIG5vbiB2aXJ0dWFsIGltcGxlbWVudGF0aW9uIG9mIGxl bmd0aCgpCi0gICAgdmlydHVhbCB2b2lkIHBvc2l0aW9uKElubGluZUJveCogYm94LCBpbnQgZnJv bSwgaW50IGxlbiwgYm9vbCByZXZlcnNlLCBib29sIG92ZXJyaWRlKTsKKyAgICB2aXJ0dWFsIHZv aWQgcG9zaXRpb24oSW5saW5lQm94Kik7CiAKICAgICB2aXJ0dWFsIHVuc2lnbmVkIHdpZHRoKHVu c2lnbmVkIGZyb20sIHVuc2lnbmVkIGxlbiwgY29uc3QgRm9udCosIGludCB4cG9zKSBjb25zdDsK ICAgICB2aXJ0dWFsIHVuc2lnbmVkIHdpZHRoKHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIGxlbiwg aW50IHhwb3MsIGJvb2wgZmlyc3RMaW5lID0gZmFsc2UpIGNvbnN0OwpJbmRleDogV2ViQ29yZS9y ZW5kZXJpbmcvYmlkaS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9yZW5kZXJpbmcvYmlkaS5j cHAJKHJldmlzaW9uIDE1NjUzKQorKysgV2ViQ29yZS9yZW5kZXJpbmcvYmlkaS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTgxMyw3ICs4MTMsMTAgQEAgUm9vdElubGluZUJveCogUmVuZGVyQmxvY2s6 OmNvbnN0cnVjdExpbgogICAgICAgICAgICAgaWYgKHItPmJveC0+aXNJbmxpbmVUZXh0Qm94KCkp IHsKICAgICAgICAgICAgICAgICBJbmxpbmVUZXh0Qm94ICp0ZXh0ID0gc3RhdGljX2Nhc3Q8SW5s aW5lVGV4dEJveCo+KHItPmJveCk7CiAgICAgICAgICAgICAgICAgdGV4dC0+c2V0U3RhcnQoci0+ c3RhcnQpOwotICAgICAgICAgICAgICAgIHRleHQtPnNldExlbihyLT5zdG9wLXItPnN0YXJ0KTsK KyAgICAgICAgICAgICAgICB0ZXh0LT5zZXRMZW4oci0+c3RvcCAtIHItPnN0YXJ0KTsKKyAgICAg ICAgICAgICAgICBib29sIHZpc3VhbGx5T3JkZXJlZCA9IHItPm9iai0+c3R5bGUoKS0+dmlzdWFs bHlPcmRlcmVkKCk7CisgICAgICAgICAgICAgICAgdGV4dC0+bV9yZXZlcnNlZCA9IHItPmxldmVs ICUgMiAmJiAhdmlzdWFsbHlPcmRlcmVkOworICAgICAgICAgICAgICAgIHRleHQtPm1fZGlyT3Zl cnJpZGUgPSByLT5vdmVycmlkZSB8fCB2aXN1YWxseU9yZGVyZWQ7CiAgICAgICAgICAgICB9CiAg ICAgICAgIH0KICAgICB9CkBAIC05OTUsNyArOTk4LDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6Y29t cHV0ZVZlcnRpY2FsUG9zaXRpbwogCiAgICAgICAgIC8vIFBvc2l0aW9uIGlzIHVzZWQgdG8gcHJv cGVybHkgcG9zaXRpb24gYm90aCByZXBsYWNlZCBlbGVtZW50cyBhbmQKICAgICAgICAgLy8gdG8g dXBkYXRlIHRoZSBzdGF0aWMgbm9ybWFsIGZsb3cgeC95IG9mIHBvc2l0aW9uZWQgZWxlbWVudHMu Ci0gICAgICAgIHItPm9iai0+cG9zaXRpb24oci0+Ym94LCByLT5zdGFydCwgci0+c3RvcCAtIHIt PnN0YXJ0LCByLT5sZXZlbCUyLCByLT5vdmVycmlkZSk7CisgICAgICAgIHItPm9iai0+cG9zaXRp b24oci0+Ym94KTsKICAgICB9CiB9CiAK