--- a/dom/events/EventDispatcher.cpp
+++ b/dom/events/EventDispatcher.cpp
@@ -1065,159 +1065,108 @@ EventDispatcher::CreateEvent(EventTarget
default:
// For all other types of events, create a vanilla event object.
return NS_NewDOMEvent(aOwner, aPresContext, aEvent);
}
}
// And if we didn't get an event, check the type argument.
-#define LOG_EVENT_CREATION(name) mozilla::Telemetry::Accumulate( \
- mozilla::Telemetry::CREATE_EVENT_##name, true);
-
- if (aEventType.LowerCaseEqualsLiteral("mouseevent")) {
- LOG_EVENT_CREATION(MOUSEEVENT);
- return NS_NewDOMMouseEvent(aOwner, aPresContext, nullptr);
- }
- if (aEventType.LowerCaseEqualsLiteral("mouseevents")) {
- LOG_EVENT_CREATION(MOUSEEVENTS);
+ if (aEventType.LowerCaseEqualsLiteral("mouseevent") ||
+ aEventType.LowerCaseEqualsLiteral("mouseevents")) {
return NS_NewDOMMouseEvent(aOwner, aPresContext, nullptr);
}
if (aEventType.LowerCaseEqualsLiteral("mousescrollevents")) {
- LOG_EVENT_CREATION(MOUSESCROLLEVENTS);
return NS_NewDOMMouseScrollEvent(aOwner, aPresContext, nullptr);
}
if (aEventType.LowerCaseEqualsLiteral("dragevent")) {
- LOG_EVENT_CREATION(DRAGEVENT);
return NS_NewDOMDragEvent(aOwner, aPresContext, nullptr);
}
- if (aEventType.LowerCaseEqualsLiteral("keyboardevent")) {
- LOG_EVENT_CREATION(KEYBOARDEVENT);
- return NS_NewDOMKeyboardEvent(aOwner, aPresContext, nullptr);
- }
- if (aEventType.LowerCaseEqualsLiteral("keyevents")) {
- LOG_EVENT_CREATION(KEYEVENTS);
+ if (aEventType.LowerCaseEqualsLiteral("keyboardevent") ||
+ aEventType.LowerCaseEqualsLiteral("keyevents")) {
return NS_NewDOMKeyboardEvent(aOwner, aPresContext, nullptr);
}
- if (aEventType.LowerCaseEqualsLiteral("compositionevent")) {
- LOG_EVENT_CREATION(COMPOSITIONEVENT);
+ if (aEventType.LowerCaseEqualsLiteral("compositionevent") ||
+ aEventType.LowerCaseEqualsLiteral("textevent")) {
return NS_NewDOMCompositionEvent(aOwner, aPresContext, nullptr);
}
- if (aEventType.LowerCaseEqualsLiteral("textevent")) {
- LOG_EVENT_CREATION(TEXTEVENT);
- return NS_NewDOMCompositionEvent(aOwner, aPresContext, nullptr);
- }
- if (aEventType.LowerCaseEqualsLiteral("mutationevent")) {
- LOG_EVENT_CREATION(MUTATIONEVENT);
- return NS_NewDOMMutationEvent(aOwner, aPresContext, nullptr);
- }
- if (aEventType.LowerCaseEqualsLiteral("mutationevents")) {
- LOG_EVENT_CREATION(MUTATIONEVENTS);
+ if (aEventType.LowerCaseEqualsLiteral("mutationevent") ||
+ aEventType.LowerCaseEqualsLiteral("mutationevents")) {
return NS_NewDOMMutationEvent(aOwner, aPresContext, nullptr);
}
if (aEventType.LowerCaseEqualsLiteral("deviceorientationevent")) {
- LOG_EVENT_CREATION(DEVICEORIENTATIONEVENT);
DeviceOrientationEventInit init;
RefPtr<Event> event =
DeviceOrientationEvent::Constructor(aOwner, EmptyString(), init);
event->MarkUninitialized();
return event.forget();
}
if (aEventType.LowerCaseEqualsLiteral("devicemotionevent")) {
- LOG_EVENT_CREATION(DEVICEMOTIONEVENT);
return NS_NewDOMDeviceMotionEvent(aOwner, aPresContext, nullptr);
}
- if (aEventType.LowerCaseEqualsLiteral("uievent")) {
- LOG_EVENT_CREATION(UIEVENT);
- return NS_NewDOMUIEvent(aOwner, aPresContext, nullptr);
- }
- if (aEventType.LowerCaseEqualsLiteral("uievents")) {
- LOG_EVENT_CREATION(UIEVENTS);
+ if (aEventType.LowerCaseEqualsLiteral("uievent") ||
+ aEventType.LowerCaseEqualsLiteral("uievents")) {
return NS_NewDOMUIEvent(aOwner, aPresContext, nullptr);
}
- if (aEventType.LowerCaseEqualsLiteral("event")) {
- LOG_EVENT_CREATION(EVENT);
- return NS_NewDOMEvent(aOwner, aPresContext, nullptr);
- }
- if (aEventType.LowerCaseEqualsLiteral("events")) {
- LOG_EVENT_CREATION(EVENTS);
- return NS_NewDOMEvent(aOwner, aPresContext, nullptr);
- }
- if (aEventType.LowerCaseEqualsLiteral("htmlevents")) {
- LOG_EVENT_CREATION(HTMLEVENTS);
- return NS_NewDOMEvent(aOwner, aPresContext, nullptr);
- }
- if (aEventType.LowerCaseEqualsLiteral("svgevents")) {
- LOG_EVENT_CREATION(SVGEVENTS);
+ if (aEventType.LowerCaseEqualsLiteral("event") ||
+ aEventType.LowerCaseEqualsLiteral("events") ||
+ aEventType.LowerCaseEqualsLiteral("htmlevents") ||
+ aEventType.LowerCaseEqualsLiteral("svgevents")) {
return NS_NewDOMEvent(aOwner, aPresContext, nullptr);
}
if (aEventType.LowerCaseEqualsLiteral("timeevent")) {
- LOG_EVENT_CREATION(TIMEEVENT);
return NS_NewDOMTimeEvent(aOwner, aPresContext, nullptr);
}
if (aEventType.LowerCaseEqualsLiteral("messageevent")) {
- LOG_EVENT_CREATION(MESSAGEEVENT);
RefPtr<Event> event = new MessageEvent(aOwner, aPresContext, nullptr);
return event.forget();
}
if (aEventType.LowerCaseEqualsLiteral("beforeunloadevent")) {
- LOG_EVENT_CREATION(BEFOREUNLOADEVENT);
return NS_NewDOMBeforeUnloadEvent(aOwner, aPresContext, nullptr);
}
if (aEventType.LowerCaseEqualsLiteral("scrollareaevent")) {
- LOG_EVENT_CREATION(SCROLLAREAEVENT);
return NS_NewDOMScrollAreaEvent(aOwner, aPresContext, nullptr);
}
if (aEventType.LowerCaseEqualsLiteral("touchevent") &&
TouchEvent::PrefEnabled(nsContentUtils::GetDocShellForEventTarget(aOwner))) {
- LOG_EVENT_CREATION(TOUCHEVENT);
return NS_NewDOMTouchEvent(aOwner, aPresContext, nullptr);
}
if (aEventType.LowerCaseEqualsLiteral("hashchangeevent")) {
- LOG_EVENT_CREATION(HASHCHANGEEVENT);
HashChangeEventInit init;
RefPtr<Event> event =
HashChangeEvent::Constructor(aOwner, EmptyString(), init);
event->MarkUninitialized();
return event.forget();
}
if (aEventType.LowerCaseEqualsLiteral("customevent")) {
- LOG_EVENT_CREATION(CUSTOMEVENT);
return NS_NewDOMCustomEvent(aOwner, aPresContext, nullptr);
}
if (aEventType.LowerCaseEqualsLiteral("storageevent")) {
- LOG_EVENT_CREATION(STORAGEEVENT);
RefPtr<Event> event =
StorageEvent::Constructor(aOwner, EmptyString(), StorageEventInit());
event->MarkUninitialized();
return event.forget();
}
if (aEventType.LowerCaseEqualsLiteral("focusevent")) {
RefPtr<Event> event = NS_NewDOMFocusEvent(aOwner, aPresContext, nullptr);
event->MarkUninitialized();
return event.forget();
}
// Only allow these events for chrome
if (aCallerType == CallerType::System) {
if (aEventType.LowerCaseEqualsLiteral("simplegestureevent")) {
return NS_NewDOMSimpleGestureEvent(aOwner, aPresContext, nullptr);
}
- if (aEventType.LowerCaseEqualsLiteral("xulcommandevent")) {
- LOG_EVENT_CREATION(XULCOMMANDEVENT);
- return NS_NewDOMXULCommandEvent(aOwner, aPresContext, nullptr);
- }
- if (aEventType.LowerCaseEqualsLiteral("xulcommandevents")) {
- LOG_EVENT_CREATION(XULCOMMANDEVENTS);
+ if (aEventType.LowerCaseEqualsLiteral("xulcommandevent") ||
+ aEventType.LowerCaseEqualsLiteral("xulcommandevents")) {
return NS_NewDOMXULCommandEvent(aOwner, aPresContext, nullptr);
}
}
-#undef LOG_EVENT_CREATION
-
// NEW EVENT TYPES SHOULD NOT BE ADDED HERE; THEY SHOULD USE ONLY EVENT
// CONSTRUCTORS
return nullptr;
}
// static
void
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -439,256 +439,16 @@
"alert_emails": ["kgupta@mozilla.com"],
"bug_numbers": [1261373],
"expires_in_version": "62",
"description": "Main thread response times for APZ notifications about input events (ms)",
"kind" : "exponential",
"high": 60000,
"n_buckets": 50
},
- "CREATE_EVENT_BEFOREUNLOADEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"beforeunloadevent\") ever called",
- "expires_in_version": "60",
- "kind": "count",
- "bug_numbers": [1295588, 1251198, 1358893]
- },
- "CREATE_EVENT_COMPOSITIONEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"compositionevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_CUSTOMEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"customevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_DEVICEMOTIONEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"devicemotionevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_DEVICEORIENTATIONEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"deviceorientationevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_DRAGEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"dragevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_ERROREVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"errorevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198, 1333901]
- },
- "CREATE_EVENT_EVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"event\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_EVENTS" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"events\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_HASHCHANGEEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"hashchangeevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_HTMLEVENTS" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"htmlevents\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_KEYBOARDEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"keyboardevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_KEYEVENTS" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"keyevents\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_MESSAGEEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"messageevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_MOUSEEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"mouseevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_MOUSEEVENTS" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"mouseevents\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_MOUSESCROLLEVENTS" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"mousescrollevents\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_MUTATIONEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"mutationevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_MUTATIONEVENTS" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"mutationevents\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_POPSTATEEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"popstateevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_SCROLLAREAEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"scrollareaevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_STORAGEEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"storageevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_SVGEVENTS" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"svgevents\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_TEXTEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"textevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_TIMEEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"timeevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_TOUCHEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"touchevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_UIEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"uievent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_UIEVENTS" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"uievents\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_XULCOMMANDEVENT" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"xulcommandevent\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
- "CREATE_EVENT_XULCOMMANDEVENTS" : {
- "record_in_processes": ["main", "content"],
- "alert_emails": ["ayg@aryeh.name"],
- "description": "Was document.createEvent(\"xulcommandevents\") ever called",
- "expires_in_version": "56",
- "kind": "count",
- "bug_numbers": [1295588, 1251198]
- },
"CYCLE_COLLECTOR": {
"record_in_processes": ["main", "content"],
"alert_emails": ["dev-telemetry-gc-alerts@mozilla.org"],
"expires_in_version": "never",
"kind": "exponential",
"high": 10000,
"n_buckets": 50,
"description": "Time spent on one cycle collection (ms)"
--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -1615,46 +1615,16 @@
"AUTO_REJECTED_TRANSLATION_OFFERS",
"BROWSER_SHIM_USAGE_BLOCKED",
"CANVAS_WEBGL_ACCL_FAILURE_ID",
"CANVAS_WEBGL_FAILURE_ID",
"CHANGES_OF_TARGET_LANGUAGE",
"CHARSET_OVERRIDE_USED",
"COMPONENTS_SHIM_ACCESSED_BY_CONTENT",
"CONTENT_DOCUMENTS_DESTROYED",
- "CREATE_EVENT_BEFOREUNLOADEVENT",
- "CREATE_EVENT_COMPOSITIONEVENT",
- "CREATE_EVENT_CUSTOMEVENT",
- "CREATE_EVENT_DEVICEMOTIONEVENT",
- "CREATE_EVENT_DEVICEORIENTATIONEVENT",
- "CREATE_EVENT_DRAGEVENT",
- "CREATE_EVENT_ERROREVENT",
- "CREATE_EVENT_EVENT",
- "CREATE_EVENT_EVENTS",
- "CREATE_EVENT_HASHCHANGEEVENT",
- "CREATE_EVENT_HTMLEVENTS",
- "CREATE_EVENT_KEYBOARDEVENT",
- "CREATE_EVENT_KEYEVENTS",
- "CREATE_EVENT_MESSAGEEVENT",
- "CREATE_EVENT_MOUSEEVENT",
- "CREATE_EVENT_MOUSEEVENTS",
- "CREATE_EVENT_MOUSESCROLLEVENTS",
- "CREATE_EVENT_MUTATIONEVENT",
- "CREATE_EVENT_MUTATIONEVENTS",
- "CREATE_EVENT_POPSTATEEVENT",
- "CREATE_EVENT_SCROLLAREAEVENT",
- "CREATE_EVENT_STORAGEEVENT",
- "CREATE_EVENT_SVGEVENTS",
- "CREATE_EVENT_TEXTEVENT",
- "CREATE_EVENT_TIMEEVENT",
- "CREATE_EVENT_TOUCHEVENT",
- "CREATE_EVENT_UIEVENT",
- "CREATE_EVENT_UIEVENTS",
- "CREATE_EVENT_XULCOMMANDEVENT",
- "CREATE_EVENT_XULCOMMANDEVENTS",
"CSP_DOCUMENTS_COUNT",
"CSP_UNSAFE_EVAL_DOCUMENTS_COUNT",
"CSP_UNSAFE_INLINE_DOCUMENTS_COUNT",
"CYCLE_COLLECTOR_OOM",
"CYCLE_COLLECTOR_WORKER_OOM",
"D3D11_COMPOSITING_FAILURE_ID",
"D3D11_SYNC_HANDLE_FAILURE",
"D3D9_COMPOSITING_FAILURE_ID",