48700 2010-10-29 17:16:53 -0700 [Qt] IM: Don't manipulate selection via RenderTextControl 2010-10-30 07:51:54 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 kling webkit-qt-unassigned darin rniwa tkent oldest_to_newest 302200 0 kling 2010-10-29 17:16:53 -0700 As brought up by Ryosuke Niwa on IRC, Qt's Input Method API shouldn't be accessing the selection through RenderTextControl. We should go directly through the Frame's SelectionController instead. 302201 1 72417 kling 2010-10-29 17:18:26 -0700 Created attachment 72417 Proposed patch 302307 2 72417 kling 2010-10-30 07:51:43 -0700 Comment on attachment 72417 Proposed patch Clearing flags on attachment: 72417 Committed r70982: <http://trac.webkit.org/changeset/70982> 302308 3 kling 2010-10-30 07:51:54 -0700 All reviewed patches have been landed. Closing bug. 72417 2010-10-29 17:18:26 -0700 2010-10-30 07:51:43 -0700 Proposed patch bug-48700.diff text/plain 4815 kling ZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwIGIvV2ViS2l0L3F0L0FwaS9x d2VicGFnZS5jcHAKaW5kZXggNDBmNDFjNS4uNmEyODhkNSAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0 L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKQEAgLTEw MjQsOSArMTAyNCw5IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjppbnB1dE1ldGhvZEV2ZW50KFFJ bnB1dE1ldGhvZEV2ZW50ICpldikKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIFJlbmRl ck9iamVjdCogcmVuZGVyZXIgPSAwOworICAgIE5vZGUqIG5vZGUgPSAwOwogICAgIGlmIChmcmFt ZS0+c2VsZWN0aW9uKCktPnJvb3RFZGl0YWJsZUVsZW1lbnQoKSkKLSAgICAgICAgcmVuZGVyZXIg PSBmcmFtZS0+c2VsZWN0aW9uKCktPnJvb3RFZGl0YWJsZUVsZW1lbnQoKS0+c2hhZG93QW5jZXN0 b3JOb2RlKCktPnJlbmRlcmVyKCk7CisgICAgICAgIG5vZGUgPSBmcmFtZS0+c2VsZWN0aW9uKCkt PnJvb3RFZGl0YWJsZUVsZW1lbnQoKS0+c2hhZG93QW5jZXN0b3JOb2RlKCk7CiAKICAgICBWZWN0 b3I8Q29tcG9zaXRpb25VbmRlcmxpbmU+IHVuZGVybGluZXM7CiAgICAgYm9vbCBoYXNTZWxlY3Rp b24gPSBmYWxzZTsKQEAgLTEwNTQsOCArMTA1NCw4IEBAIHZvaWQgUVdlYlBhZ2VQcml2YXRlOjpp bnB1dE1ldGhvZEV2ZW50KFFJbnB1dE1ldGhvZEV2ZW50ICpldikKICAgICAgICAgY2FzZSBRSW5w dXRNZXRob2RFdmVudDo6U2VsZWN0aW9uOiB7CiAgICAgICAgICAgICBoYXNTZWxlY3Rpb24gPSB0 cnVlOwogICAgICAgICAgICAgLy8gQSBzZWxlY3Rpb24gaW4gdGhlIGlucHV0TWV0aG9kRXZlbnQg aXMgYWx3YXlzIHJlZmxlY3RlZCBpbiB0aGUgdmlzaWJsZSB0ZXh0Ci0gICAgICAgICAgICBpZiAo cmVuZGVyZXIgJiYgcmVuZGVyZXItPm5vZGUoKSkKLSAgICAgICAgICAgICAgICBzZXRTZWxlY3Rp b25SYW5nZShyZW5kZXJlci0+bm9kZSgpLCBxTWluKGEuc3RhcnQsIChhLnN0YXJ0ICsgYS5sZW5n dGgpKSwgcU1heChhLnN0YXJ0LCAoYS5zdGFydCArIGEubGVuZ3RoKSkpOworICAgICAgICAgICAg aWYgKG5vZGUpCisgICAgICAgICAgICAgICAgc2V0U2VsZWN0aW9uUmFuZ2Uobm9kZSwgcU1pbihh LnN0YXJ0LCAoYS5zdGFydCArIGEubGVuZ3RoKSksIHFNYXgoYS5zdGFydCwgKGEuc3RhcnQgKyBh Lmxlbmd0aCkpKTsKIAogICAgICAgICAgICAgaWYgKCFldi0+cHJlZWRpdFN0cmluZygpLmlzRW1w dHkoKSkgewogICAgICAgICAgICAgICAgIGVkaXRvci0+c2V0Q29tcG9zaXRpb24oZXYtPnByZWVk aXRTdHJpbmcoKSwgdW5kZXJsaW5lcywKQEAgLTEzMTksMTQgKzEzMTksMTEgQEAgUVZhcmlhbnQg UVdlYlBhZ2U6OmlucHV0TWV0aG9kUXVlcnkoUXQ6OklucHV0TWV0aG9kUXVlcnkgcHJvcGVydHkp IGNvbnN0CiAgICAgICAgICAgICByZXR1cm4gUVZhcmlhbnQoUUZvbnQoKSk7CiAgICAgICAgIH0K ICAgICAgICAgY2FzZSBRdDo6SW1DdXJzb3JQb3NpdGlvbjogewotICAgICAgICAgICAgaWYgKHJl bmRlclRleHRDb250cm9sKSB7Ci0gICAgICAgICAgICAgICAgaWYgKGVkaXRvci0+aGFzQ29tcG9z aXRpb24oKSkgewotICAgICAgICAgICAgICAgICAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlID0gZWRp dG9yLT5jb21wb3NpdGlvblJhbmdlKCk7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBRVmFy aWFudChyZW5kZXJUZXh0Q29udHJvbC0+c2VsZWN0aW9uRW5kKCkgLSBUZXh0SXRlcmF0b3I6OnJh bmdlTGVuZ3RoKHJhbmdlLmdldCgpKSk7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAg ICAgIHJldHVybiBRVmFyaWFudChmcmFtZS0+c2VsZWN0aW9uKCktPmV4dGVudCgpLm9mZnNldElu Q29udGFpbmVyTm9kZSgpKTsKKyAgICAgICAgICAgIGlmIChlZGl0b3ItPmhhc0NvbXBvc2l0aW9u KCkpIHsKKyAgICAgICAgICAgICAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlID0gZWRpdG9yLT5jb21w b3NpdGlvblJhbmdlKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIFFWYXJpYW50KGZyYW1lLT5z ZWxlY3Rpb24oKS0+ZW5kKCkub2Zmc2V0SW5Db250YWluZXJOb2RlKCkgLSBUZXh0SXRlcmF0b3I6 OnJhbmdlTGVuZ3RoKHJhbmdlLmdldCgpKSk7CiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBy ZXR1cm4gUVZhcmlhbnQoKTsKKyAgICAgICAgICAgIHJldHVybiBRVmFyaWFudChmcmFtZS0+c2Vs ZWN0aW9uKCktPmV4dGVudCgpLm9mZnNldEluQ29udGFpbmVyTm9kZSgpKTsKICAgICAgICAgfQog ICAgICAgICBjYXNlIFF0OjpJbVN1cnJvdW5kaW5nVGV4dDogewogICAgICAgICAgICAgaWYgKHJl bmRlclRleHRDb250cm9sKSB7CkBAIC0xMzQwLDIzICsxMzM3LDIwIEBAIFFWYXJpYW50IFFXZWJQ YWdlOjppbnB1dE1ldGhvZFF1ZXJ5KFF0OjpJbnB1dE1ldGhvZFF1ZXJ5IHByb3BlcnR5KSBjb25z dAogICAgICAgICB9CiAgICAgICAgIGNhc2UgUXQ6OkltQ3VycmVudFNlbGVjdGlvbjogewogICAg ICAgICAgICAgaWYgKHJlbmRlclRleHRDb250cm9sKSB7Ci0gICAgICAgICAgICAgICAgaW50IHN0 YXJ0ID0gcmVuZGVyVGV4dENvbnRyb2wtPnNlbGVjdGlvblN0YXJ0KCk7Ci0gICAgICAgICAgICAg ICAgaW50IGVuZCA9IHJlbmRlclRleHRDb250cm9sLT5zZWxlY3Rpb25FbmQoKTsKKyAgICAgICAg ICAgICAgICBpbnQgc3RhcnQgPSBmcmFtZS0+c2VsZWN0aW9uKCktPnN0YXJ0KCkub2Zmc2V0SW5D b250YWluZXJOb2RlKCk7CisgICAgICAgICAgICAgICAgaW50IGVuZCA9IGZyYW1lLT5zZWxlY3Rp b24oKS0+ZW5kKCkub2Zmc2V0SW5Db250YWluZXJOb2RlKCk7CiAgICAgICAgICAgICAgICAgaWYg KGVuZCA+IHN0YXJ0KQotICAgICAgICAgICAgICAgICAgICByZXR1cm4gUVZhcmlhbnQoUVN0cmlu ZyhyZW5kZXJUZXh0Q29udHJvbC0+dGV4dCgpKS5taWQoc3RhcnQsZW5kLXN0YXJ0KSk7CisgICAg ICAgICAgICAgICAgICAgIHJldHVybiBRVmFyaWFudChRU3RyaW5nKHJlbmRlclRleHRDb250cm9s LT50ZXh0KCkpLm1pZChzdGFydCwgZW5kIC0gc3RhcnQpKTsKICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIHJldHVybiBRVmFyaWFudCgpOwogCiAgICAgICAgIH0KICAgICAgICAgY2FzZSBRdDo6 SW1BbmNob3JQb3NpdGlvbjogewotICAgICAgICAgICAgaWYgKHJlbmRlclRleHRDb250cm9sKSB7 Ci0gICAgICAgICAgICAgICAgaWYgKGVkaXRvci0+aGFzQ29tcG9zaXRpb24oKSkgewotICAgICAg ICAgICAgICAgICAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlID0gZWRpdG9yLT5jb21wb3NpdGlvblJh bmdlKCk7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBRVmFyaWFudChyZW5kZXJUZXh0Q29u dHJvbC0+c2VsZWN0aW9uU3RhcnQoKSAtIFRleHRJdGVyYXRvcjo6cmFuZ2VMZW5ndGgocmFuZ2Uu Z2V0KCkpKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgcmV0dXJuIFFWYXJp YW50KGZyYW1lLT5zZWxlY3Rpb24oKS0+YmFzZSgpLm9mZnNldEluQ29udGFpbmVyTm9kZSgpKTsK KyAgICAgICAgICAgIGlmIChlZGl0b3ItPmhhc0NvbXBvc2l0aW9uKCkpIHsKKyAgICAgICAgICAg ICAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlID0gZWRpdG9yLT5jb21wb3NpdGlvblJhbmdlKCk7Cisg ICAgICAgICAgICAgICAgcmV0dXJuIFFWYXJpYW50KGZyYW1lLT5zZWxlY3Rpb24oKS0+c3RhcnQo KS5vZmZzZXRJbkNvbnRhaW5lck5vZGUoKSAtIFRleHRJdGVyYXRvcjo6cmFuZ2VMZW5ndGgocmFu Z2UuZ2V0KCkpKTsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiBRVmFyaWFudCgp OworICAgICAgICAgICAgcmV0dXJuIFFWYXJpYW50KGZyYW1lLT5zZWxlY3Rpb24oKS0+YmFzZSgp Lm9mZnNldEluQ29udGFpbmVyTm9kZSgpKTsKICAgICAgICAgfQogICAgICAgICBjYXNlIFF0OjpJ bU1heGltdW1UZXh0TGVuZ3RoOiB7CiAgICAgICAgICAgICBpZiAoZnJhbWUtPnNlbGVjdGlvbigp LT5pc0NvbnRlbnRFZGl0YWJsZSgpKSB7CmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9n IGIvV2ViS2l0L3F0L0NoYW5nZUxvZwppbmRleCA5OGQ2ZDQ1Li44MzBlYjgwIDEwMDY0NAotLS0g YS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsNSAr MSwyMCBAQAogMjAxMC0xMC0yOSAgQW5kcmVhcyBLbGluZyAgPGtsaW5nQHdlYmtpdC5vcmc+CiAK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBJTTog RG9uJ3QgbWFuaXB1bGF0ZSBzZWxlY3Rpb24gdmlhIFJlbmRlclRleHRDb250cm9sCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODcwMAorCisgICAgICAg IEdvIGRpcmVjdGx5IHRocm91Z2ggdGhlIEZyYW1lJ3MgU2VsZWN0aW9uQ29udHJvbGxlciBpbnN0 ZWFkLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgdGhpcyBpcyBjb3ZlcmVkIGJ5IHRzdF9RV2Vi UGFnZTo6aW5wdXRNZXRob2RzLgorCisgICAgICAgICogQXBpL3F3ZWJwYWdlLmNwcDoKKyAgICAg ICAgKFFXZWJQYWdlUHJpdmF0ZTo6aW5wdXRNZXRob2RFdmVudCk6CisgICAgICAgIChRV2ViUGFn ZTo6aW5wdXRNZXRob2RRdWVyeSk6CisKKzIwMTAtMTAtMjkgIEFuZHJlYXMgS2xpbmcgIDxrbGlu Z0B3ZWJraXQub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IEFyaXlhIEhpZGF5YXQuCiAKICAg ICAgICAgW1F0XSBRV2ViUGFnZSdzIElucHV0TWV0aG9kIGV2ZW50IGhhbmRsaW5nIGNhbGxzIFNo b3J0Y3V0T3ZlcnJpZGUgaGFuZGxlciB0b28K