Implements the ability to get and set the caret position and the current selection from anywhere in…

Source/web/WebAXObject.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 814 matching lines @@
 }
 
 WebAXRole WebAXObject::role() const
 {
     if (isDetached())
         return WebAXRoleUnknown;
 
     return static_cast<WebAXRole>(m_private->roleValue());
 }
 
+void WebAXObject::selection(unsigned* anchorId, unsigned* anchorOffset,
+    unsigned* focusId, unsigned* focusOffset) const
+{
+    if (isDetached()) {
+        *anchorId = 0;
+        *anchorOffset = 0;
+        *focusId = 0;
+        *focusOffset = 0;
+        return;
+    }
+
+    AXObject::AXSelection axSelection = m_private->selection();
+    *anchorId = axSelection.anchorId;
+    *anchorOffset = axSelection.anchorOffset;
+    *focusId = axSelection.focusId;
+    *focusOffset = axSelection.focusOffset;
+    return;
+}
+
 unsigned WebAXObject::selectionEnd() const
 {
     if (isDetached())
         return 0;
 
-    return m_private->selectedTextRange().start + m_private->selectedTextRange().length;
+    AXObject::AXSelection axSelection = m_private->selectionUnderObject();
+    return axSelection.focusOffset;
 }
 
 unsigned WebAXObject::selectionStart() const
 {
     if (isDetached())
         return 0;
 
-    return m_private->selectedTextRange().start;
+    AXObject::AXSelection axSelection = m_private->selectionUnderObject();
+    return axSelection.anchorOffset;
 }
 
 unsigned WebAXObject::selectionEndLineNumber() const
 {
     if (isDetached())
         return 0;
 
     VisiblePosition position = m_private->visiblePositionForIndex(selectionEnd());
     int lineNumber = m_private->lineForPosition(position);
     if (lineNumber < 0)
@@ skipping 17 matching lines @@
 {
     if (!isDetached())
         m_private->setFocused(on);
 }
 
 void WebAXObject::setSelectedTextRange(int selectionStart, int selectionEnd) const
 {
     if (isDetached())
         return;
 
-    m_private->setSelectedTextRange(AXObject::PlainTextRange(selectionStart, selectionEnd - selectionStart));
+    m_private->setSelection(AXObject::AXSelection(selectionStart, selectionEnd));
 }
 
 void WebAXObject::setValue(WebString value) const
 {
     if (isDetached())
         return;
 
     m_private->setValue(value);
 }
 
@@ skipping 609 matching lines @@
     for (size_t i = 0; i < vectorSize; i++)
         offsetsWebVector[i] = offsetsVector[i];
     offsets.swap(offsetsWebVector);
 }
 
 void WebAXObject::wordBoundaries(WebVector<int>& starts, WebVector<int>& ends) const
 {
     if (isDetached())
         return;
 
-    Vector<AXObject::PlainTextRange> words;
-    m_private->wordBoundaries(words);
+    Vector<AXObject::AXSelection> wordBoundaries;

[dmazzoni, 2015/06/16 17:24:04]

Switching this to use AXSelection doesn't make sense to me, because anchorNode
and focusNode are just ignored. Also, word boundaries are not selections and
they don't have "anchor" and "focus", they just have a start and end. Trying to
reuse the same data structure here just seems confusing.

+    m_private->wordBoundaries(wordBoundaries);
 
-    WebVector<int> startsWebVector(words.size());
-    WebVector<int> endsWebVector(words.size());
-    for (size_t i = 0; i < words.size(); i++) {
-        startsWebVector[i] = words[i].start;
-        endsWebVector[i] = words[i].start + words[i].length;
+    WebVector<int> wordStartOffsets(wordBoundaries.size());
+    WebVector<int> wordEndOffsets(wordBoundaries.size());
+    for (size_t i = 0; i < wordBoundaries.size(); ++i) {
+        wordStartOffsets[i] = wordBoundaries[i].anchorOffset;
+        wordEndOffsets[i] = wordBoundaries[i].focusOffset;
     }
-    starts.swap(startsWebVector);
-    ends.swap(endsWebVector);
+
+    starts.swap(wordStartOffsets);
+    ends.swap(wordEndOffsets);
 }
 
 bool WebAXObject::isScrollableContainer() const
 {
     if (isDetached())
         return false;
 
     return m_private->isScrollableContainer();
 }
 
@@ skipping 57 matching lines @@
     m_private = object;
     return *this;
 }
 
 WebAXObject::operator WTF::PassRefPtr<AXObject>() const
 {
     return m_private.get();
 }
 
 } // namespace blink