summaryrefslogtreecommitdiffstats
path: root/gfx/layers/apz
diff options
context:
space:
mode:
Diffstat (limited to 'gfx/layers/apz')
-rw-r--r--gfx/layers/apz/src/AsyncPanZoomController.cpp23
-rw-r--r--gfx/layers/apz/src/PotentialCheckerboardDurationTracker.cpp18
-rw-r--r--gfx/layers/apz/src/PotentialCheckerboardDurationTracker.h2
3 files changed, 1 insertions, 42 deletions
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.cpp b/gfx/layers/apz/src/AsyncPanZoomController.cpp
index e7574eeb7..3d4112395 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.cpp
+++ b/gfx/layers/apz/src/AsyncPanZoomController.cpp
@@ -38,7 +38,6 @@
#include "mozilla/ReentrantMonitor.h" // for ReentrantMonitorAutoEnter, etc
#include "mozilla/RefPtr.h" // for RefPtr
#include "mozilla/StaticPtr.h" // for StaticAutoPtr
-#include "mozilla/Telemetry.h" // for Telemetry
#include "mozilla/TimeStamp.h" // for TimeDuration, TimeStamp
#include "mozilla/dom/CheckerboardReportService.h" // for CheckerboardEventStorage
// note: CheckerboardReportService.h actually lives in gfx/layers/apz/util/
@@ -1686,25 +1685,6 @@ void AsyncPanZoomController::DoDelayedRequestContentRepaint()
mPinchPaintTimerSet = false;
}
-static ScrollInputMethod
-ScrollInputMethodForWheelDeltaType(ScrollWheelInput::ScrollDeltaType aDeltaType)
-{
- switch (aDeltaType) {
- case ScrollWheelInput::SCROLLDELTA_LINE: {
- return ScrollInputMethod::ApzWheelLine;
- }
- case ScrollWheelInput::SCROLLDELTA_PAGE: {
- return ScrollInputMethod::ApzWheelPage;
- }
- case ScrollWheelInput::SCROLLDELTA_PIXEL: {
- return ScrollInputMethod::ApzWheelPixel;
- }
- default:
- MOZ_ASSERT_UNREACHABLE("unexpected scroll delta type");
- return ScrollInputMethod::ApzWheelLine;
- }
-}
-
nsEventStatus AsyncPanZoomController::OnScrollWheel(const ScrollWheelInput& aEvent)
{
ParentLayerPoint delta = GetScrollWheelDelta(aEvent);
@@ -3229,11 +3209,10 @@ AsyncPanZoomController::ReportCheckerboard(const TimeStamp& aSampleTime)
mLastCheckerboardReport = aSampleTime;
bool recordTrace = gfxPrefs::APZRecordCheckerboarding();
- bool forTelemetry = Telemetry::CanRecordExtended();
uint32_t magnitude = GetCheckerboardMagnitude();
MutexAutoLock lock(mCheckerboardEventLock);
- if (!mCheckerboardEvent && (recordTrace || forTelemetry)) {
+ if (!mCheckerboardEvent && recordTrace) {
mCheckerboardEvent = MakeUnique<CheckerboardEvent>(recordTrace);
}
mPotentialCheckerboardTracker.InTransform(IsTransformingState(mState));
diff --git a/gfx/layers/apz/src/PotentialCheckerboardDurationTracker.cpp b/gfx/layers/apz/src/PotentialCheckerboardDurationTracker.cpp
index e469421ad..3c62a1101 100644
--- a/gfx/layers/apz/src/PotentialCheckerboardDurationTracker.cpp
+++ b/gfx/layers/apz/src/PotentialCheckerboardDurationTracker.cpp
@@ -6,8 +6,6 @@
#include "PotentialCheckerboardDurationTracker.h"
-#include "mozilla/Telemetry.h" // for Telemetry
-
namespace mozilla {
namespace layers {
@@ -20,10 +18,6 @@ PotentialCheckerboardDurationTracker::PotentialCheckerboardDurationTracker()
void
PotentialCheckerboardDurationTracker::CheckerboardSeen()
{
- // This might get called while mInCheckerboard is already true
- if (!Tracking()) {
- mCurrentPeriodStart = TimeStamp::Now();
- }
mInCheckerboard = true;
}
@@ -32,9 +26,6 @@ PotentialCheckerboardDurationTracker::CheckerboardDone()
{
MOZ_ASSERT(Tracking());
mInCheckerboard = false;
- if (!Tracking()) {
- /* Telemetry STUB */
- }
}
void
@@ -50,19 +41,10 @@ PotentialCheckerboardDurationTracker::InTransform(bool aInTransform)
// must be true (or we would have early-exited this function already).
// Therefore, we are starting a potential checkerboard period.
mInTransform = aInTransform;
- mCurrentPeriodStart = TimeStamp::Now();
return;
}
mInTransform = aInTransform;
-
- if (!Tracking()) {
- // Tracking() must have been true at the start of this function, or we
- // would have taken the other !Tracking branch above. If it's false now,
- // it means we just stopped tracking, so we are ending a potential
- // checkerboard period.
- /* Telemetry STUB */
- }
}
bool
diff --git a/gfx/layers/apz/src/PotentialCheckerboardDurationTracker.h b/gfx/layers/apz/src/PotentialCheckerboardDurationTracker.h
index 6154003ad..bcba113d3 100644
--- a/gfx/layers/apz/src/PotentialCheckerboardDurationTracker.h
+++ b/gfx/layers/apz/src/PotentialCheckerboardDurationTracker.h
@@ -50,8 +50,6 @@ private:
private:
bool mInCheckerboard;
bool mInTransform;
-
- TimeStamp mCurrentPeriodStart;
};
} // namespace layers