Merge mozilla-central to autoland. CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 30 Apr 2019 15:01:17 +0200
changeset 530738 5179e588a94f9d8143ad18c0e4f4684aa37e9f3b
parent 530737 e04d7e4e58a12869d43db693b66e1467d758ef39 (current diff)
parent 530712 90234f4c094dcc794df28fdd464793dfe065f943 (diff)
child 530739 44829dfb74d2147e9c2cb0b45dacad650bfe4782
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central to autoland. CLOSED TREE
--- a/layout/base/PresShell.cpp
+++ b/layout/base/PresShell.cpp
@@ -3325,18 +3325,18 @@ static nscoord ComputeWhereToScroll(Wher
  * Note that, since we are performing a layout scroll, it's possible that
  * this fnction will sometimes be unsuccessful; the content will move as
  * fast as it can on the screen using layout viewport scrolling, and then
  * stop there, even if it could get closer to the desired position by
  * moving the visual viewport within the layout viewport.
  */
 static void ScrollToShowRect(nsIScrollableFrame* aFrameAsScrollable,
                              const nsRect& aRect,
-                             nsIPresShell::ScrollAxis aVertical,
-                             nsIPresShell::ScrollAxis aHorizontal,
+                             ScrollAxis aVertical,
+                             ScrollAxis aHorizontal,
                              ScrollFlags aScrollFlags) {
   nsPoint scrollPt = aFrameAsScrollable->GetVisualViewportOffset();
   nsRect visibleRect(scrollPt, aFrameAsScrollable->GetVisualViewportSize());
 
   nsSize lineSize;
   // Don't call GetLineScrollAmount unless we actually need it. Not only
   // does this save time, but it's not safe to call GetLineScrollAmount
   // during reflow (because it depends on font size inflation and doesn't