Commit 6a8c79a9 authored by bryner%brianryner.com's avatar bryner%brianryner.com
Browse files

Remove non-inlined version of nsIPresShell::GetDocument(). Bug 253889, r+sr=roc.

parent 02ca230f

accessible/src/base/nsAccessNode.cpp

+1 −3
Original line number Diff line number Diff line
@@ -112,9 +112,7 @@ NS_IMETHODIMP nsAccessNode::Init() 
    // Create a doc accessible so we can cache this node

    nsCOMPtr<nsIPresShell> presShell(do_QueryReferent(mWeakShell));

    if (presShell) {

      nsCOMPtr<nsIDocument> doc;

      presShell->GetDocument(getter_AddRefs(doc));

      nsCOMPtr<nsIDOMNode> docNode(do_QueryInterface(doc));

      nsCOMPtr<nsIDOMNode> docNode(do_QueryInterface(presShell->GetDocument()));

      if (docNode) {

        nsCOMPtr<nsIAccessibilityService> accService = 

          do_GetService("@mozilla.org/accessibilityService;1");

accessible/src/base/nsAccessible.cpp

+1 −3
Original line number Diff line number Diff line
@@ -683,9 +683,7 @@ void nsAccessible::GetScrollOffset(nsRect *aRect) 
{

  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mWeakShell));

  if (shell) {

    nsCOMPtr<nsIDocument> doc;

    shell->GetDocument(getter_AddRefs(doc));

    nsCOMPtr<nsIDOMDocumentView> docView(do_QueryInterface(doc));

    nsCOMPtr<nsIDOMDocumentView> docView(do_QueryInterface(shell->GetDocument()));

    if (!docView) 

      return;

accessible/src/base/nsAccessibleTreeWalker.cpp

+2 −5
Original line number Diff line number Diff line
@@ -59,11 +59,8 @@ nsAccessibleTreeWalker::nsAccessibleTreeWalker(nsIWeakReference* aPresShell, nsI 


  if (aWalkAnonContent) {

    nsCOMPtr<nsIPresShell> presShell(do_QueryReferent(mWeakShell));

    if (presShell) {

      nsCOMPtr<nsIDocument> doc;

      presShell->GetDocument(getter_AddRefs(doc)); 

      mBindingManager = doc->GetBindingManager();

    }

    if (presShell)

      mBindingManager = presShell->GetDocument()->GetBindingManager();

  }

  MOZ_COUNT_CTOR(nsAccessibleTreeWalker);

}

accessible/src/base/nsCaretAccessible.cpp

+1 −2
Original line number Diff line number Diff line
@@ -95,8 +95,7 @@ NS_IMETHODIMP nsCaretAccessible::AttachNewSelectionListener(nsIDOMNode *aCurrent 
  if (!presShell)

    return NS_ERROR_FAILURE;



  nsCOMPtr<nsIDocument> doc;

  presShell->GetDocument(getter_AddRefs(doc));

  nsCOMPtr<nsIDocument> doc = presShell->GetDocument();

  if (!doc)  // we also should try to QI to document instead (necessary to do when node is a document)

    doc = do_QueryInterface(aCurrentNode);

  nsCOMPtr<nsIContent> content(do_QueryInterface(aCurrentNode));

accessible/src/base/nsDocAccessible.cpp

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ nsDocAccessible::nsDocAccessible(nsIDOMNode *aDOMNode, nsIWeakReference* aShell) 


  nsCOMPtr<nsIPresShell> shell(do_QueryReferent(mWeakShell));

  if (shell) {

    shell->GetDocument(getter_AddRefs(mDocument));

    mDocument = shell->GetDocument();

    nsIViewManager* vm = shell->GetViewManager();

    if (vm) {

      nsCOMPtr<nsIWidget> widget;