mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
d457251529
- Bug 1120715 - Part 6: Remove the dom.requestcache.enabled pref; r=bkelly (800c996a96) - Bug 1143222 - Put the DOM Cache tests in sequential mode again until we fix the rest of the intermittent failures; a=RyanVM (2ebdd659a1) - Bug 1255636 - Give a better error message when the Request constructor fails because of a cross-origin referrer URL; r=bkelly (d81a21c0bb) - Bug 1265056 - don't needlessly construct nsAutoCString temporaries in dom/; r=baku (3be49ca3fc) - Bug 1243849 - Restore support for accessing the Cache API from app:// URLs and also for storing requests/responses with app:// URLs within it; r=bkelly (eb56fa564c) - Bug 1263235, part 1 - Move PBrowser::AsyncMessage's data argument last. r=smaug (6852b87c22) - Bug 1263235, part 2 - Make PContent::AsyncMessage and PContentBridge::AsyncMessage's data argument last. r=smaug (9e8cd94461) - Bug 1263028 - send HTTP data to the content process in smaller chunks, r=michal (c0da548157) - Bug 1263235, part 3 - Move PHttpChannel::OnTransportAndData's data argument last. r=mayhemer (e1bf4f430f) - Bug 1263235, part 4 - Make PBrowserStream::Write's data argument last. r=jimm (8bcec4d541) - Bug 1260876 - Remove process switch code for signed package code (added by Bug 1186290). r=valentin. (cef270b44c) - Bug 1234575 - Empty fragment is ignored in URI of location header r=mcmanus (db68f102d8) - Bug 1262506 - Unused variable in a runnable in BackgroundParentImpl, r=ehsan (9288f0a111) - bug 1239166 - platform work to support Microsoft Family Safety functionality r=froydnj,mgoodwin,mhowell,rbarnes,vladan (adc357f3b3) - Bug 842818 - Make Crypto::GetRandomValues() work off the main thread r=baku,keeler,mt (533f8942c4) - Bug 1247089 - Add a mode to ReportToConsoleNonLocalized that ignores the calling location. r=bkelly (4be23e0869) - Bug 1258883 - Add a way to replace the entire Push service in tests. r=wchen (06a5f27016) - Bug 1243856 - Remove alarms from the Push H2 backend. r=dragana (60d146dc73) - Bug 1246066 - Clear PushService timeout tasks on uninitialization. r=itcambridge (461276a972) - Bug 1214338 - Implement Android GCM-based PushService protocol. r=rnewman r=kitcambridge (f2bb78994a) - Bug 1257821 - Support the new aesgcm content encoding scheme. r=mt (1da653c14a) - Bug 1243856 - Remove alarms from the Push WebSocket backend. r=dragana (43f74c4999) - Bug 1258145 - Remove waitForPromise from the xpcshell tests. r=wchen (cdd1aff2f6) - Bug 1253831 - Don't check actual intervals in the Push backoff test. r=wchen (859fa0bba3) - Bug 1246341 - Include status codes in "ack" and "unregister" requests. r=dragana (a62d0daf9b) - Bug 1246341 - Add a test for push event error reporting. r=dragana (013bc814e4) - Bug 1247089 - Log Web Push decryption errors. r=bkelly (ffc093dc2f) - Bug 1258221 - patch 2 - Port FileSystem API and DeviceStorage API to PBackground, r=smaug (c1c0e08bc0) - Bug 1258221 - patch 3 - Rename FileSystemTaskBase to FileSystemTaskChildBase, r=smaug (867a0e65fd) - Bug 1251032 - Don't return layersId or textureFactoryIdentifier as outparams in RenderFrameParent constructor. r=kanru (198ddff7fc) - Bug 1251032 - Send RenderFrame info down to child in CreateWindow message. r=kanru (87e9001088) - Bug 1251032 - Make it possible to assign a frameloader to RenderFrameParent after construction. r=kanru (96483d1282) - Bug 1254865 - Send disableglobalhistory state down to TabChild after construction asynchronously. r=smaug (3949285b62) - Bug 1238707 Release the window immediately in TabParent::Destroy() to avoid leaks. r=smaug (fc612485d7) - Bug 1256589 part.1 Move the implementation of StopPropagation() from dom::Event to WidgetEvent r=smaug (181721b64c) - Bug 1256589 part.2 Move the implementation of StopImmediatePropagation() from dom::Event to WidgetEvent r=smaug (554a0dc5b5) - Bug 1203059 part.1 nsXBLWincowKeyHandler mark WidgetEvent::mFlags if it's reserved by chrome before the event is dispatched into the content r=smaug (9162dd68cb) - Bug 1203059 part.2 When an event is reserved by chrome, it should be fired only on chrome r=smaug (35f082ca5f) - Bug 1203059 part.3 Installing and removing keyboard event listeners of nsXBLWindowKeyHandler should be done by the class itself r=smaug (1e06c2d0bc) - Bug 1203059 part.4 Update test_keycodes.xul for the new behavior r=smaug (3014d21c75) - Bug 1256589 part.3 Move the implementation of StopCrossProcessForwarding() from dom::Event to WidgetEvent r=smaug (96db915b51) - Bug 1257180 - patch 1 - Directory clonable to workers, r=smaug (5634acb08d) - Bug 1257180 - patch 2 - Directory can be sent via postMessage(), r=smaug (82ada39ae3) - Bug 1263311: Part 3 - s/nsCancelableRunnable/CancelableRunnable/g. r=froydnj (79d0a6c81f) - Bug 1253198: add WebRtcIce prefix to all ICE unit tests. r=bwc (9c18f5fd56) - Bug 1244926: added TCP socket filter to only allow outgoing STUN. r=jesup (75debfdc84) - Bug 1257405 - Increase auth secret length to 16 octets. r=mt (b1e000c331) - Bug 1257401 - Remove the worker descriptor for PushSubscription. r=khuey (5791fb69ef) - Bug 1257401 - Remove the worker descriptor for PushManager. r=khuey (e2c75903a9) - Bug 1257821 - Remove the authenticated aesgcm128 content coding scheme. r=mt,marco (64a2917910) - Bug 1256488 - Add a Base64 URL-decoder for C++ and chrome JS callers. r=mt,baku (0bbb250298) - Bug 1247685 - Validate and store app server keys in the Push service. r=mt (c3c026ccb1) - Bug 1252650 - Support loading PushService immediately on Android; r=kitcambridge (d59a37fec4) - Bug 1258595 - Shut down the Push service if errors occur at startup. r=wchen (eef1805652) - Bug 1258595 - Wait for the Push service to shut down between tests. r=wchen (c30cf92ce6) - Bug 1262618 - Fix an unchained promise and a couple of non-promise returns in the push service. r=wchen (8eadab5706) - Bug 1263747 - Log error messages when stringifying errors. r=bgrins (edffd0074e) - Bug 1265705 - Silence startup JavaScript strict warning in resource://gre/modules/PushService.jsm. r=kitcambridge (e7e210fb61) - Bug 1264062 - Don't bother checking which accelerated layer types are available if they're all disabled by pref r=milan (0d3208ad59) - Bug 1263346. Remove wrong Ivy Bridge device id. r=Bas (7e39e7f370) - fix misspatch (a67a111b2c) - Bug 1251334 - Create a disposable pref to force-disable e10s in an emergency. r=jimm (ef892d4474) - Bug 1254774 - error: member access into incomplete type 'nsIUUIDGenerator' after bug 1237847. r=aklotz (c1f334609f) - Bug 1257242 - Split the ::BrowserTabsRemoteAutostart() function into two parts, to allow for the blocking policies to be checked independently from the prefs checks. r=jimm (1babda578f) - Bug 1260190 - Disable e10s for accessibility users on OS X. r=jimm (219e5b1f19) - Bug 1237769 - Disable e10s on Windows XP if layers acceleration is requested r=milan (60f2434e9f) - Bug 1232911 - [3.2] Block VPX support in ADM on unsupported devices. r=snorp (6924aa073a) - Bug 1263249 - Bubble up unique failureId in GetFeatureStatus. r=mconley,milan (cd56eeab3c) - Bug 1219296 - Split fields not needed for repaints out from FrameMetrics. r=kats (9003ca634a) - Bug 1219296 - Factor out scroll snap information into a form that's usable by the compositor. r=kats (23d3e619a1) - Bug 1219296 - Make ScrollMetadata::sNullMetadata a StaticAutoPtr so that ScrollMetadata can admit nsTArray members. r=kats (1729ff7d93) - Bug 1257641 - Replace the mUpdateScrollOffset bool with an enum, needed in the next patch. r=botond (f9d546f8e8) - Bug 1257641 - Use empty transactions to carry scroll offset updates to APZ that don't require a repaint. r=mattwoodrow,mstange,botond (ba4a8a8c29) - Bug 1246290 - Add a bit to FrameMetrics to indicate if APZ-scrolling should be disabled on that APZC. r=botond (af2067137f) - Bug 1256589 part.4 Move the implementation of PreventDefault() and add PreventDefaultBeforeDispatch() from dom::Event to WidgetEvent r=smaug (e7828f2d8f) - Bug 1256589 part.5 Add DefaultPrevented() and DefaultPreventedByContent() to WidgetEvent r=smaug (e65cdd9127) - Bug 1249915 - Fix missing MOZ_COUNT_CTOR and some misc cleanup. r=karlt (d2f26cf971) - Bug 1154183 part.1 Move shortcut/access key candidate list creators from nsContentUtils to WidgetKeyboardEvent r=smaug (40b0b11a5a) - Bug 1154183 part.2 eKeyDown event should have charCode value of following keypress event r=smaug (28c1443ba3) - Bug 1154183 part.3 Clean up some variable names in nsXBLWindowKeyHandler::WalkHandlersAndExecute() r=smaug (81e25023d8) - Bug 1154183 part.4 Implement nsXBLWindowKeyHandler::GetElementForHandler() r=smaug (b5605d5c83) - Bug 1154183 part.5 Make nsXBLWindowKeyHandler::GetElementForHandler() use early return style r=smaug (017467204f) - Bug 1154183 part.6 Add nsXBLWindowKeyHandler::IsExecuteableElement() r=smaug (1fda349113) - Bug 1154183 part.7 Don't dispatch preceding keydown events of reserved keypress events on content in the default event group r=smaug (15b9e8c9d2) - Bug 1256589 part.6 Move the implementation of IsTrusted() from dom::Event to WidgetEvent r=smaug (ec79520fd3) - Bug 1253044. Fix fall through of observer topics when other conditions aren't met in PresShell::Observe. r=dholbert (dcc36884aa) - Bug 1157546 - Replace the image visibility API with a more general API that tracks visibility for any kind of frame. r=mstange (d6ea061614) - Bug 1219296 - Factor out the algorithm that computes a scroll snap destination into a reusable form. r=kats (296cbe9e49) - Bug 1254275 - Inspect the event queue to find out whether momentum events are following. r=kats (b2bb8a26b9) - Bug 1219296 - Scroll snap directly in APZ instead of going through the main thread. r=kats (0a30b550f9) - Bug 1219296 - Fix an include-what-you-use error. r=kats (4a128ae98e) - Bug 1260588 - C++ APZ should only allow handoff to ancestor APZC r=botond (9856ab5160) - Bug 1257269 - Panning up in a scrollable element should not hide the toolbar r=kats,jchen (1036ffc9e3) - Bug 1219296 - Ship scroll snap information to the compositor. r=kats (0e920f02a1) - Bug 1219296 - Move the layout.css.scroll-snap.proximity-threshold pref to gfxPrefs, so it can be queried on the compositor thread. r=kats (2e3e1ec16e) - Bug 1219296 - Remove StartSmoothScroll()'s argument, which is no longer used. r=kats (12efcd9c79) - Bug 1219296 - Light refactoring to how a smooth scroll is launched inside APZC. r=kats (ba6a9ed9a2) - Bug 1219296 - Followup to fix stale code comments. r=me and DONTBUILD (fec5f65988) - Bug 1257641 - Remove now-unused code for the lightweight scroll offset update message. r=botond (d449e45d6d) - Bug 1236680 Part 1: Add new WinUtils function to Resolve moved Users folder. r=jimm (51d12f856c) - Bug 1236680 Part 2: Resolve GMP path for moved Users folder. r=cpearce (e568217b78) - Bug 1236680 Part 3: Add #ifs to include to fix bustage. r=me (40c38680ea) - Bug 1240315: Add startup crash report annotation for AppInit_DLLs; r=jimm (aa2040baae) - Bug 1253446 - patch 2 - Return the proper scaling factor when querying the primary screen on Windows. r=emk (9765e4f7ca) - Bug 1251624 - patch 1 - The desktop to device scaling in WinUtils::MonitorFromRect should not depend on custom CSS pixel scaling (devPixelsPerPx setting). r=emk (788b4ad5db) - Bug 1251624 - patch 2 - Check for scaling override (devPixelsPerPx setting) in nsScreenWin::GetDefaultCSSScaleFactor, for proper window positioning when a custom scale factor is used. r=emk (2843a3fe70) - Bug 1222149 - delete unused fields from AsyncEncodeAndWriteIcon; r=roc clang-cl says these are unused, so let's delete them. (62cf7f8f47) - Bug 1204809 - Notify (don't hang) third party windows when adding shortcut icon. r=jmathies (7e4058a0f8) - Bug 1253566 - Deal with char16_t/wchar_t mismatch. r=aklotz (1c6cf160c7) - Bug 1211941 - Let nsICacheStorage.openTruncate impl return an HTTP cache entry write handle, r=michal (6a5796fb93) - Bug 1050613 - Make sure force-valid for HTTP cache entries is removed when entries are removed, r=michal (9efb91eefc) - Bug 1248389 - Cache index causing CPU loops, r=honzab (175b5b27f2) - Bug 1066970 - Show 'calculating' during HTTP cache cleaning process in preferences window, r=michal (db722000d8) - Bug 1248958 - CacheIndex mRWBuf ownership too fragile, read-after-free, r=honzab (66ee3d1d0d) - Bug 1248003 - Purge from HTTP cache memory pool only in reasonable intervals, r=michal (1cd6cb5983) - Bug 1068674 - Don't turn off e10s if hardware acceleration is disabled. r=jimm (dfbef44278)
312 lines
12 KiB
C++
312 lines
12 KiB
C++
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "FrameMetrics.h"
|
|
#include "ScrollSnap.h"
|
|
#include "gfxPrefs.h"
|
|
#include "mozilla/Maybe.h"
|
|
#include "mozilla/Preferences.h"
|
|
#include "nsLineLayout.h"
|
|
|
|
namespace mozilla {
|
|
|
|
using layers::ScrollSnapInfo;
|
|
|
|
/**
|
|
* Stores candidate snapping edges.
|
|
*/
|
|
class SnappingEdgeCallback {
|
|
public:
|
|
virtual void AddHorizontalEdge(nscoord aEdge) = 0;
|
|
virtual void AddVerticalEdge(nscoord aEdge) = 0;
|
|
virtual void AddHorizontalEdgeInterval(const nsRect &aScrollRange,
|
|
nscoord aInterval,
|
|
nscoord aOffset) = 0;
|
|
virtual void AddVerticalEdgeInterval(const nsRect &aScrollRange,
|
|
nscoord aInterval,
|
|
nscoord aOffset) = 0;
|
|
};
|
|
|
|
/**
|
|
* Keeps track of the current best edge to snap to. The criteria for
|
|
* adding an edge depends on the scrolling unit.
|
|
*/
|
|
class CalcSnapPoints : public SnappingEdgeCallback {
|
|
public:
|
|
CalcSnapPoints(nsIScrollableFrame::ScrollUnit aUnit,
|
|
const nsPoint& aDestination,
|
|
const nsPoint& aStartPos);
|
|
virtual void AddHorizontalEdge(nscoord aEdge) override;
|
|
virtual void AddVerticalEdge(nscoord aEdge) override;
|
|
virtual void AddHorizontalEdgeInterval(const nsRect &aScrollRange,
|
|
nscoord aInterval, nscoord aOffset)
|
|
override;
|
|
virtual void AddVerticalEdgeInterval(const nsRect &aScrollRange,
|
|
nscoord aInterval, nscoord aOffset)
|
|
override;
|
|
void AddEdge(nscoord aEdge,
|
|
nscoord aDestination,
|
|
nscoord aStartPos,
|
|
nscoord aScrollingDirection,
|
|
nscoord* aBestEdge,
|
|
bool* aEdgeFound);
|
|
void AddEdgeInterval(nscoord aInterval,
|
|
nscoord aMinPos,
|
|
nscoord aMaxPos,
|
|
nscoord aOffset,
|
|
nscoord aDestination,
|
|
nscoord aStartPos,
|
|
nscoord aScrollingDirection,
|
|
nscoord* aBestEdge,
|
|
bool* aEdgeFound);
|
|
nsPoint GetBestEdge() const;
|
|
protected:
|
|
nsIScrollableFrame::ScrollUnit mUnit;
|
|
nsPoint mDestination; // gives the position after scrolling but before snapping
|
|
nsPoint mStartPos; // gives the position before scrolling
|
|
nsIntPoint mScrollingDirection; // always -1, 0, or 1
|
|
nsPoint mBestEdge; // keeps track of the position of the current best edge
|
|
bool mHorizontalEdgeFound; // true if mBestEdge.x is storing a valid horizontal edge
|
|
bool mVerticalEdgeFound; // true if mBestEdge.y is storing a valid vertical edge
|
|
};
|
|
|
|
CalcSnapPoints::CalcSnapPoints(nsIScrollableFrame::ScrollUnit aUnit,
|
|
const nsPoint& aDestination,
|
|
const nsPoint& aStartPos)
|
|
{
|
|
mUnit = aUnit;
|
|
mDestination = aDestination;
|
|
mStartPos = aStartPos;
|
|
|
|
nsPoint direction = aDestination - aStartPos;
|
|
mScrollingDirection = nsIntPoint(0,0);
|
|
if (direction.x < 0) {
|
|
mScrollingDirection.x = -1;
|
|
}
|
|
if (direction.x > 0) {
|
|
mScrollingDirection.x = 1;
|
|
}
|
|
if (direction.y < 0) {
|
|
mScrollingDirection.y = -1;
|
|
}
|
|
if (direction.y > 0) {
|
|
mScrollingDirection.y = 1;
|
|
}
|
|
mBestEdge = aDestination;
|
|
mHorizontalEdgeFound = false;
|
|
mVerticalEdgeFound = false;
|
|
}
|
|
|
|
nsPoint
|
|
CalcSnapPoints::GetBestEdge() const
|
|
{
|
|
return nsPoint(mVerticalEdgeFound ? mBestEdge.x : mStartPos.x,
|
|
mHorizontalEdgeFound ? mBestEdge.y : mStartPos.y);
|
|
}
|
|
|
|
void
|
|
CalcSnapPoints::AddHorizontalEdge(nscoord aEdge)
|
|
{
|
|
AddEdge(aEdge, mDestination.y, mStartPos.y, mScrollingDirection.y, &mBestEdge.y,
|
|
&mHorizontalEdgeFound);
|
|
}
|
|
|
|
void
|
|
CalcSnapPoints::AddVerticalEdge(nscoord aEdge)
|
|
{
|
|
AddEdge(aEdge, mDestination.x, mStartPos.x, mScrollingDirection.x, &mBestEdge.x,
|
|
&mVerticalEdgeFound);
|
|
}
|
|
|
|
void
|
|
CalcSnapPoints::AddHorizontalEdgeInterval(const nsRect &aScrollRange,
|
|
nscoord aInterval, nscoord aOffset)
|
|
{
|
|
AddEdgeInterval(aInterval, aScrollRange.y, aScrollRange.YMost(), aOffset,
|
|
mDestination.y, mStartPos.y, mScrollingDirection.y,
|
|
&mBestEdge.y, &mHorizontalEdgeFound);
|
|
}
|
|
|
|
void
|
|
CalcSnapPoints::AddVerticalEdgeInterval(const nsRect &aScrollRange,
|
|
nscoord aInterval, nscoord aOffset)
|
|
{
|
|
AddEdgeInterval(aInterval, aScrollRange.x, aScrollRange.XMost(), aOffset,
|
|
mDestination.x, mStartPos.x, mScrollingDirection.x,
|
|
&mBestEdge.x, &mVerticalEdgeFound);
|
|
}
|
|
|
|
void
|
|
CalcSnapPoints::AddEdge(nscoord aEdge, nscoord aDestination, nscoord aStartPos,
|
|
nscoord aScrollingDirection, nscoord* aBestEdge,
|
|
bool *aEdgeFound)
|
|
{
|
|
// nsIScrollableFrame::DEVICE_PIXELS indicates that we are releasing a drag
|
|
// gesture or any other user input event that sets an absolute scroll
|
|
// position. In this case, scroll snapping is expected to travel in any
|
|
// direction. Otherwise, we will restrict the direction of the scroll
|
|
// snapping movement based on aScrollingDirection.
|
|
if (mUnit != nsIScrollableFrame::DEVICE_PIXELS) {
|
|
// Unless DEVICE_PIXELS, we only want to snap to points ahead of the
|
|
// direction we are scrolling
|
|
if (aScrollingDirection == 0) {
|
|
// The scroll direction is neutral - will not hit a snap point.
|
|
return;
|
|
}
|
|
// nsIScrollableFrame::WHOLE indicates that we are navigating to "home" or
|
|
// "end". In this case, we will always select the first or last snap point
|
|
// regardless of the direction of the scroll. Otherwise, we will select
|
|
// scroll snapping points only in the direction specified by
|
|
// aScrollingDirection.
|
|
if (mUnit != nsIScrollableFrame::WHOLE) {
|
|
// Direction of the edge from the current position (before scrolling) in
|
|
// the direction of scrolling
|
|
nscoord direction = (aEdge - aStartPos) * aScrollingDirection;
|
|
if (direction <= 0) {
|
|
// The edge is not in the direction we are scrolling, skip it.
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
if (!*aEdgeFound) {
|
|
*aBestEdge = aEdge;
|
|
*aEdgeFound = true;
|
|
return;
|
|
}
|
|
if (mUnit == nsIScrollableFrame::DEVICE_PIXELS ||
|
|
mUnit == nsIScrollableFrame::LINES) {
|
|
if (std::abs(aEdge - aDestination) < std::abs(*aBestEdge - aDestination)) {
|
|
*aBestEdge = aEdge;
|
|
}
|
|
} else if (mUnit == nsIScrollableFrame::PAGES) {
|
|
// distance to the edge from the scrolling destination in the direction of scrolling
|
|
nscoord overshoot = (aEdge - aDestination) * aScrollingDirection;
|
|
// distance to the current best edge from the scrolling destination in the direction of scrolling
|
|
nscoord curOvershoot = (*aBestEdge - aDestination) * aScrollingDirection;
|
|
|
|
// edges between the current position and the scrolling destination are favoured
|
|
// to preserve context
|
|
if (overshoot < 0 && (overshoot > curOvershoot || curOvershoot >= 0)) {
|
|
*aBestEdge = aEdge;
|
|
}
|
|
// if there are no edges between the current position and the scrolling destination
|
|
// the closest edge beyond the destination is used
|
|
if (overshoot > 0 && overshoot < curOvershoot) {
|
|
*aBestEdge = aEdge;
|
|
}
|
|
} else if (mUnit == nsIScrollableFrame::WHOLE) {
|
|
// the edge closest to the top/bottom/left/right is used, depending on scrolling direction
|
|
if (aScrollingDirection > 0 && aEdge > *aBestEdge) {
|
|
*aBestEdge = aEdge;
|
|
} else if (aScrollingDirection < 0 && aEdge < *aBestEdge) {
|
|
*aBestEdge = aEdge;
|
|
}
|
|
} else {
|
|
NS_ERROR("Invalid scroll mode");
|
|
return;
|
|
}
|
|
}
|
|
|
|
void
|
|
CalcSnapPoints::AddEdgeInterval(nscoord aInterval, nscoord aMinPos,
|
|
nscoord aMaxPos, nscoord aOffset,
|
|
nscoord aDestination, nscoord aStartPos,
|
|
nscoord aScrollingDirection,
|
|
nscoord* aBestEdge, bool *aEdgeFound)
|
|
{
|
|
if (aInterval == 0) {
|
|
// When interval is 0, there are no scroll snap points.
|
|
// Avoid division by zero and bail.
|
|
return;
|
|
}
|
|
|
|
// The only possible candidate interval snap points are the edges immediately
|
|
// surrounding aDestination.
|
|
|
|
// aDestination must be clamped to the scroll
|
|
// range in order to handle cases where the best matching snap point would
|
|
// result in scrolling out of bounds. This clamping must be prior to
|
|
// selecting the two interval edges.
|
|
nscoord clamped = std::max(std::min(aDestination, aMaxPos), aMinPos);
|
|
|
|
// Add each edge in the interval immediately before aTarget and after aTarget
|
|
// Do not add edges that are out of range.
|
|
nscoord r = (clamped + aOffset) % aInterval;
|
|
if (r < aMinPos) {
|
|
r += aInterval;
|
|
}
|
|
nscoord edge = clamped - r;
|
|
if (edge >= aMinPos && edge <= aMaxPos) {
|
|
AddEdge(edge, aDestination, aStartPos, aScrollingDirection, aBestEdge,
|
|
aEdgeFound);
|
|
}
|
|
edge += aInterval;
|
|
if (edge >= aMinPos && edge <= aMaxPos) {
|
|
AddEdge(edge, aDestination, aStartPos, aScrollingDirection, aBestEdge,
|
|
aEdgeFound);
|
|
}
|
|
}
|
|
|
|
static void
|
|
ProcessScrollSnapCoordinates(SnappingEdgeCallback& aCallback,
|
|
const nsTArray<nsPoint>& aScrollSnapCoordinates,
|
|
const nsPoint& aScrollSnapDestination) {
|
|
for (nsPoint snapCoords : aScrollSnapCoordinates) {
|
|
// Make them relative to the scroll snap destination.
|
|
snapCoords -= aScrollSnapDestination;
|
|
|
|
aCallback.AddVerticalEdge(snapCoords.x);
|
|
aCallback.AddHorizontalEdge(snapCoords.y);
|
|
}
|
|
}
|
|
|
|
Maybe<nsPoint> ScrollSnapUtils::GetSnapPointForDestination(
|
|
const ScrollSnapInfo& aSnapInfo,
|
|
nsIScrollableFrame::ScrollUnit aUnit,
|
|
const nsSize& aScrollPortSize,
|
|
const nsRect& aScrollRange,
|
|
const nsPoint& aStartPos,
|
|
const nsPoint& aDestination)
|
|
{
|
|
if (aSnapInfo.mScrollSnapTypeY == NS_STYLE_SCROLL_SNAP_TYPE_NONE &&
|
|
aSnapInfo.mScrollSnapTypeX == NS_STYLE_SCROLL_SNAP_TYPE_NONE) {
|
|
return Nothing();
|
|
}
|
|
|
|
nsPoint destPos = aSnapInfo.mScrollSnapDestination;
|
|
|
|
CalcSnapPoints calcSnapPoints(aUnit, aDestination, aStartPos);
|
|
|
|
if (aSnapInfo.mScrollSnapIntervalX.isSome()) {
|
|
nscoord interval = aSnapInfo.mScrollSnapIntervalX.value();
|
|
calcSnapPoints.AddVerticalEdgeInterval(aScrollRange, interval, destPos.x);
|
|
}
|
|
if (aSnapInfo.mScrollSnapIntervalY.isSome()) {
|
|
nscoord interval = aSnapInfo.mScrollSnapIntervalY.value();
|
|
calcSnapPoints.AddHorizontalEdgeInterval(aScrollRange, interval, destPos.y);
|
|
}
|
|
|
|
ProcessScrollSnapCoordinates(calcSnapPoints, aSnapInfo.mScrollSnapCoordinates, destPos);
|
|
bool snapped = false;
|
|
nsPoint finalPos = calcSnapPoints.GetBestEdge();
|
|
nscoord proximityThreshold = gfxPrefs::ScrollSnapProximityThreshold();
|
|
proximityThreshold = nsPresContext::CSSPixelsToAppUnits(proximityThreshold);
|
|
if (aSnapInfo.mScrollSnapTypeY == NS_STYLE_SCROLL_SNAP_TYPE_PROXIMITY &&
|
|
std::abs(aDestination.y - finalPos.y) > proximityThreshold) {
|
|
finalPos.y = aDestination.y;
|
|
} else {
|
|
snapped = true;
|
|
}
|
|
if (aSnapInfo.mScrollSnapTypeX == NS_STYLE_SCROLL_SNAP_TYPE_PROXIMITY &&
|
|
std::abs(aDestination.x - finalPos.x) > proximityThreshold) {
|
|
finalPos.x = aDestination.x;
|
|
} else {
|
|
snapped = true;
|
|
}
|
|
return snapped ? Some(finalPos) : Nothing();
|
|
}
|
|
|
|
} // namespace mozilla
|