Commit fa70ca74 authored by xiaochengh's avatar xiaochengh Committed by Commit Bot

Remove TextIteratorTextState::GetString()

The above mentioned function simply returns a string member of the class,
and is only used inside the class. Hence, this patch removes the function
to reduce code complexity and any possible confusion.

BUG=721957
TEST=n/a; no behavioral change

Review-Url: https://codereview.chromium.org/2915863005
Cr-Commit-Position: refs/heads/master@{#476518}
parent 5cbd575e
...@@ -47,7 +47,7 @@ UChar TextIteratorTextState::CharacterAt(unsigned index) const { ...@@ -47,7 +47,7 @@ UChar TextIteratorTextState::CharacterAt(unsigned index) const {
return single_character_buffer_; return single_character_buffer_;
} }
return GetString()[PositionStartOffset() + index]; return text_[PositionStartOffset() + index];
} }
String TextIteratorTextState::Substring(unsigned position, String TextIteratorTextState::Substring(unsigned position,
...@@ -61,7 +61,7 @@ String TextIteratorTextState::Substring(unsigned position, ...@@ -61,7 +61,7 @@ String TextIteratorTextState::Substring(unsigned position,
DCHECK_EQ(length, 1u); DCHECK_EQ(length, 1u);
return String(&single_character_buffer_, 1); return String(&single_character_buffer_, 1);
} }
return GetString().Substring(PositionStartOffset() + position, length); return text_.Substring(PositionStartOffset() + position, length);
} }
void TextIteratorTextState::AppendTextToStringBuilder( void TextIteratorTextState::AppendTextToStringBuilder(
...@@ -76,8 +76,7 @@ void TextIteratorTextState::AppendTextToStringBuilder( ...@@ -76,8 +76,7 @@ void TextIteratorTextState::AppendTextToStringBuilder(
DCHECK_EQ(position, 0u); DCHECK_EQ(position, 0u);
builder.Append(single_character_buffer_); builder.Append(single_character_buffer_);
} else { } else {
builder.Append(GetString(), PositionStartOffset() + position, builder.Append(text_, PositionStartOffset() + position, length_to_append);
length_to_append);
} }
} }
...@@ -185,10 +184,10 @@ void TextIteratorTextState::AppendTextTo(ForwardsTextBuffer* output, ...@@ -185,10 +184,10 @@ void TextIteratorTextState::AppendTextTo(ForwardsTextBuffer* output,
if (PositionNode()) { if (PositionNode()) {
FlushPositionOffsets(); FlushPositionOffsets();
unsigned offset = PositionStartOffset() + position; unsigned offset = PositionStartOffset() + position;
if (GetString().Is8Bit()) if (text_.Is8Bit())
output->PushRange(GetString().Characters8() + offset, length_to_append); output->PushRange(text_.Characters8() + offset, length_to_append);
else else
output->PushRange(GetString().Characters16() + offset, length_to_append); output->PushRange(text_.Characters16() + offset, length_to_append);
return; return;
} }
// We shouldn't be attempting to append text that doesn't exist. // We shouldn't be attempting to append text that doesn't exist.
......
...@@ -45,8 +45,6 @@ class CORE_EXPORT TextIteratorTextState { ...@@ -45,8 +45,6 @@ class CORE_EXPORT TextIteratorTextState {
explicit TextIteratorTextState(const TextIteratorBehavior&); explicit TextIteratorTextState(const TextIteratorBehavior&);
~TextIteratorTextState() {} ~TextIteratorTextState() {}
const String& GetString() const { return text_; }
int length() const { return text_length_; } int length() const { return text_length_; }
UChar CharacterAt(unsigned index) const; UChar CharacterAt(unsigned index) const;
String Substring(unsigned position, unsigned length) const; String Substring(unsigned position, unsigned length) const;
......
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