summaryrefslogtreecommitdiff
path: root/gfx
diff options
context:
space:
mode:
Diffstat (limited to 'gfx')
-rw-r--r--gfx/2d/Logging.h4
-rw-r--r--gfx/ipc/GPUProcessHost.h7
-rw-r--r--gfx/layers/apz/src/AsyncPanZoomController.h4
-rw-r--r--gfx/layers/apz/src/CheckerboardEvent.h3
-rw-r--r--gfx/layers/apz/src/InputBlockState.cpp2
-rw-r--r--gfx/layers/apz/src/InputBlockState.h3
-rw-r--r--gfx/layers/apz/util/ScrollInputMethods.h1
-rw-r--r--gfx/layers/d3d11/CompositorD3D11.cpp4
-rw-r--r--gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp2
-rw-r--r--gfx/thebes/gfxEnv.h2
-rw-r--r--gfx/thebes/gfxFontEntry.cpp1
-rw-r--r--gfx/thebes/gfxGDIFontList.cpp1
-rw-r--r--gfx/thebes/gfxPlatform.h4
-rw-r--r--gfx/thebes/gfxUserFontSet.cpp1
14 files changed, 8 insertions, 31 deletions
diff --git a/gfx/2d/Logging.h b/gfx/2d/Logging.h
index 534ee3d400..4c81fc7a82 100644
--- a/gfx/2d/Logging.h
+++ b/gfx/2d/Logging.h
@@ -561,10 +561,6 @@ typedef Log<LOG_CRITICAL, CriticalLogger> CriticalLog;
#define gfxWarning mozilla::gfx::WarningLog
#define gfxWarningOnce static gfxWarning GFX_LOGGING_GLUE(sOnceAtLine,__LINE__) = gfxWarning
-// In the debug build, this is equivalent to the default gfxCriticalError.
-// In the non-debug build, on nightly and dev edition, it will MOZ_CRASH.
-// On beta and release versions, it will telemetry count, but proceed.
-//
// You should create a (new) enum in the LogReason and use it for the reason
// parameter to ensure uniqueness.
#define gfxDevCrash(reason) gfxCriticalError(int(gfx::LogOptions::AutoPrefix) | int(gfx::LogOptions::AssertOnCall) | int(gfx::LogOptions::CrashAction), (reason))
diff --git a/gfx/ipc/GPUProcessHost.h b/gfx/ipc/GPUProcessHost.h
index d5c19f35d9..8fefd757e9 100644
--- a/gfx/ipc/GPUProcessHost.h
+++ b/gfx/ipc/GPUProcessHost.h
@@ -1,5 +1,4 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
- * vim: sts=8 sw=2 ts=2 tw=99 et :
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
@@ -85,10 +84,8 @@ public:
return !!mGPUChild;
}
- // Return the time stamp for when we tried to launch the GPU process. This is
- // currently used for Telemetry so that we can determine how long GPU processes
- // take to spin up. Note this doesn't denote a successful launch, just when we
- // attempted launch.
+ // Return the time stamp for when we tried to launch the GPU process.
+ // Note this doesn't denote a successful launch, just when we attempted launch.
TimeStamp GetLaunchTime() const {
return mLaunchTime;
}
diff --git a/gfx/layers/apz/src/AsyncPanZoomController.h b/gfx/layers/apz/src/AsyncPanZoomController.h
index 4ffa025da1..fa55957dc9 100644
--- a/gfx/layers/apz/src/AsyncPanZoomController.h
+++ b/gfx/layers/apz/src/AsyncPanZoomController.h
@@ -228,14 +228,14 @@ public:
uint32_t GetCheckerboardMagnitude() const;
/**
- * Report the number of CSSPixel-milliseconds of checkerboard to telemetry.
+ * Report the number of CSSPixel-milliseconds of checkerboard.
*/
void ReportCheckerboard(const TimeStamp& aSampleTime);
/**
* Flush any active checkerboard report that's in progress. This basically
* pretends like any in-progress checkerboard event has terminated, and pushes
- * out the report to the checkerboard reporting service and telemetry. If the
+ * out the report to the checkerboard reporting service. If the
* checkerboard event has not really finished, it will start a new event
* on the next composite.
*/
diff --git a/gfx/layers/apz/src/CheckerboardEvent.h b/gfx/layers/apz/src/CheckerboardEvent.h
index c71611d89c..3459287eb2 100644
--- a/gfx/layers/apz/src/CheckerboardEvent.h
+++ b/gfx/layers/apz/src/CheckerboardEvent.h
@@ -157,8 +157,7 @@ private:
private:
/**
* If true, we should log the various properties during the checkerboard
- * event. If false, we only need to record things we need for telemetry
- * measures.
+ * event.
*/
const bool mRecordTrace;
/**
diff --git a/gfx/layers/apz/src/InputBlockState.cpp b/gfx/layers/apz/src/InputBlockState.cpp
index 4d1c7fb16b..c9358e7207 100644
--- a/gfx/layers/apz/src/InputBlockState.cpp
+++ b/gfx/layers/apz/src/InputBlockState.cpp
@@ -46,7 +46,7 @@ InputBlockState::SetConfirmedTargetApzc(const RefPtr<AsyncPanZoomController>& aT
aState == TargetConfirmationState::eConfirmed) {
// The main thread finally responded. We had already timed out the
// confirmation, but we want to update the state internally so that we
- // can record the time for telemetry purposes.
+ // can record the time.
mTargetConfirmed = TargetConfirmationState::eTimedOutAndMainThreadResponded;
}
if (mTargetConfirmed != TargetConfirmationState::eUnconfirmed) {
diff --git a/gfx/layers/apz/src/InputBlockState.h b/gfx/layers/apz/src/InputBlockState.h
index 787ec0d61b..b52c4946bf 100644
--- a/gfx/layers/apz/src/InputBlockState.h
+++ b/gfx/layers/apz/src/InputBlockState.h
@@ -143,8 +143,7 @@ public:
/**
* This should be called when a content response notification has been
- * delivered to this block. If all the notifications have arrived, this
- * will report the total time take to telemetry.
+ * delivered to this block.
*/
void RecordContentResponseTime();
diff --git a/gfx/layers/apz/util/ScrollInputMethods.h b/gfx/layers/apz/util/ScrollInputMethods.h
index ba599cd8b1..61a5865c45 100644
--- a/gfx/layers/apz/util/ScrollInputMethods.h
+++ b/gfx/layers/apz/util/ScrollInputMethods.h
@@ -11,7 +11,6 @@ namespace layers {
/**
* An enumeration that lists various input methods used to trigger scrolling.
- * Used as the values for the SCROLL_INPUT_METHODS telemetry histogram.
*/
enum class ScrollInputMethod {
diff --git a/gfx/layers/d3d11/CompositorD3D11.cpp b/gfx/layers/d3d11/CompositorD3D11.cpp
index 2197f54449..505e5881d4 100644
--- a/gfx/layers/d3d11/CompositorD3D11.cpp
+++ b/gfx/layers/d3d11/CompositorD3D11.cpp
@@ -25,7 +25,6 @@
#include "mozilla/widget/WinCompositorWidget.h"
#include "mozilla/EnumeratedArray.h"
-#include "mozilla/Telemetry.h"
#include "BlendShaderConstants.h"
#include "D3D11ShareHandleImage.h"
@@ -1376,9 +1375,6 @@ DeviceAttachmentsD3D11::InitSyncObject()
if (FAILED(hr) || !mSyncHandle) {
gfxCriticalError() << "Failed to get SharedHandle for sync texture. Result: "
<< hexa(hr);
- NS_DispatchToMainThread(NS_NewRunnableFunction([] () -> void {
- Accumulate(Telemetry::D3D11_SYNC_HANDLE_FAILURE, 1);
- }));
return false;
}
diff --git a/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp b/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp
index 3a10ff97f0..56d0386868 100644
--- a/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp
+++ b/gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp
@@ -49,7 +49,6 @@
#include "mozilla/layout/RenderFrameParent.h"
#include "mozilla/media/MediaSystemResourceService.h" // for MediaSystemResourceService
#include "mozilla/mozalloc.h" // for operator new, etc
-#include "mozilla/Telemetry.h"
#ifdef MOZ_WIDGET_GTK
#include "basic/X11BasicCompositor.h" // for X11BasicCompositor
#endif
@@ -70,7 +69,6 @@
#include "mozilla/Hal.h"
#include "mozilla/HalTypes.h"
#include "mozilla/StaticPtr.h"
-#include "mozilla/Telemetry.h"
#include "mozilla/VsyncDispatcher.h"
#if defined(XP_WIN) || defined(MOZ_WIDGET_GTK)
#include "VsyncSource.h"
diff --git a/gfx/thebes/gfxEnv.h b/gfx/thebes/gfxEnv.h
index 18c1091513..ff4a8063ac 100644
--- a/gfx/thebes/gfxEnv.h
+++ b/gfx/thebes/gfxEnv.h
@@ -70,8 +70,6 @@ public:
// Force gfxDevCrash to use MOZ_CRASH in Beta and Release
DECL_GFX_ENV("MOZ_GFX_CRASH_MOZ_CRASH", GfxDevCrashMozCrash);
- // Force gfxDevCrash to use telemetry in Nightly and Aurora
- DECL_GFX_ENV("MOZ_GFX_CRASH_TELEMETRY", GfxDevCrashTelemetry);
DECL_GFX_ENV("MOZ_GFX_VR_NO_DISTORTION", VRNoDistortion);
diff --git a/gfx/thebes/gfxFontEntry.cpp b/gfx/thebes/gfxFontEntry.cpp
index 695e94e9fd..90c0bc8585 100644
--- a/gfx/thebes/gfxFontEntry.cpp
+++ b/gfx/thebes/gfxFontEntry.cpp
@@ -34,7 +34,6 @@
#include "mozilla/MemoryReporting.h"
#include "mozilla/Preferences.h"
#include "mozilla/Services.h"
-#include "mozilla/Telemetry.h"
#include "gfxSVGGlyphs.h"
#include "gfx2DGlue.h"
diff --git a/gfx/thebes/gfxGDIFontList.cpp b/gfx/thebes/gfxGDIFontList.cpp
index f65334fe64..ae2a43368f 100644
--- a/gfx/thebes/gfxGDIFontList.cpp
+++ b/gfx/thebes/gfxGDIFontList.cpp
@@ -28,7 +28,6 @@
#include "GeckoProfiler.h"
#include "mozilla/MemoryReporting.h"
-#include "mozilla/Telemetry.h"
#include "mozilla/WindowsVersion.h"
#include <usp10.h>
diff --git a/gfx/thebes/gfxPlatform.h b/gfx/thebes/gfxPlatform.h
index 642cf909f4..a4d5417a58 100644
--- a/gfx/thebes/gfxPlatform.h
+++ b/gfx/thebes/gfxPlatform.h
@@ -159,9 +159,7 @@ public:
static gfxPlatform *GetPlatform();
/**
- * Returns whether or not graphics has been initialized yet. This is
- * intended for Telemetry where we don't necessarily want to initialize
- * graphics just to observe its state.
+ * Returns whether or not graphics has been initialized yet.
*/
static bool Initialized();
diff --git a/gfx/thebes/gfxUserFontSet.cpp b/gfx/thebes/gfxUserFontSet.cpp
index e1c55c334e..585bd14d02 100644
--- a/gfx/thebes/gfxUserFontSet.cpp
+++ b/gfx/thebes/gfxUserFontSet.cpp
@@ -17,7 +17,6 @@
#include "gfxFontConstants.h"
#include "mozilla/Preferences.h"
#include "mozilla/Services.h"
-#include "mozilla/Telemetry.h"
#include "mozilla/gfx/2D.h"
#include "gfxPlatformFontList.h"