diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-04 07:41:14 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-04 07:41:14 +0200 |
| commit | 45ec2bceb4822646805136b8874a3681b14e78ef (patch) | |
| tree | d1db6daa9b40f85e6bc36a6768d1b74d735454f8 /widget/windows | |
| parent | 7d73b3fbfe1cd4f3a45b569f98f19041f95a50b9 (diff) | |
| parent | 2e00eb87ef299e6eb7521670e6a6720fee19f5fc (diff) | |
| download | UXP-45ec2bceb4822646805136b8874a3681b14e78ef.tar UXP-45ec2bceb4822646805136b8874a3681b14e78ef.tar.gz UXP-45ec2bceb4822646805136b8874a3681b14e78ef.tar.lz UXP-45ec2bceb4822646805136b8874a3681b14e78ef.tar.xz UXP-45ec2bceb4822646805136b8874a3681b14e78ef.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'widget/windows')
| -rw-r--r-- | widget/windows/nsLookAndFeel.cpp | 3 | ||||
| -rw-r--r-- | widget/windows/nsWindow.cpp | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/widget/windows/nsLookAndFeel.cpp b/widget/windows/nsLookAndFeel.cpp index 97f81abfd..a907622d9 100644 --- a/widget/windows/nsLookAndFeel.cpp +++ b/widget/windows/nsLookAndFeel.cpp @@ -11,7 +11,6 @@ #include "nsUXThemeConstants.h" #include "gfxFont.h" #include "WinUtils.h" -#include "mozilla/Telemetry.h" #include "mozilla/WindowsVersion.h" #include "gfxFontConstants.h" @@ -65,8 +64,6 @@ nsLookAndFeel::nsLookAndFeel() : nsXPLookAndFeel() , mUseAccessibilityTheme(0) { - mozilla::Telemetry::Accumulate(mozilla::Telemetry::TOUCH_ENABLED_DEVICE, - WinUtils::IsTouchDeviceSupportPresent()); } nsLookAndFeel::~nsLookAndFeel() diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp index 5ce0117b0..122d18686 100644 --- a/widget/windows/nsWindow.cpp +++ b/widget/windows/nsWindow.cpp @@ -4232,10 +4232,6 @@ nsWindow::DispatchMouseEvent(EventMessage aEventMessage, WPARAM wParam, } if (WinUtils::GetIsMouseFromTouch(aEventMessage)) { - if (aEventMessage == eMouseDown) { - Telemetry::Accumulate(Telemetry::FX_TOUCH_USED, 1); - } - if (mTouchWindow) { // If mTouchWindow is true, then we must have APZ enabled and be // feeding it raw touch events. In that case we don't need to @@ -6750,8 +6746,6 @@ bool nsWindow::OnGesture(WPARAM wParam, LPARAM lParam) bool endFeedback = true; if (mGesture.PanDeltaToPixelScroll(wheelEvent)) { - mozilla::Telemetry::Accumulate(mozilla::Telemetry::SCROLL_INPUT_METHODS, - (uint32_t) ScrollInputMethod::MainThreadTouch); DispatchEvent(&wheelEvent, status); } |