131611 2014-04-14 02:58:04 -0700 Make WK(Web)View magnification setters actually use view-relative positions 2014-04-14 10:28:39 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton andersca simon.fraser oldest_to_newest 1000456 0 thorton 2014-04-14 02:58:04 -0700 WKWebView/WKView's setMagnification: and setMagnification:centeredAtPoint: both expose the somewhat bizarre but widespread notion of a scale "origin", which really just translates into the scroll position post-scale. We intended for setMagnification: and setMagnification:centeredAtPoint: to use view-relative points (and points within the view instead of (negative) scroll position) to center the zoom, as those make much more sense as exposed API. <rdar://problem/15965239> 1000457 1 229276 thorton 2014-04-14 03:05:37 -0700 Created attachment 229276 patch 1000534 2 thorton 2014-04-14 10:28:39 -0700 http://trac.webkit.org/changeset/167253 229276 2014-04-14 03:05:37 -0700 2014-04-14 08:33:36 -0700 patch scale.diff text/plain 5821 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBiNGE3MGRmLi5hY2NkZGY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTQtMDQtMTQgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgTWFrZSBXSyhXZWIpVmlldyBtYWduaWZpY2F0aW9uIHNldHRlcnMgYWN0dWFsbHkg dXNlIHZpZXctcmVsYXRpdmUgcG9zaXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMzE2MTEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE1OTY1 MjM5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tOgorICAgICAgICAoLVtXS1ZpZXcgc2V0TWFnbmlm aWNhdGlvbjpjZW50ZXJlZEF0UG9pbnQ6XSk6CisgICAgICAgICgtW1dLVmlldyBzZXRNYWduaWZp Y2F0aW9uOl0pOgorICAgICAgICBVc2Ugc2NhbGVQYWdlSW5WaWV3Q29vcmRpbmF0ZXMgaW5zdGVh ZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OnNjYWxlUGFnZUluVmlld0Nvb3JkaW5hdGVzKToKKyAgICAgICAg KiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzY2FsZVBhZ2VJblZpZXdD b29yZGluYXRlcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnBhZ2VTY2FsZUZhY3Rvcik6 CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5tZXNzYWdlcy5pbjoKKyAgICAgICAgQWRkIHNjYWxlUGFn ZUluVmlld0Nvb3JkaW5hdGVzLCB3aGljaCB0dXJucyB0aGUgc2NhbGUgY2VudGVycG9pbnQgd2l0 aGluIHRoZSB2aWV3CisgICAgICAgIGludG8gd2hhdCBzY2FsZVBhZ2UgZXhwZWN0czogYSBwb3N0 LXNjYWxlIHNjcm9sbCBvZmZzZXQuCisKIDIwMTQtMDQtMTMgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNA YXBwbGUuY29tPgogCiAgICAgICAgIFtRdWlja0xvb2tdIE1vdmUgZmlsZSBzeXN0ZW0tcmVsYXRl ZCBjb2RlIGludG8gV2ViS2l0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL21hYy9XS1ZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1Zp ZXcubW0KaW5kZXggMTYyZjQyOC4uMjk1M2E4NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvbWFjL1dLVmlldy5tbQpAQCAtMzg2OSwxMyArMzg2OSwxMyBAQCBzdGF0aWMgTlNTdHJp bmcgKnBhdGhXaXRoVW5pcXVlRmlsZW5hbWVGb3JQYXRoKE5TU3RyaW5nICpwYXRoKQogCiAtICh2 b2lkKXNldE1hZ25pZmljYXRpb246KGRvdWJsZSltYWduaWZpY2F0aW9uIGNlbnRlcmVkQXRQb2lu dDooTlNQb2ludClwb2ludAogewotICAgIF9kYXRhLT5fcGFnZS0+c2NhbGVQYWdlKG1hZ25pZmlj YXRpb24sIHJvdW5kZWRJbnRQb2ludChwb2ludCkpOworICAgIF9kYXRhLT5fcGFnZS0+c2NhbGVQ YWdlSW5WaWV3Q29vcmRpbmF0ZXMobWFnbmlmaWNhdGlvbiwgcm91bmRlZEludFBvaW50KHBvaW50 KSk7CiB9CiAKIC0gKHZvaWQpc2V0TWFnbmlmaWNhdGlvbjooZG91YmxlKW1hZ25pZmljYXRpb24K IHsKICAgICBGbG9hdFBvaW50IHZpZXdDZW50ZXIoTlNNaWRYKFtzZWxmIGJvdW5kc10pLCBOU01p ZFkoW3NlbGYgYm91bmRzXSkpOwotICAgIF9kYXRhLT5fcGFnZS0+c2NhbGVQYWdlKG1hZ25pZmlj YXRpb24sIHJvdW5kZWRJbnRQb2ludCh2aWV3Q2VudGVyKSk7CisgICAgX2RhdGEtPl9wYWdlLT5z Y2FsZVBhZ2VJblZpZXdDb29yZGluYXRlcyhtYWduaWZpY2F0aW9uLCByb3VuZGVkSW50UG9pbnQo dmlld0NlbnRlcikpOwogfQogCiAtIChkb3VibGUpbWFnbmlmaWNhdGlvbgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCAzY2M3MTA1Li40YWFlZTQ1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMTczMCw2ICsxNzMw LDE1IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpzY2FsZVBhZ2UoZG91YmxlIHNjYWxlLCBjb25zdCBJ bnRQb2ludCYgb3JpZ2luKQogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6 U2NhbGVQYWdlKHNjYWxlLCBvcmlnaW4pLCBtX3BhZ2VJRCk7CiB9CiAKK3ZvaWQgV2ViUGFnZVBy b3h5OjpzY2FsZVBhZ2VJblZpZXdDb29yZGluYXRlcyhkb3VibGUgc2NhbGUsIGNvbnN0IEludFBv aW50JiBjZW50ZXJJblZpZXdDb29yZGluYXRlcykKK3sKKyAgICBpZiAoIWlzVmFsaWQoKSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgbV9wYWdlU2NhbGVGYWN0b3IgPSBzY2FsZTsKKyAgICBtX3By b2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlNjYWxlUGFnZUluVmlld0Nvb3JkaW5hdGVz KHNjYWxlLCBjZW50ZXJJblZpZXdDb29yZGluYXRlcyksIG1fcGFnZUlEKTsKK30KKwogdm9pZCBX ZWJQYWdlUHJveHk6OnNldEludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yKGZsb2F0IHNjYWxlRmFj dG9yKQogewogICAgIGlmIChtX2ludHJpbnNpY0RldmljZVNjYWxlRmFjdG9yID09IHNjYWxlRmFj dG9yKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IGRiYTNjYTYu LjIyOWE1ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTcz MSw2ICs3MzEsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRQYWdlQW5kVGV4dFpvb21GYWN0b3Jz KGRvdWJsZSBwYWdlWm9vbUZhY3RvciwgZG91YmxlIHRleHRab29tRmFjdG9yKTsKIAogICAgIHZv aWQgc2NhbGVQYWdlKGRvdWJsZSBzY2FsZSwgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIG9yaWdp bik7CisgICAgdm9pZCBzY2FsZVBhZ2VJblZpZXdDb29yZGluYXRlcyhkb3VibGUgc2NhbGUsIGNv bnN0IFdlYkNvcmU6OkludFBvaW50JiBjZW50ZXJJblZpZXdDb29yZGluYXRlcyk7CiAgICAgZG91 YmxlIHBhZ2VTY2FsZUZhY3RvcigpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZVNjYWxlRmFjdG9yOyB9 CiAKICAgICBmbG9hdCBkZXZpY2VTY2FsZUZhY3RvcigpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDVlODdkNjcuLmQ3MzBmNDAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAg LTEyOTgsMTIgKzEyOTgsMjMgQEAgdm9pZCBXZWJQYWdlOjpzY2FsZVBhZ2UoZG91YmxlIHNjYWxl LCBjb25zdCBJbnRQb2ludCYgb3JpZ2luKQogICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94 eTo6UGFnZVNjYWxlRmFjdG9yRGlkQ2hhbmdlKHNjYWxlKSk7CiB9CiAKK3ZvaWQgV2ViUGFnZTo6 c2NhbGVQYWdlSW5WaWV3Q29vcmRpbmF0ZXMoZG91YmxlIHNjYWxlLCBJbnRQb2ludCBjZW50ZXJJ blZpZXdDb29yZGluYXRlcykKK3sKKyAgICBpZiAoc2NhbGUgPT0gcGFnZVNjYWxlRmFjdG9yKCkp CisgICAgICAgIHJldHVybjsKKworICAgIEludFBvaW50IHNjcm9sbFBvc2l0aW9uQXROZXdTY2Fs ZSA9IG1haW5GcmFtZVZpZXcoKS0+cm9vdFZpZXdUb0NvbnRlbnRzKC1jZW50ZXJJblZpZXdDb29y ZGluYXRlcyk7CisgICAgZG91YmxlIHNjYWxlUmF0aW8gPSBzY2FsZSAvIHBhZ2VTY2FsZUZhY3Rv cigpOworICAgIHNjcm9sbFBvc2l0aW9uQXROZXdTY2FsZS5zY2FsZShzY2FsZVJhdGlvLCBzY2Fs ZVJhdGlvKTsKKyAgICBzY2FsZVBhZ2Uoc2NhbGUsIHNjcm9sbFBvc2l0aW9uQXROZXdTY2FsZSk7 Cit9CisKIGRvdWJsZSBXZWJQYWdlOjpwYWdlU2NhbGVGYWN0b3IoKSBjb25zdAogewogICAgIFBs dWdpblZpZXcqIHBsdWdpblZpZXcgPSBwbHVnaW5WaWV3Rm9yRnJhbWUoJm1fcGFnZS0+bWFpbkZy YW1lKCkpOwogICAgIGlmIChwbHVnaW5WaWV3ICYmIHBsdWdpblZpZXctPmhhbmRsZXNQYWdlU2Nh bGVGYWN0b3IoKSkKICAgICAgICAgcmV0dXJuIHBsdWdpblZpZXctPnBhZ2VTY2FsZUZhY3Rvcigp OwotICAgIAorCiAgICAgcmV0dXJuIG1fcGFnZS0+cGFnZVNjYWxlRmFjdG9yKCk7CiB9CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IGUzNmZkOGIu LjYyMDMzZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu aApAQCAtMzQ5LDYgKzM0OSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHdpbmRvd1NjcmVlbkRpZENo YW5nZSh1aW50NjRfdCk7CiAKICAgICB2b2lkIHNjYWxlUGFnZShkb3VibGUgc2NhbGUsIGNvbnN0 IFdlYkNvcmU6OkludFBvaW50JiBvcmlnaW4pOworICAgIHZvaWQgc2NhbGVQYWdlSW5WaWV3Q29v cmRpbmF0ZXMoZG91YmxlIHNjYWxlLCBXZWJDb3JlOjpJbnRQb2ludCBjZW50ZXJJblZpZXdDb29y ZGluYXRlcyk7CiAgICAgZG91YmxlIHBhZ2VTY2FsZUZhY3RvcigpIGNvbnN0OwogCiAgICAgdm9p ZCBzZXRVc2VGaXhlZExheW91dChib29sKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLm1lc3NhZ2VzLmluIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KaW5kZXggM2ZhMDZkMi4uNzczOTUx MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu bWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBh Z2UubWVzc2FnZXMuaW4KQEAgLTE2Nyw2ICsxNjcsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlIExl Z2FjeVJlY2VpdmVyIHsKICAgICBXaW5kb3dTY3JlZW5EaWRDaGFuZ2UodWludDY0X3QgZGlzcGxh eUlEKQogCiAgICAgU2NhbGVQYWdlKGRvdWJsZSBzY2FsZSwgV2ViQ29yZTo6SW50UG9pbnQgb3Jp Z2luKQorICAgIFNjYWxlUGFnZUluVmlld0Nvb3JkaW5hdGVzKGRvdWJsZSBzY2FsZSwgV2ViQ29y ZTo6SW50UG9pbnQgY2VudGVySW5WaWV3Q29vcmRpbmF0ZXMpCiAKICAgICBTZXRVc2VGaXhlZExh eW91dChib29sIGZpeGVkKQogICAgIFNldEZpeGVkTGF5b3V0U2l6ZShXZWJDb3JlOjpJbnRTaXpl IHNpemUpCg==