125813 2013-12-16 16:12:54 -0800 WKView.magnification should include magnification due to the active gesture 2013-12-16 16:32:26 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton andersca mitz sam simon.fraser oldest_to_newest 960288 0 thorton 2013-12-16 16:12:54 -0800 Otherwise, the parent app cannot tell if the effective scale is != 1 during the initial pinch in. Plus, it makes more sense this way. 960293 1 219366 thorton 2013-12-16 16:25:12 -0800 Created attachment 219366 patch 960296 2 219366 simon.fraser 2013-12-16 16:29:01 -0800 Comment on attachment 219366 patch View in context: https://bugs.webkit.org/attachment.cgi?id=219366&action=review > Source/WebKit2/UIProcess/mac/ViewGestureController.h:43 > + double magnification(); const? 960299 3 thorton 2013-12-16 16:32:26 -0800 http://trac.webkit.org/changeset/160675 219366 2013-12-16 16:25:12 -0800 2013-12-16 16:29:01 -0800 patch zoom.diff text/plain 2667 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA0ZDhmY2RkLi4xYjk5OTQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMg QEAKKzIwMTMtMTItMTYgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgV0tWaWV3Lm1hZ25pZmljYXRpb24gc2hvdWxkIGluY2x1ZGUgbWFnbmlmaWNhdGlv biBkdWUgdG8gdGhlIGFjdGl2ZSBnZXN0dXJlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMjU4MTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBNYWtlIFdLVmlldy5tYWduaWZpY2F0aW9uIHJlc3BlY3QgYWN0 aXZlIHBpbmNoLXpvb20gZ2VzdHVyZXMuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9X S1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBtYWduaWZpY2F0aW9uXSk6CisgICAgICAgIElm IHdlIGhhdmUgYSBWaWV3R2VzdHVyZUNvbnRyb2xsZXIsIGRlZmVyIHRvIGl0IGZvciB0aGUgY3Vy cmVudCBtYWduaWZpY2F0aW9uLgorCisgICAgICAgICogVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVy ZUNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpWaWV3R2VzdHVyZUNvbnRyb2xsZXI6 Om1hZ25pZmljYXRpb24pOgorICAgICAgICBSZXR1cm4gZWl0aGVyIHRoZSBjdXJyZW50IHBpbmNo LXpvb20gbWFnbmlmaWNhdGlvbiwgaWYgd2UncmUgaW4gdGhlIG1pZGRsZSBvZiBhIGdlc3R1cmUs CisgICAgICAgIG9yIHRoZSBwYWdlU2NhbGVGYWN0b3IsIGlmIHdlJ3JlIG5vdC4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmg6CisKIDIwMTMtMTItMTUg IFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViS2l0 MiBWaWV3IEdlc3R1cmVzOiBDYW4ndCBwaW5jaCBpbiBwYXN0IHRoZSBtYXhpbXVtIHNjYWxlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0gYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KaW5kZXggZmY3YzMzMS4u MzIyMjQzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tW aWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFjL1dLVmlldy5tbQpA QCAtMzMwNyw2ICszMzA3LDkgQEAgc3RhdGljIE5TU3RyaW5nICpwYXRoV2l0aFVuaXF1ZUZpbGVu YW1lRm9yUGF0aChOU1N0cmluZyAqcGF0aCkKIAogLSAoZG91YmxlKW1hZ25pZmljYXRpb24KIHsK KyAgICBpZiAoX2RhdGEtPl9nZXN0dXJlQ29udHJvbGxlcikKKyAgICAgICAgcmV0dXJuIF9kYXRh LT5fZ2VzdHVyZUNvbnRyb2xsZXItPm1hZ25pZmljYXRpb24oKTsKKwogICAgIHJldHVybiBfZGF0 YS0+X3BhZ2UtPnBhZ2VTY2FsZUZhY3RvcigpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5jcHAKaW5kZXggOWRiMGJl OS4uOGUzYmE3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3 R2VzdHVyZUNvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMv Vmlld0dlc3R1cmVDb250cm9sbGVyLmNwcApAQCAtMTQ0LDQgKzE0NCwxMiBAQCB2b2lkIFZpZXdH ZXN0dXJlQ29udHJvbGxlcjo6ZW5kQWN0aXZlR2VzdHVyZSgpCiAgICAgbV9hY3RpdmVHZXN0dXJl VHlwZSA9IFZpZXdHZXN0dXJlVHlwZTo6Tm9uZTsKIH0KIAorZG91YmxlIFZpZXdHZXN0dXJlQ29u dHJvbGxlcjo6bWFnbmlmaWNhdGlvbigpCit7CisgICAgaWYgKG1fYWN0aXZlR2VzdHVyZVR5cGUg PT0gVmlld0dlc3R1cmVUeXBlOjpNYWduaWZpY2F0aW9uKQorICAgICAgICByZXR1cm4gbV9tYWdu aWZpY2F0aW9uOworCisgICAgcmV0dXJuIG1fd2ViUGFnZVByb3h5LnBhZ2VTY2FsZUZhY3Rvcigp OworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVDb250cm9sbGVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvbWFjL1ZpZXdHZXN0dXJlQ29udHJvbGxlci5oCmluZGV4IDI4NzM5YTguLjI0Yzky ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvVmlld0dlc3R1cmVD b250cm9sbGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9WaWV3R2VzdHVy ZUNvbnRyb2xsZXIuaApAQCAtNDAsNiArNDAsNyBAQCBwdWJsaWM6CiAgICAgflZpZXdHZXN0dXJl Q29udHJvbGxlcigpOwogCiAgICAgdm9pZCBoYW5kbGVNYWduaWZpY2F0aW9uR2VzdHVyZShkb3Vi bGUgc2NhbGUsIFdlYkNvcmU6OkZsb2F0UG9pbnQgb3JpZ2luKTsKKyAgICBkb3VibGUgbWFnbmlm aWNhdGlvbigpOwogCiAgICAgdm9pZCBlbmRBY3RpdmVHZXN0dXJlKCk7CiAK