From 40600875c7b58ecce361336ca1e40242535e0e24 Mon Sep 17 00:00:00 2001 From: Mark Capella Date: Sun, 1 Apr 2012 03:50:03 -0400 Subject: [PATCH] Bug 740375 - get rid nsIAccessible innerHTML method, r=tbsaunde --- accessible/public/nsIAccessible.idl | 9 +-------- accessible/src/base/nsAccessible.cpp | 11 ----------- accessible/src/base/nsApplicationAccessible.cpp | 7 ------- accessible/src/base/nsApplicationAccessible.h | 1 - 4 files changed, 1 insertion(+), 27 deletions(-) diff --git a/accessible/public/nsIAccessible.idl b/accessible/public/nsIAccessible.idl index d464fc08c522..13f82ba104ac 100644 --- a/accessible/public/nsIAccessible.idl +++ b/accessible/public/nsIAccessible.idl @@ -59,7 +59,7 @@ interface nsIAccessibleRelation; * Mozilla creates the implementations of nsIAccessible on demand. * See http://www.mozilla.org/projects/ui/accessibility for more information. */ -[scriptable, uuid(e7c44e0d-736e-4ead-afee-b51f4b574020)] +[scriptable, uuid(46d422d1-c92f-4536-bdef-f77bc8350ec7)] interface nsIAccessible : nsISupports { /** @@ -103,13 +103,6 @@ interface nsIAccessible : nsISupports */ readonly attribute long indexInParent; - /** - * The innerHTML for the HTML element associated with this accessible if applicable. - * This is a text string of all the markup inside the DOM - * node, not including the start and end tag for the node. - */ - readonly attribute DOMString innerHTML; - /** * The DOM node this nsIAccessible is associated with. */ diff --git a/accessible/src/base/nsAccessible.cpp b/accessible/src/base/nsAccessible.cpp index c67400276ab3..c53225070281 100644 --- a/accessible/src/base/nsAccessible.cpp +++ b/accessible/src/base/nsAccessible.cpp @@ -263,17 +263,6 @@ nsAccessible::GetRootDocument(nsIAccessibleDocument **aRootDocument) return NS_OK; } -NS_IMETHODIMP -nsAccessible::GetInnerHTML(nsAString& aInnerHTML) -{ - aInnerHTML.Truncate(); - - nsCOMPtr htmlElement = do_QueryInterface(mContent); - NS_ENSURE_TRUE(htmlElement, NS_ERROR_NULL_POINTER); - - return htmlElement->GetInnerHTML(aInnerHTML); -} - NS_IMETHODIMP nsAccessible::GetLanguage(nsAString& aLanguage) { diff --git a/accessible/src/base/nsApplicationAccessible.cpp b/accessible/src/base/nsApplicationAccessible.cpp index 12c4e8d456c1..db6bc94756c6 100644 --- a/accessible/src/base/nsApplicationAccessible.cpp +++ b/accessible/src/base/nsApplicationAccessible.cpp @@ -441,13 +441,6 @@ nsApplicationAccessible::GetRootDocument(nsIAccessibleDocument **aRootDocument) return NS_OK; } -NS_IMETHODIMP -nsApplicationAccessible::GetInnerHTML(nsAString &aInnerHTML) -{ - aInnerHTML.Truncate(); - return NS_OK; -} - NS_IMETHODIMP nsApplicationAccessible::ScrollTo(PRUint32 aScrollType) { diff --git a/accessible/src/base/nsApplicationAccessible.h b/accessible/src/base/nsApplicationAccessible.h index 219e4ecdd073..b1929fdd38f3 100644 --- a/accessible/src/base/nsApplicationAccessible.h +++ b/accessible/src/base/nsApplicationAccessible.h @@ -73,7 +73,6 @@ public: NS_SCRIPTABLE NS_IMETHOD GetDOMNode(nsIDOMNode** aDOMNode); NS_SCRIPTABLE NS_IMETHOD GetDocument(nsIAccessibleDocument** aDocument); NS_SCRIPTABLE NS_IMETHOD GetRootDocument(nsIAccessibleDocument** aRootDocument); - NS_SCRIPTABLE NS_IMETHOD GetInnerHTML(nsAString& aInnerHTML); NS_SCRIPTABLE NS_IMETHOD ScrollTo(PRUint32 aScrollType); NS_SCRIPTABLE NS_IMETHOD ScrollToPoint(PRUint32 aCoordinateType, PRInt32 aX, PRInt32 aY); NS_SCRIPTABLE NS_IMETHOD GetLanguage(nsAString& aLanguage);