121885 2013-09-24 17:38:14 -0700 [Windows] Overpanning occurs even when what is being panned isn't the main document 2013-09-25 16:25:04 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC Windows 7 RESOLVED FIXED InRadar P2 Normal --- 1 roger_fong webkit-unassigned bdakin bfulgham commit-queue esprehn+autocc glenn jonlee kondapallykalyan roger_fong simon.fraser oldest_to_newest 932823 0 roger_fong 2013-09-24 17:38:14 -0700 When calling scrollbyrecursively we current keep track of the scrolled scrollview. However this does not take overflow scrolls into account. Hence what we see is that when we are panning an overflow scroll but the main document's scroll position is at either the beginning or end, overpanning occurs. We should instead keep track of the ScrollableArea since that encompasses both overflow scrolls and scroll views. <rdar://problem/15072332> 932825 1 212527 roger_fong 2013-09-24 17:47:25 -0700 Created attachment 212527 patch 933130 2 roger_fong 2013-09-25 11:34:31 -0700 Note that as of right now, only the Windows port uses the third argument in this method, and hence is the only one affected by this change. 933131 3 212527 bfulgham 2013-09-25 11:36:51 -0700 Comment on attachment 212527 patch r=me 933145 4 roger_fong 2013-09-25 12:05:04 -0700 Committed: http://trac.webkit.org/changeset/156416 212527 2013-09-24 17:47:25 -0700 2013-09-25 11:36:51 -0700 patch patch.patch text/plain 6885 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NjM3NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDEzLTA5LTI0ICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTg4NS4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE1 MDcyMzMyPi4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBObyBuZXcgZnVuY3Rpb25hbGl0eSBhZGRlZC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5k ZXJMYXllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllcjo6c2Nyb2xsQnlSZWN1 cnNpdmVseSk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyLmg6CisKIDIwMTMtMDkt MjQgIE1hcmsgTGFtICA8bWFyay5sYW1AYXBwbGUuY29tPgogCiAgICAgICAgIENoYW5nZSBKU0Mg ZGVidWcgaG9va3MgdG8gcGFzcyBhIENhbGxGcmFtZSogaW5zdGVhZCBvZiBhIERlYnVnZ2VyQ2Fs bEZyYW1lLgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCShy ZXZpc2lvbiAxNTYyODApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXIu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMTY2LDcgKzIxNjYsNyBAQAogICAgIHNjcm9sbEJ5UmVj dXJzaXZlbHkoYWRqdXN0ZWRTY3JvbGxEZWx0YShkZWx0YSksIFNjcm9sbE9mZnNldENsYW1wZWQp OwogfQogCi12b2lkIFJlbmRlckxheWVyOjpzY3JvbGxCeVJlY3Vyc2l2ZWx5KGNvbnN0IEludFNp emUmIGRlbHRhLCBTY3JvbGxPZmZzZXRDbGFtcGluZyBjbGFtcCwgU2Nyb2xsVmlldyoqIHNjcm9s bGVkVmlldykKK3ZvaWQgUmVuZGVyTGF5ZXI6OnNjcm9sbEJ5UmVjdXJzaXZlbHkoY29uc3QgSW50 U2l6ZSYgZGVsdGEsIFNjcm9sbE9mZnNldENsYW1waW5nIGNsYW1wLCBTY3JvbGxhYmxlQXJlYSoq IHNjcm9sbGVkQXJlYSkKIHsKICAgICBpZiAoZGVsdGEuaXNaZXJvKCkpCiAgICAgICAgIHJldHVy bjsKQEAgLTIxNzgsMTQgKzIxNzgsMTQgQEAKICAgICBpZiAocmVuZGVyZXIoKS5oYXNPdmVyZmxv d0NsaXAoKSAmJiAhcmVzdHJpY3RlZEJ5TGluZUNsYW1wKSB7CiAgICAgICAgIEludFNpemUgbmV3 U2Nyb2xsT2Zmc2V0ID0gc2Nyb2xsT2Zmc2V0KCkgKyBkZWx0YTsKICAgICAgICAgc2Nyb2xsVG9P ZmZzZXQobmV3U2Nyb2xsT2Zmc2V0LCBjbGFtcCk7Ci0gICAgICAgIGlmIChzY3JvbGxlZFZpZXcp Ci0gICAgICAgICAgICAqc2Nyb2xsZWRWaWV3ID0gJnJlbmRlcmVyKCkudmlldygpLmZyYW1lVmll dygpOworICAgICAgICBpZiAoc2Nyb2xsZWRBcmVhKQorICAgICAgICAgICAgKnNjcm9sbGVkQXJl YSA9IHRoaXM7CiAKICAgICAgICAgLy8gSWYgdGhpcyBsYXllciBjYW4ndCBkbyB0aGUgc2Nyb2xs IHdlIGFzayB0aGUgbmV4dCBsYXllciB1cCB0aGF0IGNhbiBzY3JvbGwgdG8gdHJ5CiAgICAgICAg IEludFNpemUgcmVtYWluaW5nU2Nyb2xsT2Zmc2V0ID0gbmV3U2Nyb2xsT2Zmc2V0IC0gc2Nyb2xs T2Zmc2V0KCk7CiAgICAgICAgIGlmICghcmVtYWluaW5nU2Nyb2xsT2Zmc2V0LmlzWmVybygpICYm IHJlbmRlcmVyKCkucGFyZW50KCkpIHsKICAgICAgICAgICAgIGlmIChSZW5kZXJMYXllciogc2Ny b2xsYWJsZUxheWVyID0gZW5jbG9zaW5nU2Nyb2xsYWJsZUxheWVyKCkpCi0gICAgICAgICAgICAg ICAgc2Nyb2xsYWJsZUxheWVyLT5zY3JvbGxCeVJlY3Vyc2l2ZWx5KHJlbWFpbmluZ1Njcm9sbE9m ZnNldCwgY2xhbXAsIHNjcm9sbGVkVmlldyk7CisgICAgICAgICAgICAgICAgc2Nyb2xsYWJsZUxh eWVyLT5zY3JvbGxCeVJlY3Vyc2l2ZWx5KHJlbWFpbmluZ1Njcm9sbE9mZnNldCwgY2xhbXAsIHNj cm9sbGVkQXJlYSk7CiAKICAgICAgICAgICAgIHJlbmRlcmVyKCkuZnJhbWUoKS5ldmVudEhhbmRs ZXIoKS51cGRhdGVBdXRvc2Nyb2xsUmVuZGVyZXIoKTsKICAgICAgICAgfQpAQCAtMjE5Myw4ICsy MTkzLDggQEAKICAgICAgICAgLy8gSWYgd2UgYXJlIGhlcmUsIHdlIHdlcmUgY2FsbGVkIG9uIGEg cmVuZGVyZXIgdGhhdCBjYW4gYmUgcHJvZ3JhbW1hdGljYWxseSBzY3JvbGxlZCwgYnV0IGRvZXNu J3QKICAgICAgICAgLy8gaGF2ZSBhbiBvdmVyZmxvdyBjbGlwLiBXaGljaCBtZWFucyB0aGF0IGl0 IGlzIGEgZG9jdW1lbnQgbm9kZSB0aGF0IGNhbiBiZSBzY3JvbGxlZC4KICAgICAgICAgcmVuZGVy ZXIoKS52aWV3KCkuZnJhbWVWaWV3KCkuc2Nyb2xsQnkoZGVsdGEpOwotICAgICAgICBpZiAoc2Ny b2xsZWRWaWV3KQotICAgICAgICAgICAgKnNjcm9sbGVkVmlldyA9ICZyZW5kZXJlcigpLnZpZXco KS5mcmFtZVZpZXcoKTsKKyAgICAgICAgaWYgKHNjcm9sbGVkQXJlYSkKKyAgICAgICAgICAgICpz Y3JvbGxlZEFyZWEgPSAmcmVuZGVyZXIoKS52aWV3KCkuZnJhbWVWaWV3KCk7CiAKICAgICAgICAg Ly8gRklYTUU6IElmIHdlIGRpZG4ndCBzY3JvbGwgdGhlIHdob2xlIHdheSwgZG8gd2Ugd2FudCB0 byB0cnkgbG9va2luZyBhdCB0aGUgZnJhbWVzIG93bmVyRWxlbWVudD8gCiAgICAgICAgIC8vIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yODIzNwpJbmRleDogU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgJKHJldmlzaW9uIDE1NjI4MCkKKysrIFNvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zODYs NyArMzg2LDcgQEAKICAgICB9OwogCiAgICAgLy8gU2Nyb2xsaW5nIG1ldGhvZHMgZm9yIGxheWVy cyB0aGF0IGNhbiBzY3JvbGwgdGhlaXIgb3ZlcmZsb3cuCi0gICAgdm9pZCBzY3JvbGxCeVJlY3Vy c2l2ZWx5KGNvbnN0IEludFNpemUmLCBTY3JvbGxPZmZzZXRDbGFtcGluZyA9IFNjcm9sbE9mZnNl dFVuY2xhbXBlZCwgU2Nyb2xsVmlldyoqIHNjcm9sbGVkVmlldyA9IDApOworICAgIHZvaWQgc2Ny b2xsQnlSZWN1cnNpdmVseShjb25zdCBJbnRTaXplJiwgU2Nyb2xsT2Zmc2V0Q2xhbXBpbmcgPSBT Y3JvbGxPZmZzZXRVbmNsYW1wZWQsIFNjcm9sbGFibGVBcmVhKiogc2Nyb2xsZWRBcmVhID0gMCk7 CiAgICAgdm9pZCBzY3JvbGxUb09mZnNldChjb25zdCBJbnRTaXplJiwgU2Nyb2xsT2Zmc2V0Q2xh bXBpbmcgPSBTY3JvbGxPZmZzZXRVbmNsYW1wZWQpOwogICAgIHZvaWQgc2Nyb2xsVG9YT2Zmc2V0 KGludCB4LCBTY3JvbGxPZmZzZXRDbGFtcGluZyBjbGFtcCA9IFNjcm9sbE9mZnNldFVuY2xhbXBl ZCkgeyBzY3JvbGxUb09mZnNldChJbnRTaXplKHgsIHNjcm9sbFlPZmZzZXQoKSksIGNsYW1wKTsg fQogICAgIHZvaWQgc2Nyb2xsVG9ZT2Zmc2V0KGludCB5LCBTY3JvbGxPZmZzZXRDbGFtcGluZyBj bGFtcCA9IFNjcm9sbE9mZnNldFVuY2xhbXBlZCkgeyBzY3JvbGxUb09mZnNldChJbnRTaXplKHNj cm9sbFhPZmZzZXQoKSwgeSksIGNsYW1wKTsgfQpJbmRleDogU291cmNlL1dlYktpdC93aW4vQ2hh bmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwkocmV2aXNp b24gMTU2Mzc1KQorKysgU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTQgQEAKKzIwMTMtMDktMjQgIFJvZ2VyIEZvbmcgIDxyb2dlcl9mb25nQGFw cGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIxODg1LgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTUwNzIzMzI+LgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViVmlldy5jcHA6Cisg ICAgICAgIChXZWJWaWV3OjpnZXN0dXJlTm90aWZ5KToKKyAgICAgICAgKFdlYlZpZXc6Omdlc3R1 cmUpOgorCiAyMDEzLTA5LTI0ICBCcmVudCBGdWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgog CiAgICAgICAgIFtXaW5kb3dzXSBVbnJldmlld2VkIGNyYXNoIGZpeCBhZnRlciByMTU2MzIxLgpJ bmRleDogU291cmNlL1dlYktpdC93aW4vV2ViVmlldy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC93aW4vV2ViVmlldy5jcHAJKHJldmlzaW9uIDE1NjI4MCkKKysrIFNvdXJjZS9XZWJL aXQvd2luL1dlYlZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNjE5LDYgKzE2MTksMTAgQEAK ICAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIH0KICAgICAgICAgfQorICAgIH0g ZWxzZSB7CisgICAgICAgIC8vIFdlJ3ZlIGhpdCB0aGUgbWFpbiBkb2N1bWVudCBidXQgbm90IGFu eSBvZiB0aGUgZG9jdW1lbnQncyBjb250ZW50CisgICAgICAgIGlmIChjb3JlKG1fbWFpbkZyYW1l KS0+dmlldygpLT5pc1Njcm9sbGFibGUoKSkKKyAgICAgICAgICAgIGNhbkJlU2Nyb2xsZWQgPSB0 cnVlOwogICAgIH0KIAogICAgIC8vIFdlIGFsd2F5cyBhbGxvdyB0d28tZmluZ2VyZWQgcGFubmlu ZyB3aXRoIGluZXJ0aWEgYW5kIGEgZ3V0dGVyICh3aGljaCBsaW1pdHMgbW92ZW1lbnQgdG8gb25l CkBAIC0xNjk1LDE0ICsxNjk5LDE0IEBACiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg ICAgIH0KIAotICAgICAgICBTY3JvbGxWaWV3KiBzY3JvbGxlZFZpZXcgPSAwOworICAgICAgICBT Y3JvbGxhYmxlQXJlYSogc2Nyb2xsZWRBcmVhID0gMDsKIAogICAgICAgICBpZiAoIW1fZ2VzdHVy ZVRhcmdldE5vZGUgfHwgIW1fZ2VzdHVyZVRhcmdldE5vZGUtPnJlbmRlcmVyKCkpIHsKICAgICAg ICAgICAgIC8vIFdlIG1pZ2h0IGRpcmVjdGx5IGhpdCB0aGUgZG9jdW1lbnQgd2l0aG91dCBoaXR0 aW5nIGFueSBub2RlcwogICAgICAgICAgICAgY29yZUZyYW1lLT52aWV3KCktPnNjcm9sbEJ5KElu dFNpemUoLWRlbHRhWCwgLWRlbHRhWSkpOwotICAgICAgICAgICAgc2Nyb2xsZWRWaWV3ID0gY29y ZUZyYW1lLT52aWV3KCk7CisgICAgICAgICAgICBzY3JvbGxlZEFyZWEgPSBjb3JlRnJhbWUtPnZp ZXcoKTsKICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBtX2dlc3R1cmVUYXJnZXROb2RlLT5y ZW5kZXJlcigpLT5lbmNsb3NpbmdMYXllcigpLT5zY3JvbGxCeVJlY3Vyc2l2ZWx5KEludFNpemUo LWRlbHRhWCwgLWRlbHRhWSksIFdlYkNvcmU6OlJlbmRlckxheWVyOjpTY3JvbGxPZmZzZXRDbGFt cGVkLCAmc2Nyb2xsZWRWaWV3KTsKKyAgICAgICAgICAgIG1fZ2VzdHVyZVRhcmdldE5vZGUtPnJl bmRlcmVyKCktPmVuY2xvc2luZ0xheWVyKCktPnNjcm9sbEJ5UmVjdXJzaXZlbHkoSW50U2l6ZSgt ZGVsdGFYLCAtZGVsdGFZKSwgV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OlNjcm9sbE9mZnNldENsYW1w ZWQsICZzY3JvbGxlZEFyZWEpOwogCiAgICAgICAgIGlmICghKFVwZGF0ZVBhbm5pbmdGZWVkYmFj a1B0cigpICYmIEJlZ2luUGFubmluZ0ZlZWRiYWNrUHRyKCkgJiYgRW5kUGFubmluZ0ZlZWRiYWNr UHRyKCkpKSB7CiAgICAgICAgICAgICBDbG9zZUdlc3R1cmVJbmZvSGFuZGxlUHRyKCkoZ2VzdHVy ZUhhbmRsZSk7CkBAIC0xNzIwLDEyICsxNzI0LDEyIEBACiAgICAgICAgICAgICBtX3hPdmVycGFu ID0gMDsKICAgICAgICAgfQogCi0gICAgICAgIGlmICghc2Nyb2xsZWRWaWV3KSB7CisgICAgICAg IGlmICghc2Nyb2xsZWRBcmVhKSB7CiAgICAgICAgICAgICBDbG9zZUdlc3R1cmVJbmZvSGFuZGxl UHRyKCkoZ2VzdHVyZUhhbmRsZSk7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAg fQogCi0gICAgICAgIFNjcm9sbGJhciogdmVydFNjcm9sbGJhciA9IHNjcm9sbGVkVmlldy0+dmVy dGljYWxTY3JvbGxiYXIoKTsKKyAgICAgICAgU2Nyb2xsYmFyKiB2ZXJ0U2Nyb2xsYmFyID0gc2Ny b2xsZWRBcmVhLT52ZXJ0aWNhbFNjcm9sbGJhcigpOwogCiAgICAgICAgIGludCB5cGFuID0gMDsK ICAgICAgICAgaW50IHhwYW4gPSAwOwpAQCAtMTczMyw3ICsxNzM3LDcgQEAKICAgICAgICAgaWYg KHZlcnRTY3JvbGxiYXIgJiYgKCF2ZXJ0U2Nyb2xsYmFyLT5jdXJyZW50UG9zKCkgfHwgdmVydFNj cm9sbGJhci0+Y3VycmVudFBvcygpID49IHZlcnRTY3JvbGxiYXItPm1heGltdW0oKSkpCiAgICAg ICAgICAgICB5cGFuID0gbV95T3ZlcnBhbjsKIAotICAgICAgICBTY3JvbGxiYXIqIGhvcmlTY3Jv bGxiYXIgPSBzY3JvbGxlZFZpZXctPmhvcml6b250YWxTY3JvbGxiYXIoKTsKKyAgICAgICAgU2Ny b2xsYmFyKiBob3JpU2Nyb2xsYmFyID0gc2Nyb2xsZWRBcmVhLT5ob3Jpem9udGFsU2Nyb2xsYmFy KCk7CiAKICAgICAgICAgaWYgKGhvcmlTY3JvbGxiYXIgJiYgKCFob3JpU2Nyb2xsYmFyLT5jdXJy ZW50UG9zKCkgfHwgaG9yaVNjcm9sbGJhci0+Y3VycmVudFBvcygpID49IGhvcmlTY3JvbGxiYXIt Pm1heGltdW0oKSkpCiAgICAgICAgICAgICB4cGFuID0gbV94T3ZlcnBhbjsK