71435 2011-11-02 19:09:20 -0700 Move NSRange / DOMRange conversion functions to WebFramePrivate 2011-11-03 09:47:11 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joepeck joepeck darin ddkilzer joepeck webkit.review.bot oldest_to_newest 495152 0 joepeck 2011-11-02 19:09:20 -0700 Move the following from WebFrame (WebInternal) to WebFrame (WebPrivate): - (DOMRange *)_convertNSRangeToDOMRange:(NSRange)nsrange - (NSRange)_convertDOMRangeToNSRange:(DOMRange *)range Remove the old version that were left around for Leopard but are no longer used. 495154 1 113421 joepeck 2011-11-02 19:15:55 -0700 Created attachment 113421 [PATCH] Move Functions to WebFramePrivate 495206 2 113421 webkit.review.bot 2011-11-02 22:28:32 -0700 Comment on attachment 113421 [PATCH] Move Functions to WebFramePrivate Clearing flags on attachment: 113421 Committed r99139: <http://trac.webkit.org/changeset/99139> 495207 3 webkit.review.bot 2011-11-02 22:28:36 -0700 All reviewed patches have been landed. Closing bug. 495550 4 113421 darin 2011-11-03 09:47:11 -0700 Comment on attachment 113421 [PATCH] Move Functions to WebFramePrivate View in context: https://bugs.webkit.org/attachment.cgi?id=113421&action=review > Source/WebKit/mac/WebView/WebFrame.mm:-695 > -- (DOMRange *)convertNSRangeToDOMRange:(NSRange)nsrange > -{ > - // This method exists to maintain compatibility with Leopard's Dictionary.app. <rdar://problem/6002160> > - return [self _convertNSRangeToDOMRange:nsrange]; > -} If removing this, we should also remove the -[WebHTMLView _bridge] method. 113421 2011-11-02 19:15:55 -0700 2011-11-03 09:47:11 -0700 [PATCH] Move Functions to WebFramePrivate move-funcs.patch text/plain 4062 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZwppbmRleCA3YTg5NjBmLi4wMzlmOTc3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTEtMTEtMDIgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFw cGxlLmNvbT4KKworICAgICAgICBNb3ZlIE5TUmFuZ2UgLyBET01SYW5nZSBjb252ZXJzaW9uIGZ1 bmN0aW9ucyB0byBXZWJGcmFtZVByaXZhdGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTcxNDM1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTW92ZSBjb252ZXJzaW9uIGZ1bmN0aW9ucyB0byBXZWJGcmFtZVBy aXZhdGUsCisgICAgICAgIGFuZCByZW1vdmUgdGhlIG5vIGxvbmdlciB1c2VkIHZlcnNpb25zLgor CisgICAgICAgICogV2ViVmlldy9XZWJGcmFtZS5tbToKKyAgICAgICAgKC1bV2ViRnJhbWUgX2Nv bnZlcnROU1JhbmdlVG9ET01SYW5nZTpdKToKKyAgICAgICAgKC1bV2ViRnJhbWUgX2NvbnZlcnRE T01SYW5nZVRvTlNSYW5nZTpdKToKKyAgICAgICAgKiBXZWJWaWV3L1dlYkZyYW1lSW50ZXJuYWwu aDoKKyAgICAgICAgKiBXZWJWaWV3L1dlYkZyYW1lUHJpdmF0ZS5oOgorCiAyMDExLTExLTAyICBK b24gTGVlICA8am9ubGVlQGFwcGxlLmNvbT4KIAogICAgICAgICBFeHBhbmQgRHJhZ0NvbnRyb2xs ZXIgdG8gcHJvdmlkZSBtb3JlIGluZm9ybWF0aW9uIGFib3V0IHRoZSBkcmFnZ2luZyBzZXNzaW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tIGIvU291 cmNlL1dlYktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZS5tbQppbmRleCAwMjk4NThhLi5iNzcwYTNk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lLm1tCisrKyBi L1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWUubW0KQEAgLTY4OCwyOCArNjg4LDYg QEAgc3RhdGljIGlubGluZSBXZWJEYXRhU291cmNlICpkYXRhU291cmNlKERvY3VtZW50TG9hZGVy KiBsb2FkZXIpCiAgICAgcmV0dXJuIFRleHRJdGVyYXRvcjo6cmFuZ2VGcm9tTG9jYXRpb25BbmRM ZW5ndGgoX3ByaXZhdGUtPmNvcmVGcmFtZS0+c2VsZWN0aW9uKCktPnJvb3RFZGl0YWJsZUVsZW1l bnRPckRvY3VtZW50RWxlbWVudCgpLCBuc3JhbmdlLmxvY2F0aW9uLCBuc3JhbmdlLmxlbmd0aCk7 CiB9CiAKLS0gKERPTVJhbmdlICopY29udmVydE5TUmFuZ2VUb0RPTVJhbmdlOihOU1JhbmdlKW5z cmFuZ2UKLXsKLSAgICAvLyBUaGlzIG1ldGhvZCBleGlzdHMgdG8gbWFpbnRhaW4gY29tcGF0aWJp bGl0eSB3aXRoIExlb3BhcmQncyBEaWN0aW9uYXJ5LmFwcC4gPHJkYXI6Ly9wcm9ibGVtLzYwMDIx NjA+Ci0gICAgcmV0dXJuIFtzZWxmIF9jb252ZXJ0TlNSYW5nZVRvRE9NUmFuZ2U6bnNyYW5nZV07 Ci19Ci0KLS0gKERPTVJhbmdlICopX2NvbnZlcnROU1JhbmdlVG9ET01SYW5nZTooTlNSYW5nZSlu c3JhbmdlCi17Ci0gICAgcmV0dXJuIGtpdChbc2VsZiBfY29udmVydFRvRE9NUmFuZ2U6bnNyYW5n ZV0uZ2V0KCkpOwotfQotCi0tIChOU1JhbmdlKWNvbnZlcnRET01SYW5nZVRvTlNSYW5nZTooRE9N UmFuZ2UgKilyYW5nZQotewotICAgIC8vIFRoaXMgbWV0aG9kIGV4aXN0cyB0byBtYWludGFpbiBj b21wYXRpYmlsaXR5IHdpdGggTGVvcGFyZCdzIERpY3Rpb25hcnkuYXBwLiA8cmRhcjovL3Byb2Js ZW0vNjAwMjE2MD4KLSAgICByZXR1cm4gW3NlbGYgX2NvbnZlcnRET01SYW5nZVRvTlNSYW5nZTpy YW5nZV07Ci19Ci0KLS0gKE5TUmFuZ2UpX2NvbnZlcnRET01SYW5nZVRvTlNSYW5nZTooRE9NUmFu Z2UgKilyYW5nZQotewotICAgIHJldHVybiBbc2VsZiBfY29udmVydFRvTlNSYW5nZTpjb3JlKHJh bmdlKV07Ci19Ci0KIC0gKERPTVJhbmdlICopX21hcmtET01SYW5nZQogewogICAgIHJldHVybiBr aXQoX3ByaXZhdGUtPmNvcmVGcmFtZS0+ZWRpdG9yKCktPm1hcmsoKS50b05vcm1hbGl6ZWRSYW5n ZSgpLmdldCgpKTsKQEAgLTkyNSw2ICs5MDMsMTYgQEAgc3RhdGljIGlubGluZSBXZWJEYXRhU291 cmNlICpkYXRhU291cmNlKERvY3VtZW50TG9hZGVyKiBsb2FkZXIpCiAgICAgICAgIF9wcml2YXRl LT5jb3JlRnJhbWUtPnNlbGVjdGlvbigpLT5zZXRTZWxlY3Rpb24oVmlzaWJsZVNlbGVjdGlvbihk b21SYW5nZS5nZXQoKSwgU0VMX0RFRkFVTFRfQUZGSU5JVFkpKTsKIH0KIAorLSAoRE9NUmFuZ2Ug KilfY29udmVydE5TUmFuZ2VUb0RPTVJhbmdlOihOU1JhbmdlKW5zcmFuZ2UKK3sKKyAgICByZXR1 cm4ga2l0KFtzZWxmIF9jb252ZXJ0VG9ET01SYW5nZTpuc3JhbmdlXS5nZXQoKSk7Cit9CisKKy0g KE5TUmFuZ2UpX2NvbnZlcnRET01SYW5nZVRvTlNSYW5nZTooRE9NUmFuZ2UgKilyYW5nZQorewor ICAgIHJldHVybiBbc2VsZiBfY29udmVydFRvTlNSYW5nZTpjb3JlKHJhbmdlKV07Cit9CisKIC0g KEJPT0wpX2lzRGlzcGxheWluZ1N0YW5kYWxvbmVJbWFnZQogewogICAgIERvY3VtZW50KiBkb2N1 bWVudCA9IF9wcml2YXRlLT5jb3JlRnJhbWUtPmRvY3VtZW50KCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lSW50ZXJuYWwuaCBiL1NvdXJjZS9XZWJLaXQv bWFjL1dlYlZpZXcvV2ViRnJhbWVJbnRlcm5hbC5oCmluZGV4IDdiMGUyOTIuLmUyZjcyMjggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWVJbnRlcm5hbC5oCisr KyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWVJbnRlcm5hbC5oCkBAIC0xMzgs OCArMTM4LDYgQEAgV2ViVmlldyAqZ2V0V2ViVmlldyhXZWJGcmFtZSAqd2ViRnJhbWUpOwogCiAt IChET01SYW5nZSAqKV9yYW5nZUJ5QWx0ZXJpbmdDdXJyZW50U2VsZWN0aW9uOihXZWJDb3JlOjpG cmFtZVNlbGVjdGlvbjo6RUFsdGVyYXRpb24pYWx0ZXJhdGlvbiBkaXJlY3Rpb246KFdlYkNvcmU6 OlNlbGVjdGlvbkRpcmVjdGlvbilkaXJlY3Rpb24gZ3JhbnVsYXJpdHk6KFdlYkNvcmU6OlRleHRH cmFudWxhcml0eSlncmFudWxhcml0eTsKIC0gKE5TUmFuZ2UpX2NvbnZlcnRUb05TUmFuZ2U6KFdl YkNvcmU6OlJhbmdlKilyYW5nZTsKLS0gKERPTVJhbmdlICopX2NvbnZlcnROU1JhbmdlVG9ET01S YW5nZTooTlNSYW5nZSlyYW5nZTsKLS0gKE5TUmFuZ2UpX2NvbnZlcnRET01SYW5nZVRvTlNSYW5n ZTooRE9NUmFuZ2UgKilyYW5nZTsKIC0gKFBhc3NSZWZQdHI8V2ViQ29yZTo6UmFuZ2U+KV9jb252 ZXJ0VG9ET01SYW5nZTooTlNSYW5nZSluc3JhbmdlOwogCiAtIChET01Eb2N1bWVudEZyYWdtZW50 ICopX2RvY3VtZW50RnJhZ21lbnRXaXRoTWFya3VwU3RyaW5nOihOU1N0cmluZyAqKW1hcmt1cFN0 cmluZyBiYXNlVVJMU3RyaW5nOihOU1N0cmluZyAqKWJhc2VVUkxTdHJpbmc7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lUHJpdmF0ZS5oIGIvU291cmNlL1dl YktpdC9tYWMvV2ViVmlldy9XZWJGcmFtZVByaXZhdGUuaAppbmRleCA5OGRiYjcwLi5mYmZjZDdi IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJWaWV3L1dlYkZyYW1lUHJpdmF0ZS5o CisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYlZpZXcvV2ViRnJhbWVQcml2YXRlLmgKQEAgLTgz LDYgKzgzLDkgQEAgdHlwZWRlZiBlbnVtIHsKIC0gKE5TUmFuZ2UpX3NlbGVjdGVkTlNSYW5nZTsK IC0gKHZvaWQpX3NlbGVjdE5TUmFuZ2U6KE5TUmFuZ2UpcmFuZ2U7CiAKKy0gKERPTVJhbmdlICop X2NvbnZlcnROU1JhbmdlVG9ET01SYW5nZTooTlNSYW5nZSlyYW5nZTsKKy0gKE5TUmFuZ2UpX2Nv bnZlcnRET01SYW5nZVRvTlNSYW5nZTooRE9NUmFuZ2UgKilyYW5nZTsKKwogLSAoQk9PTClfaXNE aXNwbGF5aW5nU3RhbmRhbG9uZUltYWdlOwogCiAtICh1bnNpZ25lZClfcGVuZGluZ0ZyYW1lVW5s b2FkRXZlbnRDb3VudDsK