53195 2011-01-26 14:57:10 -0800 Several WKView Internal category methods are implemented in the main category. 2011-01-26 17:32:57 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.6 RESOLVED FIXED P2 Normal --- 0 jingidy+wk webkit-unassigned commit-queue mitz oldest_to_newest 340495 0 jingidy+wk 2011-01-26 14:57:10 -0800 _setEventBeingResent:, _interceptKeyEvent:, _getTextInputState:selectionEnd:underlines:, and _setAccessibilityChildToken: are defined in WKView (Internal) but are implemented in the main category. This prevents the code from compiling when WKViewInternal.h is imported in WKView.mm. 340498 1 80243 jingidy+wk 2011-01-26 14:59:03 -0800 Created attachment 80243 Moved these methods to the correct category. 340505 2 80243 mitz 2011-01-26 15:07:54 -0800 Comment on attachment 80243 Moved these methods to the correct category. rs=me 340636 3 80243 mitz 2011-01-26 17:31:56 -0800 Comment on attachment 80243 Moved these methods to the correct category. I am going to land this. 340638 4 mitz 2011-01-26 17:32:57 -0800 Committed revision 76741. 80243 2011-01-26 14:59:03 -0800 2011-01-26 17:31:56 -0800 Moved these methods to the correct category. 53195.patch text/plain 4078 jingidy+wk SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc2NzIyKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDEtMjYgIEppbmcgSmlu ICA8amppbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisgICAgICAgIAorICAgICAgICBTZXZlcmFsIFdLVmlldyBJbnRlcm5hbCBjYXRlZ29yeSBtZXRo b2RzIGFyZSBpbXBsZW1lbnRlZCBpbiB0aGUgbWFpbiBjYXRlZ29yeS4KKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTUzMTk1CisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL21hYy9XS1ZpZXcubW06CisgICAgICAgICgtW1dLVmlldyBfc2V0RXZlbnRCZWlu Z1Jlc2VudDpdKTogTW92ZWQgaW50byBpbXBsZW1lbnRhdGlvbiBvZiBXS1ZpZXcgKEludGVybmFs KS4KKyAgICAgICAgKC1bV0tWaWV3IF9pbnRlcmNlcHRLZXlFdmVudDpdKTogTW92ZWQgaW50byBp bXBsZW1lbnRhdGlvbiBvZiBXS1ZpZXcgKEludGVybmFsKS4KKyAgICAgICAgKC1bV0tWaWV3IF9n ZXRUZXh0SW5wdXRTdGF0ZTpzZWxlY3Rpb25FbmQ6dW5kZXJsaW5lczpXZWJDb3JlOjpdKTogTW92 ZWQgaW50byBpbXBsZW1lbnRhdGlvbiBvZiBXS1ZpZXcgKEludGVybmFsKS4KKyAgICAgICAgKC1b V0tWaWV3IF9zZXRBY2Nlc3NpYmlsaXR5Q2hpbGRUb2tlbjpdKTogTW92ZWQgaW50byBpbXBsZW1l bnRhdGlvbiBvZiBXS1ZpZXcgKEludGVybmFsKS4KKwogMjAxMS0wMS0yNSAgQnJpYW4gV2VpbnN0 ZWluICA8YndlaW5zdGVpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW50dGkg S29pdmlzdG8uCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvV0tWaWV3 Lm1tCShyZXZpc2lvbiA3NjcyMykKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFj L1dLVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtODQyLDI3ICs4NDIsNiBAQCAtIChCT09MKXBl cmZvcm1LZXlFcXVpdmFsZW50OihOU0V2ZW50ICopCiAgICAgcmV0dXJuIFtzZWxmIF9oYW5kbGVT dHlsZUtleUVxdWl2YWxlbnQ6ZXZlbnRdIHx8IFtzdXBlciBwZXJmb3JtS2V5RXF1aXZhbGVudDpl dmVudF07CiB9CiAKLS0gKHZvaWQpX3NldEV2ZW50QmVpbmdSZXNlbnQ6KE5TRXZlbnQgKilldmVu dAotewotICAgIF9kYXRhLT5fa2V5RG93bkV2ZW50QmVpbmdSZXNlbnQgPSBbZXZlbnQgcmV0YWlu XTsKLX0KLQotLSAoVmVjdG9yPEtleXByZXNzQ29tbWFuZD4mKV9pbnRlcmNlcHRLZXlFdmVudDoo TlNFdmVudCAqKXRoZUV2ZW50IAotewotICAgIF9kYXRhLT5fY29tbWFuZHNMaXN0LmNsZWFyKCk7 Ci0gICAgLy8gaW50ZXJwcmV0S2V5RXZlbnRzIHdpbGwgdHJpZ2dlciBvbmUgb3IgbW9yZSBjYWxs cyB0byBkb0NvbW1hbmRCeVNlbGVjdG9yIG9yIHNldFRleHQKLSAgICAvLyB0aGF0IHdpbGwgcG9w dWxhdGUgdGhlIGNvbW1hbmRzTGlzdCB2ZWN0b3IuCi0gICAgW3NlbGYgaW50ZXJwcmV0S2V5RXZl bnRzOltOU0FycmF5IGFycmF5V2l0aE9iamVjdDp0aGVFdmVudF1dOwotICAgIHJldHVybiBfZGF0 YS0+X2NvbW1hbmRzTGlzdDsKLX0KLQotLSAodm9pZClfZ2V0VGV4dElucHV0U3RhdGU6KHVuc2ln bmVkKXN0YXJ0IHNlbGVjdGlvbkVuZDoodW5zaWduZWQpZW5kIHVuZGVybGluZXM6KFZlY3RvcjxX ZWJDb3JlOjpDb21wb3NpdGlvblVuZGVybGluZT4mKWxpbmVzCi17Ci0gICAgc3RhcnQgPSBfZGF0 YS0+X3NlbGVjdGlvblN0YXJ0OwotICAgIGVuZCA9IF9kYXRhLT5fc2VsZWN0aW9uRW5kOwotICAg IGxpbmVzID0gX2RhdGEtPl91bmRlcmxpbmVzOwotfQotCiAtICh2b2lkKWtleVVwOihOU0V2ZW50 ICopdGhlRXZlbnQKIHsKICAgICBfZGF0YS0+X3BhZ2UtPmhhbmRsZUtleWJvYXJkRXZlbnQoTmF0 aXZlV2ViS2V5Ym9hcmRFdmVudCh0aGVFdmVudCwgc2VsZikpOwpAQCAtMTMwNCwxNCArMTI4Myw2 IEBAIC0gKHZvaWQpdmlld0RpZFVuaGlkZQogICAgIF9kYXRhLT5fcGFnZS0+dmlld1N0YXRlRGlk Q2hhbmdlKFdlYlBhZ2VQcm94eTo6Vmlld0lzVmlzaWJsZSk7CiB9CiAKLS0gKHZvaWQpX3NldEFj Y2Vzc2liaWxpdHlDaGlsZFRva2VuOihOU0RhdGEgKilkYXRhCi17Ci0jaWYgIWRlZmluZWQoQlVJ TERJTkdfT05fU05PV19MRU9QQVJEKQotICAgIF9kYXRhLT5fcmVtb3RlQWNjZXNzaWJpbGl0eUNo aWxkID0gV0tBWFJlbW90ZUVsZW1lbnRGb3JUb2tlbigoQ0ZEYXRhUmVmKWRhdGEpOwotICAgIFtz ZWxmIF9zZXRSZW1vdGVBY2Nlc3NpYmlsaXR5V2luZG93OltzZWxmIHdpbmRvd11dOwotI2VuZGlm Ci19Ci0KIC0gKEJPT0wpYWNjZXNzaWJpbGl0eUlzSWdub3JlZAogewogICAgIHJldHVybiBOTzsK QEAgLTE0NDYsNiArMTQxNywyNyBAQCAtICh2b2lkKV9zZXRVc2VySW50ZXJmYWNlSXRlbVN0YXRl OihOU1N0CiAgICAgfQogfQogCistICh2b2lkKV9zZXRFdmVudEJlaW5nUmVzZW50OihOU0V2ZW50 ICopZXZlbnQKK3sKKyAgICBfZGF0YS0+X2tleURvd25FdmVudEJlaW5nUmVzZW50ID0gW2V2ZW50 IHJldGFpbl07Cit9CisKKy0gKFZlY3RvcjxLZXlwcmVzc0NvbW1hbmQ+JilfaW50ZXJjZXB0S2V5 RXZlbnQ6KE5TRXZlbnQgKil0aGVFdmVudCAKK3sKKyAgICBfZGF0YS0+X2NvbW1hbmRzTGlzdC5j bGVhcigpOworICAgIC8vIGludGVycHJldEtleUV2ZW50cyB3aWxsIHRyaWdnZXIgb25lIG9yIG1v cmUgY2FsbHMgdG8gZG9Db21tYW5kQnlTZWxlY3RvciBvciBzZXRUZXh0CisgICAgLy8gdGhhdCB3 aWxsIHBvcHVsYXRlIHRoZSBjb21tYW5kc0xpc3QgdmVjdG9yLgorICAgIFtzZWxmIGludGVycHJl dEtleUV2ZW50czpbTlNBcnJheSBhcnJheVdpdGhPYmplY3Q6dGhlRXZlbnRdXTsKKyAgICByZXR1 cm4gX2RhdGEtPl9jb21tYW5kc0xpc3Q7Cit9CisKKy0gKHZvaWQpX2dldFRleHRJbnB1dFN0YXRl Oih1bnNpZ25lZClzdGFydCBzZWxlY3Rpb25FbmQ6KHVuc2lnbmVkKWVuZCB1bmRlcmxpbmVzOihW ZWN0b3I8V2ViQ29yZTo6Q29tcG9zaXRpb25VbmRlcmxpbmU+JilsaW5lcworeworICAgIHN0YXJ0 ID0gX2RhdGEtPl9zZWxlY3Rpb25TdGFydDsKKyAgICBlbmQgPSBfZGF0YS0+X3NlbGVjdGlvbkVu ZDsKKyAgICBsaW5lcyA9IF9kYXRhLT5fdW5kZXJsaW5lczsKK30KKwogLSAoTlNSZWN0KV9jb252 ZXJ0VG9EZXZpY2VTcGFjZTooTlNSZWN0KXJlY3QKIHsKICAgICByZXR1cm4gdG9EZXZpY2VTcGFj ZShyZWN0LCBbc2VsZiB3aW5kb3ddKTsKQEAgLTE2ODQsNiArMTY3NiwxNCBAQCAtICh2b2lkKV9w YWdlRGlkTGVhdmVBY2NlbGVyYXRlZENvbXBvc2l0CiB9CiAjZW5kaWYgLy8gVVNFKEFDQ0VMRVJB VEVEX0NPTVBPU0lUSU5HKQogCistICh2b2lkKV9zZXRBY2Nlc3NpYmlsaXR5Q2hpbGRUb2tlbjoo TlNEYXRhICopZGF0YQoreworI2lmICFkZWZpbmVkKEJVSUxESU5HX09OX1NOT1dfTEVPUEFSRCkK KyAgICBfZGF0YS0+X3JlbW90ZUFjY2Vzc2liaWxpdHlDaGlsZCA9IFdLQVhSZW1vdGVFbGVtZW50 Rm9yVG9rZW4oKENGRGF0YVJlZilkYXRhKTsKKyAgICBbc2VsZiBfc2V0UmVtb3RlQWNjZXNzaWJp bGl0eVdpbmRvdzpbc2VsZiB3aW5kb3ddXTsKKyNlbmRpZgorfQorCiAtICh2b2lkKV9zZXRDb21w bGV4VGV4dElucHV0RW5hYmxlZDooQk9PTCljb21wbGV4VGV4dElucHV0RW5hYmxlZCBwbHVnaW5D b21wbGV4VGV4dElucHV0SWRlbnRpZmllcjoodWludDY0X3QpcGx1Z2luQ29tcGxleFRleHRJbnB1 dElkZW50aWZpZXIKIHsKICAgICBCT09MIGlucHV0U291cmNlQ2hhbmdlZCA9IF9kYXRhLT5fcGx1 Z2luQ29tcGxleFRleHRJbnB1dElkZW50aWZpZXI7Cg==