138567 2014-11-10 11:12:28 -0800 Some functions on DictionaryLookup.h should just be generic functions on Range or VisiblePosition 2015-08-18 09:04:07 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bdakin thorton bdakin enrica simon.fraser thorton oldest_to_newest 1047565 0 bdakin 2014-11-10 11:12:28 -0800 Some functions on DictionaryLookup.h should just be generic functions on Range or VisiblePosition, specifically isPositionInRange() and shouldUseSelection() 1047566 1 bdakin 2014-11-10 11:14:17 -0800 And rangeExpandedAroundPositionByCharacters()! Which is code originally stolen from Editor, according to Tim. 1118253 2 259191 thorton 2015-08-17 14:47:30 -0700 Created attachment 259191 Patch 1118364 3 thorton 2015-08-17 19:03:16 -0700 http://trac.webkit.org/changeset/188565 1118524 4 259191 sabouhallawa 2015-08-18 09:03:47 -0700 Comment on attachment 259191 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=259191&action=review > Source/WebCore/dom/Range.cpp:1963 > +bool Range::contains(const VisiblePosition& position) const Can't we be more generic here and have the prototype of this function: bool Range::contains(const VisiblePosition &start, const VisiblePosition &end)? > Source/WebCore/editing/mac/DictionaryLookup.mm:61 > + return selectedRange->contains(position); To check whether a VisiblePosition is in a range of VisibleSelection, is not it sufficient to call Range::isPointInRange()? What is the difference if VisiblePosition is at the boundary of the range of VisibleSelection when: 1. calling Range::isPointInRange() 2. calling the deleted function isPositionInRange() 3. calling Range::contains() 259191 2015-08-17 14:47:30 -0700 2015-08-18 09:04:07 -0700 Patch bug-138567-20150817144728.patch text/plain 6799 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMTg4NTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE4ODFlOTlhYmE0ZTM1 ZTZlZDA1MzFjOGU0ZTc5ZDliOTRmMzI1YS4uYTYxNGYyZWE4MmE1ODM4NmIzOTk4N2ViZjcyYzJl YTM3YmMzZDU1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE1LTA4LTE3ICBUaW0g SG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFNvbWUgZnVuY3Rp b25zIG9uIERpY3Rpb25hcnlMb29rdXAuaCBzaG91bGQganVzdCBiZSBnZW5lcmljIGZ1bmN0aW9u cyBlbHNld2hlcmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzODU2NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cywganVzdCByZWZhY3RvcmluZy4KKworICAgICAgICAqIGRvbS9SYW5n ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSYW5nZTo6Y29udGFpbnMpOgorICAgICAgICAqIGRv bS9SYW5nZS5oOgorICAgICAgICBBZGQgYSBSYW5nZTo6Y29udGFpbnMoVmlzaWJsZVBvc2l0aW9u KS4KKyAgICAgICAgSXQncyBzaW1wbGVyIHRoYW4gdGhlIG9sZCB0aGluZyBmcm9tIERpY3Rpb25h cnlMb29rdXAubW0sIGJ1dCBkb2VzIHRoZSBzYW1lIHRoaW5nLgorICAgICAgICBJdCdzIHNvIHNp bXBsZSB0aGF0IGl0IGRvZXNuJ3QgbmVjZXNzYXJpbHkgbmVlZCB0byBleGlzdCwgYnV0IGl0IHNl ZW1zIHVzZWZ1bC4KKworICAgICAgICAqIGVkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Om1ha2VSYW5nZSk6CisgICAgICAgIG51bGxwdHJzCisKKyAgICAgICAg KiBlZGl0aW5nL21hYy9EaWN0aW9uYXJ5TG9va3VwLmg6CisgICAgICAgICogZWRpdGluZy9tYWMv RGljdGlvbmFyeUxvb2t1cC5tbToKKyAgICAgICAgKFdlYkNvcmU6OnNlbGVjdGlvbkNvbnRhaW5z UG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6cmFuZ2VGb3JEaWN0aW9uYXJ5TG9va3VwQXRI aXRUZXN0UmVzdWx0KToKKyAgICAgICAgKFdlYkNvcmU6OmlzUG9zaXRpb25JblJhbmdlKTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OnNob3VsZFVzZVNlbGVjdGlvbik6IERlbGV0ZWQuCisg ICAgICAgIE1vdmUgaXNQb3NpdGlvbkluUmFuZ2UgdG8gUmFuZ2UuCisgICAgICAgIFJlbmFtZSBz aG91bGRVc2VTZWxlY3Rpb24gdG8gd2hhdCBpdCByZWFsbHkgbWVhbnMuCisgICAgICAgIEkgZGlk bid0IG1vdmUgc2VsZWN0aW9uQ29udGFpbnNQb3NpdGlvbiB0byBWaXNpYmxlU2VsZWN0aW9uIGJl Y2F1c2UgaXQKKyAgICAgICAgb25seSBoYW5kbGVzIFJhbmdlIHNlbGVjdGlvbnMsIG5vdCBhbnkg b2YgdGhlIG9oZXJzLCBhbmQgdGh1cyBpc24ndAorICAgICAgICBnZW5lcmljIGVub3VnaCB0byBw dXQgdGhlcmUuCisKIDIwMTUtMDgtMTcgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5A d2Via2l0Lm9yZz4KIAogICAgICAgICBNb3ZlIHNvbWUgY29tbWFuZHMgZnJvbSAuL0NNYWtlTGlz dHMudHh0IHRvIFNvdXJjZS9jbWFrZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1Jh bmdlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAKaW5kZXggYThkNWI4ZDNhYmM4 Y2YzNDQzNjcwNzA4YTI2ZDkyZjBiOWZmYTgwMC4uOWJhNDgxNDBiOTc1YjkyNWU3NmY5ZDEzMzAw M2E5NjA5MjUzM2I3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCkBAIC0xOTYwLDYgKzE5NjAsMTQgQEAg Ym9vbCBSYW5nZTo6Y29udGFpbnMoY29uc3QgUmFuZ2UmIG90aGVyKSBjb25zdAogICAgIHJldHVy biBlbmRUb0VuZCA+PSAwOwogfQogCitib29sIFJhbmdlOjpjb250YWlucyhjb25zdCBWaXNpYmxl UG9zaXRpb24mIHBvc2l0aW9uKSBjb25zdAoreworICAgIFJlZlB0cjxSYW5nZT4gcG9zaXRpb25S YW5nZSA9IG1ha2VSYW5nZShwb3NpdGlvbiwgcG9zaXRpb24pOworICAgIGlmICghcG9zaXRpb25S YW5nZSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHJldHVybiBjb250YWlucygqcG9zaXRp b25SYW5nZSk7Cit9CisKIGJvb2wgYXJlUmFuZ2VzRXF1YWwoY29uc3QgUmFuZ2UqIGEsIGNvbnN0 IFJhbmdlKiBiKQogewogICAgIGlmIChhID09IGIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9kb20vUmFuZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5oCmluZGV4IGM2ZTI1YWVj YjEzYzU3ZDgzOTUxMjgwNzc0MjQwNTYzM2UxNjUxZmMuLjA4YmNjZmY1MjAxYzg5ZmMzYTYxNmM4 YjI0OGM3MjI5YzBhZTlkNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5oCkBAIC0xNTUsNiArMTU1LDcgQEAgcHVi bGljOgogI2VuZGlmCiAKICAgICBXRUJDT1JFX0VYUE9SVCBib29sIGNvbnRhaW5zKGNvbnN0IFJh bmdlJikgY29uc3Q7CisgICAgYm9vbCBjb250YWlucyhjb25zdCBWaXNpYmxlUG9zaXRpb24mKSBj b25zdDsKIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBSYW5nZShEb2N1bWVudCYpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uY3BwIGIvU291cmNl L1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uY3BwCmluZGV4IDc4MjQxYjkwNDQ2ZDcx YmY0OWMzZGI3N2UzZTE4NzNiODU4OWE1MTUuLjYzYzBmYmVlNjg0YmE5ZDNjNDQ5NGQ1NTAxYTdj OTUzNjdlZDFjNDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVBv c2l0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Zpc2libGVQb3NpdGlvbi5j cHAKQEAgLTY3MCwxMiArNjcwLDEyIEBAIHZvaWQgVmlzaWJsZVBvc2l0aW9uOjpzaG93VHJlZUZv clRoaXMoKSBjb25zdAogUGFzc1JlZlB0cjxSYW5nZT4gbWFrZVJhbmdlKGNvbnN0IFZpc2libGVQ b3NpdGlvbiAmc3RhcnQsIGNvbnN0IFZpc2libGVQb3NpdGlvbiAmZW5kKQogewogICAgIGlmIChz dGFydC5pc051bGwoKSB8fCBlbmQuaXNOdWxsKCkpCi0gICAgICAgIHJldHVybiAwOworICAgICAg ICByZXR1cm4gbnVsbHB0cjsKICAgICAKICAgICBQb3NpdGlvbiBzID0gc3RhcnQuZGVlcEVxdWl2 YWxlbnQoKS5wYXJlbnRBbmNob3JlZEVxdWl2YWxlbnQoKTsKICAgICBQb3NpdGlvbiBlID0gZW5k LmRlZXBFcXVpdmFsZW50KCkucGFyZW50QW5jaG9yZWRFcXVpdmFsZW50KCk7CiAgICAgaWYgKHMu aXNOdWxsKCkgfHwgZS5pc051bGwoKSkKLSAgICAgICAgcmV0dXJuIDA7CisgICAgICAgIHJldHVy biBudWxscHRyOwogCiAgICAgcmV0dXJuIFJhbmdlOjpjcmVhdGUocy5jb250YWluZXJOb2RlKCkt PmRvY3VtZW50KCksIHMuY29udGFpbmVyTm9kZSgpLCBzLm9mZnNldEluQ29udGFpbmVyTm9kZSgp LCBlLmNvbnRhaW5lck5vZGUoKSwgZS5vZmZzZXRJbkNvbnRhaW5lck5vZGUoKSk7CiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9EaWN0aW9uYXJ5TG9va3VwLmggYi9T b3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9EaWN0aW9uYXJ5TG9va3VwLmgKaW5kZXggNzgyYmE2 ZjdjMzFlNjIyOTQyNGI0NjNmMmJlZGUxZTU2M2NiY2JlYi4uZjYyMjhmNWQ3OGU0NDNlYjM4YzQz NDA1ZGE1MTA2ODFjYTE3Yzk1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9t YWMvRGljdGlvbmFyeUxvb2t1cC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0Rp Y3Rpb25hcnlMb29rdXAuaApAQCAtMzcsMTQgKzM3LDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiBjbGFzcyBIaXRUZXN0UmVzdWx0OwogY2xhc3MgUmFuZ2U7Ci1jbGFzcyBWaXNpYmxlUG9zaXRp b247CiBjbGFzcyBWaXNpYmxlU2VsZWN0aW9uOwogCi0vLyBGSVhNRTogU29tZSBvZiB0aGVzZSBm dW5jdGlvbnMgc2hvdWxkIHByb2JhYmx5IGJlIGluIGEgbW9yZSBnZW5lcmljIGNsYXNzLgotLy8g aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzODU2NwotYm9vbCBpc1Bv c2l0aW9uSW5SYW5nZShjb25zdCBWaXNpYmxlUG9zaXRpb24mLCBSYW5nZSopOwotYm9vbCBzaG91 bGRVc2VTZWxlY3Rpb24oY29uc3QgVmlzaWJsZVBvc2l0aW9uJiwgY29uc3QgVmlzaWJsZVNlbGVj dGlvbiYpOwotCiBXRUJDT1JFX0VYUE9SVCBQYXNzUmVmUHRyPFJhbmdlPiByYW5nZUZvckRpY3Rp b25hcnlMb29rdXBGb3JTZWxlY3Rpb24oY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYsIE5TRGljdGlv bmFyeSAqKm9wdGlvbnMpOwogV0VCQ09SRV9FWFBPUlQgUGFzc1JlZlB0cjxSYW5nZT4gcmFuZ2VG b3JEaWN0aW9uYXJ5TG9va3VwQXRIaXRUZXN0UmVzdWx0KGNvbnN0IEhpdFRlc3RSZXN1bHQmLCBO U0RpY3Rpb25hcnkgKipvcHRpb25zKTsKIFdFQkNPUkVfRVhQT1JUIE5TU3RyaW5nICpkaWN0aW9u YXJ5TG9va3VwRm9yUERGU2VsZWN0aW9uKFBERlNlbGVjdGlvbiAqLCBOU0RpY3Rpb25hcnkgKipv cHRpb25zKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFjL0RpY3Rpb25h cnlMb29rdXAubW0gYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hYy9EaWN0aW9uYXJ5TG9va3Vw Lm1tCmluZGV4IGExZTRmNjQyZGM0NGE5YjE0ZWY1MDFmZTAxNzY3MDMyMjViOWJlYTUuLmVkMDQ3 OWU0YjJiYjliN2ViZGUyYTAxZGJmNzFlZTY2NjI2M2JjOTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvbWFjL0RpY3Rpb25hcnlMb29rdXAubW0KKysrIGIvU291cmNlL1dlYkNv cmUvZWRpdGluZy9tYWMvRGljdGlvbmFyeUxvb2t1cC5tbQpAQCAtNDksMjQgKzQ5LDcgQEAKIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCi1ib29sIGlzUG9zaXRpb25JblJhbmdlKGNvbnN0IFZpc2li bGVQb3NpdGlvbiYgcG9zaXRpb24sIFJhbmdlKiByYW5nZSkKLXsKLSAgICBSZWZQdHI8UmFuZ2U+ IHBvc2l0aW9uUmFuZ2UgPSBtYWtlUmFuZ2UocG9zaXRpb24sIHBvc2l0aW9uKTsKLQotICAgIEV4 Y2VwdGlvbkNvZGUgZWMgPSAwOwotICAgIHJhbmdlLT5jb21wYXJlQm91bmRhcnlQb2ludHMoUmFu Z2U6OlNUQVJUX1RPX1NUQVJULCBwb3NpdGlvblJhbmdlLmdldCgpLCBlYyk7Ci0gICAgaWYgKGVj KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBpZiAoIXJhbmdlLT5pc1BvaW50SW5SYW5n ZShwb3NpdGlvblJhbmdlLT5zdGFydENvbnRhaW5lcigpLCBwb3NpdGlvblJhbmdlLT5zdGFydE9m ZnNldCgpLCBlYykpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoZWMpCi0gICAgICAg IHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiB0cnVlOwotfQotCi1ib29sIHNob3VsZFVzZVNl bGVjdGlvbihjb25zdCBWaXNpYmxlUG9zaXRpb24mIHBvc2l0aW9uLCBjb25zdCBWaXNpYmxlU2Vs ZWN0aW9uJiBzZWxlY3Rpb24pCitzdGF0aWMgYm9vbCBzZWxlY3Rpb25Db250YWluc1Bvc2l0aW9u KGNvbnN0IFZpc2libGVQb3NpdGlvbiYgcG9zaXRpb24sIGNvbnN0IFZpc2libGVTZWxlY3Rpb24m IHNlbGVjdGlvbikKIHsKICAgICBpZiAoIXNlbGVjdGlvbi5pc1JhbmdlKCkpCiAgICAgICAgIHJl dHVybiBmYWxzZTsKQEAgLTc1LDcgKzU4LDcgQEAgYm9vbCBzaG91bGRVc2VTZWxlY3Rpb24oY29u c3QgVmlzaWJsZVBvc2l0aW9uJiBwb3NpdGlvbiwgY29uc3QgVmlzaWJsZVNlbGVjdGlvbiYKICAg ICBpZiAoIXNlbGVjdGVkUmFuZ2UpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIHJldHVy biBpc1Bvc2l0aW9uSW5SYW5nZShwb3NpdGlvbiwgc2VsZWN0ZWRSYW5nZS5nZXQoKSk7CisgICAg cmV0dXJuIHNlbGVjdGVkUmFuZ2UtPmNvbnRhaW5zKHBvc2l0aW9uKTsKIH0KIAogUGFzc1JlZlB0 cjxSYW5nZT4gcmFuZ2VGb3JEaWN0aW9uYXJ5TG9va3VwRm9yU2VsZWN0aW9uKGNvbnN0IFZpc2li bGVTZWxlY3Rpb24mIHNlbGVjdGlvbiwgTlNEaWN0aW9uYXJ5ICoqb3B0aW9ucykKQEAgLTEyNyw4 ICsxMTAsOSBAQCBQYXNzUmVmUHRyPFJhbmdlPiByYW5nZUZvckRpY3Rpb25hcnlMb29rdXBBdEhp dFRlc3RSZXN1bHQoY29uc3QgSGl0VGVzdFJlc3VsdCYgaAogICAgIGlmIChwb3NpdGlvbi5pc051 bGwoKSkKICAgICAgICAgcG9zaXRpb24gPSBmaXJzdFBvc2l0aW9uSW5PckJlZm9yZU5vZGUobm9k ZSk7CiAKKyAgICAvLyBJZiB3ZSBoaXQgdGhlIHNlbGVjdGlvbiwgdXNlIHRoYXQgaW5zdGVhZCBv ZiBsZXR0aW5nIExvb2t1cCBkZWNpZGUgdGhlIHJhbmdlLgogICAgIFZpc2libGVTZWxlY3Rpb24g c2VsZWN0aW9uID0gZnJhbWUtPnBhZ2UoKS0+Zm9jdXNDb250cm9sbGVyKCkuZm9jdXNlZE9yTWFp bkZyYW1lKCkuc2VsZWN0aW9uKCkuc2VsZWN0aW9uKCk7Ci0gICAgaWYgKHNob3VsZFVzZVNlbGVj dGlvbihwb3NpdGlvbiwgc2VsZWN0aW9uKSkKKyAgICBpZiAoc2VsZWN0aW9uQ29udGFpbnNQb3Np dGlvbihwb3NpdGlvbiwgc2VsZWN0aW9uKSkKICAgICAgICAgcmV0dXJuIHJhbmdlRm9yRGljdGlv bmFyeUxvb2t1cEZvclNlbGVjdGlvbihzZWxlY3Rpb24sIG9wdGlvbnMpOwogCiAgICAgVmlzaWJs ZVNlbGVjdGlvbiBzZWxlY3Rpb25BY2NvdW50aW5nRm9yTGluZVJ1bGVzID0gVmlzaWJsZVNlbGVj dGlvbihwb3NpdGlvbik7Cg==