diff --git a/accessible/tests/mochitest/jsat/test_traversal.html b/accessible/tests/mochitest/jsat/test_traversal.html
index 533e9d89ff..e2c4ff4183 100644
--- a/accessible/tests/mochitest/jsat/test_traversal.html
+++ b/accessible/tests/mochitest/jsat/test_traversal.html
@@ -83,7 +83,7 @@
'listitem-2-3']);
queueTraversalSequence(gQueue, docAcc, TraversalRules.Graphic, null,
- ['image-2', 'image-3']);
+ ['image-1', 'image-2', 'image-3']);
queueTraversalSequence(gQueue, docAcc, TraversalRules.Link, null,
['link-0', 'link-1', 'link-2', 'link-3']);
@@ -117,7 +117,7 @@
'1. Scheme', '2. Racket', '3. Clojure',
'4. Standard Lisp', 'link-0', ' Lisp',
'checkbox-1-5', ' LeLisp', '• JavaScript',
- 'heading-5', 'image-2', 'image-3',
+ 'heading-5', 'image-1', 'image-2', 'image-3',
'Not actually an image', 'link-1', 'anchor-1',
'link-2', 'anchor-2', 'link-3', '3', '1', '4',
'1', 'Sunday', 'M', 'Week 1', '3', '4', '7', '2',
diff --git a/accessible/tests/mochitest/tree/test_invalid_img.xhtml b/accessible/tests/mochitest/tree/test_invalid_img.xhtml
index 2079c86ee7..f7c29fb8f4 100644
--- a/accessible/tests/mochitest/tree/test_invalid_img.xhtml
+++ b/accessible/tests/mochitest/tree/test_invalid_img.xhtml
@@ -20,8 +20,8 @@
document.getElementsByTagName("img")[0].firstChild.data = "2";
var accTree = {
- role: ROLE_TEXT,
- children: [ { role: ROLE_TEXT_LEAF } ]
+ role: ROLE_GRAPHIC,
+ children: []
};
testAccessibleTree("the_img", accTree);
SimpleTest.finish();
diff --git a/config/milestone.txt b/config/milestone.txt
index a99a9ac9f8..8642dc41d7 100644
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -10,4 +10,4 @@
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
-4.5.9
\ No newline at end of file
+4.6.0
\ No newline at end of file
diff --git a/dom/base/nsIImageLoadingContent.idl b/dom/base/nsIImageLoadingContent.idl
index eacc4ac3a9..234571e1bd 100644
--- a/dom/base/nsIImageLoadingContent.idl
+++ b/dom/base/nsIImageLoadingContent.idl
@@ -68,7 +68,7 @@ interface nsIImageLoadingContent : imgINotificationObserver
* the image was blocked. This status always refers to the
* CURRENT_REQUEST load.
*/
- readonly attribute short imageBlockingStatus;
+ [infallible] readonly attribute short imageBlockingStatus;
/**
* Used to register an image decoder observer. Typically, this will
diff --git a/dom/html/reftests/468263-2-alternate-ref.html b/dom/html/reftests/468263-2-alternate-ref.html
index 538898c979..c3bdb9da93 100644
--- a/dom/html/reftests/468263-2-alternate-ref.html
+++ b/dom/html/reftests/468263-2-alternate-ref.html
@@ -2,6 +2,7 @@
+
diff --git a/dom/media/mp3/MP3Demuxer.cpp b/dom/media/mp3/MP3Demuxer.cpp
index 5a98cabfed..ccc515afb4 100644
--- a/dom/media/mp3/MP3Demuxer.cpp
+++ b/dom/media/mp3/MP3Demuxer.cpp
@@ -396,7 +396,10 @@ MP3TrackDemuxer::Duration(int64_t aNumFrames) const {
MediaByteRange
MP3TrackDemuxer::FindFirstFrame() {
- static const int MIN_SUCCESSIVE_FRAMES = 4;
+ // This check is meant to avoid invalid frames from broken streams, but
+ // small MP3 files and streams with odd header data can break this. Lowering
+ // the value to 3 seems to help significantly.
+ static const int MIN_SUCCESSIVE_FRAMES = 3;
MediaByteRange candidateFrame = FindNextFrame();
int numSuccFrames = candidateFrame.Length() > 0;
diff --git a/dom/media/webaudio/AudioBuffer.cpp b/dom/media/webaudio/AudioBuffer.cpp
index e4252dfcf8..39fe8c7353 100644
--- a/dom/media/webaudio/AudioBuffer.cpp
+++ b/dom/media/webaudio/AudioBuffer.cpp
@@ -254,6 +254,9 @@ void
AudioBuffer::CopyFromChannel(const Float32Array& aDestination, uint32_t aChannelNumber,
uint32_t aStartInChannel, ErrorResult& aRv)
{
+ JS::AutoCheckCannotGC nogc;
+ aDestination.ComputeLengthAndData();
+
uint32_t length = aDestination.Length();
CheckedInt end = aStartInChannel;
end += length;
@@ -263,8 +266,6 @@ AudioBuffer::CopyFromChannel(const Float32Array& aDestination, uint32_t aChannel
return;
}
- JS::AutoCheckCannotGC nogc;
- aDestination.ComputeLengthAndData();
JSObject* channelArray = mJSChannels[aChannelNumber];
const float* sourceData = nullptr;
if (channelArray) {
@@ -295,6 +296,9 @@ AudioBuffer::CopyToChannel(JSContext* aJSContext, const Float32Array& aSource,
uint32_t aChannelNumber, uint32_t aStartInChannel,
ErrorResult& aRv)
{
+ JS::AutoCheckCannotGC nogc;
+ aSource.ComputeLengthAndData();
+
uint32_t length = aSource.Length();
CheckedInt end = aStartInChannel;
end += length;
@@ -309,7 +313,6 @@ AudioBuffer::CopyToChannel(JSContext* aJSContext, const Float32Array& aSource,
return;
}
- JS::AutoCheckCannotGC nogc;
JSObject* channelArray = mJSChannels[aChannelNumber];
if (JS_GetTypedArrayLength(channelArray) != mLength) {
// The array's buffer was detached.
@@ -317,7 +320,6 @@ AudioBuffer::CopyToChannel(JSContext* aJSContext, const Float32Array& aSource,
return;
}
- aSource.ComputeLengthAndData();
bool isShared = false;
float* channelData = JS_GetFloat32ArrayData(channelArray, &isShared, nogc);
// The channelData arrays should all have originated in
diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build
index 14b602ac23..c78758a06b 100644
--- a/gfx/cairo/cairo/src/moz.build
+++ b/gfx/cairo/cairo/src/moz.build
@@ -214,6 +214,11 @@ if CONFIG['MOZ_TREE_FREETYPE']:
DEFINES['FT_LCD_FILTER_H'] = '%s/modules/freetype2/include/freetype/ftlcdfil.h' % TOPSRCDIR
# Suppress warnings in third-party code.
+if CONFIG['_MSC_VER']:
+ CFLAGS += [
+ '-wd4005',
+ '-wd4146',
+ ]
if CONFIG['GNU_CC'] or CONFIG['CLANG_CL']:
CFLAGS += [
'-Wno-enum-compare',
diff --git a/image/test/crashtests/delaytest.html b/image/test/crashtests/delaytest.html
index 00cd1ebd11..762aec7891 100644
--- a/image/test/crashtests/delaytest.html
+++ b/image/test/crashtests/delaytest.html
@@ -4,7 +4,8 @@
Delayed image reftest wrapper
-
+
+
-
+
+
diff --git a/image/test/reftest/bmp/bmpsuite/b/wrapper.html b/image/test/reftest/bmp/bmpsuite/b/wrapper.html
index 47e68959fd..22b74c8fc1 100644
--- a/image/test/reftest/bmp/bmpsuite/b/wrapper.html
+++ b/image/test/reftest/bmp/bmpsuite/b/wrapper.html
@@ -14,13 +14,13 @@
-
+
+
diff --git a/image/test/reftest/bmp/bmpsuite/q/wrapper.html b/image/test/reftest/bmp/bmpsuite/q/wrapper.html
index 47e68959fd..22b74c8fc1 100644
--- a/image/test/reftest/bmp/bmpsuite/q/wrapper.html
+++ b/image/test/reftest/bmp/bmpsuite/q/wrapper.html
@@ -14,13 +14,13 @@
-
+
+
diff --git a/image/test/reftest/downscaling/downscale-16px.html b/image/test/reftest/downscaling/downscale-16px.html
index b34adb93da..06d6db2bf6 100644
--- a/image/test/reftest/downscaling/downscale-16px.html
+++ b/image/test/reftest/downscaling/downscale-16px.html
@@ -14,13 +14,13 @@
-
+
+
diff --git a/image/test/reftest/downscaling/downscale-8px.html b/image/test/reftest/downscaling/downscale-8px.html
index 32cb1b211b..fdc632e53b 100644
--- a/image/test/reftest/downscaling/downscale-8px.html
+++ b/image/test/reftest/downscaling/downscale-8px.html
@@ -14,7 +14,8 @@
-
+
+
-
+
+
-
+
+
-
+
+
diff --git a/image/test/reftest/pngsuite-background/wrapper.html b/image/test/reftest/pngsuite-background/wrapper.html
index 5bbe75e01c..45b5167754 100644
--- a/image/test/reftest/pngsuite-background/wrapper.html
+++ b/image/test/reftest/pngsuite-background/wrapper.html
@@ -14,7 +14,8 @@
-
+
+
-
+
+
diff --git a/image/test/reftest/pngsuite-transparency/wrapper.html b/image/test/reftest/pngsuite-transparency/wrapper.html
index 5bbe75e01c..45b5167754 100644
--- a/image/test/reftest/pngsuite-transparency/wrapper.html
+++ b/image/test/reftest/pngsuite-transparency/wrapper.html
@@ -14,7 +14,8 @@
-
+
+
+
+
+
+
+
+
+
+
+
diff --git a/toolkit/components/telemetry/Histograms.json b/toolkit/components/telemetry/Histograms.json
index f61a67efc6..2d90166a6a 100644
--- a/toolkit/components/telemetry/Histograms.json
+++ b/toolkit/components/telemetry/Histograms.json
@@ -3704,265 +3704,6 @@
"n_values": 30,
"description": "Flash object instances count on page"
},
- "MOZ_SQLITE_OPEN_MS": {
- "expires_in_version": "default",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite open() (ms)"
- },
- "MOZ_SQLITE_OPEN_MAIN_THREAD_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite open() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_TRUNCATE_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite truncate() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_TRUNCATE_MAIN_THREAD_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite truncate() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_OTHER_READ_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_OTHER_READ_MAIN_THREAD_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_PLACES_READ_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_PLACES_READ_MAIN_THREAD_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_COOKIES_OPEN_READAHEAD_MS": {
- "expires_in_version": "never",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on cookie DB open with readahead (ms)"
- },
- "MOZ_SQLITE_COOKIES_READ_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_COOKIES_READ_MAIN_THREAD_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_WEBAPPS_READ_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_WEBAPPS_READ_MAIN_THREAD_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite read() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_OTHER_WRITE_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_OTHER_WRITE_MAIN_THREAD_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_PLACES_WRITE_MS": {
- "expires_in_version": "default",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite write() (ms)"
- },
- "MOZ_SQLITE_PLACES_WRITE_MAIN_THREAD_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_COOKIES_WRITE_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_COOKIES_WRITE_MAIN_THREAD_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_WEBAPPS_WRITE_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_WEBAPPS_WRITE_MAIN_THREAD_MS": {
- "expires_in_version": "40",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite write() (ms) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_OTHER_SYNC_MS": {
- "expires_in_version": "never",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite fsync() (ms)"
- },
- "MOZ_SQLITE_OTHER_SYNC_MAIN_THREAD_MS": {
- "expires_in_version": "never",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite fsync() (ms)"
- },
- "MOZ_SQLITE_PLACES_SYNC_MS": {
- "expires_in_version": "never",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite fsync() (ms)"
- },
- "MOZ_SQLITE_PLACES_SYNC_MAIN_THREAD_MS": {
- "expires_in_version": "never",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite fsync() (ms)"
- },
- "MOZ_SQLITE_COOKIES_SYNC_MS": {
- "expires_in_version": "never",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite fsync() (ms)"
- },
- "MOZ_SQLITE_COOKIES_SYNC_MAIN_THREAD_MS": {
- "expires_in_version": "never",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite fsync() (ms)"
- },
- "MOZ_SQLITE_WEBAPPS_SYNC_MS": {
- "expires_in_version": "never",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite fsync() (ms)"
- },
- "MOZ_SQLITE_WEBAPPS_SYNC_MAIN_THREAD_MS": {
- "expires_in_version": "never",
- "kind": "exponential",
- "high": 3000,
- "n_buckets": 10,
- "description": "Time spent on SQLite fsync() (ms)"
- },
- "MOZ_SQLITE_OTHER_READ_B": {
- "expires_in_version": "default",
- "kind": "linear",
- "high": 32768,
- "n_buckets": 3,
- "description": "SQLite read() (bytes)"
- },
- "MOZ_SQLITE_PLACES_READ_B": {
- "expires_in_version": "40",
- "kind": "linear",
- "high": 32768,
- "n_buckets": 3,
- "description": "SQLite read() (bytes) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_COOKIES_READ_B": {
- "expires_in_version": "40",
- "kind": "linear",
- "high": 32768,
- "n_buckets": 3,
- "description": "SQLite read() (bytes) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_WEBAPPS_READ_B": {
- "expires_in_version": "40",
- "kind": "linear",
- "high": 32768,
- "n_buckets": 3,
- "description": "SQLite read() (bytes) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_PLACES_WRITE_B": {
- "expires_in_version": "40",
- "kind": "linear",
- "high": 32768,
- "n_buckets": 3,
- "description": "SQLite write (bytes) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_COOKIES_WRITE_B": {
- "expires_in_version": "40",
- "kind": "linear",
- "high": 32768,
- "n_buckets": 3,
- "description": "SQLite write (bytes) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_WEBAPPS_WRITE_B": {
- "expires_in_version": "40",
- "kind": "linear",
- "high": 32768,
- "n_buckets": 3,
- "description": "SQLite write (bytes) *** No longer needed (bug 1156565). Delete histogram and accumulation code! ***"
- },
- "MOZ_SQLITE_OTHER_WRITE_B": {
- "expires_in_version": "default",
- "kind": "linear",
- "high": 32768,
- "n_buckets": 3,
- "description": "SQLite write (bytes)"
- },
"MOZ_STORAGE_ASYNC_REQUESTS_MS": {
"alert_emails": ["perf-telemetry-alerts@mozilla.com"],
"expires_in_version": "40",
diff --git a/toolkit/components/telemetry/histogram-whitelists.json b/toolkit/components/telemetry/histogram-whitelists.json
index 529d9f4d57..5cd7c31452 100644
--- a/toolkit/components/telemetry/histogram-whitelists.json
+++ b/toolkit/components/telemetry/histogram-whitelists.json
@@ -392,43 +392,6 @@
"MEDIA_WMF_DECODE_ERROR",
"MIXED_CONTENT_PAGE_LOAD",
"MIXED_CONTENT_UNBLOCK_COUNTER",
- "MOZ_SQLITE_COOKIES_OPEN_READAHEAD_MS",
- "MOZ_SQLITE_COOKIES_READ_B",
- "MOZ_SQLITE_COOKIES_READ_MAIN_THREAD_MS",
- "MOZ_SQLITE_COOKIES_READ_MS",
- "MOZ_SQLITE_COOKIES_SYNC_MAIN_THREAD_MS",
- "MOZ_SQLITE_COOKIES_SYNC_MS",
- "MOZ_SQLITE_COOKIES_WRITE_B",
- "MOZ_SQLITE_COOKIES_WRITE_MAIN_THREAD_MS",
- "MOZ_SQLITE_COOKIES_WRITE_MS",
- "MOZ_SQLITE_OPEN_MAIN_THREAD_MS",
- "MOZ_SQLITE_OPEN_MS",
- "MOZ_SQLITE_OTHER_READ_B",
- "MOZ_SQLITE_OTHER_READ_MAIN_THREAD_MS",
- "MOZ_SQLITE_OTHER_READ_MS",
- "MOZ_SQLITE_OTHER_SYNC_MAIN_THREAD_MS",
- "MOZ_SQLITE_OTHER_SYNC_MS",
- "MOZ_SQLITE_OTHER_WRITE_B",
- "MOZ_SQLITE_OTHER_WRITE_MAIN_THREAD_MS",
- "MOZ_SQLITE_OTHER_WRITE_MS",
- "MOZ_SQLITE_PLACES_READ_B",
- "MOZ_SQLITE_PLACES_READ_MAIN_THREAD_MS",
- "MOZ_SQLITE_PLACES_READ_MS",
- "MOZ_SQLITE_PLACES_SYNC_MAIN_THREAD_MS",
- "MOZ_SQLITE_PLACES_SYNC_MS",
- "MOZ_SQLITE_PLACES_WRITE_B",
- "MOZ_SQLITE_PLACES_WRITE_MAIN_THREAD_MS",
- "MOZ_SQLITE_PLACES_WRITE_MS",
- "MOZ_SQLITE_TRUNCATE_MAIN_THREAD_MS",
- "MOZ_SQLITE_TRUNCATE_MS",
- "MOZ_SQLITE_WEBAPPS_READ_B",
- "MOZ_SQLITE_WEBAPPS_READ_MAIN_THREAD_MS",
- "MOZ_SQLITE_WEBAPPS_READ_MS",
- "MOZ_SQLITE_WEBAPPS_SYNC_MAIN_THREAD_MS",
- "MOZ_SQLITE_WEBAPPS_SYNC_MS",
- "MOZ_SQLITE_WEBAPPS_WRITE_B",
- "MOZ_SQLITE_WEBAPPS_WRITE_MAIN_THREAD_MS",
- "MOZ_SQLITE_WEBAPPS_WRITE_MS",
"NETWORK_CACHE_METADATA_FIRST_READ_SIZE",
"NETWORK_CACHE_METADATA_FIRST_READ_TIME_MS",
"NETWORK_CACHE_METADATA_SECOND_READ_TIME_MS",
@@ -1232,43 +1195,6 @@
"MIXED_CONTENT_HSTS",
"MIXED_CONTENT_PAGE_LOAD",
"MIXED_CONTENT_UNBLOCK_COUNTER",
- "MOZ_SQLITE_COOKIES_OPEN_READAHEAD_MS",
- "MOZ_SQLITE_COOKIES_READ_B",
- "MOZ_SQLITE_COOKIES_READ_MAIN_THREAD_MS",
- "MOZ_SQLITE_COOKIES_READ_MS",
- "MOZ_SQLITE_COOKIES_SYNC_MAIN_THREAD_MS",
- "MOZ_SQLITE_COOKIES_SYNC_MS",
- "MOZ_SQLITE_COOKIES_WRITE_B",
- "MOZ_SQLITE_COOKIES_WRITE_MAIN_THREAD_MS",
- "MOZ_SQLITE_COOKIES_WRITE_MS",
- "MOZ_SQLITE_OPEN_MAIN_THREAD_MS",
- "MOZ_SQLITE_OPEN_MS",
- "MOZ_SQLITE_OTHER_READ_B",
- "MOZ_SQLITE_OTHER_READ_MAIN_THREAD_MS",
- "MOZ_SQLITE_OTHER_READ_MS",
- "MOZ_SQLITE_OTHER_SYNC_MAIN_THREAD_MS",
- "MOZ_SQLITE_OTHER_SYNC_MS",
- "MOZ_SQLITE_OTHER_WRITE_B",
- "MOZ_SQLITE_OTHER_WRITE_MAIN_THREAD_MS",
- "MOZ_SQLITE_OTHER_WRITE_MS",
- "MOZ_SQLITE_PLACES_READ_B",
- "MOZ_SQLITE_PLACES_READ_MAIN_THREAD_MS",
- "MOZ_SQLITE_PLACES_READ_MS",
- "MOZ_SQLITE_PLACES_SYNC_MAIN_THREAD_MS",
- "MOZ_SQLITE_PLACES_SYNC_MS",
- "MOZ_SQLITE_PLACES_WRITE_B",
- "MOZ_SQLITE_PLACES_WRITE_MAIN_THREAD_MS",
- "MOZ_SQLITE_PLACES_WRITE_MS",
- "MOZ_SQLITE_TRUNCATE_MAIN_THREAD_MS",
- "MOZ_SQLITE_TRUNCATE_MS",
- "MOZ_SQLITE_WEBAPPS_READ_B",
- "MOZ_SQLITE_WEBAPPS_READ_MAIN_THREAD_MS",
- "MOZ_SQLITE_WEBAPPS_READ_MS",
- "MOZ_SQLITE_WEBAPPS_SYNC_MAIN_THREAD_MS",
- "MOZ_SQLITE_WEBAPPS_SYNC_MS",
- "MOZ_SQLITE_WEBAPPS_WRITE_B",
- "MOZ_SQLITE_WEBAPPS_WRITE_MAIN_THREAD_MS",
- "MOZ_SQLITE_WEBAPPS_WRITE_MS",
"MOZ_STORAGE_ASYNC_REQUESTS_MS",
"MOZ_STORAGE_ASYNC_REQUESTS_SUCCESS",
"NETWORK_CACHE_METADATA_FIRST_READ_SIZE",
@@ -1885,7 +1811,6 @@
"WEAVE_CONFIGURED",
"NEWTAB_PAGE_ENABLED",
"GRADIENT_DURATION",
- "MOZ_SQLITE_OPEN_MS",
"SHOULD_TRANSLATION_UI_APPEAR",
"NEWTAB_PAGE_LIFE_SPAN",
"FX_TOTAL_TOP_VISITS",
@@ -1902,7 +1827,6 @@
"FX_NEW_WINDOW_MS",
"PDF_VIEWER_TIME_TO_VIEW_MS",
"SSL_OCSP_MAY_FETCH",
- "MOZ_SQLITE_OTHER_READ_B",
"CHECK_JAVA_ENABLED",
"TRANSLATION_OPPORTUNITIES",
"FX_SESSION_RESTORE_CONTENT_COLLECT_DATA_LONGEST_OP_MS",
@@ -1928,11 +1852,9 @@
"FX_SESSION_RESTORE_DOM_STORAGE_SIZE_ESTIMATE_CHARS",
"DATA_STORAGE_ENTRIES",
"TRANSLATED_PAGES_BY_LANGUAGE",
- "MOZ_SQLITE_OTHER_WRITE_B",
"LOCALDOMSTORAGE_SHUTDOWN_DATABASE_MS",
"SSL_CERT_VERIFICATION_ERRORS",
"FX_SESSION_RESTORE_NUMBER_OF_WINDOWS_RESTORED",
- "MOZ_SQLITE_PLACES_WRITE_MS",
"FX_THUMBNAILS_BG_CAPTURE_CANVAS_DRAW_TIME_MS",
"FX_SESSION_RESTORE_STARTUP_INIT_SESSION_MS",
"FX_SESSION_RESTORE_WRITE_FILE_MS",