diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-05-15 11:04:41 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-05-20 13:55:50 +0000 |
| commit | 3e82ac05b113eee4a08510600dd02c7c695f0b88 (patch) | |
| tree | 59e64d3a3f595ef284818bbf7c708260e929f799 /gfx/layers/apz/src/AsyncPanZoomController.cpp | |
| parent | 3ab7bd811f8f901806e51c046b6f032c260dc64a (diff) | |
| download | UXP-3e82ac05b113eee4a08510600dd02c7c695f0b88.tar UXP-3e82ac05b113eee4a08510600dd02c7c695f0b88.tar.gz UXP-3e82ac05b113eee4a08510600dd02c7c695f0b88.tar.lz UXP-3e82ac05b113eee4a08510600dd02c7c695f0b88.tar.xz UXP-3e82ac05b113eee4a08510600dd02c7c695f0b88.zip | |
Issue #80- De-unify gfx/layers
Excludes layers/ipc/CompositorBridgeParent and CrossProcessCompositorBridgeParent
because the latter purposely uses functions implemented in the former.
See also code comment in CrossProcessCompositorBridgeParent.cpp
Note: likely dead code for us anyway; likely not worth investing in to solve.
Diffstat (limited to 'gfx/layers/apz/src/AsyncPanZoomController.cpp')
| -rw-r--r-- | gfx/layers/apz/src/AsyncPanZoomController.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp index 3d4112395..d9ad3ae78 100644 --- a/gfx/layers/apz/src/AsyncPanZoomController.cpp +++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp @@ -33,6 +33,7 @@ #include "mozilla/ClearOnShutdown.h" // for ClearOnShutdown #include "mozilla/ComputedTimingFunction.h" // for ComputedTimingFunction #include "mozilla/EventForwards.h" // for nsEventStatus_* +#include "mozilla/EventStateManager.h" #include "mozilla/MouseEvents.h" // for WidgetWheelEvent #include "mozilla/Preferences.h" // for Preferences #include "mozilla/ReentrantMonitor.h" // for ReentrantMonitorAutoEnter, etc @@ -44,6 +45,7 @@ #include "mozilla/dom/Touch.h" // for Touch #include "mozilla/gfx/BasePoint.h" // for BasePoint #include "mozilla/gfx/BaseRect.h" // for BaseRect +#include "mozilla/gfx/Coord.h" #include "mozilla/gfx/Point.h" // for Point, RoundedToInt, etc #include "mozilla/gfx/Rect.h" // for RoundedIn #include "mozilla/gfx/ScaleFactor.h" // for ScaleFactor @@ -102,7 +104,12 @@ typedef GeckoContentController::APZStateChange APZStateChange; typedef GeckoContentController::TapType TapType; typedef mozilla::gfx::Point Point; typedef mozilla::gfx::Matrix4x4 Matrix4x4; +using mozilla::gfx::CoordTyped; +using mozilla::gfx::IntCoordTyped; +using mozilla::gfx::IntRectTyped; using mozilla::gfx::PointTyped; +using mozilla::gfx::RectTyped; +using mozilla::gfx::ScaleFactors2D; // Choose between platform-specific implementations. #ifdef MOZ_WIDGET_ANDROID @@ -833,7 +840,9 @@ AsyncPanZoomController::ArePointerEventsConsumable(TouchBlockState* aBlock, uint } template <typename Units> -static CoordTyped<Units> GetAxisStart(AsyncDragMetrics::DragDirection aDir, const PointTyped<Units>& aValue) { +static CoordTyped<Units> GetAxisStart( +AsyncDragMetrics::DragDirection aDir, +const PointTyped<Units>& aValue) { if (aDir == AsyncDragMetrics::HORIZONTAL) { return aValue.x; } else { |