120119 2013-08-21 10:23:20 -0700 Add some operator overloads to VisiblePosition 2013-08-22 17:35:46 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID InRadar P2 Normal --- 119829 1 roger_fong webkit-unassigned bfulgham rniwa roger_fong thorton webkit-bug-importer oldest_to_newest 919508 0 roger_fong 2013-08-21 10:23:20 -0700 Having these here does no harm and they're quite useful for comparing VisiblePositions. I need them for https://bugs.webkit.org/show_bug.cgi?id=119829 919528 1 webkit-bug-importer 2013-08-21 10:53:02 -0700 <rdar://problem/14797554> 920032 2 209410 roger_fong 2013-08-22 17:22:00 -0700 Created attachment 209410 patch 920040 3 209410 rniwa 2013-08-22 17:32:18 -0700 Comment on attachment 209410 patch View in context: https://bugs.webkit.org/attachment.cgi?id=209410&action=review > Source/WebCore/dom/Position.h:243 > +inline bool operator<(const Position& a, const Position& b) > +{ > + return a.anchorNode() == b.anchorNode() && a.deprecatedEditingOffset() < b.deprecatedEditingOffset() && a.anchorType() == b.anchorType(); > +} I don't think this comparison operator makes sense. Just because nodes aren't same doesn't mean they aren't comparable. If anything, we should be calling comparePositions instead. r-. 920041 4 roger_fong 2013-08-22 17:35:46 -0700 (In reply to comment #3) > (From update of attachment 209410 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=209410&action=review > > > Source/WebCore/dom/Position.h:243 > > +inline bool operator<(const Position& a, const Position& b) > > +{ > > + return a.anchorNode() == b.anchorNode() && a.deprecatedEditingOffset() < b.deprecatedEditingOffset() && a.anchorType() == b.anchorType(); > > +} > > I don't think this comparison operator makes sense. Just because nodes aren't same doesn't mean they aren't comparable. > > If anything, we should be calling comparePositions instead. r-. didn't realize that method existed...will use that instead. 209410 2013-08-22 17:22:00 -0700 2013-08-22 17:32:17 -0700 patch patch.patch text/plain 3367 roger_fong SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE1NDQ2NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDEzLTA4LTIyICBSb2dlciBG b25nICA8cm9nZXJfZm9uZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHNvbWUgb3BlcmF0b3Ig b3ZlcmxvYWRzIHRvIFZpc2libGVQb3NpdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMDExOS4KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE0 Nzk3NTU0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAK KyAgICAgICAgQWRkaW5nIHNvbWUgb3BlcmF0b3Igb3ZlcmxvYWRzIGZvciBjb252ZW5pZW5jZS4K KyAgICAgICAgVGhleSB3b3JrIHRoZSBzYW1lIHdheSBhcyB0aGUgPT0gYW5kICE9IG9wZXJhdG9y IG92ZXJsb2Fkcy4KKworICAgICAgICAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6aXNU ZXh0Q29udHJvbCk6CisgICAgICAgICogZG9tL1Bvc2l0aW9uLmg6CisgICAgICAgIChXZWJDb3Jl OjpvcGVyYXRvcjwpOgorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I+KToKKyAgICAgICAgKFdl YkNvcmU6Om9wZXJhdG9yPD0pOgorICAgICAgICAoV2ViQ29yZTo6b3BlcmF0b3I+PSk6CisgICAg ICAgICogZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6Om9wZXJh dG9yPCk6CisgICAgICAgIChXZWJDb3JlOjpvcGVyYXRvcj4pOgorICAgICAgICAoV2ViQ29yZTo6 b3BlcmF0b3I8PSk6CisgICAgICAgIChXZWJDb3JlOjpvcGVyYXRvcj49KToKKwogMjAxMy0wOC0y MiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBVbmF2 YWlsYWJsZSBwbHVnLWluIGluZGljYXRvciB0ZXh0IGlzIG9uZSBwaXhlbCB0b28gbG93CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9kb20vUG9zaXRpb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9kb20vUG9zaXRpb24uaAkocmV2aXNpb24gMTU0NDMwKQorKysgU291cmNlL1dlYkNvcmUv ZG9tL1Bvc2l0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTIzNyw2ICsyMzcsMjYgQEAKICAgICBy ZXR1cm4gYS5hbmNob3JOb2RlKCkgPT0gYi5hbmNob3JOb2RlKCkgJiYgYS5kZXByZWNhdGVkRWRp dGluZ09mZnNldCgpID09IGIuZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKSAmJiBhLmFuY2hvclR5 cGUoKSA9PSBiLmFuY2hvclR5cGUoKTsKIH0KIAoraW5saW5lIGJvb2wgb3BlcmF0b3I8KGNvbnN0 IFBvc2l0aW9uJiBhLCBjb25zdCBQb3NpdGlvbiYgYikKK3sKKyAgICByZXR1cm4gYS5hbmNob3JO b2RlKCkgPT0gYi5hbmNob3JOb2RlKCkgJiYgYS5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpIDwg Yi5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpICYmIGEuYW5jaG9yVHlwZSgpID09IGIuYW5jaG9y VHlwZSgpOworfQorCitpbmxpbmUgYm9vbCBvcGVyYXRvcj4oY29uc3QgUG9zaXRpb24mIGEsIGNv bnN0IFBvc2l0aW9uJiBiKQoreworICAgIHJldHVybiBhLmFuY2hvck5vZGUoKSA9PSBiLmFuY2hv ck5vZGUoKSAmJiBhLmRlcHJlY2F0ZWRFZGl0aW5nT2Zmc2V0KCkgPiBiLmRlcHJlY2F0ZWRFZGl0 aW5nT2Zmc2V0KCkgJiYgYS5hbmNob3JUeXBlKCkgPT0gYi5hbmNob3JUeXBlKCk7Cit9CisKK2lu bGluZSBib29sIG9wZXJhdG9yPD0oY29uc3QgUG9zaXRpb24mIGEsIGNvbnN0IFBvc2l0aW9uJiBi KQoreworICAgIHJldHVybiBhLmFuY2hvck5vZGUoKSA9PSBiLmFuY2hvck5vZGUoKSAmJiBhLmRl cHJlY2F0ZWRFZGl0aW5nT2Zmc2V0KCkgPD0gYi5kZXByZWNhdGVkRWRpdGluZ09mZnNldCgpICYm IGEuYW5jaG9yVHlwZSgpID09IGIuYW5jaG9yVHlwZSgpOworfQorCitpbmxpbmUgYm9vbCBvcGVy YXRvcj49KGNvbnN0IFBvc2l0aW9uJiBhLCBjb25zdCBQb3NpdGlvbiYgYikKK3sKKyAgICByZXR1 cm4gYS5hbmNob3JOb2RlKCkgPT0gYi5hbmNob3JOb2RlKCkgJiYgYS5kZXByZWNhdGVkRWRpdGlu Z09mZnNldCgpID49IGIuZGVwcmVjYXRlZEVkaXRpbmdPZmZzZXQoKSAmJiBhLmFuY2hvclR5cGUo KSA9PSBiLmFuY2hvclR5cGUoKTsKK30KKwogaW5saW5lIGJvb2wgb3BlcmF0b3IhPShjb25zdCBQ b3NpdGlvbiYgYSwgY29uc3QgUG9zaXRpb24mIGIpCiB7CiAgICAgcmV0dXJuICEoYSA9PSBiKTsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVmlzaWJsZVBvc2l0aW9uLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaAkocmV2aXNpb24g MTU0NDMwKQorKysgU291cmNlL1dlYkNvcmUvZWRpdGluZy9WaXNpYmxlUG9zaXRpb24uaAkod29y a2luZyBjb3B5KQpAQCAtMTIyLDcgKzEyMiwyNyBAQAogewogICAgIHJldHVybiBhLmRlZXBFcXVp dmFsZW50KCkgPT0gYi5kZWVwRXF1aXZhbGVudCgpOwogfQorCitpbmxpbmUgYm9vbCBvcGVyYXRv cjwoY29uc3QgVmlzaWJsZVBvc2l0aW9uJiBhLCBjb25zdCBWaXNpYmxlUG9zaXRpb24mIGIpCit7 CisgICAgcmV0dXJuIGEuZGVlcEVxdWl2YWxlbnQoKSA8IGIuZGVlcEVxdWl2YWxlbnQoKTsKK30K KworaW5saW5lIGJvb2wgb3BlcmF0b3I+KGNvbnN0IFZpc2libGVQb3NpdGlvbiYgYSwgY29uc3Qg VmlzaWJsZVBvc2l0aW9uJiBiKQoreworICAgIHJldHVybiBhLmRlZXBFcXVpdmFsZW50KCkgPiBi LmRlZXBFcXVpdmFsZW50KCk7Cit9CisKK2lubGluZSBib29sIG9wZXJhdG9yPD0oY29uc3QgVmlz aWJsZVBvc2l0aW9uJiBhLCBjb25zdCBWaXNpYmxlUG9zaXRpb24mIGIpCit7CisgICAgcmV0dXJu IGEuZGVlcEVxdWl2YWxlbnQoKSA8PSBiLmRlZXBFcXVpdmFsZW50KCk7Cit9CiAgCitpbmxpbmUg Ym9vbCBvcGVyYXRvcj49KGNvbnN0IFZpc2libGVQb3NpdGlvbiYgYSwgY29uc3QgVmlzaWJsZVBv c2l0aW9uJiBiKQoreworICAgIHJldHVybiBhLmRlZXBFcXVpdmFsZW50KCkgPj0gYi5kZWVwRXF1 aXZhbGVudCgpOworfQorCiBpbmxpbmUgYm9vbCBvcGVyYXRvciE9KGNvbnN0IFZpc2libGVQb3Np dGlvbiYgYSwgY29uc3QgVmlzaWJsZVBvc2l0aW9uJiBiKQogewogICAgIHJldHVybiAhKGEgPT0g Yik7Cg==