--- a/.clang-format-ignore
+++ b/.clang-format-ignore
@@ -35,28 +35,31 @@ widget/tests/.*
 xpcom/glue/tests/.*
 xpcom/tests/.*
 
 # Generated from ./tools/rewriting/ThirdPartyPaths.txt
 # awk '{print ""$1".*"}' ./tools/rewriting/ThirdPartyPaths.txt
 browser/components/translation/cld2/.*
 browser/extensions/mortar/ppapi/.*
 db/sqlite3/src/.*
+devtools/client/sourceeditor/codemirror/.*
+devtools/client/sourceeditor/tern/.*
 extensions/spellcheck/hunspell/src/.*
 gfx/angle/.*
 gfx/cairo/.*
 gfx/graphite2/.*
 gfx/harfbuzz/.*
 gfx/ots/.*
 gfx/qcms/.*
 gfx/sfntly/.*
 gfx/skia/.*
 gfx/vr/openvr/.*
-gfx/webrender.*
-gfx/webrender_api.*
+gfx/webrender/.*
+gfx/webrender_api/.*
+gfx/wrench/.*
 gfx/ycbcr/.*
 intl/hyphenation/hyphen/.*
 intl/icu/.*
 ipc/chromium/.*
 js/src/ctypes/libffi/.*
 js/src/dtoa.c.*
 js/src/jit/arm64/vixl/.*
 media/ffvpx/.*
@@ -89,27 +92,27 @@ mobile/android/geckoview/src/thirdparty/
 mobile/android/thirdparty/.*
 modules/brotli/.*
 modules/fdlibm/.*
 modules/freetype2/.*
 modules/libbz2/.*
 modules/libmar/.*
 modules/pdfium/.*
 modules/woff2/.*
+modules/xz-embedded/.*
 modules/zlib/.*
 netwerk/sctp/src/.*
 netwerk/srtp/src/.*
 nsprpub/.*
 other-licenses/.*
 parser/expat/.*
 security/nss/.*
 security/sandbox/chromium/.*
 testing/gtest/gmock/.*
 testing/gtest/gtest/.*
-testing/talos/talos/tests/canvasmark/.*
 testing/talos/talos/tests/dromaeo/.*
 testing/talos/talos/tests/kraken/.*
 testing/talos/talos/tests/v8_7/.*
 third_party/aom/.*
 third_party/python/blessings/.*
 third_party/python/configobj/.*
 third_party/python/futures/.*
 third_party/python/jsmin/.*
@@ -129,9 +132,9 @@ third_party/python/six/.*
 third_party/python/which/.*
 third_party/rust/.*
 toolkit/components/jsoncpp/.*
 toolkit/components/lz4/.*
 toolkit/components/protobuf/.*
 toolkit/components/url-classifier/chromium/.*
 toolkit/components/url-classifier/protobuf/.*
 toolkit/crashreporter/google-breakpad/.*
-tools/fuzzing/libfuzzer.*
+tools/fuzzing/libfuzzer/.*

--- a/tools/rewriting/ThirdPartyPaths.txt
+++ b/tools/rewriting/ThirdPartyPaths.txt
@@ -1,23 +1,25 @@
 browser/components/translation/cld2/
 browser/extensions/mortar/ppapi/
 db/sqlite3/src/
+devtools/client/sourceeditor/codemirror/
+devtools/client/sourceeditor/tern/
 extensions/spellcheck/hunspell/src/
 gfx/angle/
 gfx/cairo/
 gfx/graphite2/
 gfx/harfbuzz/
 gfx/ots/
 gfx/qcms/
 gfx/sfntly/
 gfx/skia/
 gfx/vr/openvr/
-gfx/webrender
-gfx/webrender_api
+gfx/webrender/
+gfx/webrender_api/
 gfx/wrench/
 gfx/ycbcr/
 intl/hyphenation/hyphen/
 intl/icu/
 ipc/chromium/
 js/src/ctypes/libffi/
 js/src/dtoa.c
 js/src/jit/arm64/vixl/
@@ -51,16 +53,17 @@ mobile/android/geckoview/src/thirdparty/
 mobile/android/thirdparty/
 modules/brotli/
 modules/fdlibm/
 modules/freetype2/
 modules/libbz2/
 modules/libmar/
 modules/pdfium/
 modules/woff2/
+modules/xz-embedded/
 modules/zlib/
 netwerk/sctp/src/
 netwerk/srtp/src/
 nsprpub/
 other-licenses/
 parser/expat/
 security/nss/
 security/sandbox/chromium/
@@ -90,9 +93,9 @@ third_party/python/six/
 third_party/python/which/
 third_party/rust/
 toolkit/components/jsoncpp/
 toolkit/components/lz4/
 toolkit/components/protobuf/
 toolkit/components/url-classifier/chromium/
 toolkit/components/url-classifier/protobuf/
 toolkit/crashreporter/google-breakpad/
-tools/fuzzing/libfuzzer
+tools/fuzzing/libfuzzer/