Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 15:55:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1630781 - Expand mSampledState into a deque. r=botond

Browse Source 
The deque always has size 1, so this patch is functionally a no-op. It sets up
the usage of front() and back() to allow holding more than one item in a future
patch.

Depends on D72042

Differential Revision: https://phabricator.services.mozilla.com/D72043
This commit is contained in:
Kartikaya Gupta 2020-04-25 22:04:59 +00:00
parent dba00154a9
commit 6041ceee66
2 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
gfx/layers/apz/src/AsyncPanZoomController.cpp
View File

@ -858,6 +858,9 @@ AsyncPanZoomController::AsyncPanZoomController(
if (aGestures == USE_GESTURE_DETECTOR) {
mGestureEventListener = new GestureEventListener(this);
}
// Put one default-constructed sampled state in the queue.
RecursiveMutexAutoLock lock(mRecursiveMutex);
mSampledState.emplace_back();
}
AsyncPanZoomController::~AsyncPanZoomController() { MOZ_ASSERT(IsDestroyed()); }
@ -3150,7 +3153,7 @@ void AsyncPanZoomController::UpdateWithTouchAtDevicePoint(
Maybe<CompositionPayload> AsyncPanZoomController::NotifyScrollSampling() {
RecursiveMutexAutoLock lock(mRecursiveMutex);
return mSampledState.TakeScrollPayload();
return mSampledState.front().TakeScrollPayload();
}
bool AsyncPanZoomController::AttemptScroll(
@ -4167,7 +4170,7 @@ CSSRect AsyncPanZoomController::GetEffectiveLayoutViewport(
return mLastContentPaintMetrics.GetLayoutViewport();
}
if (aMode == eForCompositing) {
return mSampledState.GetLayoutViewport();
return mSampledState.front().GetLayoutViewport();
}
return Metrics().GetLayoutViewport();
}
@ -4179,7 +4182,7 @@ CSSPoint AsyncPanZoomController::GetEffectiveScrollOffset(
return mLastContentPaintMetrics.GetVisualViewportOffset();
}
if (aMode == eForCompositing) {
return mSampledState.GetScrollOffset();
return mSampledState.front().GetScrollOffset();
}
return Metrics().GetScrollOffset();
}
@ -4191,15 +4194,17 @@ CSSToParentLayerScale2D AsyncPanZoomController::GetEffectiveZoom(
return mLastContentPaintMetrics.GetZoom();
}
if (aMode == eForCompositing) {
return mSampledState.GetZoom();
return mSampledState.front().GetZoom();
}
return Metrics().GetZoom();
}
bool AsyncPanZoomController::SampleCompositedAsyncTransform(
const RecursiveMutexAutoLock& aProofOfLock) {
if (mSampledState != SampledAPZCState(Metrics())) {
mSampledState = SampledAPZCState(Metrics(), std::move(mScrollPayload));
MOZ_ASSERT(mSampledState.size() == 1);
if (mSampledState.back() != SampledAPZCState(Metrics())) {
mSampledState.back() =
SampledAPZCState(Metrics(), std::move(mScrollPayload));
return true;
}
return false;
@ -4529,8 +4534,10 @@ void AsyncPanZoomController::NotifyLayersUpdated(
mExpectedGeckoMetrics = aLayerMetrics;
ShareCompositorFrameMetrics();
mSampledState.UpdateScrollProperties(Metrics());
mSampledState.UpdateZoomProperties(Metrics());
for (auto& sampledState : mSampledState) {
sampledState.UpdateScrollProperties(Metrics());
sampledState.UpdateZoomProperties(Metrics());
}
if (Metrics().GetDisplayPortMargins() != ScreenMargin()) {
// A non-zero display port margin here indicates a displayport has
@ -4568,13 +4575,17 @@ void AsyncPanZoomController::NotifyLayersUpdated(
needContentRepaint = true;
}
Metrics().ZoomBy(totalResolutionChange / presShellResolutionChange);
mSampledState.ZoomBy(totalResolutionChange / presShellResolutionChange);
for (auto& sampledState : mSampledState) {
sampledState.ZoomBy(totalResolutionChange / presShellResolutionChange);
}
} else {
// Take the new zoom as either device scale or composition width or
// viewport size got changed (e.g. due to orientation change, or content
// changing the meta-viewport tag).
Metrics().SetZoom(aLayerMetrics.GetZoom());
mSampledState.UpdateZoomProperties(aLayerMetrics);
for (auto& sampledState : mSampledState) {
sampledState.UpdateZoomProperties(aLayerMetrics);
}
Metrics().SetDevPixelsPerCSSPixel(
aLayerMetrics.GetDevPixelsPerCSSPixel());
}
@ -4649,7 +4660,9 @@ void AsyncPanZoomController::NotifyLayersUpdated(
}
Metrics().RecalculateLayoutViewportOffset();
mSampledState.UpdateScrollProperties(Metrics());
for (auto& sampledState : mSampledState) {
sampledState.UpdateScrollProperties(Metrics());
}
mExpectedGeckoMetrics = aLayerMetrics;
// If an animation is underway, tell it about the scroll offset update.
@ -4678,7 +4691,9 @@ void AsyncPanZoomController::NotifyLayersUpdated(
// scrollable rect or composition bounds may have changed in a way that
// makes our local scroll offset out of bounds, so re-clamp it.
ClampAndSetScrollOffset(Metrics().GetScrollOffset());
mSampledState.ClampScrollOffset(Metrics());
for (auto& sampledState : mSampledState) {
sampledState.ClampScrollOffset(Metrics());
}
}
}
@ -4714,7 +4729,9 @@ void AsyncPanZoomController::NotifyLayersUpdated(
// The rest of this branch largely follows the code in the
// |if (scrollOffsetUpdated)| branch above.
Metrics().RecalculateLayoutViewportOffset();
mSampledState.UpdateScrollProperties(Metrics());
for (auto& sampledState : mSampledState) {
sampledState.UpdateScrollProperties(Metrics());
}
mExpectedGeckoMetrics = aLayerMetrics;
if (ShouldCancelAnimationForScrollUpdate(Nothing())) {
CancelAnimation();

10
gfx/layers/apz/src/AsyncPanZoomController.h
View File

@ -960,10 +960,12 @@ class AsyncPanZoomController {
// This allows us to transform events into Gecko's coordinate space.
FrameMetrics mExpectedGeckoMetrics;
// This holds important state from the Metrics() at the last time
// SampleCompositedAsyncTransform() was called. mRecursiveMutex must be held
// when using or modifying this member.
SampledAPZCState mSampledState;
// This holds important state from the Metrics() at previous times
// SampleCompositedAsyncTransform() was called. This will always have exactly
// one item. mRecursiveMutex must be held when using or modifying this member.
// Samples should be inserted to the "back" of the deque and extracted from
// the "front".
std::deque<SampledAPZCState> mSampledState;
// Groups state variables that are specific to a platform.
// Initialized on first use.