135187 2014-07-22 20:11:38 -0700 [iOS][WK2] r171124 is incorrect when the virtual keyboard is up 2014-07-23 22:02:42 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin oldest_to_newest 1024152 0 benjamin 2014-07-22 20:11:38 -0700 [iOS][WK2] r171124 is incorrect when the virtual keyboard is up 1024155 1 235339 benjamin 2014-07-22 20:37:24 -0700 Created attachment 235339 Patch 1024167 2 235339 simon.fraser 2014-07-22 22:33:33 -0700 Comment on attachment 235339 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=235339&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:803 > + CGFloat maxHorizontalOffset = contentSize.width + contentInsets.right - scrollViewSize.width; > + if (contentOffset.x > maxHorizontalOffset) > + contentOffset.x = maxHorizontalOffset; > + CGFloat maxVerticalOffset = contentSize.height + contentInsets.bottom - scrollViewSize.height; > + if (contentOffset.y > maxVerticalOffset) > + contentOffset.y = maxVerticalOffset; > + if (contentOffset.x < -contentInsets.left) > + contentOffset.x = -contentInsets.left; > + if (contentOffset.y < -contentInsets.top) > + contentOffset.y = -contentInsets.top; > + return contentOffset; std::min()/std::max()? 1024443 3 benjamin 2014-07-23 22:02:42 -0700 Committed r171507: <http://trac.webkit.org/changeset/171507> 235339 2014-07-22 20:37:24 -0700 2014-07-22 22:33:32 -0700 Patch bug-135187-20140722203626.patch text/plain 6989 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTcxMzUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZGJjMGJjYWZiOGY3Y2Ex YmYzMjk2OTM5MWE2ZmEyYzExMTZmNGRkYy4uN2FjNTBmYzdlNjM2MDBjY2U4NjdhMDM4MDQyMzk0 N2E4NjNhMmQwYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM3IEBACiAyMDE0LTA3LTIyICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCisgICAgICAgIFtpT1NdW1dLMl0g cjE3MTEyNCBpcyBpbmNvcnJlY3Qgd2hlbiB0aGUgdmlydHVhbCBrZXlib2FyZCBpcyB1cAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1MTg3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVW5mb3J0dW5hdGVs eSwgcmVzdHJpY3RpbmcgdGhlIGlucHV0IGludG8gdGhlIGRvY3VtZW50IHJlY3QgZG9lcyBub3Qg d29yay4KKyAgICAgICAgV2hlbiB0aGUga2V5Ym9hcmQgaXMgdXAsIHRoZSBrZXlib2FyZCBib3Vu ZHMgY2FuIG92ZXJsYXAgdGhlIFdLV2ViVmlldywgYW5kCisgICAgICAgIHRoZSB2YWxpZCByYW5n ZSBzaG91bGQgYWNjb3VudCBmb3IgdGhhdC4KKworICAgICAgICBJbnN0ZWFkIG9mIHBsYXlpbmcg d2l0aCB0aGUga2V5Ym9hcmQgcmVjdCwgd2UgY2FuIGxpbWl0IHRoZSBzY3JvbGwgcG9zaXRpb24K KyAgICAgICAgaW5zaWRlIHRoZSB2YWxpZCByYW5nZSBvZiBVSVNjcm9sbFZpZXcuIFRoZSBrZXli b2FyZCBhbHdheXMgYWRqdXN0cyB0aGUgVUlTY3JvbGxWaWV3CisgICAgICAgIHJhbmdlIGFzIG5l ZWRlZCB0byBnaXZlIGFjY2VzcyB0byB0aGUgY29udGVudC4gVXNpbmcgdGhhdCByYW5nZSBpcyBh IGJpdCBtb3JlIHBlcm1pc3NpdmUKKyAgICAgICAgYmVjYXVzZSB0aGUgcGFnZSBjb3VsZCBzY3Jv bGwgdG8gcmV2ZWFsIGNvbnRlbnQgaW4gdGhlIGNvbnRlbnQgaW5zZXQgZGVmaW5lZCBieSB0aGUg Y2xpZW50CisgICAgICAgIG9mIHRoZSBBUEkgKHRoaXMgY291bGQgYWN0dWFsbHkgYmUgcXVpdGUg dXNlZnVsIGZvciBoeWJyaWQgYXBwcykuCisKKyAgICAgICAgVGhlcmUgd2FzIGFscmVhZHkgYSBm dW5jdGlvbiB0byBjaGFuZ2UgdGhlIGNvbnRlbnQgb2Zmc2V0IGluIHRoZSB2YWxpZCBzY3JvbGx2 aWV3CisgICAgICAgIHJhbmdlOiBjaGFuZ2VDb250ZW50T2Zmc2V0Qm91bmRlZEluVmFsaWRSYW5n ZSgpLCBJIGV4dHJhY3RlZCB0aGUgcmFuZ2UgY2hlY2sKKyAgICAgICAgdG8gY29udGVudE9mZnNl dEJvdW5kZWRJblZhbGlkUmFuZ2UoKSBmb3IgdGhlIG5lZWRzIG9mIC1bV0tXZWJWaWV3IF9zY3Jv bGxUb0NvbnRlbnRPZmZzZXQ6XS4KKworICAgICAgICBTby4uLmNvbnRlbnRPZmZzZXRCb3VuZGVk SW5WYWxpZFJhbmdlKCkgaXMgY29vbCwgYnV0IGl0IGlzIG5vdCBpbiB0aGUgcmlnaHQgY29vcmRp bmF0ZQorICAgICAgICBzeXN0ZW0uIFRoZSBzY3JvbGwgcG9zaXRpb24gd2UgZ2V0IGZyb20gdGhl IFdlYlByb2Nlc3MgaXMgaW4gZG9jdW1lbnQgY29vcmRpbmF0ZXMsIHdoaWxlCisgICAgICAgIGNv bnRlbnRPZmZzZXRCb3VuZGVkSW5WYWxpZFJhbmdlKCkgd29ya3Mgd2l0aCB0aGUgVUlTY3JvbGxW aWV3IGNvb3JkaW5hdGVzLgorICAgICAgICBUbyBmaXggdGhhdCwgd2Ugc2NhbGUgdGhlIGlucHV0 IHBvc2l0aW9uIHRvIGdldCB0byB0aGUgc2FtZSBzY2FsZSBhcyBVSVNjcm9sbFZpZXcsIHRoZW4K KyAgICAgICAgYXBwbHkgdGhlIGluc2V0cyB3aXRoIHRoZSB3ZWlyZGx5IG5hbWVkIFtXS1dlYlZp ZXcgX2FkanVzdGVkQ29udGVudE9mZnNldDpdLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgIChjb250ZW50T2Zmc2V0Qm91bmRlZEluVmFsaWRS YW5nZSk6CisgICAgICAgIChjaGFuZ2VDb250ZW50T2Zmc2V0Qm91bmRlZEluVmFsaWRSYW5nZSk6 CisgICAgICAgICgtW1dLV2ViVmlldyBfc2Nyb2xsVG9Db250ZW50T2Zmc2V0Ol0pOgorCisyMDE0 LTA3LTIyICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCiAgICAgICAg IFtpT1NdW1dLMl0gV2ViUGFnZVByb3h5IHNob3VsZCBub3QgZG8gYW55dGhpbmcgd2hlbiByZXNw b25kaW5nIHRvIGFuIGFuaW1hdGVkIHJlc2l6ZSBpcyB0aGUgcGFnZSBpcyBub3QgaW4gYSB2YWxp ZCBzdGF0ZQogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTM1MTY5CiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xNzc0MDE0OT4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KaW5kZXggZmYxYTNkMTNmYTEw NmY5ZDEwY2E3MTI2MDFlM2U5ODA0YmE1MzUwMi4uNzU0YjI0NmFjM2E5NjdhYzdiYjAzNjU0MWFm ZjcwYzMzMGM2YjBjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXcubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYlZpZXcubW0KQEAgLTc4NCwyMyArNzg0LDI4IEBAIHN0YXRpYyBXZWJDb3JlOjpDb2xv ciBzY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yKFdLV2ViVmlldyAqd2ViVmlldykKICAgICBfdXNl c01pbmltYWxVSSA9IE5POwogfQogCi1zdGF0aWMgdm9pZCBjaGFuZ2VDb250ZW50T2Zmc2V0Qm91 bmRlZEluVmFsaWRSYW5nZShVSVNjcm9sbFZpZXcgKnNjcm9sbFZpZXcsIFdlYkNvcmU6OkZsb2F0 UG9pbnQgY29udGVudE9mZnNldCkKK3N0YXRpYyBDR1BvaW50IGNvbnRlbnRPZmZzZXRCb3VuZGVk SW5WYWxpZFJhbmdlKFVJU2Nyb2xsVmlldyAqc2Nyb2xsVmlldywgQ0dQb2ludCBjb250ZW50T2Zm c2V0KQogewogICAgIFVJRWRnZUluc2V0cyBjb250ZW50SW5zZXRzID0gc2Nyb2xsVmlldy5jb250 ZW50SW5zZXQ7CiAgICAgQ0dTaXplIGNvbnRlbnRTaXplID0gc2Nyb2xsVmlldy5jb250ZW50U2l6 ZTsKICAgICBDR1NpemUgc2Nyb2xsVmlld1NpemUgPSBzY3JvbGxWaWV3LmJvdW5kcy5zaXplOwog Ci0gICAgZmxvYXQgbWF4SG9yaXpvbnRhbE9mZnNldCA9IGNvbnRlbnRTaXplLndpZHRoICsgY29u dGVudEluc2V0cy5yaWdodCAtIHNjcm9sbFZpZXdTaXplLndpZHRoOwotICAgIGlmIChjb250ZW50 T2Zmc2V0LngoKSA+IG1heEhvcml6b250YWxPZmZzZXQpCi0gICAgICAgIGNvbnRlbnRPZmZzZXQu c2V0WChtYXhIb3Jpem9udGFsT2Zmc2V0KTsKLSAgICBmbG9hdCBtYXhWZXJ0aWNhbE9mZnNldCA9 IGNvbnRlbnRTaXplLmhlaWdodCArIGNvbnRlbnRJbnNldHMuYm90dG9tIC0gc2Nyb2xsVmlld1Np emUuaGVpZ2h0OwotICAgIGlmIChjb250ZW50T2Zmc2V0LnkoKSA+IG1heFZlcnRpY2FsT2Zmc2V0 KQotICAgICAgICBjb250ZW50T2Zmc2V0LnNldFkobWF4VmVydGljYWxPZmZzZXQpOwotICAgIGlm IChjb250ZW50T2Zmc2V0LngoKSA8IC1jb250ZW50SW5zZXRzLmxlZnQpCi0gICAgICAgIGNvbnRl bnRPZmZzZXQuc2V0WCgtY29udGVudEluc2V0cy5sZWZ0KTsKLSAgICBpZiAoY29udGVudE9mZnNl dC55KCkgPCAtY29udGVudEluc2V0cy50b3ApCi0gICAgICAgIGNvbnRlbnRPZmZzZXQuc2V0WSgt Y29udGVudEluc2V0cy50b3ApOwotICAgIHNjcm9sbFZpZXcuY29udGVudE9mZnNldCA9IGNvbnRl bnRPZmZzZXQ7CisgICAgQ0dGbG9hdCBtYXhIb3Jpem9udGFsT2Zmc2V0ID0gY29udGVudFNpemUu d2lkdGggKyBjb250ZW50SW5zZXRzLnJpZ2h0IC0gc2Nyb2xsVmlld1NpemUud2lkdGg7CisgICAg aWYgKGNvbnRlbnRPZmZzZXQueCA+IG1heEhvcml6b250YWxPZmZzZXQpCisgICAgICAgIGNvbnRl bnRPZmZzZXQueCA9IG1heEhvcml6b250YWxPZmZzZXQ7CisgICAgQ0dGbG9hdCBtYXhWZXJ0aWNh bE9mZnNldCA9IGNvbnRlbnRTaXplLmhlaWdodCArIGNvbnRlbnRJbnNldHMuYm90dG9tIC0gc2Ny b2xsVmlld1NpemUuaGVpZ2h0OworICAgIGlmIChjb250ZW50T2Zmc2V0LnkgPiBtYXhWZXJ0aWNh bE9mZnNldCkKKyAgICAgICAgY29udGVudE9mZnNldC55ID0gbWF4VmVydGljYWxPZmZzZXQ7Cisg ICAgaWYgKGNvbnRlbnRPZmZzZXQueCA8IC1jb250ZW50SW5zZXRzLmxlZnQpCisgICAgICAgIGNv bnRlbnRPZmZzZXQueCA9IC1jb250ZW50SW5zZXRzLmxlZnQ7CisgICAgaWYgKGNvbnRlbnRPZmZz ZXQueSA8IC1jb250ZW50SW5zZXRzLnRvcCkKKyAgICAgICAgY29udGVudE9mZnNldC55ID0gLWNv bnRlbnRJbnNldHMudG9wOworICAgIHJldHVybiBjb250ZW50T2Zmc2V0OworfQorCitzdGF0aWMg dm9pZCBjaGFuZ2VDb250ZW50T2Zmc2V0Qm91bmRlZEluVmFsaWRSYW5nZShVSVNjcm9sbFZpZXcg KnNjcm9sbFZpZXcsIFdlYkNvcmU6OkZsb2F0UG9pbnQgY29udGVudE9mZnNldCkKK3sKKyAgICBz Y3JvbGxWaWV3LmNvbnRlbnRPZmZzZXQgPSBjb250ZW50T2Zmc2V0Qm91bmRlZEluVmFsaWRSYW5n ZShzY3JvbGxWaWV3LCBjb250ZW50T2Zmc2V0KTsKIH0KIAogLy8gV2ViQ29yZSBzdG9yZXMgdGhl IHBhZ2Ugc2NhbGUgZmFjdG9yIGFzIGZsb2F0IGluc3RlYWQgb2YgZG91YmxlLiBXaGVuIHdlIGdl dCBhIHNjYWxlIGZyb20gV2ViQ29yZSwKQEAgLTEwMDIsMjkgKzEwMDcsMjIgQEAgc3RhdGljIFdl YkNvcmU6OkZsb2F0UG9pbnQgY29uc3RyYWluQ29udGVudE9mZnNldChXZWJDb3JlOjpGbG9hdFBv aW50IGNvbnRlbnRPZmYKICAgICByZXR1cm4gY29udGVudE9mZnNldDsKIH0KIAotLSAodm9pZClf c2Nyb2xsVG9Db250ZW50T2Zmc2V0OihXZWJDb3JlOjpGbG9hdFBvaW50KWNvbnRlbnRPZmZzZXQK Ky0gKHZvaWQpX3Njcm9sbFRvQ29udGVudE9mZnNldDooV2ViQ29yZTo6RmxvYXRQb2ludCljb250 ZW50T2Zmc2V0SW5QYWdlQ29vcmRpbmF0ZXMKIHsKICAgICBpZiAoX2R5bmFtaWNWaWV3cG9ydFVw ZGF0ZU1vZGUgIT0gRHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZTo6Tm90UmVzaXppbmcpCiAgICAg ICAgIHJldHVybjsKIAotICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgc2NhbGVkT2Zmc2V0ID0gY29u dGVudE9mZnNldDsKKyAgICBXZWJDb3JlOjpGbG9hdFBvaW50IHNjYWxlZE9mZnNldCA9IGNvbnRl bnRPZmZzZXRJblBhZ2VDb29yZGluYXRlczsKICAgICBDR0Zsb2F0IHpvb21TY2FsZSA9IGNvbnRl bnRab29tU2NhbGUoc2VsZik7CiAgICAgc2NhbGVkT2Zmc2V0LnNjYWxlKHpvb21TY2FsZSwgem9v bVNjYWxlKTsKIAotICAgIFdlYkNvcmU6OkZsb2F0UG9pbnQgY29udGVudE9mZnNldEluRG9jdW1l bnQgPSBzY2FsZWRPZmZzZXQ7Ci0gICAgV2ViQ29yZTo6RmxvYXRTaXplIGRvY3VtZW50U2l6ZUlu U2VsZkNvb3JkaW5hdGVzKFtfY29udGVudFZpZXcgZnJhbWVdLnNpemUpOwotICAgIFdlYkNvcmU6 OkZsb2F0U2l6ZSB1bm9ic2N1cmVkUmVjdFNpemUoVUlFZGdlSW5zZXRzSW5zZXRSZWN0KHNlbGYu Ym91bmRzLCBbc2VsZiBfY29tcHV0ZWRDb250ZW50SW5zZXRdKS5zaXplKTsKLQotICAgIGZsb2F0 IG1heGltdW1Ib3Jpem9udGFsT2Zmc2V0ID0gZG9jdW1lbnRTaXplSW5TZWxmQ29vcmRpbmF0ZXMu d2lkdGgoKSAtIHVub2JzY3VyZWRSZWN0U2l6ZS53aWR0aCgpOwotICAgIGZsb2F0IG1heGltdW1W ZXJ0aWNhbE9mZnNldCA9IGRvY3VtZW50U2l6ZUluU2VsZkNvb3JkaW5hdGVzLmhlaWdodCgpIC0g dW5vYnNjdXJlZFJlY3RTaXplLmhlaWdodCgpOwotICAgIGNvbnRlbnRPZmZzZXRJbkRvY3VtZW50 ID0gY29udGVudE9mZnNldEluRG9jdW1lbnQuc2hydW5rVG8oV2ViQ29yZTo6RmxvYXRQb2ludCht YXhpbXVtSG9yaXpvbnRhbE9mZnNldCwgbWF4aW11bVZlcnRpY2FsT2Zmc2V0KSk7Ci0gICAgY29u dGVudE9mZnNldEluRG9jdW1lbnQgPSBjb250ZW50T2Zmc2V0SW5Eb2N1bWVudC5leHBhbmRlZFRv KFdlYkNvcmU6OkZsb2F0UG9pbnQoMCwgMCkpOworICAgIENHUG9pbnQgY29udGVudE9mZnNldElu U2Nyb2xsVmlld0Nvb3JkaW5hdGVzID0gW3NlbGYgX2FkanVzdGVkQ29udGVudE9mZnNldDpzY2Fs ZWRPZmZzZXRdOworICAgIGNvbnRlbnRPZmZzZXRJblNjcm9sbFZpZXdDb29yZGluYXRlcyA9IGNv bnRlbnRPZmZzZXRCb3VuZGVkSW5WYWxpZFJhbmdlKF9zY3JvbGxWaWV3LmdldCgpLCBjb250ZW50 T2Zmc2V0SW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMpOwogCiAgICAgW19zY3JvbGxWaWV3IF9zdG9w U2Nyb2xsaW5nQW5kWm9vbWluZ0FuaW1hdGlvbnNdOwogCi0gICAgQ0dQb2ludCBhZGp1c3RlZENv bnRlbnRPZmZzZXQgPSBbc2VsZiBfYWRqdXN0ZWRDb250ZW50T2Zmc2V0OmNvbnRlbnRPZmZzZXRJ bkRvY3VtZW50XTsKLSAgICBpZiAoIUNHUG9pbnRFcXVhbFRvUG9pbnQoYWRqdXN0ZWRDb250ZW50 T2Zmc2V0LCBbX3Njcm9sbFZpZXcgY29udGVudE9mZnNldF0pKQotICAgICAgICBbX3Njcm9sbFZp ZXcgc2V0Q29udGVudE9mZnNldDphZGp1c3RlZENvbnRlbnRPZmZzZXRdOworICAgIGlmICghQ0dQ b2ludEVxdWFsVG9Qb2ludChjb250ZW50T2Zmc2V0SW5TY3JvbGxWaWV3Q29vcmRpbmF0ZXMsIFtf c2Nyb2xsVmlldyBjb250ZW50T2Zmc2V0XSkpCisgICAgICAgIFtfc2Nyb2xsVmlldyBzZXRDb250 ZW50T2Zmc2V0OmNvbnRlbnRPZmZzZXRJblNjcm9sbFZpZXdDb29yZGluYXRlc107CiAgICAgZWxz ZSB7CiAgICAgICAgIC8vIElmIHdlIGhhdmVuJ3QgY2hhbmdlZCBhbnl0aGluZywgdGhlcmUgd291 bGQgbm90IGJlIGFueSBWaXNpYmxlQ29udGVudFJlY3QgdXBkYXRlIHNlbnQgdG8gdGhlIGNvbnRl bnQuCiAgICAgICAgIC8vIFRoZSBXZWJQcm9jZXNzIHdvdWxkIGtlZXAgdGhlIGludmFsaWQgY29u dGVudE9mZnNldCBhcyBpdHMgc2Nyb2xsIHBvc2l0aW9uLgo=