134952 2014-07-15 16:29:19 -0700 [iOS][WK2] Scrolling request from the scrolling tree must be limited to offsets in the document 2014-07-15 17:20:24 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 benjamin benjamin enrica simon.fraser oldest_to_newest 1022595 0 benjamin 2014-07-15 16:29:19 -0700 [iOS][WK2] Scrolling request from the scrolling tree must be limited to offsets in the document 1022600 1 234965 benjamin 2014-07-15 16:56:26 -0700 Created attachment 234965 Patch 1022601 2 benjamin 2014-07-15 16:58:06 -0700 <rdar://problem/17647116> 1022604 3 234965 enrica 2014-07-15 17:00:48 -0700 Comment on attachment 234965 Patch Looks reasonable to me. 1022605 4 234965 simon.fraser 2014-07-15 17:01:54 -0700 Comment on attachment 234965 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=234965&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:1001 > + if (contentOffsetInDocument.x() > maximumHorizontalOffset) > + contentOffsetInDocument.setX(maximumHorizontalOffset); > + if (contentOffsetInDocument.x() < 0) > + contentOffsetInDocument.setX(0); Maybe something with std::min(std::max(x, 0), max)? > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:1010 > + CGPoint adjustedContentOffset = [self _adjustedContentOffset:contentOffsetInDocument]; Blank line above this please. 1022607 5 benjamin 2014-07-15 17:20:24 -0700 Committed r171124: <http://trac.webkit.org/changeset/171124> 234965 2014-07-15 16:56:26 -0700 2014-07-15 17:01:54 -0700 Patch bug-134952-20140715165546.patch text/plain 6708 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxMTE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjU4YTFhMTUxNDg1Y2Ex YzEzOTg5MjA5YmU3ZWQ2MWZlODI5NmU4Yi4uOGNjMDM0N2ExYjJhNGY2YTAzYWYwNjYwZjY3Zjcz ZmZhY2M5ZDhkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE0LTA3LTE1ICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBbaU9TXVtXSzJd IFNjcm9sbGluZyByZXF1ZXN0IGZyb20gdGhlIHNjcm9sbGluZyB0cmVlIG11c3QgYmUgbGltaXRl ZCB0byBvZmZzZXRzIGluIHRoZSBkb2N1bWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM0OTUyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzY0 NzExNj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBX aGVuIHdlIHJlY2VpdmVkIGEgc2Nyb2xsIHJlcXVlc3QsIHdlIHdlcmUgdGFraW5nIHRoYXQgb2Zm c2V0IGRpcmVjdGx5IHRvIHNldCB0aGUgVUlTY3JvbGxWaWV3CisgICAgICAgIHNjcm9sbCBwb3Np dGlvbi4gVGhpcyBpcyBhIHByb2JsZW0gaWYgYSBwYWdlIHJlcXVlc3Qgc2Nyb2xsaW5nIHRvIGFu IGludmFsaWQgcG9zaXRpb24sIHdlIHdlcmUKKyAgICAgICAgc3RpbGwgZG9pbmcgaXQuCisKKyAg ICAgICAgVGhpcyBwYXRjaCBsaW1pdHMgdGhlIHBvc2l0aW9uIHRvIGJlIGluc2lkZSB0aGUgZG9j dW1lbnQuCisKKyAgICAgICAgLS0gV2h5IG5vdCBsaW1pdCB0aGUgc2Nyb2xsIG9mZnNldCBpbiB0 aGUgV2ViUHJvY2VzcyB3aGVuIHdlIHJlY2VpdmUgdGhlIHNjcm9sbCByZXF1ZXN0PyAtLQorCisg ICAgICAgIFNvbWUgcGFnZXMgcmVseSBvbiB0aGUgcGFnZSBzY2FsZSBmYWN0b3IgY2hhbmdpbmcg aW5zdGFudGx5LCBiZWNhdXNlIHRoYXQgaXMgaG93IGl0IHdvcmtlZAorICAgICAgICBvbiBXZWJL aXQxLgorCisgICAgICAgIE9uIFdlYktpdDIsIHRoZSBXZWJQcm9jZXNzIGNhbm5vdCBrbm93IHRo ZSB2YWxpZCByYW5nZSBiZWNhdXNlIHRoZSBvYnNjdXJlZCBpbnNldHMgYXJlIGNoYW5naW5nCisg ICAgICAgIGR5bmFtaWNhbGx5LCBhbmQgdGhlIHBhZ2Ugc2NhbGUgZmFjdG9yIGNhbiBjaGFuZ2Ug aW4gcmVzcG9uc2UgdG8gV2ViUHJvY2VzcyBldmVudHMgKHRoZSBmb2N1cworICAgICAgICBjaGFu Z2luZyBmb3IgZXhhbXBsZSkuIFRvIG1ha2UgdGhlIHBhZ2Ugd29ya3MsIHRoZSBXZWJQcm9jZXNz IGRvZXMgbm90IHJlc3RyaWN0IHRoZSBzY3JvbGwgcG9zaXRpb24uCisKKyAgICAgICAgSW4gdGhh dCBhcmNoaXRlY3R1cmUsIHRoZSBVSVByb2Nlc3MgaGFzIHRvIHNhbml0aXplIHRoZSBpbnB1dCwg d2hpY2ggd2FzIG5vdCBkb25lIGJlZm9yZSB0aGlzIHBhdGNoLgorCisgICAgICAgIC0tIFdoeSBu b3QgdXNlIGNoYW5nZUNvbnRlbnRPZmZzZXRCb3VuZGVkSW5WYWxpZFJhbmdlKCk/CisKKyAgICAg ICAgVGhlIHNjcm9sbCBvZmZzZXQgYXMgc2VlbiBieSB0aGUgcGFnZSBpcyByZWxhdGl2ZSB0byB0 aGUgdW5vYnNjdXJlZCByZWN0LiBXaGlsZSB0aGUgcG9zaXRpb24gdXNlZAorICAgICAgICBmb3Ig aGlzdG9yeSBpdGVtIGlzIGEgdmlzdWFsIHBvc2l0aW9uLiBBbGwgd2UgbmVlZCBpbiB0aGlzIGNh c2UgaXMgYSBwb3NpdGlvbiBpbiB0aGUgdmlldy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkv Q29jb2EvV0tXZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3Njcm9sbFRvQ29udGVu dE9mZnNldDpdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5Lmg6CisgICAgICAg ICogVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW06CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6cmVzZW5kTGFzdFZpc2libGVDb250ZW50UmVjdHMpOgorCiAyMDE0LTA3LTE1 ICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lP TihXSzIgaU9TKTogU2FmYXJpIGhhbmdzIHdoZW4gc3dpdGNoaW5nIGZvY3VzIGZyb20gYSBmaWVs ZCB1c2luZyB0aGUgVGFiIGtleS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXcubW0KaW5kZXggMjNjYmVkN2YzZGRlYWIzM2YxNTgxZGJlYTIwZjUzZDI1 NTc0ZmYyNy4uZDgyNmM5NTJmZmU5ZGIxZDU3MWMzYzIwZDNlNjhlYWQ0Y2UyYjdmNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTk4 NiwxMyArOTg2LDM2IEBAIHN0YXRpYyBXZWJDb3JlOjpGbG9hdFBvaW50IGNvbnN0cmFpbkNvbnRl bnRPZmZzZXQoV2ViQ29yZTo6RmxvYXRQb2ludCBjb250ZW50T2ZmCiAgICAgaWYgKF9pc0FuaW1h dGluZ1Jlc2l6ZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgW19zY3JvbGxWaWV3IF9zdG9wU2Ny b2xsaW5nQW5kWm9vbWluZ0FuaW1hdGlvbnNdOwotCiAgICAgV2ViQ29yZTo6RmxvYXRQb2ludCBz Y2FsZWRPZmZzZXQgPSBjb250ZW50T2Zmc2V0OwogICAgIENHRmxvYXQgem9vbVNjYWxlID0gY29u dGVudFpvb21TY2FsZShzZWxmKTsKICAgICBzY2FsZWRPZmZzZXQuc2NhbGUoem9vbVNjYWxlLCB6 b29tU2NhbGUpOwogCi0gICAgW19zY3JvbGxWaWV3IHNldENvbnRlbnRPZmZzZXQ6W3NlbGYgX2Fk anVzdGVkQ29udGVudE9mZnNldDpzY2FsZWRPZmZzZXRdXTsKKyAgICBXZWJDb3JlOjpGbG9hdFBv aW50IGNvbnRlbnRPZmZzZXRJbkRvY3VtZW50ID0gc2NhbGVkT2Zmc2V0OworICAgIFdlYkNvcmU6 OkZsb2F0U2l6ZSBkb2N1bWVudFNpemVJblNlbGZDb29yZGluYXRlcyhbX2NvbnRlbnRWaWV3IGZy YW1lXS5zaXplKTsKKyAgICBXZWJDb3JlOjpGbG9hdFNpemUgdW5vYnNjdXJlZFJlY3RTaXplKFVJ RWRnZUluc2V0c0luc2V0UmVjdChzZWxmLmJvdW5kcywgW3NlbGYgX2NvbXB1dGVkQ29udGVudElu c2V0XSkuc2l6ZSk7CisKKyAgICBmbG9hdCBtYXhpbXVtSG9yaXpvbnRhbE9mZnNldCA9IGRvY3Vt ZW50U2l6ZUluU2VsZkNvb3JkaW5hdGVzLndpZHRoKCkgLSB1bm9ic2N1cmVkUmVjdFNpemUud2lk dGgoKTsKKyAgICBpZiAoY29udGVudE9mZnNldEluRG9jdW1lbnQueCgpID4gbWF4aW11bUhvcml6 b250YWxPZmZzZXQpCisgICAgICAgIGNvbnRlbnRPZmZzZXRJbkRvY3VtZW50LnNldFgobWF4aW11 bUhvcml6b250YWxPZmZzZXQpOworICAgIGlmIChjb250ZW50T2Zmc2V0SW5Eb2N1bWVudC54KCkg PCAwKQorICAgICAgICBjb250ZW50T2Zmc2V0SW5Eb2N1bWVudC5zZXRYKDApOworCisgICAgZmxv YXQgbWF4aW11bVZlcnRpY2FsT2Zmc2V0ID0gZG9jdW1lbnRTaXplSW5TZWxmQ29vcmRpbmF0ZXMu aGVpZ2h0KCkgLSB1bm9ic2N1cmVkUmVjdFNpemUuaGVpZ2h0KCk7CisgICAgaWYgKGNvbnRlbnRP ZmZzZXRJbkRvY3VtZW50LnkoKSA+IG1heGltdW1WZXJ0aWNhbE9mZnNldCkKKyAgICAgICAgY29u dGVudE9mZnNldEluRG9jdW1lbnQuc2V0WShtYXhpbXVtVmVydGljYWxPZmZzZXQpOworICAgIGlm IChjb250ZW50T2Zmc2V0SW5Eb2N1bWVudC55KCkgPCAwKQorICAgICAgICBjb250ZW50T2Zmc2V0 SW5Eb2N1bWVudC5zZXRZKDApOworCisgICAgW19zY3JvbGxWaWV3IF9zdG9wU2Nyb2xsaW5nQW5k Wm9vbWluZ0FuaW1hdGlvbnNdOworICAgIENHUG9pbnQgYWRqdXN0ZWRDb250ZW50T2Zmc2V0ID0g W3NlbGYgX2FkanVzdGVkQ29udGVudE9mZnNldDpjb250ZW50T2Zmc2V0SW5Eb2N1bWVudF07Cisg ICAgaWYgKCFDR1BvaW50RXF1YWxUb1BvaW50KGFkanVzdGVkQ29udGVudE9mZnNldCwgW19zY3Jv bGxWaWV3IGNvbnRlbnRPZmZzZXRdKSkKKyAgICAgICAgW19zY3JvbGxWaWV3IHNldENvbnRlbnRP ZmZzZXQ6YWRqdXN0ZWRDb250ZW50T2Zmc2V0XTsKKyAgICBlbHNlIHsKKyAgICAgICAgLy8gSWYg d2UgaGF2ZW4ndCBjaGFuZ2VkIGFueXRoaW5nLCB0aGVyZSB3b3VsZCBub3QgYmUgYW55IFZpc2li bGVDb250ZW50UmVjdCB1cGRhdGUgc2VudCB0byB0aGUgY29udGVudC4KKyAgICAgICAgLy8gVGhl IFdlYlByb2Nlc3Mgd291bGQga2VlcCB0aGUgaW52YWxpZCBjb250ZW50T2Zmc2V0IGFzIGl0cyBz Y3JvbGwgcG9zaXRpb24uCisgICAgICAgIC8vIFRvIHN5bmNocm9uaXplIHRoZSBXZWJQcm9jZXNz IHdpdGggd2hhdCBpcyBvbiBzY3JlZW4sIHdlIHNlbmQgdGhlIFZpc2libGVDb250ZW50UmVjdCBh Z2Fpbi4KKyAgICAgICAgX3BhZ2UtPnJlc2VuZExhc3RWaXNpYmxlQ29udGVudFJlY3RzKCk7Cisg ICAgfQogfQogCiAtIChCT09MKV9zY3JvbGxUb1JlY3Q6KFdlYkNvcmU6OkZsb2F0UmVjdCl0YXJn ZXRSZWN0IG9yaWdpbjooV2ViQ29yZTo6RmxvYXRQb2ludClvcmlnaW4gbWluaW11bVNjcm9sbERp c3RhbmNlOihmbG9hdCltaW5pbXVtU2Nyb2xsRGlzdGFuY2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuaAppbmRleCBkOGI3YmQ2ZmYxMzJjZWI2NDk5ODFmMDlkMjljNGI3NDI3 Yzk5MzY0Li5jMjNkNTY0NDEyYWUzYjVkMmIwZjI2ODEyMDlkNjBiNjRiN2IxYmU0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCkBAIC0zODMsNiArMzgzLDcgQEAgcHVi bGljOgogICAgIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgdW5vYnNjdXJlZENvbnRlbnRSZWN0 KCkgY29uc3QgeyByZXR1cm4gbV9sYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlLnVub2JzY3Vy ZWRSZWN0KCk7IH0KIAogICAgIHZvaWQgdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyhjb25zdCBX ZWJDb3JlOjpGbG9hdFJlY3QmIGV4cG9zZWRSZWN0LCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3Qm IHVub2JzY3VyZWRSZWN0LCBjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIHVub2JzY3VyZWRSZWN0 SW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMsIGNvbnN0IFdlYkNvcmU6OkZsb2F0UmVjdCYgY3VzdG9t Rml4ZWRQb3NpdGlvblJlY3QsIGRvdWJsZSBzY2FsZSwgYm9vbCBpblN0YWJsZVN0YXRlLCBib29s IGlzQ2hhbmdpbmdPYnNjdXJlZEluc2V0c0ludGVyYWN0aXZlbHksIGRvdWJsZSB0aW1lc3RhbXAs IGRvdWJsZSBob3Jpem9udGFsVmVsb2NpdHksIGRvdWJsZSB2ZXJ0aWNhbFZlbG9jaXR5LCBkb3Vi bGUgc2NhbGVDaGFuZ2VSYXRlKTsKKyAgICB2b2lkIHJlc2VuZExhc3RWaXNpYmxlQ29udGVudFJl Y3RzKCk7CiAKICAgICBlbnVtIGNsYXNzIFVub2JzY3VyZWRSZWN0Q29uc3RyYWludCB7IENvbnN0 cmFpbmVkVG9Eb2N1bWVudFJlY3QsIFVuY29uc3RyYWluZWQgfTsKICAgICBXZWJDb3JlOjpGbG9h dFJlY3QgY29tcHV0ZUN1c3RvbUZpeGVkUG9zaXRpb25SZWN0KGNvbnN0IFdlYkNvcmU6OkZsb2F0 UmVjdCYgdW5vYnNjdXJlZENvbnRlbnRSZWN0LCBkb3VibGUgZGlzcGxheWVkQ29udGVudFNjYWxl LCBVbm9ic2N1cmVkUmVjdENvbnN0cmFpbnQgPSBVbm9ic2N1cmVkUmVjdENvbnN0cmFpbnQ6OlVu Y29uc3RyYWluZWQpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2lvcy9XZWJQYWdlUHJveHlJT1MubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dl YlBhZ2VQcm94eUlPUy5tbQppbmRleCA5MzAzOTRmMzkyZTFmYTE1ZmQ5NTVmOGZlNjZkZTE2YjI2 ZDJjMDM2Li42YTllNmYxZDgwZmY5NDJjY2U2OTc0NDNjYTU0MzVhNjM5ZDM2MmFkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQpAQCAtMTkz LDYgKzE5MywxMSBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0 cyhjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmIGV4cG9zZWRSZQogICAgIG1fcHJvY2Vzcy0+c2Vu ZChNZXNzYWdlczo6Vmlld1VwZGF0ZURpc3BhdGNoZXI6OlZpc2libGVDb250ZW50UmVjdFVwZGF0 ZShtX3BhZ2VJRCwgdmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlSW5mbyksIDApOwogfQogCit2b2lk IFdlYlBhZ2VQcm94eTo6cmVzZW5kTGFzdFZpc2libGVDb250ZW50UmVjdHMoKQoreworICAgIG1f cHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6Vmlld1VwZGF0ZURpc3BhdGNoZXI6OlZpc2libGVDb250 ZW50UmVjdFVwZGF0ZShtX3BhZ2VJRCwgbV9sYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlKSwg MCk7Cit9CisKIHN0YXRpYyBpbmxpbmUgZmxvYXQgYWRqdXN0ZWRVbmV4cG9zZWRFZGdlKGZsb2F0 IGRvY3VtZW50RWRnZSwgZmxvYXQgZXhwb3NlZFJlY3RFZGdlLCBmbG9hdCBmYWN0b3IpCiB7CiAg ICAgaWYgKGV4cG9zZWRSZWN0RWRnZSA8IGRvY3VtZW50RWRnZSkK