mirrors/gecko-dev
1
0
Fork 1
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-11-12 22:28:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug 1440118 - If the APZ content response timeout is set to zero, use the fallback (timeout) behavior unconditionally. r=kats

Browse source 
MozReview-Commit-ID: HrkUd3MJoxC

--HG--
extra : rebase_source : a75aa57831ec65f6390b445a24481900195e0441
This commit is contained in:
Botond Ballo 2018-02-21 17:55:03 -05:00
parent ce409598e9
commit 13810202c4
2 changed files with 51 additions and 6 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

43
gfx/layers/apz/src/InputQueue.cpp
View file

@ -35,6 +35,8 @@ InputQueue::ReceiveInputEvent(const RefPtr<AsyncPanZoomController>& aTarget,
uint64_t* aOutInputBlockId) {
APZThreadUtils::AssertOnControllerThread();
AutoRunImmediateTimeout timeoutRunner{this};
switch (aEvent.mInputType) {
case MULTITOUCH_INPUT: {
const MultiTouchInput& event = aEvent.AsMultiTouchInput();
@ -445,6 +447,7 @@ InputQueue::MaybeRequestContentResponse(const RefPtr<AsyncPanZoomController>& aT
uint64_t
InputQueue::InjectNewTouchBlock(AsyncPanZoomController* aTarget)
{
AutoRunImmediateTimeout timeoutRunner{this};
TouchBlockState* block = StartNewTouchBlock(aTarget,
TargetConfirmationFlags{true},
/* aCopyPropertiesFromCurrent = */ true);
@ -567,12 +570,26 @@ InputQueue::ScheduleMainThreadTimeout(const RefPtr<AsyncPanZoomController>& aTar
CancelableBlockState* aBlock) {
INPQ_LOG("scheduling main thread timeout for target %p\n", aTarget.get());
aBlock->StartContentResponseTimer();
aTarget->PostDelayedTask(
NewRunnableMethod<uint64_t>("layers::InputQueue::MainThreadTimeout",
this,
&InputQueue::MainThreadTimeout,
aBlock->GetBlockId()),
gfxPrefs::APZContentResponseTimeout());
RefPtr<Runnable> timeoutTask = NewRunnableMethod<uint64_t>("layers::InputQueue::MainThreadTimeout",
this,
&InputQueue::MainThreadTimeout,
aBlock->GetBlockId());
int32_t timeout = gfxPrefs::APZContentResponseTimeout();
if (timeout == 0) {
// If the timeout is zero, treat it as a request to ignore any main
// thread confirmation and unconditionally use fallback behaviour for
// when a timeout is reached. This codepath is used by tests that
// want to exercise the fallback behaviour.
// To ensure the fallback behaviour is used unconditionally, the timeout
// is run right away instead of using PostDelayedTask(). However,
// we can't run it right here, because MainThreadTimeout() expects that
// the input block has at least one input event in mQueuedInputs, and
// the event that triggered this call may not have been added to
// mQueuedInputs yet.
mImmediateTimeout = timeoutTask.forget();
} else {
aTarget->PostDelayedTask(timeoutTask.forget(), timeout);
}
}
InputBlockState*
@ -807,5 +824,19 @@ InputQueue::Clear()
mLastActiveApzc = nullptr;
}
InputQueue::AutoRunImmediateTimeout::AutoRunImmediateTimeout(InputQueue* aQueue)
: mQueue(aQueue)
{
MOZ_ASSERT(!mQueue->mImmediateTimeout);
}
InputQueue::AutoRunImmediateTimeout::~AutoRunImmediateTimeout()
{
if (mQueue->mImmediateTimeout) {
mQueue->mImmediateTimeout->Run();
mQueue->mImmediateTimeout = nullptr;
}
}
} // namespace layers
} // namespace mozilla

14
gfx/layers/apz/src/InputQueue.h
View file

@ -139,6 +139,16 @@ public:
private:
~InputQueue();
// RAII class for automatically running a timeout task that may
// need to be run immediately after an event has been queued.
class AutoRunImmediateTimeout {
public:
explicit AutoRunImmediateTimeout(InputQueue* aQueue);
~AutoRunImmediateTimeout();
private:
InputQueue* mQueue;
};
TouchBlockState* StartNewTouchBlock(const RefPtr<AsyncPanZoomController>& aTarget,
TargetConfirmationFlags aFlags,
bool aCopyPropertiesFromCurrent);
@ -218,6 +228,10 @@ private:
// Track mouse inputs so we know if we're in a drag or not
DragTracker mDragTracker;
// Temporarily stores a timeout task that needs to be run as soon as
// as the event that triggered it has been queued.
RefPtr<Runnable> mImmediateTimeout;
};
} // namespace layers