Backed out changeset 7ce372883419 (bug 1151421) for failures in Android mochitests, e.g. test_bug1151421.html. r=backout

dom/base/nsGlobalWindow.cpp

@@ -6334,7 +6334,7 @@ nsGlobalWindow::GetScrollMaxY(ErrorResult& aError)
   FORWARD_TO_OUTER_OR_THROW(GetScrollBoundaryOuter, (eSideBottom), aError, 0);
 }
 
-CSSPoint
+CSSIntPoint
 nsGlobalWindow::GetScrollXY(bool aDoFlush)
 {
   MOZ_ASSERT(IsOuterWindow());
@@ -6358,30 +6358,30 @@ nsGlobalWindow::GetScrollXY(bool aDoFlush)
     return GetScrollXY(true);
   }
 
-  return CSSPoint::FromAppUnits(scrollPos);
+  return sf->GetScrollPositionCSSPixels();
 }
 
-double
+int32_t
 nsGlobalWindow::GetScrollXOuter()
 {
   MOZ_RELEASE_ASSERT(IsOuterWindow());
   return GetScrollXY(false).x;
 }
 
-double
+int32_t
 nsGlobalWindow::GetScrollX(ErrorResult& aError)
 {
   FORWARD_TO_OUTER_OR_THROW(GetScrollXOuter, (), aError, 0);
 }
 
-double
+int32_t
 nsGlobalWindow::GetScrollYOuter()
 {
   MOZ_RELEASE_ASSERT(IsOuterWindow());
   return GetScrollXY(false).y;
 }
 
-double
+int32_t
 nsGlobalWindow::GetScrollY(ErrorResult& aError)
 {
   FORWARD_TO_OUTER_OR_THROW(GetScrollYOuter, (), aError, 0);

dom/base/nsGlobalWindow.h

@@ -1090,15 +1090,15 @@ public:
   void SetInnerHeight(JSContext* aCx, JS::Handle<JS::Value> aValue,
                       mozilla::dom::CallerType aCallerType,
                       mozilla::ErrorResult& aError);
-  double GetScrollXOuter();
-  double GetScrollX(mozilla::ErrorResult& aError);
-  double GetPageXOffset(mozilla::ErrorResult& aError)
+  int32_t GetScrollXOuter();
+  int32_t GetScrollX(mozilla::ErrorResult& aError);
+  int32_t GetPageXOffset(mozilla::ErrorResult& aError)
   {
     return GetScrollX(aError);
   }
-  double GetScrollYOuter();
-  double GetScrollY(mozilla::ErrorResult& aError);
-  double GetPageYOffset(mozilla::ErrorResult& aError)
+  int32_t GetScrollYOuter();
+  int32_t GetScrollY(mozilla::ErrorResult& aError);
+  int32_t GetPageYOffset(mozilla::ErrorResult& aError)
   {
     return GetScrollY(aError);
   }
@@ -1635,7 +1635,7 @@ public:
   // If aDoFlush is true, we'll flush our own layout; otherwise we'll try to
   // just flush our parent and only flush ourselves if we think we need to.
   // Outer windows only.
-  mozilla::CSSPoint GetScrollXY(bool aDoFlush);
+  mozilla::CSSIntPoint GetScrollXY(bool aDoFlush);
 
   int32_t GetScrollBoundaryOuter(mozilla::Side aSide);
 

dom/webidl/Window.webidl

@@ -183,10 +183,14 @@ partial interface Window {
   [ChromeOnly] void mozScrollSnap();
   // The four properties below are double per spec at the moment, but whether
   // that will continue is unclear.
-  [Replaceable, Throws] readonly attribute double scrollX;
-  [Replaceable, Throws] readonly attribute double pageXOffset;
-  [Replaceable, Throws] readonly attribute double scrollY;
-  [Replaceable, Throws] readonly attribute double pageYOffset;
+  //[Replaceable, Throws] readonly attribute double scrollX;
+  //[Replaceable, Throws] readonly attribute double pageXOffset;
+  //[Replaceable, Throws] readonly attribute double scrollY;
+  //[Replaceable, Throws] readonly attribute double pageYOffset;
+  [Replaceable, Throws] readonly attribute long scrollX;
+  [Replaceable, Throws] readonly attribute long pageXOffset;
+  [Replaceable, Throws] readonly attribute long scrollY;
+  [Replaceable, Throws] readonly attribute long pageYOffset;
 
   // client
   // These are writable because we allow chrome to write them.  And they need