Commit fb2c2ce4 authored by Daniel Holbert's avatar Daniel Holbert
Browse files

Bug 1398379 part 1: Make callers of GetRootScrollFrameAsScrollableExternal()... 

Bug 1398379 part 1: Make callers of GetRootScrollFrameAsScrollableExternal() use its equivalent non-"External" version instead. r=mats

This is a simplification. GetRootScrollFrameAsScrollableExternal() is just a
wrapper around its non-"External" version, GetRootScrollFrameAsScrollable(), so
we might as well just directly call *that* version.  All of the callers here
are inside of libxul, so they don't need the special "External" version.

MozReview-Commit-ID: GGMMDAlJ9xu

--HG--
extra : rebase_source : a3bd19a6300d0ce66f38fb8433db20b4ec03abfb
parent 1c67d21e

accessible/generic/DocAccessible.cpp

+1 −1
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ DocAccessible::RelativeBounds(nsIFrame** aRelativeFrame) const 
      return nsRect();



    nsRect scrollPort;

    nsIScrollableFrame* sf = presShell->GetRootScrollFrameAsScrollableExternal();

    nsIScrollableFrame* sf = presShell->GetRootScrollFrameAsScrollable();

    if (sf) {

      scrollPort = sf->GetScrollPortRect();

    } else {

docshell/base/nsDocShell.cpp

+2 −2
Original line number Diff line number Diff line
@@ -9145,7 +9145,7 @@ nsDocShell::RestoreFromHistory() 
      mContentViewer->SetBounds(newBounds);

    } else {

      nsIScrollableFrame* rootScrollFrame =

        shell->GetRootScrollFrameAsScrollableExternal();

        shell->GetRootScrollFrameAsScrollable();

      if (rootScrollFrame) {

        rootScrollFrame->PostScrolledAreaEventForCurrentArea();

      }
@@ -13590,7 +13590,7 @@ nsDocShell::GetRootScrollFrame() 
  nsCOMPtr<nsIPresShell> shell = GetPresShell();

  NS_ENSURE_TRUE(shell, nullptr);



  return shell->GetRootScrollFrameAsScrollableExternal();

  return shell->GetRootScrollFrameAsScrollable();

}



NS_IMETHODIMP