diff --git a/mozilla/accessible/src/base/nsAccessibilityService.cpp b/mozilla/accessible/src/base/nsAccessibilityService.cpp
index 180353ee63b..4c8163345dd 100644
--- a/mozilla/accessible/src/base/nsAccessibilityService.cpp
+++ b/mozilla/accessible/src/base/nsAccessibilityService.cpp
@@ -751,12 +751,9 @@ nsAccessibilityService::CreateHTMLTextAccessible(nsISupports *aFrame, nsIAccessi
     // If empty text string, don't include in accessible tree
     // Items with length 0 are already gone, we also need to check for single NBSP's
     // or newlines, both of which indicate an empty text object
-    PRInt32 textLength = 0;
-    textContent->GetTextLength(&textLength);
+    PRInt32 textLength = textContent->TextLength();
     if (textLength == 1) {
-      const nsTextFragment *textFrag;
-      textContent->GetText(&textFrag);
-      PRUnichar theChar = textFrag->CharAt(0);
+      PRUnichar theChar = textContent->Text()->CharAt(0);
       // Check for NBSP (160) or newline
       if (theChar == 160 || theChar=='\n')
         return NS_ERROR_FAILURE;
diff --git a/mozilla/accessible/src/base/nsAccessible.cpp b/mozilla/accessible/src/base/nsAccessible.cpp
index 47798ede5a5..27da0acb784 100644
--- a/mozilla/accessible/src/base/nsAccessible.cpp
+++ b/mozilla/accessible/src/base/nsAccessible.cpp
@@ -998,7 +998,7 @@ NS_IMETHODIMP nsAccessible::AppendFlatStringFromContentNode(nsIContent *aContent
   }
 
   nsCOMPtr<nsITextContent> textContent(do_QueryInterface(aContent));
-  if (textContent) {     
+  if (textContent) {
     // If it's a text node, but node a comment node, append the text
     nsCOMPtr<nsIDOMComment> commentNode(do_QueryInterface(aContent));
     if (!commentNode) {