130908 2014-03-28 12:17:17 -0700 Move sync CancelComposition message under an ifdef 2014-03-28 15:08:06 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap andersca commit-queue enrica sam oldest_to_newest 995420 0 ap 2014-03-28 12:17:17 -0700 Now that we don't use CancelComposition except for when USE(ASYNC_NSTEXTINPUTCLIENT) is not on, let's hide it under an ifdef too. 995421 1 228075 ap 2014-03-28 12:22:29 -0700 Created attachment 228075 proposed patch 995463 2 228075 commit-queue 2014-03-28 15:08:03 -0700 Comment on attachment 228075 proposed patch Clearing flags on attachment: 228075 Committed r166431: <http://trac.webkit.org/changeset/166431> 995464 3 commit-queue 2014-03-28 15:08:06 -0700 All reviewed patches have been landed. Closing bug. 228075 2014-03-28 12:22:29 -0700 2014-03-28 15:08:02 -0700 proposed patch CancelComposition.txt text/plain 6596 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NjQyMSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE0LTAzLTI4ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIE1vdmUgc3luYyBDYW5jZWxD b21wb3NpdGlvbiBtZXNzYWdlIHVuZGVyIGFuIGlmZGVmCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA5MDgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbToKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5OjpjYW5jZWxDb21wb3NpdGlvbik6IERlbGV0ZWQuCisgICAgICAgICog VUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMubW06CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5t ZXNzYWdlcy5pbjoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dlYlBhZ2VNYWMu bW06CisKIDIwMTQtMDMtMjggIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAK ICAgICAgICAgRWxpbWluYXRlIGEgc3luYyBjYW5jZWxDb21wb3NpdGlvbiBjYWxsIGluIFdlYlBh Z2VQcm94eTo6ZWRpdG9yU3RhdGVDaGFuZ2VkCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiAxNjY0MjEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmgJKHdvcmtpbmcgY29weSkKQEAgLTY1MCw4ICs2NTAsNiBAQCBw dWJsaWM6CiAgICAgdm9pZCBzZXRDb21wb3NpdGlvbkFzeW5jKGNvbnN0IFN0cmluZyYgdGV4dCwg VmVjdG9yPFdlYkNvcmU6OkNvbXBvc2l0aW9uVW5kZXJsaW5lPiB1bmRlcmxpbmVzLCBjb25zdCBF ZGl0aW5nUmFuZ2UmIHNlbGVjdGlvblJhbmdlLCBjb25zdCBFZGl0aW5nUmFuZ2UmIHJlcGxhY2Vt ZW50UmFuZ2UpOwogICAgIHZvaWQgY29uZmlybUNvbXBvc2l0aW9uQXN5bmMoKTsKIAotICAgIHZv aWQgY2FuY2VsQ29tcG9zaXRpb24oKTsKLQogI2lmIFBMQVRGT1JNKE1BQykKICAgICB2b2lkIGlu c2VydERpY3RhdGVkVGV4dEFzeW5jKGNvbnN0IFN0cmluZyYgdGV4dCwgY29uc3QgRWRpdGluZ1Jh bmdlJiByZXBsYWNlbWVudFJhbmdlLCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6VGV4dEFsdGVybmF0 aXZlV2l0aFJhbmdlPiYgZGljdGF0aW9uQWx0ZXJuYXRpdmVzKTsKICAgICB2b2lkIGF0dHJpYnV0 ZWRTdWJzdHJpbmdGb3JDaGFyYWN0ZXJSYW5nZUFzeW5jKGNvbnN0IEVkaXRpbmdSYW5nZSYsIFBh c3NSZWZQdHI8QXR0cmlidXRlZFN0cmluZ0ZvckNoYXJhY3RlclJhbmdlQ2FsbGJhY2s+KTsKQEAg LTY2Nyw2ICs2NjUsNyBAQCBwdWJsaWM6CiAgICAgdWludDY0X3QgY2hhcmFjdGVySW5kZXhGb3JQ b2ludChjb25zdCBXZWJDb3JlOjpJbnRQb2ludCk7CiAgICAgV2ViQ29yZTo6SW50UmVjdCBmaXJz dFJlY3RGb3JDaGFyYWN0ZXJSYW5nZShjb25zdCBFZGl0aW5nUmFuZ2UmKTsKICAgICBib29sIGV4 ZWN1dGVLZXlwcmVzc0NvbW1hbmRzKGNvbnN0IFZlY3RvcjxXZWJDb3JlOjpLZXlwcmVzc0NvbW1h bmQ+Jik7CisgICAgdm9pZCBjYW5jZWxDb21wb3NpdGlvbigpOwogI2VuZGlmCiAKICAgICBXS1Zp ZXcqIHdrVmlldygpIGNvbnN0OwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2lvcy9X ZWJQYWdlUHJveHlJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2lvcy9XZWJQYWdlUHJveHlJT1MubW0JKHJldmlzaW9uIDE2NjQwOSkKKysrIFNvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05 OSwxMSArOTksNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6d2luZG93QW5kVmlld0ZyYW1lc0NoCiAg ICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmNhbmNlbENvbXBv c2l0aW9uKCkKLXsKLSAgICBub3RJbXBsZW1lbnRlZCgpOwotfQotCiBTdHJpbmcgV2ViUGFnZVBy b3h5OjpzdHJpbmdTZWxlY3Rpb25Gb3JQYXN0ZWJvYXJkKCkKIHsKICAgICBub3RJbXBsZW1lbnRl ZCgpOwpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJveHlNYWMu bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQYWdlUHJv eHlNYWMubW0JKHJldmlzaW9uIDE2NjQyMSkKKysrIFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9t YWMvV2ViUGFnZVByb3h5TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0yNzgsOCArMjc4LDYgQEAg Ym9vbCBXZWJQYWdlUHJveHk6OmV4ZWN1dGVLZXlwcmVzc0NvbW1hbgogICAgIHJldHVybiByZXN1 bHQ7CiB9CiAKLSNlbmRpZiAvLyAhVVNFKEFTWU5DX05TVEVYVElOUFVUQ0xJRU5UKQotCiB2b2lk IFdlYlBhZ2VQcm94eTo6Y2FuY2VsQ29tcG9zaXRpb24oKQogewogICAgIGlmICghaXNWYWxpZCgp KQpAQCAtMjg4LDYgKzI4Niw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpjYW5jZWxDb21wb3NpdGlv bigpCiAgICAgcHJvY2VzcygpLnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlOjpDYW5jZWxDb21w b3NpdGlvbigpLCBNZXNzYWdlczo6V2ViUGFnZTo6Q2FuY2VsQ29tcG9zaXRpb246OlJlcGx5KG1f ZWRpdG9yU3RhdGUpLCBtX3BhZ2VJRCk7CiB9CiAKKyNlbmRpZiAvLyAhVVNFKEFTWU5DX05TVEVY VElOUFVUQ0xJRU5UKQorCiB2b2lkIFdlYlBhZ2VQcm94eTo6aW5zZXJ0RGljdGF0ZWRUZXh0QXN5 bmMoY29uc3QgU3RyaW5nJiB0ZXh0LCBjb25zdCBFZGl0aW5nUmFuZ2UmIHJlcGxhY2VtZW50UmFu Z2UsIGNvbnN0IFZlY3RvcjxUZXh0QWx0ZXJuYXRpdmVXaXRoUmFuZ2U+JiBkaWN0YXRpb25BbHRl cm5hdGl2ZXNXaXRoUmFuZ2UpCiB7CiAjaWYgVVNFKERJQ1RBVElPTl9BTFRFUk5BVElWRVMpCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgJKHJldmlz aW9uIDE2NjQwOSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgJKHdvcmtpbmcgY29weSkKQEAgLTU1Miw3ICs1NTIsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBj b25maXJtQ29tcG9zaXRpb25Bc3luYygpOwogCiAjaWYgUExBVEZPUk0oTUFDKQotICAgIHZvaWQg Y2FuY2VsQ29tcG9zaXRpb24oRWRpdG9yU3RhdGUmIG5ld1N0YXRlKTsKICAgICB2b2lkIGluc2Vy dERpY3RhdGVkVGV4dEFzeW5jKGNvbnN0IFN0cmluZyYgdGV4dCwgY29uc3QgRWRpdGluZ1Jhbmdl JiByZXBsYWNlbWVudFJhbmdlLCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6RGljdGF0aW9uQWx0ZXJu YXRpdmU+JiBkaWN0YXRpb25BbHRlcm5hdGl2ZUxvY2F0aW9ucyk7CiAgICAgdm9pZCBhdHRyaWJ1 dGVkU3Vic3RyaW5nRm9yQ2hhcmFjdGVyUmFuZ2VBc3luYyhjb25zdCBFZGl0aW5nUmFuZ2UmLCB1 aW50NjRfdCBjYWxsYmFja0lEKTsKICNpZiAhVVNFKEFTWU5DX05TVEVYVElOUFVUQ0xJRU5UKQpA QCAtNTY2LDYgKzU2NSw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGNoYXJhY3RlckluZGV4Rm9yUG9p bnQoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQgcG9pbnQsIHVpbnQ2NF90JiByZXN1bHQpOwogICAg IHZvaWQgZmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2UoY29uc3QgRWRpdGluZ1JhbmdlJiwgV2Vi Q29yZTo6SW50UmVjdCYgcmVzdWx0UmVjdCk7CiAgICAgdm9pZCBleGVjdXRlS2V5cHJlc3NDb21t YW5kcyhjb25zdCBWZWN0b3I8V2ViQ29yZTo6S2V5cHJlc3NDb21tYW5kPiYsIGJvb2wmIGhhbmRs ZWQsIEVkaXRvclN0YXRlJiBuZXdTdGF0ZSk7CisgICAgdm9pZCBjYW5jZWxDb21wb3NpdGlvbihF ZGl0b3JTdGF0ZSYgbmV3U3RhdGUpOwogI2VuZGlmCiAjZW5kaWYKIApJbmRleDogU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4KPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UubWVzc2FnZXMuaW4J KHJldmlzaW9uIDE2NjQwOSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLm1lc3NhZ2VzLmluCSh3b3JraW5nIGNvcHkpCkBAIC0zMDcsNyArMzA3LDYgQEAgbWVz c2FnZXMgLT4gV2ViUGFnZSBMZWdhY3lSZWNlaXZlciB7CiAgICAgQ29uZmlybUNvbXBvc2l0aW9u QXN5bmMoKQogI2VuZGlmCiAjaWYgUExBVEZPUk0oTUFDKQotICAgIENhbmNlbENvbXBvc2l0aW9u KCkgLT4gKFdlYktpdDo6RWRpdG9yU3RhdGUgbmV3U3RhdGUpCiAgICAgSW5zZXJ0RGljdGF0ZWRU ZXh0QXN5bmMoU3RyaW5nIHRleHQsIFdlYktpdDo6RWRpdGluZ1JhbmdlIHJlcGxhY2VtZW50UmFu Z2UsIFZlY3RvcjxXZWJDb3JlOjpEaWN0YXRpb25BbHRlcm5hdGl2ZT4gZGljdGF0aW9uQWx0ZXJu YXRpdmVzKQogICAgIEF0dHJpYnV0ZWRTdWJzdHJpbmdGb3JDaGFyYWN0ZXJSYW5nZUFzeW5jKFdl YktpdDo6RWRpdGluZ1JhbmdlIHJhbmdlLCB1aW50NjRfdCBjYWxsYmFja0lEKTsKICNlbmRpZgpA QCAtMzIyLDYgKzMyMSw3IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2UgTGVnYWN5UmVjZWl2ZXIgewog ICAgIENoYXJhY3RlckluZGV4Rm9yUG9pbnQoV2ViQ29yZTo6SW50UG9pbnQgcG9pbnQpIC0+ICh1 aW50NjRfdCByZXN1bHQpCiAgICAgRmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFuZ2UoV2ViS2l0OjpF ZGl0aW5nUmFuZ2UgcmFuZ2UpIC0+IChXZWJDb3JlOjpJbnRSZWN0IHJlc3VsdFJlY3QpCiAgICAg RXhlY3V0ZUtleXByZXNzQ29tbWFuZHMoVmVjdG9yPFdlYkNvcmU6OktleXByZXNzQ29tbWFuZD4g c2F2ZWRDb21tYW5kcykgLT4gKGJvb2wgaGFuZGxlZCwgV2ViS2l0OjpFZGl0b3JTdGF0ZSBuZXdT dGF0ZSkKKyAgICBDYW5jZWxDb21wb3NpdGlvbigpIC0+IChXZWJLaXQ6OkVkaXRvclN0YXRlIG5l d1N0YXRlKQogI2VuZGlmCiAKICAgICBTZXRNaW5pbXVtTGF5b3V0U2l6ZShXZWJDb3JlOjpJbnRT aXplIG1pbmltdW1MYXlvdXRTaXplKQpJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQkocmV2aXNpb24gMTY2NDA5KQorKysg U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XZWJQYWdlTWFjLm1tCSh3b3Jr aW5nIGNvcHkpCkBAIC00MDAsOCArNDAwLDYgQEAgdm9pZCBXZWJQYWdlOjpleGVjdXRlS2V5cHJl c3NDb21tYW5kcyhjbwogICAgIG5ld1N0YXRlID0gZWRpdG9yU3RhdGUoKTsKIH0KIAotI2VuZGlm IC8vICFVU0UoQVNZTkNfTlNURVhUSU5QVVRDTElFTlQpCi0KIHZvaWQgV2ViUGFnZTo6Y2FuY2Vs Q29tcG9zaXRpb24oRWRpdG9yU3RhdGUmIG5ld1N0YXRlKQogewogICAgIEZyYW1lJiBmcmFtZSA9 IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFpbkZyYW1lKCk7CkBAIC00MDks NiArNDA3LDggQEAgdm9pZCBXZWJQYWdlOjpjYW5jZWxDb21wb3NpdGlvbihFZGl0b3JTdAogICAg IG5ld1N0YXRlID0gZWRpdG9yU3RhdGUoKTsKIH0KIAorI2VuZGlmIC8vICFVU0UoQVNZTkNfTlNU RVhUSU5QVVRDTElFTlQpCisKIHZvaWQgV2ViUGFnZTo6aW5zZXJ0RGljdGF0ZWRUZXh0QXN5bmMo Y29uc3QgU3RyaW5nJiB0ZXh0LCBjb25zdCBFZGl0aW5nUmFuZ2UmIHJlcGxhY2VtZW50RWRpdGlu Z1JhbmdlLCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6RGljdGF0aW9uQWx0ZXJuYXRpdmU+JiBkaWN0 YXRpb25BbHRlcm5hdGl2ZUxvY2F0aW9ucykKIHsKICAgICBGcmFtZSYgZnJhbWUgPSBtX3BhZ2Ut PmZvY3VzQ29udHJvbGxlcigpLmZvY3VzZWRPck1haW5GcmFtZSgpOwo=