77131 2012-01-26 12:35:23 -0800 Simplify checking for whether we should rubberband or not when at the edge 2012-01-26 12:47:18 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 543386 0 andersca 2012-01-26 12:35:23 -0800 Simplify checking for whether we should rubberband or not when at the edge 543388 1 124163 andersca 2012-01-26 12:37:38 -0800 Created attachment 124163 Patch 543390 2 124163 bdakin 2012-01-26 12:39:10 -0800 Comment on attachment 124163 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=124163&action=review > Source/WebCore/platform/mac/ScrollAnimatorMac.mm:932 > + Is this whitespace intentional? 543398 3 andersca 2012-01-26 12:47:18 -0800 Committed r106031: <http://trac.webkit.org/changeset/106031> 124163 2012-01-26 12:37:38 -0800 2012-01-26 12:39:10 -0800 Patch bug-77131-20120126123740.patch text/plain 6177 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MDI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2U0MTM4OWMxMDdhZDNk ZmY2NjdmZmMwMjkyMDhmNTk4ZDk3OTA3OS4uZTllZDljOGJlYzFlYTBhYjc3M2VmMmNiOGFhZThk NzBhYjVkYWEwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDEyLTAxLTI2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxpZnkgY2hl Y2tpbmcgZm9yIHdoZXRoZXIgd2Ugc2hvdWxkIHJ1YmJlcmJhbmQgb3Igbm90IHdoZW4gYXQgdGhl IGVkZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3 MTMxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2Ug b25seSBuZWVkIHRvIGNoZWNrIG9uY2UgaWYgd2UncmUgcGlubmVkIGF0IGVpdGhlciBlZGdlIHdo ZXRoZXIgd2Ugc2hvdWxkIHJ1YmJlci1iYW5kCisgICAgICAgIG9yIG5vdC4gRG8gdGhpcyB3aGVu IHRoZSB3aGVlbCBldmVudCBwaGFzZSBpcyBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZUJlZ2FuLiBU aGlzIGxldHMgdXMKKyAgICAgICAgcmVtb3ZlIGEgYnVuY2ggb2YgY29kZSB0aGF0IHdvdWxkIGtl ZXAgdHJhY2sgb2YgdGhlIGN1cnJlbnQgaG9yaXpvbnRhbCBzY3JvbGwgZGlyZWN0aW9uLgorCisg ICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLmg6CisgICAgICAgIChTY3Jv bGxBbmltYXRvck1hYyk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFj Lm1tOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6OlNjcm9sbEFuaW1hdG9y TWFjKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yTWFjOjpoYW5kbGVXaGVlbEV2 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1hdG9yTWFjOjpiZWdpblNjcm9sbEdl c3R1cmUpOgorCisyMDEyLTAxLTI2ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CisKICAgICAgICAgVXNlIFBsYXRmb3JtV2hlZWxFdmVudDo6cGhhc2UoKSB0byBkZXRlcm1p bmUgaWYgYSBzY3JvbGwgZ2VzdHVyZSBiZWdpbnMgb3IgZW5kcwogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzcxMjcKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMuaAppbmRleCA1YzI4Y2E5MTRkOWUzOTI4 MTczNTk2NjMxOTdiOTMyZjFhMTFjMjJiLi45NDgyNWExZTc0MGI1NjI4NTcxMzNkYjVmMGE2MDli MDZjMDUwMGVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xs QW5pbWF0b3JNYWMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5p bWF0b3JNYWMuaApAQCAtMTM4LDExICsxMzgsNiBAQCBwcml2YXRlOgogCiAgICAgU2Nyb2xsRWxh c3RpY2l0eUNvbnRyb2xsZXIgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlcjsKICAgICBUaW1l cjxTY3JvbGxBbmltYXRvck1hYz4gbV9zbmFwUnViYmVyQmFuZFRpbWVyOwotCi0gICAgYm9vbCBt X3Njcm9sbGVySW5pdGlhbGx5UGlubmVkT25MZWZ0OwotICAgIGJvb2wgbV9zY3JvbGxlckluaXRp YWxseVBpbm5lZE9uUmlnaHQ7Ci0gICAgaW50IG1fY3VtdWxhdGl2ZUhvcml6b250YWxTY3JvbGw7 Ci0gICAgYm9vbCBtX2RpZEN1bXVsYXRpdmVIb3Jpem9udGFsU2Nyb2xsRXZlclN3aXRjaFRvT3Bw b3NpdGVEaXJlY3Rpb25PZlBpbjsKICNlbmRpZgogCiAgICAgYm9vbCBtX2hhdmVTY3JvbGxlZFNp bmNlUGFnZUxvYWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Ny b2xsQW5pbWF0b3JNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5p bWF0b3JNYWMubW0KaW5kZXggMjA0MjU4NTc3ODY2YjIzM2ZhNjdlZGY1NzgyNTU0MTRkOTdkYmJj My4uYjA0MjJhZjNkNTk2YTNmNTk4MzE1NTg3MDQ5OGE2ZjRjOTYxNDBlNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1tCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQpAQCAtNTUzLDEw ICs1NTMsNiBAQCBTY3JvbGxBbmltYXRvck1hYzo6U2Nyb2xsQW5pbWF0b3JNYWMoU2Nyb2xsYWJs ZUFyZWEqIHNjcm9sbGFibGVBcmVhKQogI2lmIEVOQUJMRShSVUJCRVJfQkFORElORykKICAgICAs IG1fc2Nyb2xsRWxhc3RpY2l0eUNvbnRyb2xsZXIodGhpcykKICAgICAsIG1fc25hcFJ1YmJlckJh bmRUaW1lcih0aGlzLCAmU2Nyb2xsQW5pbWF0b3JNYWM6OnNuYXBSdWJiZXJCYW5kVGltZXJGaXJl ZCkKLSAgICAsIG1fc2Nyb2xsZXJJbml0aWFsbHlQaW5uZWRPbkxlZnQoZmFsc2UpCi0gICAgLCBt X3Njcm9sbGVySW5pdGlhbGx5UGlubmVkT25SaWdodChmYWxzZSkKLSAgICAsIG1fY3VtdWxhdGl2 ZUhvcml6b250YWxTY3JvbGwoMCkKLSAgICAsIG1fZGlkQ3VtdWxhdGl2ZUhvcml6b250YWxTY3Jv bGxFdmVyU3dpdGNoVG9PcHBvc2l0ZURpcmVjdGlvbk9mUGluKGZhbHNlKQogI2VuZGlmCiAgICAg LCBtX2hhdmVTY3JvbGxlZFNpbmNlUGFnZUxvYWQoZmFsc2UpCiAgICAgLCBtX25lZWRzU2Nyb2xs ZXJTdHlsZVVwZGF0ZShmYWxzZSkKQEAgLTkyMCwzOSArOTE2LDIwIEBAIGJvb2wgU2Nyb2xsQW5p bWF0b3JNYWM6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVl bEV2ZW50KQogICAgIH0gZWxzZSB7CiAgICAgICAgIGlmICghYWxsb3dzSG9yaXpvbnRhbFN0cmV0 Y2hpbmcoKSkKICAgICAgICAgICAgIHJldHVybiBTY3JvbGxBbmltYXRvcjo6aGFuZGxlV2hlZWxF dmVudCh3aGVlbEV2ZW50KTsKLSAgICAgICAgCi0gICAgICAgIGlmIChtX3Njcm9sbGFibGVBcmVh LT5ob3Jpem9udGFsU2Nyb2xsYmFyKCkpIHsKLSAgICAgICAgICAgIC8vIElmIHRoZXJlIGlzIGEg c2Nyb2xsYmFyLCB3ZSBhZ2dyZWdhdGUgdGhlIHdoZWVsIGV2ZW50cyB0byBnZXQgYW4KLSAgICAg ICAgICAgIC8vIG92ZXJhbGwgdHJlbmQgb2YgdGhlIHNjcm9sbC4gSWYgdGhlIGRpcmVjdGlvbiBv ZiB0aGUgc2Nyb2xsIGlzIGV2ZXIKLSAgICAgICAgICAgIC8vIGluIHRoZSBvcHBvc2l0ZSBkaXJl Y3Rpb24gb2YgdGhlIHBpbiBsb2NhdGlvbiwgdGhlbiB3ZSBzd2l0Y2ggdGhlCi0gICAgICAgICAg ICAvLyBib29sZWFuLCBhbmQgcnViYmVyIGJhbmQuIFRoYXQgaXMsIGlmIHdlIHdlcmUgcGlubmVk IHRvIHRoZSBsZWZ0LAotICAgICAgICAgICAgLy8gYW5kIHdlIGVuZGVkIHVwIHNjcm9sbGluZyB0 byB0aGUgcmlnaHQsIHdlIHJ1YmJlciBiYW5kLgotICAgICAgICAgICAgbV9jdW11bGF0aXZlSG9y aXpvbnRhbFNjcm9sbCArPSB3aGVlbEV2ZW50LmRlbHRhWCgpOwotICAgICAgICAgICAgaWYgKG1f c2Nyb2xsZXJJbml0aWFsbHlQaW5uZWRPbkxlZnQgJiYgbV9jdW11bGF0aXZlSG9yaXpvbnRhbFNj cm9sbCA8IDApCi0gICAgICAgICAgICAgICAgbV9kaWRDdW11bGF0aXZlSG9yaXpvbnRhbFNjcm9s bEV2ZXJTd2l0Y2hUb09wcG9zaXRlRGlyZWN0aW9uT2ZQaW4gPSB0cnVlOwotICAgICAgICAgICAg aWYgKG1fc2Nyb2xsZXJJbml0aWFsbHlQaW5uZWRPblJpZ2h0ICYmIG1fY3VtdWxhdGl2ZUhvcml6 b250YWxTY3JvbGwgPiAwKQotICAgICAgICAgICAgICAgIG1fZGlkQ3VtdWxhdGl2ZUhvcml6b250 YWxTY3JvbGxFdmVyU3dpdGNoVG9PcHBvc2l0ZURpcmVjdGlvbk9mUGluID0gdHJ1ZTsKLSAgICAg ICAgfQotCi0gICAgICAgIC8vIEFmdGVyIGEgZ2VzdHVyZSBiZWdpbnMsIHdlIGdvIHRocm91Z2g6 Ci0gICAgICAgIC8vIDErIFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlTm9uZQotICAgICAgICAvLyAw KyBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZUNoYW5nZWQKLSAgICAgICAgLy8gMSBQbGF0Zm9ybVdo ZWVsRXZlbnRQaGFzZUVuZGVkIGlmIHRoZXJlIHdhcyBhdCBsZWFzdCBvbmUgY2hhbmdlZCBldmVu dAotICAgICAgICBpZiAod2hlZWxFdmVudC5tb21lbnR1bVBoYXNlKCkgPT0gUGxhdGZvcm1XaGVl bEV2ZW50UGhhc2VOb25lICYmICFtX2RpZEN1bXVsYXRpdmVIb3Jpem9udGFsU2Nyb2xsRXZlclN3 aXRjaFRvT3Bwb3NpdGVEaXJlY3Rpb25PZlBpbikgewotICAgICAgICAgICAgaWYgKChpc1Njcm9s bGluZ0xlZnRBbmRTaG91bGROb3RSdWJiZXJCYW5kKHdoZWVsRXZlbnQsIG1fc2Nyb2xsYWJsZUFy ZWEpICYmCi0gICAgICAgICAgICAgICAgbV9zY3JvbGxlckluaXRpYWxseVBpbm5lZE9uTGVmdCAm JgotICAgICAgICAgICAgICAgIG1fc2Nyb2xsYWJsZUFyZWEtPmlzSG9yaXpvbnRhbFNjcm9sbGVy UGlubmVkVG9NaW5pbXVtUG9zaXRpb24oKSkgfHwKLSAgICAgICAgICAgICAgICAoaXNTY3JvbGxp bmdSaWdodEFuZFNob3VsZE5vdFJ1YmJlckJhbmQod2hlZWxFdmVudCwgbV9zY3JvbGxhYmxlQXJl YSkgJiYKLSAgICAgICAgICAgICAgICBtX3Njcm9sbGVySW5pdGlhbGx5UGlubmVkT25SaWdodCAm JgotICAgICAgICAgICAgICAgIG1fc2Nyb2xsYWJsZUFyZWEtPmlzSG9yaXpvbnRhbFNjcm9sbGVy UGlubmVkVG9NYXhpbXVtUG9zaXRpb24oKSkpIHsKLSAgICAgICAgICAgICAgICByZXR1cm4gU2Ny b2xsQW5pbWF0b3I6OmhhbmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7Ci0gICAgICAgICAgICB9 Ci0gICAgICAgIH0KICAgICB9CiAKICAgICBpZiAod2hlZWxFdmVudC5waGFzZSgpID09IFBsYXRm b3JtV2hlZWxFdmVudFBoYXNlQmVnYW4pIHsKKyAgICAgICAgaWYgKG1fc2Nyb2xsYWJsZUFyZWEt PmlzSG9yaXpvbnRhbFNjcm9sbGVyUGlubmVkVG9NaW5pbXVtUG9zaXRpb24oKSAmJgorICAgICAg ICAgICAgaXNTY3JvbGxpbmdMZWZ0QW5kU2hvdWxkTm90UnViYmVyQmFuZCh3aGVlbEV2ZW50LCBt X3Njcm9sbGFibGVBcmVhKSkKKyAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgICAgICBp ZiAobV9zY3JvbGxhYmxlQXJlYS0+aXNIb3Jpem9udGFsU2Nyb2xsZXJQaW5uZWRUb01heGltdW1Q b3NpdGlvbigpICYmCisgICAgICAgICAgICBpc1Njcm9sbGluZ1JpZ2h0QW5kU2hvdWxkTm90UnVi YmVyQmFuZCh3aGVlbEV2ZW50LCBtX3Njcm9sbGFibGVBcmVhKSkKKyAgICAgICAgICAgIHJldHVy biBmYWxzZTsKKwogICAgICAgICAvLyBXZSBkb24ndCByZXR1cm4gYWZ0ZXIgdGhpcyBiZWNhdXNl IHdlIHN0aWxsIHdhbnQgdGhlIHNjcm9sbCBlbGFzdGljaXR5IGNvbnRyb2xsZXIgdG8gaGFuZGxl IHRoZSB3aGVlbCBldmVudC4KICAgICAgICAgYmVnaW5TY3JvbGxHZXN0dXJlKCk7CisKICAgICB9 IGVsc2UgaWYgKHdoZWVsRXZlbnQucGhhc2UoKSA9PSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZUVu ZGVkKSB7CiAgICAgICAgIGVuZFNjcm9sbEdlc3R1cmUoKTsKICAgICAgICAgcmV0dXJuIHRydWU7 CkBAIC0xMDg4LDExICsxMDY1LDcgQEAgdm9pZCBTY3JvbGxBbmltYXRvck1hYzo6YmVnaW5TY3Jv bGxHZXN0dXJlKCkKIHsKICAgICBkaWRCZWdpblNjcm9sbEdlc3R1cmUoKTsKIAotICAgIG1fc2Ny b2xsZXJJbml0aWFsbHlQaW5uZWRPbkxlZnQgPSBtX3Njcm9sbGFibGVBcmVhLT5pc0hvcml6b250 YWxTY3JvbGxlclBpbm5lZFRvTWluaW11bVBvc2l0aW9uKCk7Ci0gICAgbV9zY3JvbGxlckluaXRp YWxseVBpbm5lZE9uUmlnaHQgPSBtX3Njcm9sbGFibGVBcmVhLT5pc0hvcml6b250YWxTY3JvbGxl clBpbm5lZFRvTWF4aW11bVBvc2l0aW9uKCk7CiAgICAgbV9oYXZlU2Nyb2xsZWRTaW5jZVBhZ2VM b2FkID0gdHJ1ZTsKLSAgICBtX2N1bXVsYXRpdmVIb3Jpem9udGFsU2Nyb2xsID0gMDsKLSAgICBt X2RpZEN1bXVsYXRpdmVIb3Jpem9udGFsU2Nyb2xsRXZlclN3aXRjaFRvT3Bwb3NpdGVEaXJlY3Rp b25PZlBpbiA9IGZhbHNlOwogCiAgICAgbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5iZWdp blNjcm9sbEdlc3R1cmUoKTsKIH0K