Commit cf89dc56 authored by Sidney San Martín's avatar Sidney San Martín Committed by Commit Bot

Undo an incorrect change to selectedRange behavior.

In r661714, I changed -[RenderWidgetHostViewCocoa selectedRange] to
account for the selection offset. But, it turns out that's already
accounted for; I mis-interpreted some other behavior.

This change effectively reverts that one
(7b4466da) but keeps the new test case.

Bug: 42434
Change-Id: I4c738abd5207d447260c98d6293a560f9694d3f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1649143
Auto-Submit: Sidney San Martín <sdy@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#667212}
parent 61186549
...@@ -1571,8 +1571,7 @@ extern NSString* NSTextInputReplacementRangeAttributeName; ...@@ -1571,8 +1571,7 @@ extern NSString* NSTextInputReplacementRangeAttributeName;
} }
- (NSRange)selectedRange { - (NSRange)selectedRange {
return NSMakeRange(textSelectionRange_.GetMin() + textSelectionOffset_, return textSelectionRange_.ToNSRange();
textSelectionRange_.length());
} }
- (NSRange)markedRange { - (NSRange)markedRange {
......
...@@ -572,7 +572,7 @@ TEST_F(RenderWidgetHostViewMacTest, NSTextInputClientConformance) { ...@@ -572,7 +572,7 @@ TEST_F(RenderWidgetHostViewMacTest, NSTextInputClientConformance) {
rwhv_mac_->SelectionChanged(base::UTF8ToUTF16("llo, world!"), 2, rwhv_mac_->SelectionChanged(base::UTF8ToUTF16("llo, world!"), 2,
gfx::Range(5, 10)); gfx::Range(5, 10));
EXPECT_NSEQ(NSMakeRange(7, 5), [rwhv_cocoa_ selectedRange]); EXPECT_NSEQ(NSMakeRange(5, 5), [rwhv_cocoa_ selectedRange]);
NSRange actualRange = NSMakeRange(1u, 2u); NSRange actualRange = NSMakeRange(1u, 2u);
NSAttributedString* actualString = [rwhv_cocoa_ NSAttributedString* actualString = [rwhv_cocoa_
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment