Move SelectionState out of LayoutObject and into Line Layout API

Source/core/layout/line/InlineTextBox.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * 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
  * version 2 of the License, or (at your option) any later version.
  *
@@ skipping 120 matching lines @@
 
 bool InlineTextBox::isSelected(int startPos, int endPos) const
 {
     int sPos = std::max(startPos - m_start, 0);
     // The position after a hard line break is considered to be past its end.
     // See the corresponding code in InlineTextBox::selectionState.
     int ePos = std::min(endPos - m_start, int(m_len) + (isLineBreak() ? 0 : 1));
     return (sPos < ePos);
 }
 
-LayoutObject::SelectionState InlineTextBox::selectionState() const
+SelectionState InlineTextBox::selectionState() const
 {
-    LayoutObject::SelectionState state = layoutObject().selectionState();
-    if (state == LayoutObject::SelectionStart || state == LayoutObject::SelectionEnd || state == LayoutObject::SelectionBoth) {
+    SelectionState state = layoutObject().selectionState();
+    if (state == SelectionStart || state == SelectionEnd || state == SelectionBoth) {
         int startPos, endPos;
         layoutObject().selectionStartEnd(startPos, endPos);
         // The position after a hard line break is considered to be past its end.
         // See the corresponding code in InlineTextBox::isSelected.
         int lastSelectable = start() + len() - (isLineBreak() ? 1 : 0);
 
         // FIXME: Remove -webkit-line-break: LineBreakAfterWhiteSpace.
         int endOfLineAdjustmentForCSSLineBreak = layoutObject().style()->lineBreak() == LineBreakAfterWhiteSpace ? -1 : 0;
-        bool start = (state != LayoutObject::SelectionEnd && startPos >= m_start && startPos <= m_start + m_len + endOfLineAdjustmentForCSSLineBreak);
-        bool end = (state != LayoutObject::SelectionStart && endPos > m_start && endPos <= lastSelectable);
+        bool start = (state != SelectionEnd && startPos >= m_start && startPos <= m_start + m_len + endOfLineAdjustmentForCSSLineBreak);
+        bool end = (state != SelectionStart && endPos > m_start && endPos <= lastSelectable);
         if (start && end)
-            state = LayoutObject::SelectionBoth;
+            state = SelectionBoth;
         else if (start)
-            state = LayoutObject::SelectionStart;
+            state = SelectionStart;
         else if (end)
-            state = LayoutObject::SelectionEnd;
-        else if ((state == LayoutObject::SelectionEnd || startPos < m_start)
-            && (state == LayoutObject::SelectionStart || endPos > lastSelectable))
-            state = LayoutObject::SelectionInside;
-        else if (state == LayoutObject::SelectionBoth)
-            state = LayoutObject::SelectionNone;
+            state = SelectionEnd;
+        else if ((state == SelectionEnd || startPos < m_start)
+            && (state == SelectionStart || endPos > lastSelectable))
+            state = SelectionInside;
+        else if (state == SelectionBoth)
+            state = SelectionNone;
     }
 
     // If there are ellipsis following, make sure their selection is updated.
     if (m_truncation != cNoTruncation && root().ellipsisBox()) {
         EllipsisBox* ellipsis = root().ellipsisBox();
-        if (state != LayoutObject::SelectionNone) {
+        if (state != SelectionNone) {
             int start, end;
             selectionStartEnd(start, end);
             // The ellipsis should be considered to be selected if the end of
             // the selection is past the beginning of the truncation and the
             // beginning of the selection is before or at the beginning of the
             // truncation.
             ellipsis->setSelectionState(end >= m_truncation && start <= m_truncation ?
-                LayoutObject::SelectionInside : LayoutObject::SelectionNone);
+                SelectionInside : SelectionNone);
         } else {
-            ellipsis->setSelectionState(LayoutObject::SelectionNone);
+            ellipsis->setSelectionState(SelectionNone);
         }
     }
 
     return state;
 }
 
 LayoutRect InlineTextBox::localSelectionRect(int startPos, int endPos)
 {
     int sPos = std::max(startPos - m_start, 0);
     int ePos = std::min(endPos - m_start, (int)m_len);
@@ skipping 171 matching lines @@
 }
 
 void InlineTextBox::paint(const PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit /*lineTop*/, LayoutUnit /*lineBottom*/)
 {
     InlineTextBoxPainter(*this).paint(paintInfo, paintOffset);
 }
 
 void InlineTextBox::selectionStartEnd(int& sPos, int& ePos) const
 {
     int startPos, endPos;
-    if (layoutObject().selectionState() == LayoutObject::SelectionInside) {
+    if (layoutObject().selectionState() == SelectionInside) {
         startPos = 0;
         endPos = layoutObject().textLength();
     } else {
         layoutObject().selectionStartEnd(startPos, endPos);
-        if (layoutObject().selectionState() == LayoutObject::SelectionStart)
+        if (layoutObject().selectionState() == SelectionStart)
             endPos = layoutObject().textLength();
-        else if (layoutObject().selectionState() == LayoutObject::SelectionEnd)
+        else if (layoutObject().selectionState() == SelectionEnd)
             startPos = 0;
     }
 
     sPos = std::max(startPos - m_start, 0);
     ePos = std::min(endPos - m_start, (int)m_len);
 }
 
 void InlineTextBox::paintDocumentMarker(GraphicsContext* pt, const LayoutPoint& boxOrigin, DocumentMarker* marker, const ComputedStyle& style, const Font& font, bool grammar)
 {
     InlineTextBoxPainter(*this).paintDocumentMarker(pt, boxOrigin, marker, style, font, grammar);
@@ skipping 171 matching lines @@
     printedCharacters = fprintf(stderr, "\t%s %p", obj.name(), &obj);
     const int layoutObjectCharacterOffset = 75;
     for (; printedCharacters < layoutObjectCharacterOffset; printedCharacters++)
         fputc(' ', stderr);
     fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), value.utf8().data());
 }
 
 #endif
 
 } // namespace blink