WIP: Modified AXPosition to work with objects with both embedded object characters and text.

third_party/WebKit/Source/modules/accessibility/AXObjectImpl.h

 
 /*
  * Copyright (C) 2008, 2009, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nuanti Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 18 matching lines @@
  */
 
 #ifndef AXObjectImpl_h
 #define AXObjectImpl_h
 
 #include "core/dom/AXObject.h"
 #include "core/editing/VisiblePosition.h"
 #include "core/editing/markers/DocumentMarker.h"
 #include "core/inspector/protocol/Accessibility.h"
 #include "modules/ModulesExport.h"
+#include "modules/accessibility/AXRange.h"
 #include "platform/geometry/FloatQuad.h"
 #include "platform/geometry/LayoutRect.h"
 #include "platform/graphics/Color.h"
 #include "platform/wtf/Forward.h"
 #include "platform/wtf/Vector.h"
 
 class SkMatrix44;
 
 namespace blink {
 
@@ skipping 197 matching lines @@
 namespace blink {
 
 class MODULES_EXPORT AXObjectImpl
     : public GarbageCollectedFinalized<AXObjectImpl>,
       public AXObject {
   WTF_MAKE_NONCOPYABLE(AXObjectImpl);
 
  public:
   typedef HeapVector<Member<AXObjectImpl>> AXObjectVector;
 
-  struct AXRange {
-    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
-    // The deepest descendant in which the range starts.
-    // (nullptr means the current object.)
-    Persistent<AXObjectImpl> anchor_object;
-    // The number of characters and child objects in the anchor object
-    // before the range starts.
-    int anchor_offset;
-    // When the same character offset could correspond to two possible
-    // cursor positions, upstream means it's on the previous line rather
-    // than the next line.
-    TextAffinity anchor_affinity;
-
-    // The deepest descendant in which the range ends.
-    // (nullptr means the current object.)
-    Persistent<AXObjectImpl> focus_object;
-    // The number of characters and child objects in the focus object
-    // before the range ends.
-    int focus_offset;
-    // When the same character offset could correspond to two possible
-    // cursor positions, upstream means it's on the previous line rather
-    // than the next line.
-    TextAffinity focus_affinity;
-
-    AXRange()
-        : anchor_object(nullptr),
-          anchor_offset(-1),
-          anchor_affinity(TextAffinity::kUpstream),
-          focus_object(nullptr),
-          focus_offset(-1),
-          focus_affinity(TextAffinity::kDownstream) {}
-
-    AXRange(int start_offset, int end_offset)
-        : anchor_object(nullptr),
-          anchor_offset(start_offset),
-          anchor_affinity(TextAffinity::kUpstream),
-          focus_object(nullptr),
-          focus_offset(end_offset),
-          focus_affinity(TextAffinity::kDownstream) {}
-
-    AXRange(AXObjectImpl* anchor_object,
-            int anchor_offset,
-            TextAffinity anchor_affinity,
-            AXObjectImpl* focus_object,
-            int focus_offset,
-            TextAffinity focus_affinity)
-        : anchor_object(anchor_object),
-          anchor_offset(anchor_offset),
-          anchor_affinity(anchor_affinity),
-          focus_object(focus_object),
-          focus_offset(focus_offset),
-          focus_affinity(focus_affinity) {}
-
-    bool IsValid() const {
-      return ((anchor_object && focus_object) ||
-              (!anchor_object && !focus_object)) &&
-             anchor_offset >= 0 && focus_offset >= 0;
-    }
-
-    // Determines if the range only refers to text offsets under the current
-    // object.
-    bool IsSimple() const {
-      return anchor_object == focus_object || !anchor_object || !focus_object;
-    }
-  };
-
  protected:
   AXObjectImpl(AXObjectCacheImpl&);
 
  public:
   virtual ~AXObjectImpl();
   DECLARE_VIRTUAL_TRACE();
 
   static unsigned NumberOfLiveAXObjects() { return number_of_live_ax_objects_; }
 
   // After constructing an AXObjectImpl, it must be given a
@@ skipping 408 matching lines @@
   virtual Element* GetElement() const;  // Same as GetNode, if it's an Element.
   virtual LayoutObject* GetLayoutObject() const { return nullptr; }
   virtual Document* GetDocument() const;
   virtual LocalFrameView* DocumentFrameView() const;
   virtual Element* AnchorElement() const { return nullptr; }
   virtual Element* ActionElement() const { return nullptr; }
   String Language() const;
   bool HasAttribute(const QualifiedName&) const;
   const AtomicString& GetAttribute(const QualifiedName&) const;
 
-  // Methods that retrieve or manipulate the current selection.
-
-  // Get the current selection from anywhere in the accessibility tree.
-  virtual AXRange Selection() const { return AXRange(); }
-  // Gets only the start and end offsets of the selection computed using the
-  // current object as the starting point. Returns a null selection if there is
-  // no selection in the subtree rooted at this object.
-  virtual AXRange SelectionUnderObject() const { return AXRange(); }
-  virtual void SetSelection(const AXRange&) {}
+  // Selection.
+  virtual AXRange Selection() const;
 
   // Scrollable containers.
   bool IsScrollableContainer() const;
   IntPoint GetScrollOffset() const;
   IntPoint MinimumScrollOffset() const;
   IntPoint MaximumScrollOffset() const;
   void SetScrollOffset(const IntPoint&) const;
 
   // If this object itself scrolls, return its ScrollableArea.
   virtual ScrollableArea* GetScrollableAreaIfScrollable() const { return 0; }
@@ skipping 110 matching lines @@
   Member<AXObjectCacheImpl> ax_object_cache_;
 
   // Updates the cached attribute values. This may be recursive, so to prevent
   // deadlocks,
   // functions called here may only search up the tree (ancestors), not down.
   void UpdateCachedAttributeValuesIfNeeded() const;
 
  private:
   bool IsCheckable() const;
   static bool IsNativeInputInMixedState(const Node*);
+  void ComputeAXObjectAndOffset(const VisiblePositionInFlatTree& position,
+                                AXObject** ax_object,
+                                int* offset) const;
   static bool IncludesARIAWidgetRole(const String&);
   static bool HasInteractiveARIAAttribute(const Element&);
 
   static unsigned number_of_live_ax_objects_;
 };
 
 DEFINE_TYPE_CASTS(AXObjectImpl, AXObject, obj, true, true);
 
 #define DEFINE_AX_OBJECT_TYPE_CASTS(thisType, predicate)               \
   DEFINE_TYPE_CASTS(thisType, AXObjectImpl, object, object->predicate, \
                     object.predicate)
 
 }  // namespace blink
 
 #endif  // AXObjectImpl_h