66977 2011-08-25 13:45:28 -0700 More work on the updated Cocoa text input specification 2011-08-25 14:20:54 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 457110 0 andersca 2011-08-25 13:45:28 -0700 More work on the updated Cocoa text input specification 457126 1 105240 andersca 2011-08-25 14:08:18 -0700 Created attachment 105240 Patch 457133 2 andersca 2011-08-25 14:20:54 -0700 Committed r93824: <http://trac.webkit.org/changeset/93824> 105240 2011-08-25 14:08:18 -0700 2011-08-25 14:17:57 -0700 Patch bug-66977-20110825140817.patch text/plain 6827 andersca SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDkzODE4KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTEtMDgtMjUgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBNb3JlIHdvcmsgb24gdGhl IHVwZGF0ZWQgQ29jb2EgdGV4dCBpbnB1dCBzcGVjaWZpY2F0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02Njk3NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL05ldHNjYXBlUGx1Z2luLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0c2NhcGVQbHVnaW46 Ok5ldHNjYXBlUGx1Z2luKToKKyAgICAgICAgSW5pdGlhbGl6ZSBtX3BsdWdpbldhbnRzTGVnYWN5 Q29jb2FUZXh0SW5wdXQgYW5kIG1faGFzSGFuZGxlZEFLZXlEb3duRXZlbnQuCisKKyAgICAgICAg KiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uaDoKKyAgICAgICAg QWRkIG1fcGx1Z2luV2FudHNMZWdhY3lDb2NvYVRleHRJbnB1dCBhbmQgbV9oYXNIYW5kbGVkQUtl eURvd25FdmVudC4KKyAgICAgICAgCisgICAgICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpz ZXRQbHVnaW5XYW50c0xlZ2FjeUNvY29hVGV4dElucHV0KToKKyAgICAgICAgQWRkIHNldHRlci4g Tm90IGNhbGxlZCB5ZXQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUv bWFjL05ldHNjYXBlUGx1Z2luTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdp bjo6cGxhdGZvcm1IYW5kbGVLZXlib2FyZEV2ZW50KToKKyAgICAgICAgU2V0IG1faGFzSGFuZGxl ZEFLZXlEb3duRXZlbnQgdG8gdHJ1ZSBpZiB3ZSBnZXQgYSBLZXlEb3duIGV2ZW50LgorCisgICAg ICAgIChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjpzZW5kQ29tcGxleFRleHRJbnB1dCk6CisgICAg ICAgIElmIHRoZSBwbHVnLWluIGlzIHVzaW5nIHRoZSB1cGRhdGVkIENvY29hIHRleHQgaW5wdXQg c3BlYywgd2UgY2FuIGRpc2FibGUgdGV4dCBpbnB1dCBoZXJlLgorCisgICAgICAgIChXZWJLaXQ6 Ok5ldHNjYXBlUGx1Z2luOjpwbHVnaW5Gb2N1c09yV2luZG93Rm9jdXNDaGFuZ2VkKToKKyAgICAg ICAgSWYgdGhlIHBsdWctaW4gaXMgdXNpbmcgdGhlIHVwZGF0ZWQgQ29jb2EgdGV4dCBpbnB1dCBz cGVjLCB0ZXh0IGlucHV0IGlzIG5vdCBlbmFibGVkIHdoZW4KKyAgICAgICAgdGhlIHBsdWctaW4g aXMgZm9jdXNlZC4KKworICAgICAgICAoV2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6c2V0Q29tcGxl eFRleHRJbnB1dEVuYWJsZWQpOgorICAgICAgICBTZXQgdGhlIHJpZ2h0IHRleHQgaW5wdXQgc3Rh dGUgYmFzZWQgb24gd2hldGhlciB0aGUgcGx1Zy1pbiBpcyB1c2luZyB0aGUgdXBkYXRlZCBzcGVj IG9yIG5vdC4KKwogMjAxMS0wOC0yNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCiAgICAgICAgIFJldHVybiB0aGUgY29ycmVjdCB2YWx1ZSBmb3IgTlBOVnN1cHBvcnRz Q2FyYm9uQm9vbApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNj YXBlL05ldHNjYXBlUGx1Z2luLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCShyZXZpc2lvbiA5Mzc5 MSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2Fw ZVBsdWdpbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc1LDcgKzc1LDkgQEAgTmV0c2NhcGVQbHVn aW46Ok5ldHNjYXBlUGx1Z2luKFBhc3NSZWZQdAogICAgICwgbV9jdXJyZW50TW91c2VFdmVudCgw KQogICAgICwgbV9wbHVnaW5IYXNGb2N1cyhmYWxzZSkKICAgICAsIG1fd2luZG93SGFzRm9jdXMo ZmFsc2UpCisgICAgLCBtX3BsdWdpbldhbnRzTGVnYWN5Q29jb2FUZXh0SW5wdXQodHJ1ZSkKICAg ICAsIG1faXNDb21wbGV4VGV4dElucHV0RW5hYmxlZChmYWxzZSkKKyAgICAsIG1faGFzSGFuZGxl ZEFLZXlEb3duRXZlbnQoZmFsc2UpCiAjaWZuZGVmIE5QX05PX0NBUkJPTgogICAgICwgbV9udWxs RXZlbnRUaW1lcihSdW5Mb29wOjptYWluKCksIHRoaXMsICZOZXRzY2FwZVBsdWdpbjo6bnVsbEV2 ZW50VGltZXJGaXJlZCkKICAgICAsIG1fbnBDR0NvbnRleHQoKQpJbmRleDogU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBl UGx1Z2luLmgJKHJldmlzaW9uIDkzNzkxKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Q bHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luLmgJKHdvcmtpbmcgY29weSkKQEAgLTU4LDYg KzU4LDcgQEAgcHVibGljOgogICAgIE5QRXJyb3IgcG9wVXBDb250ZXh0TWVudShOUE1lbnUqKTsK IAogICAgIHZvaWQgc2V0UGx1Z2luUmV0dXJuc05vbnJldGFpbmVkTGF5ZXIoYm9vbCBwbHVnaW5S ZXR1cm5zTm9ucmV0YWluZWRMYXllcikgeyBtX3BsdWdpblJldHVybnNOb25yZXRhaW5lZExheWVy ID0gcGx1Z2luUmV0dXJuc05vbnJldGFpbmVkTGF5ZXI7IH0KKyAgICB2b2lkIHNldFBsdWdpbldh bnRzTGVnYWN5Q29jb2FUZXh0SW5wdXQoYm9vbCBwbHVnaW5XYW50c0xlZ2FjeUNvY29hVGV4dElu cHV0KSB7IG1fcGx1Z2luV2FudHNMZWdhY3lDb2NvYVRleHRJbnB1dCA9IHBsdWdpbldhbnRzTGVn YWN5Q29jb2FUZXh0SW5wdXQ7IH0KIAogICAgIG1hY2hfcG9ydF90IGNvbXBvc2l0aW5nUmVuZGVy U2VydmVyUG9ydCgpOwogCkBAIC0yNDIsOSArMjQzLDE4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBt X3BsdWdpbkhhc0ZvY3VzOwogICAgIGJvb2wgbV93aW5kb3dIYXNGb2N1czsKIAorICAgIC8vIFdo ZXRoZXIgdGhlIHBsdWctaW4gd2FudHMgdG8gdXNlIHRoZSBsZWdhY3kgQ29jb2EgdGV4dCBpbnB1 dCBoYW5kbGluZyB0aGF0CisgICAgLy8gZXhpc3RlZCBpbiBXZWJLaXQxLCBvciB0aGUgdXBkYXRl ZCBDb2NvYSB0ZXh0IGlucHV0IGhhbmRsaW5nIHNwZWNpZmllZCBvbgorICAgIC8vIGh0dHBzOi8v d2lraS5tb3ppbGxhLm9yZy9OUEFQSTpDb2NvYUV2ZW50TW9kZWwjVGV4dF9JbnB1dAorICAgIGJv b2wgbV9wbHVnaW5XYW50c0xlZ2FjeUNvY29hVGV4dElucHV0OworCiAgICAgLy8gV2hldGhlciBj b21wbGV4IHRleHQgaW5wdXQgaXMgZW5hYmxlZC4KICAgICBib29sIG1faXNDb21wbGV4VGV4dElu cHV0RW5hYmxlZDsKIAorICAgIC8vIFdoZXRoZXIgdGhlIHBsdWctaW4gaGFzIGhhbmRsZWQgYSBr ZXlkb3duIGV2ZW50LiBUaGlzIGlzIHVzZWQgdG8gZGV0ZXJtaW5lCisgICAgLy8gaWYgd2UgY2Fu IHRlbGwgdGhlIHBsdWctaW4gdGhhdCB3ZSBzdXBwb3J0IHRoZSB1cGRhdGVkIENvY29hIHRleHQg aW5wdXQgc3BlY2lmaWNhdGlvbi4KKyAgICBib29sIG1faGFzSGFuZGxlZEFLZXlEb3duRXZlbnQ7 CisKICAgICBXZWJDb3JlOjpJbnRSZWN0IG1fd2luZG93RnJhbWVJblNjcmVlbkNvb3JkaW5hdGVz OwogICAgIFdlYkNvcmU6OkludFJlY3QgbV92aWV3RnJhbWVJbldpbmRvd0Nvb3JkaW5hdGVzOwog CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvbWFjL05l dHNjYXBlUGx1Z2luTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvUGx1Z2lucy9OZXRzY2FwZS9tYWMvTmV0c2NhcGVQbHVnaW5NYWMubW0JKHJldmlzaW9uIDkz NzkxKQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL21hYy9O ZXRzY2FwZVBsdWdpbk1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNzM3LDYgKzczNyw5IEBAIGJv b2wgTmV0c2NhcGVQbHVnaW46OnBsYXRmb3JtSGFuZGxlS2V5Ym8KIAogICAgIHN3aXRjaCAobV9l dmVudE1vZGVsKSB7CiAgICAgY2FzZSBOUEV2ZW50TW9kZWxDb2NvYTogeworICAgICAgICBpZiAo a2V5Ym9hcmRFdmVudC50eXBlKCkgPT0gV2ViRXZlbnQ6OktleURvd24pCisgICAgICAgICAgICBt X2hhc0hhbmRsZWRBS2V5RG93bkV2ZW50ID0gdHJ1ZTsKKwogICAgICAgICBOUENvY29hRXZlbnQg ZXZlbnQgPSBpbml0aWFsaXplS2V5Ym9hcmRFdmVudChrZXlib2FyZEV2ZW50KTsKICAgICAgICAg aGFuZGxlZCA9IE5QUF9IYW5kbGVFdmVudCgmZXZlbnQpOwogICAgICAgICBicmVhazsKQEAgLTk0 MSw2ICs5NDQsMTggQEAgc3RhdGljIGJvb2wgY29udmVydFN0cmluZ1RvS2V5Q29kZXMoY29ucwog CiB2b2lkIE5ldHNjYXBlUGx1Z2luOjpzZW5kQ29tcGxleFRleHRJbnB1dChjb25zdCBTdHJpbmcm IHRleHRJbnB1dCkKIHsKKyAgICBpZiAoIW1fcGx1Z2luV2FudHNMZWdhY3lDb2NvYVRleHRJbnB1 dCkgeworICAgICAgICAvLyBJbiB0aGUgdXBkYXRlZCBDb2NvYSB0ZXh0IGlucHV0IHNwZWMsIHRl eHQgaW5wdXQgaXMgZGlzYWJsZWQgd2hlbiB0aGUgdGV4dCBpbnB1dCBzdHJpbmcgaGFzIGJlZW4g c2VudAorICAgICAgICAvLyBieSB0aGUgVUkgcHJvY2Vzcy4gU2luY2UgdGhlIFVJIHByb2Nlc3Mg aGFzIGFsc28gdXBkYXRlZCBpdHMgc3RhdGUsIHdlIGNhbiBqdXN0IHJlc2V0IHRoZSB2YXJpYWJs ZSBoZXJlCisgICAgICAgIC8vIGluc3RlYWQgb2YgY2FsbGluZyBzZXRDb21wbGV4VGV4dElucHV0 RW5hYmxlZC4KKyAgICAgICAgbV9pc0NvbXBsZXhUZXh0SW5wdXRFbmFibGVkID0gZmFsc2U7CisK KyAgICAgICAgLy8gVGhlIFVJIHByb2Nlc3MgY2FuIGFsc28gZGlzYWJsZSB0ZXh0IGlucHV0IGJ5 IHNlbmRpbmcgYW4gZW1wdHkgaW5wdXQgc3RyaW5nLiBJbiB0aGlzIGNhc2UsIHdlIGRvbid0IHdh bnQKKyAgICAgICAgLy8gdG8gc2VuZCBpdCB0byB0aGUgcGx1Zy1pbi4KKyAgICAgICAgaWYgKHRl eHRJbnB1dC5pc051bGwoKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBzd2l0 Y2ggKG1fZXZlbnRNb2RlbCkgewogICAgIGNhc2UgTlBFdmVudE1vZGVsQ29jb2E6IHsKICAgICAg ICAgTlBDb2NvYUV2ZW50IGV2ZW50ID0gaW5pdGlhbGl6ZUV2ZW50KE5QQ29jb2FFdmVudFRleHRJ bnB1dCk7CkBAIC05ODAsNiArOTk1LDEzIEBAIHZvaWQgTmV0c2NhcGVQbHVnaW46OnBsdWdpbkZv Y3VzT3JXaW5kb3cKICAgICBib29sIHBsdWdpbkhhc0ZvY3VzQW5kV2luZG93SGFzRm9jdXMgPSBt X3BsdWdpbkhhc0ZvY3VzICYmIG1fd2luZG93SGFzRm9jdXM7CiAKICAgICBjb250cm9sbGVyKCkt PnBsdWdpbkZvY3VzT3JXaW5kb3dGb2N1c0NoYW5nZWQocGx1Z2luSGFzRm9jdXNBbmRXaW5kb3dI YXNGb2N1cyk7CisKKyAgICAvLyBJbiB0aGUgdXBkYXRlZCBDb2NvYSB0ZXh0IGlucHV0IHNwZWMs IHRoZSBwbHVnLWluIHdpbGwgZW5hYmxlIGNvbXBsZXggdGV4dCBpbnB1dAorICAgIC8vIGJ5IHJl dHVybmluZyBrTlBFdmVudFN0YXJ0SU1FIGZyb20gaXQncyBOUENvY29hRXZlbnRLZXlEb3duIGhh bmRsZXIuCisgICAgaWYgKCFtX3BsdWdpbldhbnRzTGVnYWN5Q29jb2FUZXh0SW5wdXQpCisgICAg ICAgIHJldHVybjsKKworICAgIC8vIEluIHRoZSBvbGQgbW9kZWwsIGlmIHRoZSBwbHVnLWluIGlz IGZvY3VzZWQsIGVuYWJsZSBjb21wbGV4IHRleHQgaW5wdXQuCiAgICAgc2V0Q29tcGxleFRleHRJ bnB1dEVuYWJsZWQocGx1Z2luSGFzRm9jdXNBbmRXaW5kb3dIYXNGb2N1cyk7CiB9CiAKQEAgLTk4 OCw4ICsxMDEwLDExIEBAIHZvaWQgTmV0c2NhcGVQbHVnaW46OnNldENvbXBsZXhUZXh0SW5wdXQK ICAgICBpZiAobV9pc0NvbXBsZXhUZXh0SW5wdXRFbmFibGVkID09IGNvbXBsZXhUZXh0SW5wdXRF bmFibGVkKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2lzQ29tcGxleFRleHRJbnB1dEVuYWJs ZWQgPSBjb21wbGV4VGV4dElucHV0RW5hYmxlZDsKLSAgICBjb250cm9sbGVyKCktPnNldENvbXBs ZXhUZXh0SW5wdXRTdGF0ZShjb21wbGV4VGV4dElucHV0RW5hYmxlZCA/IFBsdWdpbkNvbXBsZXhU ZXh0SW5wdXRFbmFibGVkTGVnYWN5IDogUGx1Z2luQ29tcGxleFRleHRJbnB1dERpc2FibGVkKTsK KyAgICBQbHVnaW5Db21wbGV4VGV4dElucHV0U3RhdGUgY29tcGxleFRleHRJbnB1dFN0YXRlID0g UGx1Z2luQ29tcGxleFRleHRJbnB1dERpc2FibGVkOworICAgIGlmIChtX2lzQ29tcGxleFRleHRJ bnB1dEVuYWJsZWQpCisgICAgICAgIGNvbXBsZXhUZXh0SW5wdXRTdGF0ZSA9IG1fcGx1Z2luV2Fu dHNMZWdhY3lDb2NvYVRleHRJbnB1dCA/IFBsdWdpbkNvbXBsZXhUZXh0SW5wdXRFbmFibGVkTGVn YWN5IDogUGx1Z2luQ29tcGxleFRleHRJbnB1dEVuYWJsZWQ7CisKKyAgICBjb250cm9sbGVyKCkt PnNldENvbXBsZXhUZXh0SW5wdXRTdGF0ZShjb21wbGV4VGV4dElucHV0U3RhdGUpOwogfQogCiBQ bGF0Zm9ybUxheWVyKiBOZXRzY2FwZVBsdWdpbjo6cGx1Z2luTGF5ZXIoKQo=