66672 2011-08-22 07:10:54 -0700 [Qt][WK2] ViewportInteractionEngine: the position of the content is not corrected when scaling the page manually 2011-11-26 11:52:15 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 benjamin benjamin kenneth oldest_to_newest 454579 0 benjamin 2011-08-22 07:10:54 -0700 When zooming, both the position and the scale needs to come back to the boundary. 454581 1 104674 benjamin 2011-08-22 07:16:13 -0700 Created attachment 104674 Patch 454584 2 104674 kenneth 2011-08-22 07:21:29 -0700 Comment on attachment 104674 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=104674&action=review > Source/WebKit2/ChangeLog:9 > + This method is now used as the entry point for animations in order to avoid bugs of scale or position. s/of/regarding > Source/WebKit2/UIProcess/qt/ViewportInteractionEngine.cpp:254 > + animateContentScaleIntoBoundariesIfNeeded(); > + animateContentPositionIntoBoundariesIfNeeded(); Shouldn't they be animated together? 454597 3 benjamin 2011-08-22 07:36:57 -0700 (In reply to comment #2) > s/of/regarding > > > Source/WebKit2/UIProcess/qt/ViewportInteractionEngine.cpp:254 > > + animateContentScaleIntoBoundariesIfNeeded(); > > + animateContentPositionIntoBoundariesIfNeeded(); > > Shouldn't they be animated together? I think QParallelAnimationGroup will do the trick. I will try to keep the methods separated even if they must have a common animation, just for the sake of keeping the code clean. 455343 4 benjamin 2011-08-23 05:39:40 -0700 Committed r93592: <http://trac.webkit.org/changeset/93592> 104674 2011-08-22 07:16:13 -0700 2011-11-26 11:52:15 -0800 Patch bug-66672-20110822162256.patch text/plain 4479 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogOTM1MDcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA3OGM4Nzk4YzBjMDYyMGM4 MzQ1NjNkMTQ0YWVjNzRlOTBmYjZhZDVhLi5kYWRmYzZiNjIyMjZhM2YxNjY3NTg4ZGRlOGQwNjc5 NDZjMzgzMDQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDgtMjIgIEJlbmph bWluIFBvdWxhaW4gIDxiZW5qYW1pbkB3ZWJraXQub3JnPgorCisgICAgICAgIFtRdF1bV0syXSBW aWV3cG9ydEludGVyYWN0aW9uRW5naW5lOiB0aGUgcG9zaXRpb24gb2YgdGhlIGNvbnRlbnQgaXMg bm90IGNvcnJlY3RlZCB3aGVuIHNjYWxpbmcgdGhlIHBhZ2UgbWFudWFsbHkKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2NjcyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRoZSBtZXRob2QgYW5pbWF0 ZUNvbnRlbnRJbnRvQm91bmRhcmllc0lmTmVlZGVkKCkgdG8gbW92ZSB0aGUgY29udGVudCBiYWNr IGludG8gYm90aCBzY2FsZSBhbmQgcG9zaXRpb24gYm91bmRhcmllcy4KKyAgICAgICAgVGhpcyBt ZXRob2QgaXMgbm93IHVzZWQgYXMgdGhlIGVudHJ5IHBvaW50IGZvciBhbmltYXRpb25zIGluIG9y ZGVyIHRvIGF2b2lkIGJ1Z3Mgb2Ygc2NhbGUgb3IgcG9zaXRpb24uCisKKyAgICAgICAgVGhlIGV4 aXN0aW5nIGFuaW1hdGlvbiBtZXRob2RzIHdlcmUgcmVuYW1lZCBhY2NvcmRpbmdseSBmb3IgY2xh cml0eSBhbmQgY29uc2lzdGVuY3kgd2l0aCB0aGUgdXBkYXRlQ29udGVudCBtZXRob2RzLgorCisg ICAgICAgICogVUlQcm9jZXNzL3F0L1ZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwOgorICAg ICAgICAoV2ViS2l0OjpWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwYW5HZXN0dXJlRW5kZWQp OgorICAgICAgICAoV2ViS2l0OjpWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEdlc3R1 cmVFbmRlZCk6CisgICAgICAgIChXZWJLaXQ6OlZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmFu aW1hdGVDb250ZW50SW50b0JvdW5kYXJpZXNJZk5lZWRlZCk6CisgICAgICAgIChXZWJLaXQ6OlZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmFuaW1hdGVDb250ZW50UG9zaXRpb25JbnRvQm91bmRh cmllc0lmTmVlZGVkKToKKyAgICAgICAgKFdlYktpdDo6Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2lu ZTo6YW5pbWF0ZUNvbnRlbnRTY2FsZUludG9Cb3VuZGFyaWVzSWZOZWVkZWQpOgorICAgICAgICAq IFVJUHJvY2Vzcy9xdC9WaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmg6CisKIDIwMTEtMDgtMTkg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBBbm90aGVy IGF0dGVtcHQgYXQgZml4aW5nIHRoZSBXaW5kb3dzIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1ZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1ZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCmlu ZGV4IDY3MjA3ODNkYTZjNzQxY2NkYzE0OWZlYmNmOWE3YTkxMjkxMWY5OTkuLmY0MTE1MTQ4YmRh MzNkNDY4MzNiYzRiMjUzNzUzOTEyYzBmNTY0Y2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9WaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKQEAgLTE0 OCw3ICsxNDgsNyBAQCB2b2lkIFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBhbkdlc3R1cmVD YW5jZWxsZWQoKQogdm9pZCBWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwYW5HZXN0dXJlRW5k ZWQoKQogewogICAgIFZpZXdwb3J0VXBkYXRlR3VhcmQgZ3VhcmQodGhpcyk7Ci0gICAgYW5pbWF0 ZUNvbnRlbnRQb3NpdGlvblRvQm91bmRhcmllcygpOworICAgIGFuaW1hdGVDb250ZW50SW50b0Jv dW5kYXJpZXNJZk5lZWRlZCgpOwogfQogCiB2b2lkIFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6 OnBpbmNoR2VzdHVyZVN0YXJ0ZWQoKQpAQCAtMTg1LDcgKzE4NSw3IEBAIHZvaWQgVmlld3BvcnRJ bnRlcmFjdGlvbkVuZ2luZTo6cGluY2hHZXN0dXJlRW5kZWQoKQogICAgIHsKICAgICAgICAgVmll d3BvcnRVcGRhdGVHdWFyZCBndWFyZCh0aGlzKTsKICAgICAgICAgLy8gRklYTUU6IHJlc3VtZSB0 aGUgZW5naW5lIGFmdGVyIHRoZSBhbmltYXRpb24uCi0gICAgICAgIGFuaW1hdGVDb250ZW50U2Nh bGVUb0JvdW5kYXJpZXMoKTsKKyAgICAgICAgYW5pbWF0ZUNvbnRlbnRJbnRvQm91bmRhcmllc0lm TmVlZGVkKCk7CiAgICAgfQogICAgIGlmIChtX3BpbmNoU3RhcnRTY2FsZSAhPSBtX2NvbnRlbnQt PnNjYWxlKCkpCiAgICAgICAgIGVtaXQgY29tbWl0U2NhbGVDaGFuZ2UoKTsKQEAgLTI0OCw3ICsy NDgsMTMgQEAgdm9pZCBWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjp1cGRhdGVDb250ZW50UG9z aXRpb25JZk5lZWRlZCgpCiAgICAgLy8gRklYTUU6IGlmIHRoZSBpdGVtIGNhbm5vdCBiZSBmdWxs eSBpbiB2aWV3cG9ydCwgYW5kIGlzIG5vdCBjb3ZlcmluZyB0aGUgdmlld3BvcnQsIHB1c2ggaXQg YmFjayBpbiB2aWV3CiB9CiAKLXZvaWQgVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6YW5pbWF0 ZUNvbnRlbnRQb3NpdGlvblRvQm91bmRhcmllcygpCit2b2lkIFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmU6OmFuaW1hdGVDb250ZW50SW50b0JvdW5kYXJpZXNJZk5lZWRlZCgpCit7CisgICAgYW5p bWF0ZUNvbnRlbnRTY2FsZUludG9Cb3VuZGFyaWVzSWZOZWVkZWQoKTsKKyAgICBhbmltYXRlQ29u dGVudFBvc2l0aW9uSW50b0JvdW5kYXJpZXNJZk5lZWRlZCgpOworfQorCit2b2lkIFZpZXdwb3J0 SW50ZXJhY3Rpb25FbmdpbmU6OmFuaW1hdGVDb250ZW50UG9zaXRpb25JbnRvQm91bmRhcmllc0lm TmVlZGVkKCkKIHsKICAgICBjb25zdCBRUmVjdEYgY29udGVudEdlb21ldHJ5ID0gbV92aWV3cG9y dC0+bWFwUmVjdEZyb21JdGVtKG1fY29udGVudCwgbV9jb250ZW50LT5ib3VuZGluZ1JlY3QoKSk7 CiAgICAgUVBvaW50RiBuZXdQb3MgPSBjb250ZW50R2VvbWV0cnkudG9wTGVmdCgpOwpAQCAtMjc4 LDcgKzI4NCw3IEBAIHZvaWQgVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6YW5pbWF0ZUNvbnRl bnRQb3NpdGlvblRvQm91bmRhcmllcygpCiAgICAgICAgIG1fY29udGVudC0+c2V0UG9zKG5ld1Bv cyk7CiB9CiAKLXZvaWQgVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6YW5pbWF0ZUNvbnRlbnRT Y2FsZVRvQm91bmRhcmllcygpCit2b2lkIFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmFuaW1h dGVDb250ZW50U2NhbGVJbnRvQm91bmRhcmllc0lmTmVlZGVkKCkKIHsKICAgICBjb25zdCBxcmVh bCBjdXJyZW50U2NhbGUgPSBtX2NvbnRlbnQtPnNjYWxlKCk7CiAgICAgY29uc3QgcXJlYWwgYm91 bmRlZFNjYWxlID0gcUJvdW5kKG1fY29uc3RyYWludHMubWluaW11bVNjYWxlLCBjdXJyZW50U2Nh bGUsIG1fY29uc3RyYWludHMubWF4aW11bVNjYWxlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9WaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvVmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCmluZGV4IDM3ZTM4 NjU0N2Y0YTU4ZjZlZThkOTY5ODM3OGMwNmUyMzlhNDM3OWEuLjJmODJiOGU2OTY4MjQ5MWY1YzFh OTA0OWMxNmYxMDk1YTc5YjcyOWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9xdC9WaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1ZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaApAQCAtNzgsOCArNzgsOSBAQCBw cml2YXRlOgogICAgIHZvaWQgdXBkYXRlQ29udGVudFNjYWxlSWZOZWVkZWQoKTsKICAgICB2b2lk IHVwZGF0ZUNvbnRlbnRQb3NpdGlvbklmTmVlZGVkKCk7CiAKLSAgICB2b2lkIGFuaW1hdGVDb250 ZW50UG9zaXRpb25Ub0JvdW5kYXJpZXMoKTsKLSAgICB2b2lkIGFuaW1hdGVDb250ZW50U2NhbGVU b0JvdW5kYXJpZXMoKTsKKyAgICB2b2lkIGFuaW1hdGVDb250ZW50SW50b0JvdW5kYXJpZXNJZk5l ZWRlZCgpOworICAgIHZvaWQgYW5pbWF0ZUNvbnRlbnRQb3NpdGlvbkludG9Cb3VuZGFyaWVzSWZO ZWVkZWQoKTsKKyAgICB2b2lkIGFuaW1hdGVDb250ZW50U2NhbGVJbnRvQm91bmRhcmllc0lmTmVl ZGVkKCk7CiAKICAgICB2b2lkIHNjYWxlQ29udGVudChjb25zdCBRUG9pbnRGJiBjZW50ZXJJbkNv bnRlbnRDb29yZGluYXRlLCBxcmVhbCBzY2FsZSk7CiAK