mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
fa9ed1e11b
- Bug 1166942 - Add logging of color layer bounds. r=nical (442de4b6c) - Bug 1152109 - Don't clear plugin data cache in ShadowLayers code, we need to resend this during repaints that do not involve reflow. r=roc (8670e73f9) - Bug 1158122 - Remove all occurences of nsIntRect in gfx/layers/composite. r=nical (dcfa2050a) - Bug 1158122 - Remove all occurences of nsIntRect in gfx/ipc/. r=nical (1ca3800b5) - Bug 1158122 - Remove all occurences of nsIntRect in gfx/gl/. r=nical (187d70360) - Bug 1158122 - Remove all occurences of nsIntRect in gfx/thebes/. r=nical (487ab747c) - Bug 1155621 - Remove no-op gfx2DGlue conversion helpers. r=Bas (f2ea364d4) - Bug 1158122 - Remove some occurences of nsIntRect in gfx/layers/. r=nical (b1bb2e736) - Bug 1158122 - Remove all occurences of nsIntRect in gfx/layers/client. r=nical (f0e71c984) - Bug 1158122 - Remove the remaining occurences of nsIntRect in gfx/layers. r=nical (571ff6de0) - Bug 1148350 - Add a test. r=botond (226b59773) - Bug 1158122 - Remove most occurences of nsIntRect in gfx/tests. r=nical (cb3b2541c) - Bug 1032848 - Part 1: Implement WebIDL for HTMLCanvasElement::CaptureStream. r=smaug, r=mt (210e34454) - Bug 1032848 - Part 2: Implement HTMLCanvasElement::CaptureStream. r=mt, r=jesup, r=jgilbert, r=gwright (bec93b4d3) - Bug 1032848 followup: Add 'override' annotation to Notify() method in CanvasCaptureMediaStream.cpp. rs=ehsan (9866fd266) - Bug 1032848 - Part 3: Add tests for HTMLCanvasElement::CaptureStream. r=mt, r=jgilbert, r=jesup (bde68ba7c) - Bug 987498 - Part 1 - Layers support OverlayImage. r=roc (8b22b789f) - Bug 987498 - Part 2 - HTMLMediaElement supports playback OverlayImage. r=roc (247dc15a2) - Bug 987498 - Part 3 - Implement DOMHwMediaStream. r=roc (f0d9de519) - Bug 987498 - Part 4 -Implement SetImageSize on DOMHwMediaStream. r=roc (850cf6ad0) - Bug 1147194 - Do scroll info layer hoisting when building the display list. r=tn (64ae65e97) - Bug 1161389 - Skip AccessibleCaret frame if nsDisplayListBuilder doesn't build caret. r=roc (0e8328488) - Bug 1068881 (Part 2) - Add reftests for rounding image dest rects to zero size. r=roc (00202564b) - Bug 1164227 - Don't allow invalid region simplification to invalidate unchanged scrolled contents. r=roc (3cde9cd56) - Bug 1148022 - When frame metrics are attached to the container layer of the root scroll frame, make sure that its scroll frame is active. r=tn (5369f9175) - Bug 1154478 - Really force-enable the event-regions code when APZ is enabled. r=tn (e7ba54c3d) - Move AsyncPanZoomAnimation into its own header. (bug 1139220 part 1, r=kats) (e06fd8854) - Bug 1139180 - Add BUG_COMPONENT metadata to moz.build for files in layout/. r=roc (468dedf02) - Factor the guts of AsyncScroll into a base helper class. (bug 1139220 part 2, r=kgilbert) (1719bcba6) - Use the main-thread key spline animation logic for Desktop APZ. (bug 1139220 part 3, r=kats,kgilbert) (84a1d8948) - Bug 1147038. Use the correct clip for root scroll frames in root content documents. r=mstange (cae882bdf) - Use Maybe to communicate the APZ scrollframe clip. (bug 1148582 part 1, r=mstange) (d22c5cfeb)
136 lines
5.1 KiB
C++
136 lines
5.1 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 "AsyncScrollBase.h"
|
|
|
|
using namespace mozilla;
|
|
|
|
AsyncScrollBase::AsyncScrollBase(nsPoint aStartPos)
|
|
: mIsFirstIteration(true)
|
|
, mStartPos(aStartPos)
|
|
{
|
|
}
|
|
|
|
void
|
|
AsyncScrollBase::Update(TimeStamp aTime,
|
|
nsPoint aDestination,
|
|
const nsSize& aCurrentVelocity)
|
|
{
|
|
TimeDuration duration = ComputeDuration(aTime);
|
|
nsSize currentVelocity = aCurrentVelocity;
|
|
|
|
if (!mIsFirstIteration) {
|
|
// If an additional event has not changed the destination, then do not let
|
|
// another minimum duration reset slow things down. If it would then
|
|
// instead continue with the existing timing function.
|
|
if (aDestination == mDestination &&
|
|
aTime + duration > mStartTime + mDuration)
|
|
{
|
|
return;
|
|
}
|
|
|
|
currentVelocity = VelocityAt(aTime);
|
|
mStartPos = PositionAt(aTime);
|
|
}
|
|
|
|
mStartTime = aTime;
|
|
mDuration = duration;
|
|
mDestination = aDestination;
|
|
InitTimingFunction(mTimingFunctionX, mStartPos.x, currentVelocity.width,
|
|
aDestination.x);
|
|
InitTimingFunction(mTimingFunctionY, mStartPos.y, currentVelocity.height,
|
|
aDestination.y);
|
|
mIsFirstIteration = false;
|
|
}
|
|
|
|
TimeDuration
|
|
AsyncScrollBase::ComputeDuration(TimeStamp aTime)
|
|
{
|
|
// Average last 3 delta durations (rounding errors up to 2ms are negligible for us)
|
|
int32_t eventsDeltaMs = (aTime - mPrevEventTime[2]).ToMilliseconds() / 3;
|
|
mPrevEventTime[2] = mPrevEventTime[1];
|
|
mPrevEventTime[1] = mPrevEventTime[0];
|
|
mPrevEventTime[0] = aTime;
|
|
|
|
// Modulate duration according to events rate (quicker events -> shorter durations).
|
|
// The desired effect is to use longer duration when scrolling slowly, such that
|
|
// it's easier to follow, but reduce the duration to make it feel more snappy when
|
|
// scrolling quickly. To reduce fluctuations of the duration, we average event
|
|
// intervals using the recent 4 timestamps (now + three prev -> 3 intervals).
|
|
int32_t durationMS = clamped<int32_t>(eventsDeltaMs * mIntervalRatio, mOriginMinMS, mOriginMaxMS);
|
|
|
|
return TimeDuration::FromMilliseconds(durationMS);
|
|
}
|
|
|
|
void
|
|
AsyncScrollBase::InitializeHistory(TimeStamp aTime)
|
|
{
|
|
// Starting a new scroll (i.e. not when extending an existing scroll animation),
|
|
// create imaginary prev timestamps with maximum relevant intervals between them.
|
|
|
|
// Longest relevant interval (which results in maximum duration)
|
|
TimeDuration maxDelta = TimeDuration::FromMilliseconds(mOriginMaxMS / mIntervalRatio);
|
|
mPrevEventTime[0] = aTime - maxDelta;
|
|
mPrevEventTime[1] = mPrevEventTime[0] - maxDelta;
|
|
mPrevEventTime[2] = mPrevEventTime[1] - maxDelta;
|
|
}
|
|
|
|
const double kCurrentVelocityWeighting = 0.25;
|
|
const double kStopDecelerationWeighting = 0.4;
|
|
|
|
void
|
|
AsyncScrollBase::InitTimingFunction(nsSMILKeySpline& aTimingFunction,
|
|
nscoord aCurrentPos,
|
|
nscoord aCurrentVelocity,
|
|
nscoord aDestination)
|
|
{
|
|
if (aDestination == aCurrentPos || kCurrentVelocityWeighting == 0) {
|
|
aTimingFunction.Init(0, 0, 1 - kStopDecelerationWeighting, 1);
|
|
return;
|
|
}
|
|
|
|
const TimeDuration oneSecond = TimeDuration::FromSeconds(1);
|
|
double slope = aCurrentVelocity * (mDuration / oneSecond) / (aDestination - aCurrentPos);
|
|
double normalization = sqrt(1.0 + slope * slope);
|
|
double dt = 1.0 / normalization * kCurrentVelocityWeighting;
|
|
double dxy = slope / normalization * kCurrentVelocityWeighting;
|
|
aTimingFunction.Init(dt, dxy, 1 - kStopDecelerationWeighting, 1);
|
|
}
|
|
|
|
nsPoint
|
|
AsyncScrollBase::PositionAt(TimeStamp aTime) const
|
|
{
|
|
double progressX = mTimingFunctionX.GetSplineValue(ProgressAt(aTime));
|
|
double progressY = mTimingFunctionY.GetSplineValue(ProgressAt(aTime));
|
|
return nsPoint(NSToCoordRound((1 - progressX) * mStartPos.x + progressX * mDestination.x),
|
|
NSToCoordRound((1 - progressY) * mStartPos.y + progressY * mDestination.y));
|
|
}
|
|
|
|
nsSize
|
|
AsyncScrollBase::VelocityAt(TimeStamp aTime) const
|
|
{
|
|
double timeProgress = ProgressAt(aTime);
|
|
return nsSize(VelocityComponent(timeProgress, mTimingFunctionX,
|
|
mStartPos.x, mDestination.x),
|
|
VelocityComponent(timeProgress, mTimingFunctionY,
|
|
mStartPos.y, mDestination.y));
|
|
}
|
|
|
|
nscoord
|
|
AsyncScrollBase::VelocityComponent(double aTimeProgress,
|
|
const nsSMILKeySpline& aTimingFunction,
|
|
nscoord aStart,
|
|
nscoord aDestination) const
|
|
{
|
|
double dt, dxy;
|
|
aTimingFunction.GetSplineDerivativeValues(aTimeProgress, dt, dxy);
|
|
if (dt == 0)
|
|
return dxy >= 0 ? nscoord_MAX : nscoord_MIN;
|
|
|
|
const TimeDuration oneSecond = TimeDuration::FromSeconds(1);
|
|
double slope = dxy / dt;
|
|
return NSToCoordRound(slope * (aDestination - aStart) / (mDuration / oneSecond));
|
|
}
|