Chrome side of WebKit Merge 42994:43059

webkit/glue/webtextinput_impl.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <ctype.h>
 #include "config.h"
 
 #include "base/compiler_specific.h"
 
 MSVC_PUSH_WARNING_LEVEL(0);
@@ skipping 94 matching lines @@
 
 void WebTextInputImpl::AttributedSubstringFromRange(int32_t location,
                                                     int32_t length) {
 }
 
 void WebTextInputImpl::MarkedRange(std::string* range_str) {
   RefPtr<WebCore::Range> range = GetEditor()->compositionRange();
 
   // 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) {
   WTF::RefPtr<WebCore::Range> range
       = GetFrame()->selection()->toNormalizedRange();
 
   // 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,
                                                   int32_t length) {
 }
 
 void WebTextInputImpl::CharacterIndexForPoint(double x, double y) {
 }
 
 void WebTextInputImpl::ValidAttributesForMarkedText(std::string* attributes) {
   // We simply return a string with relevant keywords.
   attributes->assign("NSUnderline,NSUnderlineColor,NSMarkedClauseSegment,NSTextInputReplacementRangeAttributeName");
 }
 
 void WebTextInputImpl::MakeAttributedString(const std::string& str) {
 }
 
 void WebTextInputImpl::DeleteToEndOfParagraph() {
   WebCore::Editor* editor = GetEditor();
   if (!editor->deleteWithDirection(WebCore::SelectionController::FORWARD,
                                    WebCore::ParagraphBoundary,
                                    true,
                                    false)) {
     editor->deleteWithDirection(WebCore::SelectionController::FORWARD,
                                 WebCore::CharacterGranularity,
                                 true,
                                 false);
   }
 }