77141 2012-01-26 14:26:12 -0800 Simplify checking of whether we should rubberband horizontally 2012-01-26 14:34:26 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 543487 0 andersca 2012-01-26 14:26:12 -0800 Simplify checking of whether we should rubberband horizontally 543491 1 124180 andersca 2012-01-26 14:28:22 -0800 Created attachment 124180 Patch 543496 2 124180 aroben 2012-01-26 14:30:58 -0800 Comment on attachment 124180 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124180&action=review > Source/WebCore/platform/mac/ScrollAnimatorMac.mm:923 > - if (m_scrollableArea->isHorizontalScrollerPinnedToMinimumPosition() && > - isScrollingLeftAndShouldNotRubberBand(wheelEvent, m_scrollableArea)) > - return false; > - > - if (m_scrollableArea->isHorizontalScrollerPinnedToMaximumPosition() && > - isScrollingRightAndShouldNotRubberBand(wheelEvent, m_scrollableArea)) > + if (pinnedInDirection(-wheelEvent.deltaX(), 0) && > + !shouldRubberBandInHorizontalDirection(wheelEvent, m_scrollableArea)) Do we still need isHorizontalScrollerPinnedToMinimumPosition/isHorizontalScrollerPinnedToMaximumPosition? pinnedInDirection is a confusing function. It takes two deltas, not a direction! What does it all MEAN? 543498 3 andersca 2012-01-26 14:34:26 -0800 Committed r106046: <http://trac.webkit.org/changeset/106046> 124180 2012-01-26 14:28:22 -0800 2012-01-26 14:30:58 -0800 Patch bug-77141-20120126142825.patch text/plain 3048 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MDM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTAzMTM0MzczZGE0MTZi ZTg5MWRmNTJkZWEzNDUwMjQzZWZmYTE4Yy4uNzk1OWE4YTUxZmRhYzdmYTdkMDUzMTc1OTUzZGI1 NzJmNTRlNTFkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE5IEBACiAyMDEyLTAxLTI2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxpZnkgY2hl Y2tpbmcgb2Ygd2hldGhlciB3ZSBzaG91bGQgcnViYmVyYmFuZCBob3Jpem9udGFsbHkKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3MTQxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSGF2ZSBhIHNpbmdsZSBj aGVjayBmb3IgaG9yaXpvbnRhbCBydWJiZXItYmFuZGluZyBpbiBib3RoIGRpcmVjdGlvbnMuIFRo aXMgaXMgaW4gcHJlcGFyYXRpb24KKyAgICAgICAgZm9yIG1vdmluZyB0aGlzIGNvZGUgaW50byBT Y3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9TY3Jv bGxBbmltYXRvck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OnNob3VsZFJ1YmJlckJhbmRJbkhv cml6b250YWxEaXJlY3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6 OmhhbmRsZVdoZWVsRXZlbnQpOgorCisyMDEyLTAxLTI2ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRl cnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgR2V0IHJpZCBvZiBTY3JvbGxFbGFzdGljaXR5Q29u dHJvbGxlcjo6YmVnaW5TY3JvbGxHZXN0dXJlKCkKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTc3MTM4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQppbmRleCA5NzNmNTcwMjhhNGVlN2JjOTExMjFh NTgwODM1N2NlNTZhNDUwZjUyLi5jMGZhODIyYjQ3ZDMxN2QzNjQ0MGYyYTQ2Zjc3YjM4ZjUxZWRl ZWYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0 b3JNYWMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9y TWFjLm1tCkBAIC04ODksMTQgKzg4OSwxNCBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpjYW5j ZWxBbmltYXRpb25zKCkKIAogI2lmIEVOQUJMRShSVUJCRVJfQkFORElORykKIAotc3RhdGljIGlu bGluZSBib29sIGlzU2Nyb2xsaW5nTGVmdEFuZFNob3VsZE5vdFJ1YmJlckJhbmQoY29uc3QgUGxh dGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50LCBTY3JvbGxhYmxlQXJlYSogc2Nyb2xsYWJsZUFy ZWEpCitzdGF0aWMgYm9vbCBzaG91bGRSdWJiZXJCYW5kSW5Ib3Jpem9udGFsRGlyZWN0aW9uKGNv bnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVudCwgU2Nyb2xsYWJsZUFyZWEqIHNjcm9s bGFibGVBcmVhKQogewotICAgIHJldHVybiB3aGVlbEV2ZW50LmRlbHRhWCgpID4gMCAmJiAhc2Ny b2xsYWJsZUFyZWEtPnNob3VsZFJ1YmJlckJhbmRJbkRpcmVjdGlvbihTY3JvbGxMZWZ0KTsKLX0K KyAgICBpZiAod2hlZWxFdmVudC5kZWx0YVgoKSA+IDApCisgICAgICAgIHJldHVybiBzY3JvbGxh YmxlQXJlYS0+c2hvdWxkUnViYmVyQmFuZEluRGlyZWN0aW9uKFNjcm9sbExlZnQpOworICAgIGlm ICh3aGVlbEV2ZW50LmRlbHRhWCgpIDwgMCkKKyAgICAgICAgcmV0dXJuIHNjcm9sbGFibGVBcmVh LT5zaG91bGRSdWJiZXJCYW5kSW5EaXJlY3Rpb24oU2Nyb2xsUmlnaHQpOwogCi1zdGF0aWMgaW5s aW5lIGJvb2wgaXNTY3JvbGxpbmdSaWdodEFuZFNob3VsZE5vdFJ1YmJlckJhbmQoY29uc3QgUGxh dGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50LCBTY3JvbGxhYmxlQXJlYSogc2Nyb2xsYWJsZUFy ZWEpCi17Ci0gICAgcmV0dXJuIHdoZWVsRXZlbnQuZGVsdGFYKCkgPCAwICYmICFzY3JvbGxhYmxl QXJlYS0+c2hvdWxkUnViYmVyQmFuZEluRGlyZWN0aW9uKFNjcm9sbFJpZ2h0KTsKKyAgICByZXR1 cm4gdHJ1ZTsKIH0KIAogYm9vbCBTY3JvbGxBbmltYXRvck1hYzo6aGFuZGxlV2hlZWxFdmVudChj b25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCkBAIC05MTksMTIgKzkxOSw4IEBA IGJvb2wgU2Nyb2xsQW5pbWF0b3JNYWM6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1X aGVlbEV2ZW50JiB3aGVlbEV2ZW50KQogICAgIH0KIAogICAgIGlmICh3aGVlbEV2ZW50LnBoYXNl KCkgPT0gUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2VCZWdhbikgewotICAgICAgICBpZiAobV9zY3Jv bGxhYmxlQXJlYS0+aXNIb3Jpem9udGFsU2Nyb2xsZXJQaW5uZWRUb01pbmltdW1Qb3NpdGlvbigp ICYmCi0gICAgICAgICAgICBpc1Njcm9sbGluZ0xlZnRBbmRTaG91bGROb3RSdWJiZXJCYW5kKHdo ZWVsRXZlbnQsIG1fc2Nyb2xsYWJsZUFyZWEpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwot Ci0gICAgICAgIGlmIChtX3Njcm9sbGFibGVBcmVhLT5pc0hvcml6b250YWxTY3JvbGxlclBpbm5l ZFRvTWF4aW11bVBvc2l0aW9uKCkgJiYKLSAgICAgICAgICAgIGlzU2Nyb2xsaW5nUmlnaHRBbmRT aG91bGROb3RSdWJiZXJCYW5kKHdoZWVsRXZlbnQsIG1fc2Nyb2xsYWJsZUFyZWEpKQorICAgICAg ICBpZiAocGlubmVkSW5EaXJlY3Rpb24oLXdoZWVsRXZlbnQuZGVsdGFYKCksIDApICYmCisgICAg ICAgICAgICAhc2hvdWxkUnViYmVyQmFuZEluSG9yaXpvbnRhbERpcmVjdGlvbih3aGVlbEV2ZW50 LCBtX3Njcm9sbGFibGVBcmVhKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgICAg ICBkaWRCZWdpblNjcm9sbEdlc3R1cmUoKTsK