126728 2014-01-09 16:38:18 -0800 Upstream iOS changes after r161530 2014-01-09 17:14:20 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 thorton thorton commit-queue simon.fraser oldest_to_newest 966132 0 thorton 2014-01-09 16:38:18 -0800 Tiny adjustment to WKContentView. 966133 1 220788 thorton 2014-01-09 16:39:07 -0800 Created attachment 220788 patch 966143 2 220788 commit-queue 2014-01-09 17:14:19 -0800 Comment on attachment 220788 patch Clearing flags on attachment: 220788 Committed r161606: <http://trac.webkit.org/changeset/161606> 966144 3 commit-queue 2014-01-09 17:14:20 -0800 All reviewed patches have been landed. Closing bug. 220788 2014-01-09 16:39:07 -0800 2014-01-09 17:14:19 -0800 patch adopt.diff text/plain 2083 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlMDFmMGFkLi42MTE2NmI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYg QEAKKzIwMTQtMDEtMDkgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgVXBzdHJlYW0gaU9TIGNoYW5nZXMgYWZ0ZXIgcjE2MTUzMAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2NzI4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9X S0NvbnRlbnRWaWV3Lm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3IHNldFZpZXdwb3J0U2l6 ZTpdKToKKyAgICAgICAgKC1bV0tDb250ZW50VmlldyBkaWRGaW5pc2hTY3JvbGxUbzpdKToKKyAg ICAgICAgKC1bV0tDb250ZW50VmlldyBkaWRTY3JvbGxUbzpdKToKKyAgICAgICAgQWRvcHQgdGhl IG5ldyBhcHByb2FjaC4KKwogMjAxNC0wMS0wOSAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNv bT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMTYwMTUyKTogU2VsZWN0aW9uIGRyYWcgc25hcHNo b3QgZG9lc24ndCBhcHBlYXIgb3IgaGFzIHRoZSB3cm9uZyBjb250ZW50IG9uIFJldGluYQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvV0tDb250ZW50Vmlldy5t bSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1dLQ29udGVudFZpZXcubW0KaW5k ZXggZDgzOTI5YS4uMTExOWQwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9pb3MvV0tDb250ZW50Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2lvcy9XS0NvbnRlbnRWaWV3Lm1tCkBAIC0xMzgsMTggKzEzOCwxOCBAQCB1c2luZyBuYW1l c3BhY2UgV2ViS2l0OwogLSAodm9pZClzZXRWaWV3cG9ydFNpemU6KENHU2l6ZSlzaXplCiB7CiAg ICAgX3BhZ2UtPnNldEZpeGVkTGF5b3V0U2l6ZShJbnRTaXplKHNpemUpKTsKLSAgICBfcGFnZS0+ dmlld0V4cG9zZWRSZWN0Q2hhbmdlZChGbG9hdFJlY3QoX3BhZ2UtPnZpZXdFeHBvc2VkUmVjdCgp LmxvY2F0aW9uKCksIEZsb2F0U2l6ZShzaXplKSksIFdlYlBhZ2VQcm94eTo6Q2xpcHNUb0V4cG9z ZWRSZWN0OjpDbGlwKTsKKyAgICBfcGFnZS0+ZHJhd2luZ0FyZWEoKS0+c2V0RXhwb3NlZFJlY3Qo RmxvYXRSZWN0KF9wYWdlLT5kcmF3aW5nQXJlYSgpLT5leHBvc2VkUmVjdCgpLmxvY2F0aW9uKCks IEZsb2F0U2l6ZShzaXplKSkpOwogfQogCiAtICh2b2lkKWRpZEZpbmlzaFNjcm9sbFRvOihDR1Bv aW50KWNvbnRlbnRPZmZzZXQKIHsKICAgICBfcGFnZS0+ZGlkRmluaXNoU2Nyb2xsaW5nKGNvbnRl bnRPZmZzZXQpOwotICAgIF9wYWdlLT52aWV3RXhwb3NlZFJlY3RDaGFuZ2VkKEZsb2F0UmVjdChG bG9hdFBvaW50KGNvbnRlbnRPZmZzZXQpLCBfcGFnZS0+Zml4ZWRMYXlvdXRTaXplKCkpLCBXZWJQ YWdlUHJveHk6OkNsaXBzVG9FeHBvc2VkUmVjdDo6Q2xpcCk7CisgICAgX3BhZ2UtPmRyYXdpbmdB cmVhKCktPnNldEV4cG9zZWRSZWN0KEZsb2F0UmVjdChGbG9hdFBvaW50KGNvbnRlbnRPZmZzZXQp LCBfcGFnZS0+Zml4ZWRMYXlvdXRTaXplKCkpKTsKIH0KIAogLSAodm9pZClkaWRTY3JvbGxUbzoo Q0dQb2ludCljb250ZW50T2Zmc2V0CiB7Ci0gICAgX3BhZ2UtPnZpZXdFeHBvc2VkUmVjdENoYW5n ZWQoRmxvYXRSZWN0KEZsb2F0UG9pbnQoY29udGVudE9mZnNldCksIF9wYWdlLT5maXhlZExheW91 dFNpemUoKSksIFdlYlBhZ2VQcm94eTo6Q2xpcHNUb0V4cG9zZWRSZWN0OjpDbGlwKTsKKyAgICBf cGFnZS0+ZHJhd2luZ0FyZWEoKS0+c2V0RXhwb3NlZFJlY3QoRmxvYXRSZWN0KEZsb2F0UG9pbnQo Y29udGVudE9mZnNldCksIF9wYWdlLT5maXhlZExheW91dFNpemUoKSkpOwogfQogCiAtICh2b2lk KWRpZFpvb21Ub1NjYWxlOihDR0Zsb2F0KXNjYWxlCg==