wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset f5877d3b95ea (bug 976605)

Browse Source
This commit is contained in:
Ed Morley 2014-04-15 17:45:37 +01:00
parent f7dbe6aa7a
commit 4a76853977
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gfx/layers/ipc/AsyncPanZoomController.cpp
View File

@ -1100,17 +1100,15 @@ nsEventStatus AsyncPanZoomController::StartPanning(const MultiTouchInput& aEvent
} else {
if (GetAxisLockMode() == FREE) {
SetState(PANNING);
} else {
HandlePanning(angle);
return nsEventStatus_eConsumeNoDefault;
}
HandlePanning(angle);
}
if (IsPanningState(mState)) {
mGeckoContentController->NotifyAPZStateChange(GetGuid(), APZStateChange::StartPanning);
return nsEventStatus_eConsumeNoDefault;
}
// Don't consume an event that didn't trigger a panning.
return nsEventStatus_eIgnore;
return IsPanningState(mState) ? nsEventStatus_eConsumeNoDefault
: nsEventStatus_eIgnore;
}
void AsyncPanZoomController::UpdateWithTouchAtDevicePoint(const MultiTouchInput& aEvent) {

4
gfx/layers/ipc/GeckoContentController.h
View File

@ -127,10 +127,6 @@ public:
* |aArg| is 1 if touch can be a pan, 0 otherwise.
*/
StartTouch,
/**
* APZ started a pan.
*/
StartPanning,
APZStateChangeSentinel
MOZ_END_NESTED_ENUM_CLASS(APZStateChange)