diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-02-22 08:59:14 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-02-22 08:59:14 +0100 |
| commit | eaac0616072e22313ea96eb6e68d9a8f28f70dc7 (patch) | |
| tree | c967d49511cb2696bdca86affac1e6ee7b374a3b /dom/base/nsGlobalWindow.h | |
| parent | d77729916b4b9c2b67abd41181336c2cbb1da968 (diff) | |
| parent | 6f96569b4499be07c210ca6c38739bbbc7ebdee7 (diff) | |
| download | UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar.gz UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar.lz UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.tar.xz UXP-eaac0616072e22313ea96eb6e68d9a8f28f70dc7.zip | |
Merge branch 'ported-moebius'
Diffstat (limited to 'dom/base/nsGlobalWindow.h')
| -rw-r--r-- | dom/base/nsGlobalWindow.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h index eab91c2e4..dbceeab74 100644 --- a/dom/base/nsGlobalWindow.h +++ b/dom/base/nsGlobalWindow.h @@ -1050,15 +1050,15 @@ public: void SetInnerHeight(JSContext* aCx, JS::Handle<JS::Value> aValue, mozilla::dom::CallerType aCallerType, mozilla::ErrorResult& aError); - int32_t GetScrollXOuter(); - int32_t GetScrollX(mozilla::ErrorResult& aError); - int32_t GetPageXOffset(mozilla::ErrorResult& aError) + double GetScrollXOuter(); + double GetScrollX(mozilla::ErrorResult& aError); + double GetPageXOffset(mozilla::ErrorResult& aError) { return GetScrollX(aError); } - int32_t GetScrollYOuter(); - int32_t GetScrollY(mozilla::ErrorResult& aError); - int32_t GetPageYOffset(mozilla::ErrorResult& aError) + double GetScrollYOuter(); + double GetScrollY(mozilla::ErrorResult& aError); + double GetPageYOffset(mozilla::ErrorResult& aError) { return GetScrollY(aError); } @@ -1579,7 +1579,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::CSSIntPoint GetScrollXY(bool aDoFlush); + mozilla::CSSPoint GetScrollXY(bool aDoFlush); int32_t GetScrollBoundaryOuter(mozilla::Side aSide); |