127085 2014-01-16 00:17:23 -0800 Expose scrollView on WKView 2014-05-10 16:55:34 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ian webkit-unassigned commit-queue mitz oldest_to_newest 968633 0 ian 2014-01-16 00:17:23 -0800 We need to expose scrollView as a property on WKView. 968639 1 221342 ian 2014-01-16 00:53:32 -0800 Created attachment 221342 patch 968670 2 221342 mitz 2014-01-16 02:37:55 -0800 Comment on attachment 221342 patch View in context: https://bugs.webkit.org/attachment.cgi?id=221342&action=review > Source/WebKit2/UIProcess/API/ios/WKScrollView.mm:50 > +- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector We’d normally name the argument “selector”, regardless of what the NSObject header calls it. > Source/WebKit2/UIProcess/API/ios/WKScrollView.mm:60 > +- (BOOL)respondsToSelector:(SEL)aSelector Ditto. > Source/WebKit2/UIProcess/API/ios/WKScrollView.mm:65 > +- (void)forwardInvocation:(NSInvocation *)anInvocation We’d normally name the argument “invocation”. > Source/WebKit2/UIProcess/API/ios/WKScrollView.mm:78 > +{ > + BOOL messageHandled = NO; > + if ([_internalDelegate respondsToSelector:[anInvocation selector]]) { > + [anInvocation invokeWithTarget:_internalDelegate]; > + messageHandled = YES; > + } > + if ([_externalDelegate respondsToSelector:[anInvocation selector]]) { > + [anInvocation invokeWithTarget:_externalDelegate]; > + messageHandled = YES; > + } > + if (!messageHandled) > + [super forwardInvocation:anInvocation]; > +} I wonder if we should also override -forwardingTargetForSelector: so that we can do faster (possibly by an order of magnitude) forwarding of selectors that only one of the delegates implements. Probably not unless we see that this is slow and the alternative is faster. 968671 3 221342 mitz 2014-01-16 02:40:18 -0800 Comment on attachment 221342 patch I didn’t mean to revert Antti’s cq+, I simply started writing my comments before he set the flag. I’m changing it back to cq+ but feel free to make changes. 968672 4 221342 commit-queue 2014-01-16 02:49:06 -0800 Comment on attachment 221342 patch Clearing flags on attachment: 221342 Committed r162121: <http://trac.webkit.org/changeset/162121> 968673 5 commit-queue 2014-01-16 02:49:08 -0800 All reviewed patches have been landed. Closing bug. 968747 6 mitz 2014-01-16 07:11:57 -0800 (In reply to comment #3) > (From update of attachment 221342 [details]) > I didn’t mean to revert Antti’s cq+, I simply started writing my comments before he set the flag. I’m changing it back to cq+ but feel free to make changes. Actually, I should have left it at cq? so that this only got landed after review by a WebKit2 owner. 1008334 7 mitz 2014-05-10 16:55:34 -0700 (In reply to comment #2) > I wonder if we should also override -forwardingTargetForSelector: so that we can do faster (possibly by an order of magnitude) forwarding of selectors that only one of the delegates implements. Probably not unless we see that this is slow and the alternative is faster. Tim Horton just discovered that indeed this is slow and the alternative is faster. See bug 132790. 221342 2014-01-16 00:53:32 -0800 2014-01-16 02:49:06 -0800 patch 127085-1.patch text/plain 6978 ian SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MjExOCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE0LTAxLTE2ICBJYW4gSGVu ZGVyc29uICA8aWFuaEBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwb3NlIHNjcm9sbFZpZXcgb24g V0tWaWV3CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MjcwODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBF eHBvc2UgV0tWaWV3J3Mgc2Nyb2xsIHZpZXcgYXMgYSBwcm9wZXJ0eS4gIEluIG9yZGVyIHRvIHN1 cHBvcnQKKyAgICAgICAgY2xpZW50cyBjYWxsaW5nIHNldERlbGVnYXRlOiwgd2UgY3JlYXRlIGEg Zm9yd2FyZGVyIG9iamVjdCB0aGF0IHNlbmRzCisgICAgICAgIGRlbGVnYXRlIG1ldGhvZHMgdG8g Ym90aCBXS1ZpZXcgKHRoZSAiaW50ZXJuYWwgZGVsZWdhdGUiKSBhbmQgdGhlCisgICAgICAgIHB1 YmxpY2x5LWV4cG9zZWQgZGVsZWdhdGUgKHRoZSAiZXh0ZXJuYWwgZGVsZWdhdGUiKS4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9pb3MvV0tTY3JvbGxWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvV0tT Y3JvbGxWaWV3Lm1tOgorICAgICAgICAoLVtXS1Njcm9sbFZpZXdEZWxlZ2F0ZUZvcndhcmRlciBp bml0V2l0aEludGVybmFsRGVsZWdhdGU6ZXh0ZXJuYWxEZWxlZ2F0ZTpdKToKKyAgICAgICAgKC1b V0tTY3JvbGxWaWV3RGVsZWdhdGVGb3J3YXJkZXIgbWV0aG9kU2lnbmF0dXJlRm9yU2VsZWN0b3I6 XSk6CisgICAgICAgICgtW1dLU2Nyb2xsVmlld0RlbGVnYXRlRm9yd2FyZGVyIHJlc3BvbmRzVG9T ZWxlY3RvcjpdKToKKyAgICAgICAgKC1bV0tTY3JvbGxWaWV3RGVsZWdhdGVGb3J3YXJkZXIgZm9y d2FyZEludm9jYXRpb246XSk6CisgICAgICAgICgtW1dLU2Nyb2xsVmlldyBzZXRJbnRlcm5hbERl bGVnYXRlOl0pOgorICAgICAgICAoLVtXS1Njcm9sbFZpZXcgc2V0RGVsZWdhdGU6XSk6CisgICAg ICAgICgtW1dLU2Nyb2xsVmlldyBkZWxlZ2F0ZV0pOgorICAgICAgICBQcmV0ZW5kIGxpa2UgX2V4 dGVybmFsRGVsZWdhdGUgaXMgdGhlIHJlYWwgZGVsZWdhdGUgdG8gYXZvaWQgZXhwb3NpbmcKKyAg ICAgICAgb3VyIGludGVybmFsIGRlbGVnYXRlIG9yIGZvcndhcmRlciBvYmplY3QuCisgICAgICAg ICgtW1dLU2Nyb2xsVmlldyBfdXBkYXRlRGVsZWdhdGVdKToKKyAgICAgICAgKC1bV0tTY3JvbGxW aWV3IGRlYWxsb2NdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2lvcy9XS1ZpZXdJT1MubW06 CisgICAgICAgICgtW1dLVmlldyBzY3JvbGxWaWV3XSk6CisgICAgICAgICgtW1dLVmlldyBfY29t bW9uSW5pdGlhbGl6YXRpb25XaXRoQ29udGV4dFJlZjpwYWdlR3JvdXBSZWY6cmVsYXRlZFRvUGFn ZTpdKToKKwogMjAxNC0wMS0xNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CiAKICAgICAgICAgW0dUS11bRUZMXVtOSVhdIERvIG5vdCB1c2UgUHJpbnRDb250ZXh0 LCBGcmFtZSBhbmQgRG9jdW1lbnRMb2FkZXIgaW4gRXJyb3JzCkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLVmlldy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3LmgJKHJldmlzaW9uIDE2MjExOCkKKysrIFNv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tWaWV3LmgJKHdvcmtpbmcgY29weSkK QEAgLTY2LDQgKzY2LDggQEAKIEBwcm9wZXJ0eSBCT09MIGRyYXdzQmFja2dyb3VuZDsKIEBwcm9w ZXJ0eSBCT09MIGRyYXdzVHJhbnNwYXJlbnRCYWNrZ3JvdW5kOwogCisjaWYgVEFSR0VUX09TX0lQ SE9ORQorQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBVSVNjcm9sbFZpZXcgKnNjcm9s bFZpZXc7CisjZW5kaWYKKwogQGVuZApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9pb3MvV0tTY3JvbGxWaWV3LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9pb3MvV0tTY3JvbGxWaWV3LmgJKHJldmlzaW9uIDE2MjExOCkKKysrIFNvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1dLU2Nyb2xsVmlldy5oCSh3b3JraW5nIGNvcHkpCkBA IC0yNiw0ICsyNiw3IEBACiAjaW1wb3J0IDxVSUtpdC9VSVdlYlNjcm9sbFZpZXcuaD4KIAogQGlu dGVyZmFjZSBXS1Njcm9sbFZpZXcgOiBVSVdlYlNjcm9sbFZpZXcKKworQHByb3BlcnR5IChub25h dG9taWMsIGFzc2lnbikgaWQgPFVJU2Nyb2xsVmlld0RlbGVnYXRlPiBpbnRlcm5hbERlbGVnYXRl OworCiBAZW5kCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS1Njcm9s bFZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3Mv V0tTY3JvbGxWaWV3Lm1tCShyZXZpc2lvbiAxNjIxMTgpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2lvcy9XS1Njcm9sbFZpZXcubW0JKHdvcmtpbmcgY29weSkKQEAgLTI2LDEyICsy NiwxMTAgQEAKICNpbXBvcnQgImNvbmZpZy5oIgogI2ltcG9ydCAiV0tTY3JvbGxWaWV3LmgiCiAK LUBpbXBsZW1lbnRhdGlvbiBXS1Njcm9sbFZpZXcKK0BpbnRlcmZhY2UgV0tTY3JvbGxWaWV3RGVs ZWdhdGVGb3J3YXJkZXIgOiBOU09iamVjdCA8VUlTY3JvbGxWaWV3RGVsZWdhdGU+CiAKKy0gKGlu c3RhbmNldHlwZSlpbml0V2l0aEludGVybmFsRGVsZWdhdGU6KGlkIDxVSVNjcm9sbFZpZXdEZWxl Z2F0ZT4paW50ZXJuYWxEZWxlZ2F0ZSBleHRlcm5hbERlbGVnYXRlOihpZCA8VUlTY3JvbGxWaWV3 RGVsZWdhdGU+KWV4dGVybmFsRGVsZWdhdGU7CisKK0BlbmQKKworQGltcGxlbWVudGF0aW9uIFdL U2Nyb2xsVmlld0RlbGVnYXRlRm9yd2FyZGVyIHsKKyAgICBpZCA8VUlTY3JvbGxWaWV3RGVsZWdh dGU+IF9pbnRlcm5hbERlbGVnYXRlOworICAgIGlkIDxVSVNjcm9sbFZpZXdEZWxlZ2F0ZT4gX2V4 dGVybmFsRGVsZWdhdGU7Cit9CisKKy0gKGluc3RhbmNldHlwZSlpbml0V2l0aEludGVybmFsRGVs ZWdhdGU6KGlkIDxVSVNjcm9sbFZpZXdEZWxlZ2F0ZT4paW50ZXJuYWxEZWxlZ2F0ZSBleHRlcm5h bERlbGVnYXRlOihpZCA8VUlTY3JvbGxWaWV3RGVsZWdhdGU+KWV4dGVybmFsRGVsZWdhdGUKK3sK KyAgICBzZWxmID0gW3N1cGVyIGluaXRdOworICAgIGlmICghc2VsZikKKyAgICAgICAgcmV0dXJu IG5pbDsKKyAgICBfaW50ZXJuYWxEZWxlZ2F0ZSA9IGludGVybmFsRGVsZWdhdGU7CisgICAgX2V4 dGVybmFsRGVsZWdhdGUgPSBleHRlcm5hbERlbGVnYXRlOworICAgIHJldHVybiBzZWxmOworfQor CistIChOU01ldGhvZFNpZ25hdHVyZSAqKW1ldGhvZFNpZ25hdHVyZUZvclNlbGVjdG9yOihTRUwp YVNlbGVjdG9yCit7CisgICAgTlNNZXRob2RTaWduYXR1cmUgKnNpZ25hdHVyZSA9IFtzdXBlciBt ZXRob2RTaWduYXR1cmVGb3JTZWxlY3RvcjphU2VsZWN0b3JdOworICAgIGlmICghc2lnbmF0dXJl KQorICAgICAgICBzaWduYXR1cmUgPSBbKE5TT2JqZWN0ICopX2ludGVybmFsRGVsZWdhdGUgbWV0 aG9kU2lnbmF0dXJlRm9yU2VsZWN0b3I6YVNlbGVjdG9yXTsKKyAgICBpZiAoIXNpZ25hdHVyZSkK KyAgICAgICAgc2lnbmF0dXJlID0gWyhOU09iamVjdCAqKV9leHRlcm5hbERlbGVnYXRlIG1ldGhv ZFNpZ25hdHVyZUZvclNlbGVjdG9yOmFTZWxlY3Rvcl07CisgICAgcmV0dXJuIHNpZ25hdHVyZTsK K30KKworLSAoQk9PTClyZXNwb25kc1RvU2VsZWN0b3I6KFNFTClhU2VsZWN0b3IKK3sKKyAgICBy ZXR1cm4gW3N1cGVyIHJlc3BvbmRzVG9TZWxlY3RvcjphU2VsZWN0b3JdIHx8IFtfaW50ZXJuYWxE ZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6YVNlbGVjdG9yXSB8fCBbX2V4dGVybmFsRGVsZWdh dGUgcmVzcG9uZHNUb1NlbGVjdG9yOmFTZWxlY3Rvcl07Cit9CisKKy0gKHZvaWQpZm9yd2FyZElu dm9jYXRpb246KE5TSW52b2NhdGlvbiAqKWFuSW52b2NhdGlvbgoreworICAgIEJPT0wgbWVzc2Fn ZUhhbmRsZWQgPSBOTzsKKyAgICBpZiAoW19pbnRlcm5hbERlbGVnYXRlIHJlc3BvbmRzVG9TZWxl Y3RvcjpbYW5JbnZvY2F0aW9uIHNlbGVjdG9yXV0pIHsKKyAgICAgICAgW2FuSW52b2NhdGlvbiBp bnZva2VXaXRoVGFyZ2V0Ol9pbnRlcm5hbERlbGVnYXRlXTsKKyAgICAgICAgbWVzc2FnZUhhbmRs ZWQgPSBZRVM7CisgICAgfQorICAgIGlmIChbX2V4dGVybmFsRGVsZWdhdGUgcmVzcG9uZHNUb1Nl bGVjdG9yOlthbkludm9jYXRpb24gc2VsZWN0b3JdXSkgeworICAgICAgICBbYW5JbnZvY2F0aW9u IGludm9rZVdpdGhUYXJnZXQ6X2V4dGVybmFsRGVsZWdhdGVdOworICAgICAgICBtZXNzYWdlSGFu ZGxlZCA9IFlFUzsKKyAgICB9CisgICAgaWYgKCFtZXNzYWdlSGFuZGxlZCkKKyAgICAgICAgW3N1 cGVyIGZvcndhcmRJbnZvY2F0aW9uOmFuSW52b2NhdGlvbl07Cit9CisKK0BlbmQKKworQGltcGxl bWVudGF0aW9uIFdLU2Nyb2xsVmlldyB7CisgICAgaWQgPFVJU2Nyb2xsVmlld0RlbGVnYXRlPiBf ZXh0ZXJuYWxEZWxlZ2F0ZTsKKyAgICBXS1Njcm9sbFZpZXdEZWxlZ2F0ZUZvcndhcmRlciAqX2Rl bGVnYXRlRm9yd2FyZGVyOworfQorCiAtIChCT09MKXRvdWNoZXNTaG91bGRDYW5jZWxJbkNvbnRl bnRWaWV3OihVSVZpZXcgKiljb250ZW50VmlldwogewogICAgIHJldHVybiBOTzsKIH0KIAorLSAo dm9pZClzZXRJbnRlcm5hbERlbGVnYXRlOihpZCA8VUlTY3JvbGxWaWV3RGVsZWdhdGU+KWludGVy bmFsRGVsZWdhdGUKK3sKKyAgICBpZiAoaW50ZXJuYWxEZWxlZ2F0ZSA9PSBfaW50ZXJuYWxEZWxl Z2F0ZSkKKyAgICAgICAgcmV0dXJuOworICAgIF9pbnRlcm5hbERlbGVnYXRlID0gaW50ZXJuYWxE ZWxlZ2F0ZTsKKyAgICBbc2VsZiBfdXBkYXRlRGVsZWdhdGVdOworfQorCistICh2b2lkKXNldERl bGVnYXRlOihpZCA8VUlTY3JvbGxWaWV3RGVsZWdhdGU+KWRlbGVnYXRlCit7CisgICAgaWYgKF9l eHRlcm5hbERlbGVnYXRlID09IGRlbGVnYXRlKQorICAgICAgICByZXR1cm47CisgICAgX2V4dGVy bmFsRGVsZWdhdGUgPSBkZWxlZ2F0ZTsKKyAgICBbc2VsZiBfdXBkYXRlRGVsZWdhdGVdOworfQor CistIChpZCA8VUlTY3JvbGxWaWV3RGVsZWdhdGU+KWRlbGVnYXRlCit7CisgICAgcmV0dXJuIF9l eHRlcm5hbERlbGVnYXRlOworfQorCistICh2b2lkKV91cGRhdGVEZWxlZ2F0ZQoreworICAgIFdL U2Nyb2xsVmlld0RlbGVnYXRlRm9yd2FyZGVyICpvbGRGb3J3YXJkZXIgPSBfZGVsZWdhdGVGb3J3 YXJkZXI7CisgICAgX2RlbGVnYXRlRm9yd2FyZGVyID0gbmlsOworICAgIGlmICghX2V4dGVybmFs RGVsZWdhdGUpCisgICAgICAgIFtzdXBlciBzZXREZWxlZ2F0ZTpfaW50ZXJuYWxEZWxlZ2F0ZV07 CisgICAgZWxzZSBpZiAoIV9pbnRlcm5hbERlbGVnYXRlKQorICAgICAgICBbc3VwZXIgc2V0RGVs ZWdhdGU6X2V4dGVybmFsRGVsZWdhdGVdOworICAgIGVsc2UgeworICAgICAgICBfZGVsZWdhdGVG b3J3YXJkZXIgPSBbW1dLU2Nyb2xsVmlld0RlbGVnYXRlRm9yd2FyZGVyIGFsbG9jXSBpbml0V2l0 aEludGVybmFsRGVsZWdhdGU6X2ludGVybmFsRGVsZWdhdGUgZXh0ZXJuYWxEZWxlZ2F0ZTpfZXh0 ZXJuYWxEZWxlZ2F0ZV07CisgICAgICAgIFtzdXBlciBzZXREZWxlZ2F0ZTpfZGVsZWdhdGVGb3J3 YXJkZXJdOworICAgIH0KKyAgICBbb2xkRm9yd2FyZGVyIHJlbGVhc2VdOworfQorCistICh2b2lk KWRlYWxsb2MKK3sKKyAgICBbX2RlbGVnYXRlRm9yd2FyZGVyIHJlbGVhc2VdOworICAgIFtzdXBl ciBkZWFsbG9jXTsKK30KKwogQGVuZAogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2lvcy9XS1ZpZXdJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9pb3MvV0tWaWV3SU9TLm1tCShyZXZpc2lvbiAxNjIxMTgpCisrKyBTb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2lvcy9XS1ZpZXdJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTkw LDYgKzkwLDExIEBACiAgICAgICAgIFtzZWxmIF9mcmFtZU9yQm91bmRzQ2hhbmdlZF07CiB9CiAK Ky0gKFVJU2Nyb2xsVmlldyAqKXNjcm9sbFZpZXcKK3sKKyAgICByZXR1cm4gX3Njcm9sbFZpZXcu Z2V0KCk7Cit9CisKIC0gKFdLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciAqKWJyb3dzaW5nQ29u dGV4dENvbnRyb2xsZXIKIHsKICAgICByZXR1cm4gW19jb250ZW50VmlldyBicm93c2luZ0NvbnRl eHRDb250cm9sbGVyXTsKQEAgLTIzMiw3ICsyMzcsNyBAQAogICAgIENHUmVjdCBib3VuZHMgPSBz ZWxmLmJvdW5kczsKIAogICAgIF9zY3JvbGxWaWV3ID0gYWRvcHROUyhbW1dLU2Nyb2xsVmlldyBh bGxvY10gaW5pdFdpdGhGcmFtZTpib3VuZHNdKTsKLSAgICBbX3Njcm9sbFZpZXcgc2V0RGVsZWdh dGU6c2VsZl07CisgICAgW19zY3JvbGxWaWV3IHNldEludGVybmFsRGVsZWdhdGU6c2VsZl07CiAg ICAgW19zY3JvbGxWaWV3IHNldEJvdW5jZXNab29tOllFU107CiAKICAgICBbc2VsZiBhZGRTdWJ2 aWV3Ol9zY3JvbGxWaWV3LmdldCgpXTsK