130382 2014-03-17 20:18:52 -0700 [iOS][WebKit2] <rdar://problem/16330387> Do not use the keyboard rect for computing the general unobscuredRect, only use it for centering 2014-03-19 14:55:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin simon.fraser oldest_to_newest 991524 0 benjamin 2014-03-17 20:18:52 -0700 [iOS][WebKit2] <rdar://problem/16330387> Do not use the keyboard rect for computing the general unobscuredRect, only use it for centering 991526 1 227003 benjamin 2014-03-17 20:20:28 -0700 Created attachment 227003 Patch 991552 2 227003 simon.fraser 2014-03-17 22:28:39 -0700 Comment on attachment 227003 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227003&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm:632 > +- (CGRect)_unobscuredContentRectIncludingKeyboard This name is confusing. Does the unobscuring include or exclude the keyboard? 992276 3 benjamin 2014-03-19 14:55:44 -0700 Committed r165924: <http://trac.webkit.org/changeset/165924> 227003 2014-03-17 20:20:28 -0700 2014-03-17 22:28:38 -0700 Patch bug-130382-20140317202005.patch text/plain 4601 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1NzY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODJiOTdlNTIzNGM1ZDU2 MjNkOTUyNDMwY2I2OGY4MjMzNDJkOGY1Mi4uNzRiYmJjODc2NWUzMzFlYThmNTVmYjkyYTc4MDli N2VkMDM3NDI0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTAzLTE3ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dlYktp dDJdIDxyZGFyOi8vcHJvYmxlbS8xNjMzMDM4Nz4gRG8gbm90IHVzZSB0aGUga2V5Ym9hcmQgcmVj dCBmb3IgY29tcHV0aW5nIHRoZSBnZW5lcmFsIHVub2JzY3VyZWRSZWN0LCBvbmx5IHVzZSBpdCBm b3IgY2VudGVyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzAzODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBbHdheXMgYWNjdW11bGF0aW5nIHRoZSBrZXlib2FyZCByZWN0IG91dCBvZiB0aGUgZXhw b3NlZFJlY3QgY2F1c2VkIHNvbWUgaXNzdWVzIChzZWUgPHJkYXI6Ly9wcm9ibGVtLzE2MzMwMzg3 PikuCisgICAgICAgIFRoaXMgcGF0Y2ggc3BsaXQgdGhlIHJlY3QgaW4gdHdvOiB1bm9ic2N1cmVk IHJlY3QgZm9yIFdlYkNvcmUsIGFuZCB1bm9ic2N1cmVkQ29udGVudFJlY3RJbmNsdWRpbmdLZXli b2FyZCBmb3IgY2VudGVyaW5nCisgICAgICAgIFVJIEVsZW1lbnRzIGluIHZpZXcuCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbToKKyAgICAgICAgKC1bV0tXZWJW aWV3IF96b29tVG9SZWN0OldlYkNvcmU6OmF0U2NhbGU6b3JpZ2luOldlYkNvcmU6Ol0pOgorICAg ICAgICAoLVtXS1dlYlZpZXcgX3Njcm9sbFRvUmVjdDpXZWJDb3JlOjpvcmlnaW46V2ViQ29yZTo6 bWluaW11bVNjcm9sbERpc3RhbmNlOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3pvb21Ub1Jl Y3Q6V2ViQ29yZTo6d2l0aE9yaWdpbjpXZWJDb3JlOjpmaXRFbnRpcmVSZWN0Om1pbmltdW1TY2Fs ZTptYXhpbXVtU2NhbGU6bWluaW11bVNjcm9sbERpc3RhbmNlOl0pOgorICAgICAgICAoLVtXS1dl YlZpZXcgX3Vub2JzY3VyZWRDb250ZW50UmVjdEluY2x1ZGluZ0tleWJvYXJkXSk6CisgICAgICAg ICgtW1dLV2ViVmlldyBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c10pOgorCiAyMDE0LTAzLTE3 ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFVuZG8gc29t ZSBhY2NpZGVudGFsIEd0ayBjaGFuZ2VzIGZyb20gaHR0cDovL3RyYWMud2Via2l0Lm9yZy9jaGFu Z2VzZXQvMTY1NzU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2ViVmlldy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Lm1tCmluZGV4IDE0ZjdhYjAzOTE0NGI5OTQxYzQzN2IxOTZlYmQwZmEwN2NiOTVmZWUu LjhhYTk3OWIzYWNmYjhiMTE2MDQ1MmI1YzU3NjVlOGEwNDBjYTRhNGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCkBAIC00NDQsNyArNDQ0 LDcgQEAKIAogLSAodm9pZClfem9vbVRvUmVjdDooV2ViQ29yZTo6RmxvYXRSZWN0KXRhcmdldFJl Y3QgYXRTY2FsZTooZG91YmxlKXNjYWxlIG9yaWdpbjooV2ViQ29yZTo6RmxvYXRQb2ludClvcmln aW4KIHsKLSAgICBXZWJDb3JlOjpGbG9hdFNpemUgdW5vYnNjdXJlZENvbnRlbnRTaXplID0gX3Bh Z2UtPnVub2JzY3VyZWRDb250ZW50UmVjdCgpLnNpemUoKTsKKyAgICBXZWJDb3JlOjpGbG9hdFNp emUgdW5vYnNjdXJlZENvbnRlbnRTaXplKFtzZWxmIF91bm9ic2N1cmVkQ29udGVudFJlY3RJbmNs dWRpbmdLZXlib2FyZF0uc2l6ZSk7CiAgICAgV2ViQ29yZTo6RmxvYXRTaXplIHRhcmdldFJlY3RT aXplQWZ0ZXJab29tID0gdGFyZ2V0UmVjdC5zaXplKCk7CiAgICAgdGFyZ2V0UmVjdFNpemVBZnRl clpvb20uc2NhbGUoc2NhbGUpOwogCkBAIC00NzAsNyArNDcwLDcgQEAgc3RhdGljIFdlYkNvcmU6 OkZsb2F0UG9pbnQgY29uc3RyYWluQ29udGVudE9mZnNldChXZWJDb3JlOjpGbG9hdFBvaW50IGNv bnRlbnRPZmYKIAogLSAoQk9PTClfc2Nyb2xsVG9SZWN0OihXZWJDb3JlOjpGbG9hdFJlY3QpdGFy Z2V0UmVjdCBvcmlnaW46KFdlYkNvcmU6OkZsb2F0UG9pbnQpb3JpZ2luIG1pbmltdW1TY3JvbGxE aXN0YW5jZTooZmxvYXQpbWluaW11bVNjcm9sbERpc3RhbmNlCiB7Ci0gICAgV2ViQ29yZTo6Rmxv YXRSZWN0IHVub2JzY3VyZWRDb250ZW50UmVjdCA9IF9wYWdlLT51bm9ic2N1cmVkQ29udGVudFJl Y3QoKTsKKyAgICBXZWJDb3JlOjpGbG9hdFJlY3QgdW5vYnNjdXJlZENvbnRlbnRSZWN0KFtzZWxm IF91bm9ic2N1cmVkQ29udGVudFJlY3RJbmNsdWRpbmdLZXlib2FyZF0pOwogICAgIFdlYkNvcmU6 OkZsb2F0UG9pbnQgdW5vYnNjdXJlZENvbnRlbnRPZmZzZXQgPSB1bm9ic2N1cmVkQ29udGVudFJl Y3QubG9jYXRpb24oKTsKICAgICBXZWJDb3JlOjpGbG9hdFNpemUgY29udGVudFNpemUoW19jb250 ZW50VmlldyBib3VuZHNdLnNpemUpOwogCkBAIC01MTcsNyArNTE3LDcgQEAgc3RhdGljIFdlYkNv cmU6OkZsb2F0UG9pbnQgY29uc3RyYWluQ29udGVudE9mZnNldChXZWJDb3JlOjpGbG9hdFBvaW50 IGNvbnRlbnRPZmYKIAogICAgIGRvdWJsZSBjdXJyZW50U2NhbGUgPSBbX3Njcm9sbFZpZXcgem9v bVNjYWxlXTsKIAotICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSB1bm9ic2N1cmVkQ29udGVudFNpemUg PSBfcGFnZS0+dW5vYnNjdXJlZENvbnRlbnRSZWN0KCkuc2l6ZSgpOworICAgIFdlYkNvcmU6OkZs b2F0U2l6ZSB1bm9ic2N1cmVkQ29udGVudFNpemUoW3NlbGYgX3Vub2JzY3VyZWRDb250ZW50UmVj dEluY2x1ZGluZ0tleWJvYXJkXS5zaXplKTsKICAgICBkb3VibGUgaG9yaXpvbnRhbFNjYWxlID0g dW5vYnNjdXJlZENvbnRlbnRTaXplLndpZHRoKCkgKiBjdXJyZW50U2NhbGUgLyB0YXJnZXRSZWN0 LndpZHRoKCk7CiAgICAgZG91YmxlIHZlcnRpY2FsU2NhbGUgPSB1bm9ic2N1cmVkQ29udGVudFNp emUuaGVpZ2h0KCkgKiBjdXJyZW50U2NhbGUgLyB0YXJnZXRSZWN0LmhlaWdodCgpOwogCkBAIC02 MjksNiArNjI5LDE0IEBAIHN0YXRpYyBXZWJDb3JlOjpGbG9hdFBvaW50IGNvbnN0cmFpbkNvbnRl bnRPZmZzZXQoV2ViQ29yZTo6RmxvYXRQb2ludCBjb250ZW50T2ZmCiAgICAgW3NlbGYgX3VwZGF0 ZVZpc2libGVDb250ZW50UmVjdHNdOwogfQogCistIChDR1JlY3QpX3Vub2JzY3VyZWRDb250ZW50 UmVjdEluY2x1ZGluZ0tleWJvYXJkCit7CisgICAgVUlFZGdlSW5zZXRzIG9ic2N1cmVkSW5zZXRz ID0gX29ic2N1cmVkSW5zZXRzOworICAgIG9ic2N1cmVkSW5zZXRzLmJvdHRvbSA9IHN0ZDo6bWF4 KF9vYnNjdXJlZEluc2V0cy5ib3R0b20sIF9rZXlib2FyZFZlcnRpY2FsT3ZlcmxhcCk7CisgICAg Q0dSZWN0IHVub2JzY3VyZWRSZWN0ID0gVUlFZGdlSW5zZXRzSW5zZXRSZWN0KHNlbGYuYm91bmRz LCBvYnNjdXJlZEluc2V0cyk7CisgICAgcmV0dXJuIFtzZWxmIGNvbnZlcnRSZWN0OnVub2JzY3Vy ZWRSZWN0IHRvVmlldzpfY29udGVudFZpZXcuZ2V0KCldOworfQorCiAtICh2b2lkKV91cGRhdGVW aXNpYmxlQ29udGVudFJlY3RzCiB7CiAgICAgaWYgKCFbc2VsZiB1c2VzU3RhbmRhcmRDb250ZW50 Vmlld10pCkBAIC02MzcsOSArNjQ1LDcgQEAgc3RhdGljIFdlYkNvcmU6OkZsb2F0UG9pbnQgY29u c3RyYWluQ29udGVudE9mZnNldChXZWJDb3JlOjpGbG9hdFBvaW50IGNvbnRlbnRPZmYKICAgICBD R1JlY3QgZnVsbFZpZXdSZWN0ID0gc2VsZi5ib3VuZHM7CiAgICAgQ0dSZWN0IHZpc2libGVSZWN0 SW5Db250ZW50Q29vcmRpbmF0ZXMgPSBbc2VsZiBjb252ZXJ0UmVjdDpmdWxsVmlld1JlY3QgdG9W aWV3Ol9jb250ZW50Vmlldy5nZXQoKV07CiAKLSAgICBVSUVkZ2VJbnNldHMgb2JzY3VyZWRJbnNl dHMgPSBfb2JzY3VyZWRJbnNldHM7Ci0gICAgb2JzY3VyZWRJbnNldHMuYm90dG9tID0gc3RkOjpt YXgoX29ic2N1cmVkSW5zZXRzLmJvdHRvbSwgX2tleWJvYXJkVmVydGljYWxPdmVybGFwKTsKLSAg ICBDR1JlY3QgdW5vYnNjdXJlZFJlY3QgPSBVSUVkZ2VJbnNldHNJbnNldFJlY3QoZnVsbFZpZXdS ZWN0LCBvYnNjdXJlZEluc2V0cyk7CisgICAgQ0dSZWN0IHVub2JzY3VyZWRSZWN0ID0gVUlFZGdl SW5zZXRzSW5zZXRSZWN0KGZ1bGxWaWV3UmVjdCwgX29ic2N1cmVkSW5zZXRzKTsKICAgICBDR1Jl Y3QgdW5vYnNjdXJlZFJlY3RJbkNvbnRlbnRDb29yZGluYXRlcyA9IFtzZWxmIGNvbnZlcnRSZWN0 OnVub2JzY3VyZWRSZWN0IHRvVmlldzpfY29udGVudFZpZXcuZ2V0KCldOwogCiAgICAgQ0dGbG9h dCBzY2FsZUZhY3RvciA9IFtfc2Nyb2xsVmlldyB6b29tU2NhbGVdOwo=