Chrome side of WebKit Merge 42994:43059

webkit/glue/webtextinput_impl.cc

Index: webkit/glue/webtextinput_impl.cc
===================================================================
--- webkit/glue/webtextinput_impl.cc	(revision 14943)
+++ webkit/glue/webtextinput_impl.cc	(working copy)
@@ -112,8 +112,8 @@
 
   // Range::toString() returns a string different from what test expects.
   // So we need to construct the string ourselves.
-  SStringPrintf(range_str, "%d,%d", range->startPosition().m_offset,
-                range->endPosition().m_offset);
+  SStringPrintf(range_str, "%d,%d", range->startPosition().deprecatedEditingOffset(),
+                range->endPosition().deprecatedEditingOffset());
 }
 
 void WebTextInputImpl::SelectedRange(std::string* range_str) {
@@ -122,8 +122,8 @@
 
   // Range::toString() returns a string different from what test expects.
   // So we need to construct the string ourselves.
-  SStringPrintf(range_str, "%d,%d", range.get()->startPosition().m_offset,
-                range.get()->endPosition().m_offset);
+  SStringPrintf(range_str, "%d,%d", range.get()->startPosition().deprecatedEditingOffset(),
+                range.get()->endPosition().deprecatedEditingOffset());
 }
 
 void WebTextInputImpl::FirstRectForCharacterRange(int32_t location,