Use FrameSelection::Granularity in TextControlElement::ComputeSelection{Start,End}()

third_party/WebKit/Source/core/html/TextControlElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 485 matching lines @@
   if (!frame)
     return 0;
   {
     // To avoid regression on speedometer benchmark[1] test, we should not
     // update layout tree in this code block.
     // [1] http://browserbench.org/Speedometer/
     DocumentLifecycle::DisallowTransitionScope disallow_transition(
         GetDocument().Lifecycle());
     const SelectionInDOMTree& selection =
         frame->Selection().GetSelectionInDOMTree();
-    if (selection.Granularity() == kCharacterGranularity) {
+    if (frame->Selection().Granularity() == kCharacterGranularity) {
       return IndexForPosition(InnerEditorElement(),
                               selection.ComputeStartPosition());
     }
   }
   const VisibleSelection& visible_selection =
       frame->Selection().ComputeVisibleSelectionInDOMTreeDeprecated();
   return IndexForPosition(InnerEditorElement(), visible_selection.Start());
 }
 
 unsigned TextControlElement::selectionEnd() const {
@@ skipping 10 matching lines @@
   if (!frame)
     return 0;
   {
     // To avoid regression on speedometer benchmark[1] test, we should not
     // update layout tree in this code block.
     // [1] http://browserbench.org/Speedometer/
     DocumentLifecycle::DisallowTransitionScope disallow_transition(
         GetDocument().Lifecycle());
     const SelectionInDOMTree& selection =
         frame->Selection().GetSelectionInDOMTree();
-    if (selection.Granularity() == kCharacterGranularity) {
+    if (frame->Selection().Granularity() == kCharacterGranularity) {
       return IndexForPosition(InnerEditorElement(),
                               selection.ComputeEndPosition());
     }
   }
   const VisibleSelection& visible_selection =
       frame->Selection().ComputeVisibleSelectionInDOMTreeDeprecated();
   return IndexForPosition(InnerEditorElement(), visible_selection.End());
 }
 
 static const AtomicString& DirectionString(
@@ skipping 423 matching lines @@
 
 void TextControlElement::CopyNonAttributePropertiesFromElement(
     const Element& source) {
   const TextControlElement& source_element =
       static_cast<const TextControlElement&>(source);
   last_change_was_user_edit_ = source_element.last_change_was_user_edit_;
   HTMLFormControlElement::CopyNonAttributePropertiesFromElement(source);
 }
 
 }  // namespace blink