Bug 1135908 - [E10s] Proxy for Character/SelectionCount(), r=tbsaunde

accessible/atk/nsMaiInterfaceText.cpp

@@ -330,12 +330,17 @@ static gint
 getCharacterCountCB(AtkText *aText)
 {
   AccessibleWrap* accWrap = GetAccessibleWrap(ATK_OBJECT(aText));
-  if (!accWrap)
+  if (accWrap) {
-    return 0;
+    HyperTextAccessible* textAcc = accWrap->AsHyperText();
+    return
+      textAcc->IsDefunct() ? 0 : static_cast<gint>(textAcc->CharacterCount());
+  }
 
-  HyperTextAccessible* textAcc = accWrap->AsHyperText();
+  if (ProxyAccessible* proxy = GetProxy(ATK_OBJECT(aText))) {
-  return textAcc->IsDefunct() ?
+    return proxy->CharacterCount();
-    0 : static_cast<gint>(textAcc->CharacterCount());
+  }
+
+  return 0;
 }
 
 static gint
@@ -362,14 +367,20 @@ static gint
 getTextSelectionCountCB(AtkText *aText)
 {
   AccessibleWrap* accWrap = GetAccessibleWrap(ATK_OBJECT(aText));
-  if (!accWrap)
+  if (accWrap) {
-    return 0;
+    HyperTextAccessible* text = accWrap->AsHyperText();
+    if (!text || !text->IsTextRole()) {
+      return 0;
+    }
 
-  HyperTextAccessible* text = accWrap->AsHyperText();
+    return text->SelectionCount();
-  if (!text || !text->IsTextRole())
+  }
-    return 0;
 
-  return text->SelectionCount();
+  if (ProxyAccessible* proxy = GetProxy(ATK_OBJECT(aText))) {
+    return proxy->SelectionCount();
+  }
+
+  return 0;
 }
 
 static gchar*

accessible/ipc/DocAccessibleChild.cpp

@@ -207,6 +207,22 @@ DocAccessibleChild::RecvRelations(const uint64_t& aID,
   return true;
 }
 
+bool
+DocAccessibleChild::RecvCharacterCount(const uint64_t& aID, int32_t* aCount)
+{
+  HyperTextAccessible* acc = IdToHyperTextAccessible(aID);
+  *aCount = acc ? acc->CharacterCount() : 0;
+  return true;
+}
+
+bool
+DocAccessibleChild::RecvSelectionCount(const uint64_t& aID, int32_t* aCount)
+{
+  HyperTextAccessible* acc = IdToHyperTextAccessible(aID);
+  *aCount = acc ? acc->SelectionCount() : 0;
+  return true;
+}
+
 bool
 DocAccessibleChild::RecvTextSubstring(const uint64_t& aID,
                                       const int32_t& aStartOffset,

accessible/ipc/DocAccessibleChild.h

@@ -63,6 +63,12 @@ public:
 
   virtual bool RecvAttributes(const uint64_t& aID,
                               nsTArray<Attribute> *aAttributes) MOZ_OVERRIDE;
+
+  virtual bool RecvCharacterCount(const uint64_t& aID, int32_t* aCount)
+     MOZ_OVERRIDE;
+  virtual bool RecvSelectionCount(const uint64_t& aID, int32_t* aCount)
+     MOZ_OVERRIDE;
+
   virtual bool RecvTextSubstring(const uint64_t& aID,
                                  const int32_t& aStartOffset,
                                  const int32_t& aEndOffset, nsString* aText)

accessible/ipc/PDocAccessible.ipdl

@@ -65,6 +65,8 @@ child:
   // AccessibleText
 
   // TextSubstring is getText in IDL.
+  prio(high) sync CharacterCount(uint64_t aID) returns(int32_t aCount);
+  prio(high) sync SelectionCount(uint64_t aID) returns(int32_t aCount);
   prio(high) sync TextSubstring(uint64_t aID, int32_t aStartOffset, int32_t
                                 aEndOffset) returns(nsString aText);
   prio(high) sync GetTextAfterOffset(uint64_t aID, int32_t aOffset, int32_t aBoundaryType)

accessible/ipc/ProxyAccessible.cpp

@@ -149,6 +149,22 @@ ProxyAccessible::Relations(nsTArray<RelationType>* aTypes,
   }
 }
 
+int32_t
+ProxyAccessible::CharacterCount()
+{
+  int32_t count = 0;
+  unused << mDoc->SendCharacterCount(mID, &count);
+  return count;
+}
+
+int32_t
+ProxyAccessible::SelectionCount()
+{
+  int32_t count = 0;
+  unused << mDoc->SendSelectionCount(mID, &count);
+  return count;
+}
+
 void
 ProxyAccessible::TextSubstring(int32_t aStartOffset, int32_t aEndOfset,
                                nsString& aText) const

accessible/ipc/ProxyAccessible.h

@@ -99,6 +99,9 @@ public:
   void Relations(nsTArray<RelationType>* aTypes,
                  nsTArray<nsTArray<ProxyAccessible*>>* aTargetSets) const;
 
+  int32_t CharacterCount();
+  int32_t SelectionCount();
+
   /**
    * Get the text between the given offsets.
    */