61705 2011-05-29 12:48:40 -0700 Element: Micro-cleanup of scroll methods. 2011-05-29 13:45:24 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kling kling oldest_to_newest 412001 0 kling 2011-05-29 12:48:40 -0700 scrollIntoView(), scrollIntoViewIfNeeded() and scrollByUnits() could look a bit nicer, and in the first two cases, do a little less work in some cases. 412002 1 95292 kling 2011-05-29 12:49:32 -0700 Created attachment 95292 Proposed patch 412019 2 95292 kling 2011-05-29 13:45:16 -0700 Comment on attachment 95292 Proposed patch Clearing flags on attachment: 95292 Committed r87645: <http://trac.webkit.org/changeset/87645> 412020 3 kling 2011-05-29 13:45:24 -0700 All reviewed patches have been landed. Closing bug. 95292 2011-05-29 12:49:32 -0700 2011-05-29 13:45:16 -0700 Proposed patch bug-61705.diff text/plain 3880 kling ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwN2ZkMDk3Li44MTc1ZjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0yLDYgKzIsMjEg QEAKIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KIAorICAgICAgICBFbGVt ZW50OiBNaWNyby1jbGVhbnVwIG9mIHNjcm9sbCBtZXRob2RzLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE3MDUKKworICAgICAgICBEbyBhbiBlYXJs eSByZXR1cm4gd2l0aG91dCBjYWxjdWxhdGluZyBlbGVtZW50IGJvdW5kYXJpZXMgd2hlbiBhc2tl ZAorICAgICAgICB0byBzY3JvbGwgYW4gZWxlbWVudCB3aXRob3V0IGEgcmVuZGVyZXIoKS4KKwor ICAgICAgICAqIGRvbS9FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNj cm9sbEludG9WaWV3KToKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnQ6OnNjcm9sbEludG9WaWV3 SWZOZWVkZWQpOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudDo6c2Nyb2xsQnlVbml0cyk6CisK KzIwMTEtMDUtMjkgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCiAgICAgICAgIENhbnZhcy9KU0M6IEF1dG8t Z2VuZXJhdGUgb3ZlcmxvYWRzIGZvciBkcmF3SW1hZ2UoKQogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjE3MDMKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvZG9tL0VsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnQuY3BwCmlu ZGV4IDI1NGFjNTguLmJkMjQ5YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVt ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAKQEAgLTI3NSw0MSAr Mjc1LDQ4IEBAIGNvbnN0IEF0b21pY1N0cmluZyYgRWxlbWVudDo6Z2V0QXR0cmlidXRlKGNvbnN0 IFF1YWxpZmllZE5hbWUmIG5hbWUpIGNvbnN0CiB2b2lkIEVsZW1lbnQ6OnNjcm9sbEludG9WaWV3 KGJvb2wgYWxpZ25Ub1RvcCkgCiB7CiAgICAgZG9jdW1lbnQoKS0+dXBkYXRlTGF5b3V0SWdub3Jl UGVuZGluZ1N0eWxlc2hlZXRzKCk7CisKKyAgICBpZiAoIXJlbmRlcmVyKCkpCisgICAgICAgIHJl dHVybjsKKwogICAgIEludFJlY3QgYm91bmRzID0gZ2V0UmVjdCgpOyAgICAKLSAgICBpZiAocmVu ZGVyZXIoKSkgewotICAgICAgICAvLyBBbGlnbiB0byB0aGUgdG9wIC8gYm90dG9tIGFuZCB0byB0 aGUgY2xvc2VzdCBlZGdlLgotICAgICAgICBpZiAoYWxpZ25Ub1RvcCkKLSAgICAgICAgICAgIHJl bmRlcmVyKCktPmVuY2xvc2luZ0xheWVyKCktPnNjcm9sbFJlY3RUb1Zpc2libGUoYm91bmRzLCBm YWxzZSwgU2Nyb2xsQWxpZ25tZW50OjphbGlnblRvRWRnZUlmTmVlZGVkLCBTY3JvbGxBbGlnbm1l bnQ6OmFsaWduVG9wQWx3YXlzKTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgcmVuZGVyZXIo KS0+ZW5jbG9zaW5nTGF5ZXIoKS0+c2Nyb2xsUmVjdFRvVmlzaWJsZShib3VuZHMsIGZhbHNlLCBT Y3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQsIFNjcm9sbEFsaWdubWVudDo6YWxp Z25Cb3R0b21BbHdheXMpOwotICAgIH0KKyAgICAvLyBBbGlnbiB0byB0aGUgdG9wIC8gYm90dG9t IGFuZCB0byB0aGUgY2xvc2VzdCBlZGdlLgorICAgIGlmIChhbGlnblRvVG9wKQorICAgICAgICBy ZW5kZXJlcigpLT5lbmNsb3NpbmdMYXllcigpLT5zY3JvbGxSZWN0VG9WaXNpYmxlKGJvdW5kcywg ZmFsc2UsIFNjcm9sbEFsaWdubWVudDo6YWxpZ25Ub0VkZ2VJZk5lZWRlZCwgU2Nyb2xsQWxpZ25t ZW50OjphbGlnblRvcEFsd2F5cyk7CisgICAgZWxzZQorICAgICAgICByZW5kZXJlcigpLT5lbmNs b3NpbmdMYXllcigpLT5zY3JvbGxSZWN0VG9WaXNpYmxlKGJvdW5kcywgZmFsc2UsIFNjcm9sbEFs aWdubWVudDo6YWxpZ25Ub0VkZ2VJZk5lZWRlZCwgU2Nyb2xsQWxpZ25tZW50OjphbGlnbkJvdHRv bUFsd2F5cyk7CiB9CiAKIHZvaWQgRWxlbWVudDo6c2Nyb2xsSW50b1ZpZXdJZk5lZWRlZChib29s IGNlbnRlcklmTmVlZGVkKQogewogICAgIGRvY3VtZW50KCktPnVwZGF0ZUxheW91dElnbm9yZVBl bmRpbmdTdHlsZXNoZWV0cygpOworCisgICAgaWYgKCFyZW5kZXJlcigpKQorICAgICAgICByZXR1 cm47CisKICAgICBJbnRSZWN0IGJvdW5kcyA9IGdldFJlY3QoKTsgICAgCi0gICAgaWYgKHJlbmRl cmVyKCkpIHsKLSAgICAgICAgaWYgKGNlbnRlcklmTmVlZGVkKQotICAgICAgICAgICAgcmVuZGVy ZXIoKS0+ZW5jbG9zaW5nTGF5ZXIoKS0+c2Nyb2xsUmVjdFRvVmlzaWJsZShib3VuZHMsIGZhbHNl LCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduQ2VudGVySWZOZWVkZWQsIFNjcm9sbEFsaWdubWVudDo6 YWxpZ25DZW50ZXJJZk5lZWRlZCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHJlbmRlcmVy KCktPmVuY2xvc2luZ0xheWVyKCktPnNjcm9sbFJlY3RUb1Zpc2libGUoYm91bmRzLCBmYWxzZSwg U2Nyb2xsQWxpZ25tZW50OjphbGlnblRvRWRnZUlmTmVlZGVkLCBTY3JvbGxBbGlnbm1lbnQ6OmFs aWduVG9FZGdlSWZOZWVkZWQpOwotICAgIH0KKyAgICBpZiAoY2VudGVySWZOZWVkZWQpCisgICAg ICAgIHJlbmRlcmVyKCktPmVuY2xvc2luZ0xheWVyKCktPnNjcm9sbFJlY3RUb1Zpc2libGUoYm91 bmRzLCBmYWxzZSwgU2Nyb2xsQWxpZ25tZW50OjphbGlnbkNlbnRlcklmTmVlZGVkLCBTY3JvbGxB bGlnbm1lbnQ6OmFsaWduQ2VudGVySWZOZWVkZWQpOworICAgIGVsc2UKKyAgICAgICAgcmVuZGVy ZXIoKS0+ZW5jbG9zaW5nTGF5ZXIoKS0+c2Nyb2xsUmVjdFRvVmlzaWJsZShib3VuZHMsIGZhbHNl LCBTY3JvbGxBbGlnbm1lbnQ6OmFsaWduVG9FZGdlSWZOZWVkZWQsIFNjcm9sbEFsaWdubWVudDo6 YWxpZ25Ub0VkZ2VJZk5lZWRlZCk7CiB9CiAKIHZvaWQgRWxlbWVudDo6c2Nyb2xsQnlVbml0cyhp bnQgdW5pdHMsIFNjcm9sbEdyYW51bGFyaXR5IGdyYW51bGFyaXR5KQogewogICAgIGRvY3VtZW50 KCktPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOwotICAgIGlmIChSZW5k ZXJPYmplY3QgKnJlbmQgPSByZW5kZXJlcigpKSB7Ci0gICAgICAgIGlmIChyZW5kLT5oYXNPdmVy Zmxvd0NsaXAoKSkgewotICAgICAgICAgICAgU2Nyb2xsRGlyZWN0aW9uIGRpcmVjdGlvbiA9IFNj cm9sbERvd247Ci0gICAgICAgICAgICBpZiAodW5pdHMgPCAwKSB7Ci0gICAgICAgICAgICAgICAg ZGlyZWN0aW9uID0gU2Nyb2xsVXA7Ci0gICAgICAgICAgICAgICAgdW5pdHMgPSAtdW5pdHM7Ci0g ICAgICAgICAgICB9Ci0gICAgICAgICAgICB0b1JlbmRlckJveChyZW5kKS0+bGF5ZXIoKS0+c2Ny b2xsKGRpcmVjdGlvbiwgZ3JhbnVsYXJpdHksIHVuaXRzKTsKLSAgICAgICAgfQorCisgICAgaWYg KCFyZW5kZXJlcigpKQorICAgICAgICByZXR1cm47CisKKyAgICBpZiAoIXJlbmRlcmVyKCktPmhh c092ZXJmbG93Q2xpcCgpKQorICAgICAgICByZXR1cm47CisKKyAgICBTY3JvbGxEaXJlY3Rpb24g ZGlyZWN0aW9uID0gU2Nyb2xsRG93bjsKKyAgICBpZiAodW5pdHMgPCAwKSB7CisgICAgICAgIGRp cmVjdGlvbiA9IFNjcm9sbFVwOworICAgICAgICB1bml0cyA9IC11bml0czsKICAgICB9CisgICAg dG9SZW5kZXJCb3gocmVuZGVyZXIoKSktPmxheWVyKCktPnNjcm9sbChkaXJlY3Rpb24sIGdyYW51 bGFyaXR5LCB1bml0cyk7CiB9CiAKIHZvaWQgRWxlbWVudDo6c2Nyb2xsQnlMaW5lcyhpbnQgbGlu ZXMpCg==