| Index: ui/gfx/render_text_mac.cc
|
| diff --git a/ui/gfx/render_text_mac.cc b/ui/gfx/render_text_mac.cc
|
| index 1c046648dc63220fcca566f1ec8c85a106cd3d5e..27f4d06d76d753f6e976b73f799c25e420465c8e 100644
|
| --- a/ui/gfx/render_text_mac.cc
|
| +++ b/ui/gfx/render_text_mac.cc
|
| @@ -94,7 +94,7 @@ std::vector<Rect> RenderTextMac::GetSubstringBounds(const Range& range) {
|
|
|
| size_t RenderTextMac::TextIndexToDisplayIndex(size_t index) {
|
| // TODO(asvitkine): Implement this. http://crbug.com/131618
|
| - return index;
|
| + return std::min(index, GetDisplayText().size());
|
| }
|
|
|
| size_t RenderTextMac::DisplayIndexToTextIndex(size_t index) {
|
| @@ -148,7 +148,7 @@ void RenderTextMac::EnsureLayout() {
|
| &kCFTypeDictionaryValueCallBacks));
|
|
|
| base::ScopedCFTypeRef<CFStringRef> cf_text(
|
| - base::SysUTF16ToCFStringRef(text()));
|
| + base::SysUTF16ToCFStringRef(GetDisplayText()));
|
| base::ScopedCFTypeRef<CFAttributedStringRef> attr_text(
|
| CFAttributedStringCreate(NULL, cf_text, attributes));
|
| base::ScopedCFTypeRef<CFMutableAttributedStringRef> attr_text_mutable(
|
|
|