23185 2009-01-08 09:33:42 -0800 add a currentRange method to the WebTextIterator SPI 2009-01-08 13:00:30 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 darin darin oldest_to_newest 104886 0 darin 2009-01-08 09:33:42 -0800 Some folks at Apple need this in the Objective-C SPI. 104895 1 26526 darin 2009-01-08 10:16:28 -0800 Created attachment 26526 patch 104917 2 darin 2009-01-08 13:00:30 -0800 http://trac.webkit.org/changeset/39715 26526 2009-01-08 10:16:28 -0800 2009-01-08 10:24:13 -0800 patch TextIteratorPatch.txt text/plain 7146 darin SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiAzOTcxMCkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMzEgQEAKKzIwMDktMDEtMDggIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEJ1ZyAyMzE4NTogYWRkIGEgY3VycmVudFJhbmdlIG1ldGhvZCB0byB0aGUgV2ViVGV4dEl0 ZXJhdG9yIFNQSQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjMxODUKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNjQ1NTgzNAorCisgICAgICAgIEkgYWxz byBub3RpY2VkIGEgZ2FyYmFnZS1jb2xsZWN0aW9uLXJlbGF0ZWQgdGhyZWFkaW5nIGlzc3VlIHRo YXQgSSBmaXhlZCwgYW5kCisgICAgICAgIHRoYXQgdGhlIFNQSSBmb3IgZ2V0dGluZyB0ZXh0IHdh cyB1bm5lY2Vzc2FyaWx5IGluZWZmaWNpZW50LCBzbyBJIGZpeGVkIHRoYXQgdG9vLgorCisgICAg ICAgICogV2ViVmlldy9XZWJUZXh0SXRlcmF0b3IuaDogTW92ZWQgY3VycmVudE5vZGUgYW5kIGN1 cnJlbnRUZXh0IGludG8gYSAiZGVwcmVjYXRlZCIKKyAgICAgICAgY2F0ZWdvcnkuIEFkZGVkIGN1 cnJlbnRUZXh0UG9pbnRlciBhbmQgY3VycmVudFRleHRMZW5ndGguCisKKyAgICAgICAgKiBXZWJW aWV3L1dlYlRleHRJdGVyYXRvci5tbTogQ2hhbmdlZCBtX3RleHRJdGVyYXRvciBpbnRvIGFuIE93 blB0ciwgYW5kIGFsc28KKyAgICAgICAgdXNlZCBfdGV4dEl0ZXJhdG9yIHRvIGJlIGNvbnNpc3Rl bnQgd2l0aCBPYmpDIHJhdGhlciB0aGFuIEMrKyBuYW1pbmcuCisgICAgICAgICgrW1dlYlRleHRJ dGVyYXRvclByaXZhdGUgaW5pdGlhbGl6ZV0pOiBBZGRlZC4gQ2FsbHMgV2ViQ29yZU9iakNGaW5h bGl6ZU9uTWFpblRocmVhZCwKKyAgICAgICAgc2luY2UgdGhlIGZpbmFsaXplIG1ldGhvZCBoZXJl IHdvcmtzIHdpdGggbWFpbi10aHJlYWQgb25seSBXZWJDb3JlIG9iamVjdHMuIAorICAgICAgICAo LVtXZWJUZXh0SXRlcmF0b3IgaW5pdFdpdGhSYW5nZTpdKTogQ2hhbmdlZCBzaW5jZSBfdGV4dEl0 ZXJhdG9yIGlzIGFuIE93blB0ciBub3cuCisgICAgICAgICgtW1dlYlRleHRJdGVyYXRvciBhZHZh bmNlXSk6IENoYW5nZWQgbmFtZSBvZiBtX3RleHRJdGVyYXRvci4gUmVtb3ZlZCBudWxsIGFzc2Vy dGlvbiwKKyAgICAgICAgc2luY2UgSSBkb24ndCB0aGluayBpdCBwcm92aWRlcyBtdWNoIHZhbHVl LgorICAgICAgICAoLVtXZWJUZXh0SXRlcmF0b3IgYXRFbmRdKTogRGl0dG8uCisgICAgICAgICgt W1dlYlRleHRJdGVyYXRvciBjdXJyZW50UmFuZ2VdKTogQWRkZWQuCisgICAgICAgICgtW1dlYlRl eHRJdGVyYXRvciBjdXJyZW50VGV4dFBvaW50ZXJdKTogQWRkZWQuCisgICAgICAgICgtW1dlYlRl eHRJdGVyYXRvciBjdXJyZW50VGV4dExlbmd0aF0pOiBBZGRlZC4KKyAgICAgICAgKC1bV2ViVGV4 dEl0ZXJhdG9yIGN1cnJlbnROb2RlXSk6IERpZCBzYW1lIGFzIGFib3ZlLCBidXQgYWxzbyBwdXQg aW50byBuZXcgY2F0ZWdvcnkuCisgICAgICAgICgtW1dlYlRleHRJdGVyYXRvciBjdXJyZW50VGV4 dF0pOiBEaXR0by4KKwogMjAwOS0wMS0wNyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBXZWJL aXQvbWFjL1dlYlZpZXcvV2ViVGV4dEl0ZXJhdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlRleHRJdGVyYXRvci5oCShyZXZpc2lvbiAzOTY4MCkKKysrIFdlYktpdC9t YWMvV2ViVmlldy9XZWJUZXh0SXRlcmF0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUg QEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDggQXBwbGUgSW5jLiBBbGwgUmlnaHRzIFJlc2Vy dmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA4LCAyMDA5IEFwcGxlIEluYy4gQWxsIFJpZ2h0cyBS ZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRl ZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjUsMTMgKzI1LDE3 IEBACiAKICNpbXBvcnQgPEZvdW5kYXRpb24vRm91bmRhdGlvbi5oPgogCisjaWYgTUFDX09TX1hf VkVSU0lPTl9NQVhfQUxMT1dFRCA8PSBNQUNfT1NfWF9WRVJTSU9OXzEwXzQKKyNkZWZpbmUgV2Vi TlNVSW50ZWdlciB1bnNpZ25lZCBpbnQKKyNlbHNlCisjZGVmaW5lIFdlYk5TVUludGVnZXIgTlNV SW50ZWdlcgorI2VuZGlmCiAKIEBjbGFzcyBET01SYW5nZTsKIEBjbGFzcyBET01Ob2RlOwogQGNs YXNzIFdlYlRleHRJdGVyYXRvclByaXZhdGU7CiAKLUBpbnRlcmZhY2UgV2ViVGV4dEl0ZXJhdG9y IDogTlNPYmplY3QKLXsKK0BpbnRlcmZhY2UgV2ViVGV4dEl0ZXJhdG9yIDogTlNPYmplY3Qgewog QHByaXZhdGUKICAgICBXZWJUZXh0SXRlcmF0b3JQcml2YXRlICpfcHJpdmF0ZTsKIH0KQEAgLTM5 LDI4ICs0Myw1MyBAQAogLSAoaWQpaW5pdFdpdGhSYW5nZTooRE9NUmFuZ2UgKilyYW5nZTsKIAog LyohCi0gQG1ldGhvZCBhZHZhbmNlOgorIEBtZXRob2QgYWR2YW5jZQogIEBhYnN0cmFjdCBNYWtl cyB0aGUgV2ViVGV4dEl0ZXJhdG9yIGl0ZXJhdGUgdG8gdGhlIG5leHQgdmlzaWJsZSB0ZXh0IGVs ZW1lbnQuCiAgKi8KIC0gKHZvaWQpYWR2YW5jZTsKIAogLyohCi0gQG1ldGhvZCBjdXJyZW50Tm9k ZToKLSBAcmVzdWx0IFRoZSBjdXJyZW50IERPTU5vZGUgaW4gdGhlIFdlYlRleHRJdGVyYXRvci4K KyBAbWV0aG9kIGF0RW5kCisgQHJlc3VsdCBZRVMgaWYgdGhlIFdlYlRleHRJdGVyYXRvciBoYXMg cmVhY2hlZCB0aGUgZW5kIG9mIHRoZSBET01SYW5nZS4KICAqLwotLSAoRE9NTm9kZSAqKWN1cnJl bnROb2RlOworLSAoQk9PTClhdEVuZDsKIAogLyohCi0gQG1ldGhvZCBjdXJyZW50VGV4dDoKLSBA cmVzdWx0IFRoZSBjdXJyZW50IHRleHQgaW4gdGhlIFdlYlRleHRJdGVyYXRvci4KKyBAbWV0aG9k IGN1cnJlbnRSYW5nZQorIEByZXN1bHQgQSByYW5nZSwgaW5kaWNhdGluZyB0aGUgcG9zaXRpb24g d2l0aGluIHRoZSBkb2N1bWVudCBvZiB0aGUgY3VycmVudCB0ZXh0LgogICovCi0tIChOU1N0cmlu ZyAqKWN1cnJlbnRUZXh0OworLSAoRE9NUmFuZ2UgKiljdXJyZW50UmFuZ2U7CiAKIC8qIQotIEBt ZXRob2QgYXRFbmQ6Ci0gQHJlc3VsdCBZRVMgaWYgdGhlIFdlYlRleHRJdGVyYXRvciBoYXMgcmVh Y2hlZCB0aGUgZW5kIG9mIHRoZSBET01SYW5nZS4KKyBAbWV0aG9kIGN1cnJlbnRUZXh0UG9pbnRl cgorIEByZXN1bHQgQSBwb2ludGVyIHRvIHRoZSBjdXJyZW50IHRleHQuIFRoZSBwb2ludGVyIGJl Y29tZXMgaW52YWxpZCBhZnRlciBhbnkgbW9kaWZpY2F0aW9uIGlzIG1hZGUgdG8gdGhlIGRvY3Vt ZW50OyBpdCBtdXN0IGJlIHVzZWQgcmlnaHQgYXdheS4KICAqLwotLSAoQk9PTClhdEVuZDsKKy0g KGNvbnN0IHVuaWNoYXIgKiljdXJyZW50VGV4dFBvaW50ZXI7CisKKy8qIQorIEBtZXRob2QgY3Vy cmVudFRleHRMZW5ndGgKKyBAcmVzdWx0IGxlbmd0aFB0ciBMZW5ndGggb2YgdGhlIGN1cnJlbnQg dGV4dC4KKyAqLworLSAoV2ViTlNVSW50ZWdlciljdXJyZW50VGV4dExlbmd0aDsKKworQGVuZAor CitAaW50ZXJmYWNlIFdlYlRleHRJdGVyYXRvciAoV2ViVGV4dEl0ZXJhdG9yRGVwcmVjYXRlZCkK IAorLyohCisgQG1ldGhvZCBjdXJyZW50Tm9kZQorIEBhYnN0cmFjdCBBIGNvbnZlbmllbmNlIG1l dGhvZCB0aGF0IGZpbmRzIHRoZSBmaXJzdCBub2RlIGluIGN1cnJlbnRSYW5nZTsgaXQncyBhbG1v c3QgYWx3YXlzIGJldHRlciB0byB1c2UgY3VycmVudFJhbmdlIGluc3RlYWQuCisgQHJlc3VsdCBU aGUgY3VycmVudCBET01Ob2RlIGluIHRoZSBXZWJUZXh0SXRlcmF0b3IKKyAqLworLSAoRE9NTm9k ZSAqKWN1cnJlbnROb2RlOworCisvKiEKKyBAbWV0aG9kIGN1cnJlbnRUZXh0CisgQGFic3RyYWN0 IEEgY29udmVuaWVuY2UgbWV0aG9kIHRoYXQgbWFrZXMgYW4gTlNTdHJpbmcgb3V0IG9mIHRoZSBj dXJyZW50IHRleHQ7IGl0J3MgYWxtb3N0IGFsd2F5cyBiZXR0ZXIgdG8gdXNlIGN1cnJlbnRUZXh0 UG9pbnRlciBhbmQgY3VycmVudFRleHRMZW5ndGggaW5zdGVhZC4KKyBAcmVzdWx0IFRoZSBjdXJy ZW50IHRleHQgaW4gdGhlIFdlYlRleHRJdGVyYXRvci4KKyAqLworLSAoTlNTdHJpbmcgKiljdXJy ZW50VGV4dDsKIAogQGVuZAorCisjdW5kZWYgV2ViTlNVSW50ZWdlcgpJbmRleDogV2ViS2l0L21h Yy9XZWJWaWV3L1dlYlRleHRJdGVyYXRvci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dl YlZpZXcvV2ViVGV4dEl0ZXJhdG9yLm1tCShyZXZpc2lvbiAzOTY4MCkKKysrIFdlYktpdC9tYWMv V2ViVmlldy9XZWJUZXh0SXRlcmF0b3IubW0JKHdvcmtpbmcgY29weSkKQEAgLTI3LDMwICsyNywy NiBAQAogCiAjaW1wb3J0ICJET01Ob2RlSW50ZXJuYWwuaCIKICNpbXBvcnQgIkRPTVJhbmdlSW50 ZXJuYWwuaCIKKyNpbXBvcnQgPEphdmFTY3JpcHRDb3JlL1ZlY3Rvci5oPgogI2ltcG9ydCA8V2Vi Q29yZS9UZXh0SXRlcmF0b3IuaD4KLSNpbXBvcnQgPHd0Zi9WZWN0b3IuaD4KKyNpbXBvcnQgPFdl YkNvcmUvV2ViQ29yZU9iakNFeHRyYXMuaD4KIAordXNpbmcgbmFtZXNwYWNlIEpTQzsKIHVzaW5n IG5hbWVzcGFjZSBXZWJDb3JlOwogCi1AaW50ZXJmYWNlIFdlYlRleHRJdGVyYXRvclByaXZhdGUg OiBOU09iamVjdAoteworQGludGVyZmFjZSBXZWJUZXh0SXRlcmF0b3JQcml2YXRlIDogTlNPYmpl Y3QgewogQHB1YmxpYwotICAgIFRleHRJdGVyYXRvciogbV90ZXh0SXRlcmF0b3I7CisgICAgT3du UHRyPFRleHRJdGVyYXRvcj4gX3RleHRJdGVyYXRvcjsKIH0KIEBlbmQKIAogQGltcGxlbWVudGF0 aW9uIFdlYlRleHRJdGVyYXRvclByaXZhdGUKIAotLSAodm9pZClkZWFsbG9jCi17Ci0gICAgZGVs ZXRlIG1fdGV4dEl0ZXJhdG9yOwotICAgIFtzdXBlciBkZWFsbG9jXTsKLX0KLQotLSAodm9pZClm aW5hbGl6ZQorKyAodm9pZClpbml0aWFsaXplCiB7Ci0gICAgZGVsZXRlIG1fdGV4dEl0ZXJhdG9y OwotICAgIFtzdXBlciBmaW5hbGl6ZV07CisjaWZuZGVmIEJVSUxESU5HX09OX1RJR0VSCisgICAg V2ViQ29yZU9iakNGaW5hbGl6ZU9uTWFpblRocmVhZChzZWxmKTsKKyNlbmRpZgogfQogCiBAZW5k CkBAIC03MCwzOSArNjYsNDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAgICAgICAgIHJl dHVybiBzZWxmOwogICAgIAogICAgIF9wcml2YXRlID0gW1tXZWJUZXh0SXRlcmF0b3JQcml2YXRl IGFsbG9jXSBpbml0XTsKLSAgICBfcHJpdmF0ZS0+bV90ZXh0SXRlcmF0b3IgPSBuZXcgVGV4dEl0 ZXJhdG9yKFtyYW5nZSBfcmFuZ2VdLCB0cnVlLCBmYWxzZSk7CisgICAgX3ByaXZhdGUtPl90ZXh0 SXRlcmF0b3Iuc2V0KG5ldyBUZXh0SXRlcmF0b3IoW3JhbmdlIF9yYW5nZV0sIHRydWUsIGZhbHNl KSk7CiAgICAgcmV0dXJuIHNlbGY7CiB9CiAKIC0gKHZvaWQpYWR2YW5jZQogewotICAgIEFTU0VS VChfcHJpdmF0ZS0+bV90ZXh0SXRlcmF0b3IpOwotICAgIAotICAgIGlmIChfcHJpdmF0ZS0+bV90 ZXh0SXRlcmF0b3ItPmF0RW5kKCkpCi0gICAgICAgIHJldHVybjsKLSAgICAKLSAgICBfcHJpdmF0 ZS0+bV90ZXh0SXRlcmF0b3ItPmFkdmFuY2UoKTsKKyAgICBfcHJpdmF0ZS0+X3RleHRJdGVyYXRv ci0+YWR2YW5jZSgpOwogfQogCi0tIChET01Ob2RlICopY3VycmVudE5vZGUKKy0gKEJPT0wpYXRF bmQKIHsKLSAgICBBU1NFUlQoX3ByaXZhdGUtPm1fdGV4dEl0ZXJhdG9yKTsKLSAgICAKLSAgICBy ZXR1cm4gW0RPTU5vZGUgX3dyYXBOb2RlOl9wcml2YXRlLT5tX3RleHRJdGVyYXRvci0+bm9kZSgp XTsKKyAgICByZXR1cm4gX3ByaXZhdGUtPl90ZXh0SXRlcmF0b3ItPmF0RW5kKCk7CiB9CiAKLS0g KE5TU3RyaW5nICopY3VycmVudFRleHQKKy0gKERPTVJhbmdlICopY3VycmVudFJhbmdlCiB7Ci0g ICAgQVNTRVJUKF9wcml2YXRlLT5tX3RleHRJdGVyYXRvcik7Ci0gICAgCi0gICAgcmV0dXJuIFtO U1N0cmluZyBzdHJpbmdXaXRoQ2hhcmFjdGVyczpfcHJpdmF0ZS0+bV90ZXh0SXRlcmF0b3ItPmNo YXJhY3RlcnMoKSBsZW5ndGg6X3ByaXZhdGUtPm1fdGV4dEl0ZXJhdG9yLT5sZW5ndGgoKV07Cisg ICAgcmV0dXJuIFtET01SYW5nZSBfd3JhcFJhbmdlOl9wcml2YXRlLT5fdGV4dEl0ZXJhdG9yLT5y YW5nZSgpLmdldCgpXTsKIH0KIAotLSAoQk9PTClhdEVuZAorLSAoY29uc3QgdW5pY2hhciAqKWN1 cnJlbnRUZXh0UG9pbnRlcgogewotICAgIEFTU0VSVChfcHJpdmF0ZS0+bV90ZXh0SXRlcmF0b3Ip OwotICAgIAotICAgIHJldHVybiBfcHJpdmF0ZS0+bV90ZXh0SXRlcmF0b3ItPmF0RW5kKCk7Cisg ICAgcmV0dXJuIF9wcml2YXRlLT5fdGV4dEl0ZXJhdG9yLT5jaGFyYWN0ZXJzKCk7Cit9CisKKy0g KE5TVUludGVnZXIpY3VycmVudFRleHRMZW5ndGgKK3sKKyAgICByZXR1cm4gX3ByaXZhdGUtPl90 ZXh0SXRlcmF0b3ItPmxlbmd0aCgpOworfQorCitAZW5kCisKK0BpbXBsZW1lbnRhdGlvbiBXZWJU ZXh0SXRlcmF0b3IgKFdlYlRleHRJdGVyYXRvckRlcHJlY2F0ZWQpCisKKy0gKERPTU5vZGUgKilj dXJyZW50Tm9kZQoreworICAgIHJldHVybiBbRE9NTm9kZSBfd3JhcE5vZGU6X3ByaXZhdGUtPl90 ZXh0SXRlcmF0b3ItPm5vZGUoKV07Cit9CisKKy0gKE5TU3RyaW5nICopY3VycmVudFRleHQKK3sK KyAgICByZXR1cm4gW05TU3RyaW5nIHN0cmluZ1dpdGhDaGFyYWN0ZXJzOl9wcml2YXRlLT5fdGV4 dEl0ZXJhdG9yLT5jaGFyYWN0ZXJzKCkgbGVuZ3RoOl9wcml2YXRlLT5fdGV4dEl0ZXJhdG9yLT5s ZW5ndGgoKV07CiB9CiAKIEBlbmQK