Bug 1547416 - Move nsIPresShell::ScrollAxis to PresShellForwards.h: correct conflict fix. a=bustage-fix
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 30 Apr 2019 14:11:09 +0200
changeset 471900 90234f4c094dcc794df28fdd464793dfe065f943
parent 471898 83950e03831430c0a00db8b83890d51aad0ff43c
child 471901 42f3c8e92866d864095e3c80f25d4fefada97d14
child 471922 f35554baa67f6159f3b13de8fb9335b24c5cef76
child 471952 5179e588a94f9d8143ad18c0e4f4684aa37e9f3b
push id112960
push userarchaeopteryx@coole-files.de
push dateTue, 30 Apr 2019 13:04:04 +0000
treeherdermozilla-inbound@42f3c8e92866 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1547416
milestone68.0a1
first release with
nightly linux32
90234f4c094d / 68.0a1 / 20190430121130 / files
nightly linux64
90234f4c094d / 68.0a1 / 20190430121130 / files
nightly mac
90234f4c094d / 68.0a1 / 20190430121130 / files
nightly win32
90234f4c094d / 68.0a1 / 20190430121130 / files
nightly win64
90234f4c094d / 68.0a1 / 20190430121130 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1547416 - Move nsIPresShell::ScrollAxis to PresShellForwards.h: correct conflict fix. a=bustage-fix
layout/base/PresShell.cpp
--- 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