mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
c310927390
This is a rollup of the following patches - Change the interpretation of FrameMetrics.mZoom to a "resolution-indepedent zoom", instead of a resolution-depedent scale factor. r=roc - Remove mention of "meta" from TabChild. r=roc - Remove some useless logging. r=roc - Tag FrameMetrics with its composition bounds at paint time. r=roc - Add a helper to calculate the render resolution for a FrameMetrics. r=roc - Add a helper to compute the approximate CSS dimensions a FrameMetrics will cover during composition. r=roc - BrowserElementScrolling doesn't actually care about zoom or resolution. r=roc - Accept the viewport that content has calculated, when it's received the latest widget geometry update. r=roc - Mechanically separate uses of zoom/resolution based on new definitions. r=roc - Convert GetViewportInfo()'s resolution-dependent scale into resolution-indepedent zoom. r=roc - Reinterpret defaultZoom == 0.0 as "intrinsic scale". r=jwir3,roc
331 lines
9.6 KiB
C++
331 lines
9.6 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set sw=4 ts=8 et tw=80 : */
|
|
/* 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 "Axis.h"
|
|
#include "AsyncPanZoomController.h"
|
|
|
|
namespace mozilla {
|
|
namespace layers {
|
|
|
|
static const float EPSILON = 0.0001f;
|
|
|
|
/**
|
|
* Maximum acceleration that can happen between two frames. Velocity is
|
|
* throttled if it's above this. This may happen if a time delta is very low,
|
|
* or we get a touch point very far away from the previous position for some
|
|
* reason.
|
|
*/
|
|
static const float MAX_EVENT_ACCELERATION = 999.0f;
|
|
|
|
/**
|
|
* Amount of friction applied during flings.
|
|
*/
|
|
static const float FLING_FRICTION = 0.007f;
|
|
|
|
/**
|
|
* Threshold for velocity beneath which we turn off any acceleration we had
|
|
* during repeated flings.
|
|
*/
|
|
static const float VELOCITY_THRESHOLD = 0.14f;
|
|
|
|
/**
|
|
* Amount of acceleration we multiply in each time the user flings in one
|
|
* direction. Every time they let go of the screen, we increase the acceleration
|
|
* by this amount raised to the power of the amount of times they have let go,
|
|
* times two (to make the curve steeper). This stops if the user lets go and we
|
|
* slow down enough, or if they put their finger down without moving it for a
|
|
* moment (or in the opposite direction).
|
|
*/
|
|
static const float ACCELERATION_MULTIPLIER = 1.125f;
|
|
|
|
/**
|
|
* When flinging, if the velocity goes below this number, we just stop the
|
|
* animation completely. This is to prevent asymptotically approaching 0
|
|
* velocity and rerendering unnecessarily.
|
|
*/
|
|
static const float FLING_STOPPED_THRESHOLD = 0.01f;
|
|
|
|
Axis::Axis(AsyncPanZoomController* aAsyncPanZoomController)
|
|
: mPos(0.0f),
|
|
mVelocity(0.0f),
|
|
mAcceleration(0),
|
|
mAsyncPanZoomController(aAsyncPanZoomController),
|
|
mLockPanning(false)
|
|
{
|
|
|
|
}
|
|
|
|
void Axis::UpdateWithTouchAtDevicePoint(int32_t aPos, const TimeDuration& aTimeDelta) {
|
|
if (mLockPanning) {
|
|
return;
|
|
}
|
|
|
|
float newVelocity = (mPos - aPos) / aTimeDelta.ToMilliseconds();
|
|
|
|
bool curVelocityIsLow = fabsf(newVelocity) < 0.01f;
|
|
bool curVelocityBelowThreshold = fabsf(newVelocity) < VELOCITY_THRESHOLD;
|
|
bool directionChange = (mVelocity > 0) != (newVelocity > 0);
|
|
|
|
// If we've changed directions, or the current velocity threshold, stop any
|
|
// acceleration we've accumulated.
|
|
if (directionChange || curVelocityBelowThreshold) {
|
|
mAcceleration = 0;
|
|
}
|
|
|
|
// If a direction change has happened, or the current velocity due to this new
|
|
// touch is relatively low, then just apply it. If not, throttle it.
|
|
if (curVelocityIsLow || (directionChange && fabs(newVelocity) - EPSILON <= 0.0f)) {
|
|
mVelocity = newVelocity;
|
|
} else {
|
|
float maxChange = fabsf(mVelocity * aTimeDelta.ToMilliseconds() * MAX_EVENT_ACCELERATION);
|
|
mVelocity = NS_MIN(mVelocity + maxChange, NS_MAX(mVelocity - maxChange, newVelocity));
|
|
}
|
|
|
|
mVelocity = newVelocity;
|
|
mPos = aPos;
|
|
}
|
|
|
|
void Axis::StartTouch(int32_t aPos) {
|
|
mStartPos = aPos;
|
|
mPos = aPos;
|
|
mLockPanning = false;
|
|
}
|
|
|
|
float Axis::GetDisplacementForDuration(float aScale, const TimeDuration& aDelta) {
|
|
if (fabsf(mVelocity) < VELOCITY_THRESHOLD) {
|
|
mAcceleration = 0;
|
|
}
|
|
|
|
float accelerationFactor = GetAccelerationFactor();
|
|
float displacement = mVelocity * aScale * aDelta.ToMilliseconds() * accelerationFactor;
|
|
// If this displacement will cause an overscroll, throttle it. Can potentially
|
|
// bring it to 0 even if the velocity is high.
|
|
if (DisplacementWillOverscroll(displacement) != OVERSCROLL_NONE) {
|
|
// No need to have a velocity along this axis anymore; it won't take us
|
|
// anywhere, so we're just spinning needlessly.
|
|
mVelocity = 0.0f;
|
|
mAcceleration = 0;
|
|
displacement -= DisplacementWillOverscrollAmount(displacement);
|
|
}
|
|
return displacement;
|
|
}
|
|
|
|
float Axis::PanDistance() {
|
|
return fabsf(mPos - mStartPos);
|
|
}
|
|
|
|
void Axis::EndTouch() {
|
|
mAcceleration++;
|
|
}
|
|
|
|
void Axis::CancelTouch() {
|
|
mVelocity = 0.0f;
|
|
mAcceleration = 0;
|
|
}
|
|
|
|
void Axis::LockPanning() {
|
|
mLockPanning = true;
|
|
}
|
|
|
|
bool Axis::FlingApplyFrictionOrCancel(const TimeDuration& aDelta) {
|
|
if (fabsf(mVelocity) <= FLING_STOPPED_THRESHOLD) {
|
|
// If the velocity is very low, just set it to 0 and stop the fling,
|
|
// otherwise we'll just asymptotically approach 0 and the user won't
|
|
// actually see any changes.
|
|
mVelocity = 0.0f;
|
|
return false;
|
|
} else {
|
|
mVelocity *= NS_MAX(1.0f - FLING_FRICTION * aDelta.ToMilliseconds(), 0.0);
|
|
}
|
|
return true;
|
|
}
|
|
|
|
Axis::Overscroll Axis::GetOverscroll() {
|
|
// If the current pan takes the window to the left of or above the current
|
|
// page rect.
|
|
bool minus = GetOrigin() < GetPageStart();
|
|
// If the current pan takes the window to the right of or below the current
|
|
// page rect.
|
|
bool plus = GetCompositionEnd() > GetPageEnd();
|
|
if (minus && plus) {
|
|
return OVERSCROLL_BOTH;
|
|
}
|
|
if (minus) {
|
|
return OVERSCROLL_MINUS;
|
|
}
|
|
if (plus) {
|
|
return OVERSCROLL_PLUS;
|
|
}
|
|
return OVERSCROLL_NONE;
|
|
}
|
|
|
|
float Axis::GetExcess() {
|
|
switch (GetOverscroll()) {
|
|
case OVERSCROLL_MINUS: return GetOrigin() - GetPageStart();
|
|
case OVERSCROLL_PLUS: return GetCompositionEnd() - GetPageEnd();
|
|
case OVERSCROLL_BOTH: return (GetCompositionEnd() - GetPageEnd()) +
|
|
(GetPageStart() - GetOrigin());
|
|
default: return 0;
|
|
}
|
|
}
|
|
|
|
Axis::Overscroll Axis::DisplacementWillOverscroll(int32_t aDisplacement) {
|
|
// If the current pan plus a displacement takes the window to the left of or
|
|
// above the current page rect.
|
|
bool minus = GetOrigin() + aDisplacement < GetPageStart();
|
|
// If the current pan plus a displacement takes the window to the right of or
|
|
// below the current page rect.
|
|
bool plus = GetCompositionEnd() + aDisplacement > GetPageEnd();
|
|
if (minus && plus) {
|
|
return OVERSCROLL_BOTH;
|
|
}
|
|
if (minus) {
|
|
return OVERSCROLL_MINUS;
|
|
}
|
|
if (plus) {
|
|
return OVERSCROLL_PLUS;
|
|
}
|
|
return OVERSCROLL_NONE;
|
|
}
|
|
|
|
float Axis::DisplacementWillOverscrollAmount(int32_t aDisplacement) {
|
|
switch (DisplacementWillOverscroll(aDisplacement)) {
|
|
case OVERSCROLL_MINUS: return (GetOrigin() + aDisplacement) - GetPageStart();
|
|
case OVERSCROLL_PLUS: return (GetCompositionEnd() + aDisplacement) - GetPageEnd();
|
|
// Don't handle overscrolled in both directions; a displacement can't cause
|
|
// this, it must have already been zoomed out too far.
|
|
default: return 0;
|
|
}
|
|
}
|
|
|
|
Axis::Overscroll Axis::ScaleWillOverscroll(float aScale, int32_t aFocus) {
|
|
float originAfterScale = (GetOrigin() + aFocus) * aScale - aFocus;
|
|
|
|
bool both = ScaleWillOverscrollBothSides(aScale);
|
|
bool minus = originAfterScale < GetPageStart() * aScale;
|
|
bool plus = (originAfterScale + GetCompositionLength()) > GetPageEnd() * aScale;
|
|
|
|
if ((minus && plus) || both) {
|
|
return OVERSCROLL_BOTH;
|
|
}
|
|
if (minus) {
|
|
return OVERSCROLL_MINUS;
|
|
}
|
|
if (plus) {
|
|
return OVERSCROLL_PLUS;
|
|
}
|
|
return OVERSCROLL_NONE;
|
|
}
|
|
|
|
float Axis::ScaleWillOverscrollAmount(float aScale, int32_t aFocus) {
|
|
float originAfterScale = (GetOrigin() + aFocus) * aScale - aFocus;
|
|
switch (ScaleWillOverscroll(aScale, aFocus)) {
|
|
case OVERSCROLL_MINUS: return originAfterScale - GetPageStart() * aScale;
|
|
case OVERSCROLL_PLUS: return (originAfterScale + GetCompositionLength()) -
|
|
NS_lround(GetPageEnd() * aScale);
|
|
// Don't handle OVERSCROLL_BOTH. Client code is expected to deal with it.
|
|
default: return 0;
|
|
}
|
|
}
|
|
|
|
float Axis::GetVelocity() {
|
|
return mVelocity;
|
|
}
|
|
|
|
float Axis::GetAccelerationFactor() {
|
|
return powf(ACCELERATION_MULTIPLIER, NS_MAX(0, (mAcceleration - 4) * 3));
|
|
}
|
|
|
|
float Axis::GetCompositionEnd() {
|
|
return GetOrigin() + GetCompositionLength();
|
|
}
|
|
|
|
float Axis::GetPageEnd() {
|
|
return GetPageStart() + GetPageLength();
|
|
}
|
|
|
|
float Axis::GetOrigin() {
|
|
gfx::Point origin = mAsyncPanZoomController->GetFrameMetrics().mScrollOffset;
|
|
return GetPointOffset(origin);
|
|
}
|
|
|
|
float Axis::GetCompositionLength() {
|
|
const FrameMetrics& metrics = mAsyncPanZoomController->GetFrameMetrics();
|
|
gfx::Rect cssCompositedRect =
|
|
AsyncPanZoomController::CalculateCompositedRectInCssPixels(metrics);
|
|
return GetRectLength(cssCompositedRect);
|
|
}
|
|
|
|
float Axis::GetPageStart() {
|
|
gfx::Rect pageRect = mAsyncPanZoomController->GetFrameMetrics().mScrollableRect;
|
|
return GetRectOffset(pageRect);
|
|
}
|
|
|
|
float Axis::GetPageLength() {
|
|
gfx::Rect pageRect = mAsyncPanZoomController->GetFrameMetrics().mScrollableRect;
|
|
return GetRectLength(pageRect);
|
|
}
|
|
|
|
bool Axis::ScaleWillOverscrollBothSides(float aScale) {
|
|
const FrameMetrics& metrics = mAsyncPanZoomController->GetFrameMetrics();
|
|
|
|
gfx::Rect cssContentRect = metrics.mScrollableRect;
|
|
|
|
float currentScale = metrics.mZoom.width;
|
|
nsIntRect compositionBounds = metrics.mCompositionBounds;
|
|
gfx::Rect scaledCompositionBounds =
|
|
gfx::Rect(compositionBounds.x, compositionBounds.y,
|
|
compositionBounds.width, compositionBounds.height);
|
|
scaledCompositionBounds.ScaleInverseRoundIn(currentScale * aScale);
|
|
|
|
return GetRectLength(cssContentRect) < GetRectLength(scaledCompositionBounds);
|
|
}
|
|
|
|
AxisX::AxisX(AsyncPanZoomController* aAsyncPanZoomController)
|
|
: Axis(aAsyncPanZoomController)
|
|
{
|
|
|
|
}
|
|
|
|
float AxisX::GetPointOffset(const gfx::Point& aPoint)
|
|
{
|
|
return aPoint.x;
|
|
}
|
|
|
|
float AxisX::GetRectLength(const gfx::Rect& aRect)
|
|
{
|
|
return aRect.width;
|
|
}
|
|
|
|
float AxisX::GetRectOffset(const gfx::Rect& aRect)
|
|
{
|
|
return aRect.x;
|
|
}
|
|
|
|
AxisY::AxisY(AsyncPanZoomController* aAsyncPanZoomController)
|
|
: Axis(aAsyncPanZoomController)
|
|
{
|
|
|
|
}
|
|
|
|
float AxisY::GetPointOffset(const gfx::Point& aPoint)
|
|
{
|
|
return aPoint.y;
|
|
}
|
|
|
|
float AxisY::GetRectLength(const gfx::Rect& aRect)
|
|
{
|
|
return aRect.height;
|
|
}
|
|
|
|
float AxisY::GetRectOffset(const gfx::Rect& aRect)
|
|
{
|
|
return aRect.y;
|
|
}
|
|
|
|
}
|
|
}
|