AB2-772 Merging Fennec 65.0

Unmerged paths: both modified: mozilla-release/mobile/android/app/build.gradle both modified: mozilla-release/mobile/android/app/mobile.js both added: mozilla-release/mobile/android/app/src/main/res/drawable/pwa_oboarding.png both added: mozilla-release/mobile/android/app/src/main/res/layout/home_pager.xml deleted by them: mozilla-release/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/BrowserToolbarTabletBase.java deleted by them: mozilla-release/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ForwardButton.java deleted by them: mozilla-release/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/TabCounter.java deleted by them: mozilla-release/mobile/android/app/src/photon/java/org/mozilla/gecko/toolbar/ToolbarDisplayLayout.java deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/action_bar_menu_item_colors.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/search_suggestion_text.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/tabs_counter_fg.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/tabs_counter_text.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/two_line_page_row_title.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/two_line_page_row_url.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/url_bar_image_color.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/url_bar_title.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/color/url_bar_title_highlight.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable-hdpi/folder_closed.png deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable-xhdpi/folder_closed.png deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable-xxhdpi/folder_closed.png deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable-xxxhdpi/folder_closed.png deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable/search_list_bg.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable/search_list_selector.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable/search_list_selector_private.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable/security_mode_icon.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/drawable/url_bar_bg.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout-large-v11/browser_toolbar.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/browser_search.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/browser_toolbar.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/home_item_row.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/home_suggestion_prompt.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/private_tabs_panel.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/search_engine_row.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/suggestion_item.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/tabs_counter.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/toolbar_display_layout.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/toolbar_edit_layout.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/layout/two_line_page_row.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/values-large-v17/styles.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/values-large/dimens.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/values-large/styles.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/values-sw400dp/dimens.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/values-v17/styles.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/values/colors.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/values/dimens.xml deleted by them: mozilla-release/mobile/android/app/src/photon/res/values/styles.xml both modified: mozilla-release/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java both modified: mozilla-release/mobile/android/base/java/org/mozilla/gecko/preferences/GeckoPreferences.java deleted by them: mozilla-release/mobile/android/chrome/content/WebcompatReporter.js both modified: mozilla-release/mobile/android/gradle.configure both modified: mozilla-release/mobile/android/gradle/product_flavors.gradle both modified: mozilla-release/toolkit/mozapps/installer/packager.mk
ghostery · spacifici · Feb 1, 2019 · Jan 31, 2019 · Jan 31, 2019 · Jan 31, 2019
commit 63842019964720560f8004093f8e9c5aa509017e
diff --git a/Dockerfile b/Dockerfile
@@ -32,7 +32,6 @@ ARG UID
 ARG GID
 ENV SHELL=/bin/bash
 ENV PATH=/sdk/android-sdk/platform-tools:/sdk/android-sdk/platform-tools/bin:/sdk/android-sdk/tools:/sdk/android-sdk/tools/bin:${PATH}
-ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8"
 RUN getent group $GID || groupadd jenkins --gid $GID && \
     useradd --create-home --shell /bin/bash jenkins --uid $UID --gid $GID
 

diff --git a/mozilla-release/.cargo/config.in b/mozilla-release/.cargo/config.in
@@ -9,7 +9,12 @@ replace-with = 'vendored-sources'
 
 [source."https://github.com/servo/serde"]
 git = "https://github.com/servo/serde"
-branch = "deserialize_from_enums8"
+branch = "deserialize_from_enums9"
+replace-with = "vendored-sources"
+
+[source."https://github.com/retep998/winapi-rs"]
+git = "https://github.com/froydnj/winapi-rs"
+branch = "aarch64"
 replace-with = "vendored-sources"
 
 [source.vendored-sources]

diff --git a/mozilla-release/.clang-format b/mozilla-release/.clang-format
@@ -1,31 +1,26 @@
-BasedOnStyle: Mozilla
+BasedOnStyle: Google
 
 # Prevent the loss of indentation with these macros
 MacroBlockBegin: "^\
+JS_BEGIN_MACRO|\
 NS_INTERFACE_MAP_BEGIN|\
 NS_INTERFACE_TABLE_HEAD|\
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION|\
 NS_IMPL_CYCLE_COLLECTION_.*_BEGIN|\
 NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED|\
 NS_INTERFACE_TABLE_BEGIN|\
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED|\
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED$"
+NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED|\
+NS_QUERYFRAME_HEAD$"
 MacroBlockEnd: "^\
+JS_END_MACRO|\
 NS_INTERFACE_MAP_END|\
 NS_IMPL_CYCLE_COLLECTION_.*_END|\
 NS_INTERFACE_TABLE_END|\
-NS_INTERFACE_MAP_END_INHERITING|\
+NS_INTERFACE_TABLE_TAIL.*|\
+NS_INTERFACE_MAP_END_.*|\
 NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END_INHERITED|\
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED$"
+NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED|\
+NS_QUERYFRAME_TAIL.*$"
 
 SortIncludes: false
-
-
-BreakBeforeBraces: Custom
-BraceWrapping:
-  AfterEnum: true
-  AfterStruct: true
-  AfterFunction: true
-  AfterClass: true
-  SplitEmptyFunction: true
-
diff --git a/mozilla-release/.clang-format-ignore b/mozilla-release/.clang-format-ignore
@@ -13,13 +13,28 @@ ipc/ipdl/test/.*
 ipc/testshell/.*
 # Generated code
 js/src/builtin/intl/TimeZoneDataGenerated.h
-js/src/jsapi-tests/.*
-# See bug 1395584
-js/src/vm/Opcodes.h
-# Ignored because of bug 1342657
-layout/style/nsCSSPropAliasList.h
-# Ignored because of bug 1342657
-layout/style/nsCSSPropList.h
+
+# Don't want to reformat irregexp. bug 1510128
+js/src/irregexp/.*
+
+# Generated by js/src/util/make_unicode.py
+# Note: the irregexp files are already excluded with the rest of js/src/irregexp
+# but we add them here in case that ever changes.
+js/src/irregexp/RegExpCharacters-inl.h
+js/src/irregexp/RegExpCharacters.cpp
+js/src/util/Unicode.cpp
+js/src/util/UnicodeNonBMP.h
+
+# Ignored because of bug 1506117 & 1342657
+layout/style/nsCSSAnonBoxList.h
+layout/style/nsCSSCounterDescList.h
+layout/style/nsCSSFontDescList.h
+layout/style/nsCSSKeywordList.h
+layout/style/nsCSSPseudoElementList.h
+layout/style/nsCSSVisitedDependentPropList.h
+layout/style/nsDOMCSSValueList.h
+layout/style/nsStyleStructList.h
+
 media/mtransport/test/.*
 mfbt/tests/.*
 storage/test/.*
@@ -30,17 +45,56 @@ widget/tests/.*
 xpcom/glue/tests/.*
 xpcom/tests/.*
 
+# Generated by protobuf
+.*/.*.pb.h
+.*/.*.pb.cc
+
+# Autogenerated file
+gfx/gl/GLConsts.h
+gfx/webrender_bindings/webrender_ffi_generated.h
+intl/unicharutil/util/nsUnicodePropertyData.cpp
+intl/unicharutil/util/nsUnicodeScriptCodes.h
+media/mp4parse-rust/mp4parse.h
+widget/gtk/wayland/gtk-primary-selection-client-protocol.h
+widget/gtk/wayland/gtk-primary-selection-protocol.c
+
+# Ignored because these files are used to generate a windows.h STL wrapper,
+# and reformatting them can break generating that wrapper.
+config/windows-h-.*.h
+
+# Exclude tools/clang-tidy/test from automatic reformatting, since it can
+# break some of the tests in that directory.
+tools/clang-tidy/test/.*
+
+# The XPTCall stubs files have some inline assembly macros
+# that get reformatted badly. See bug 1510781.
+xpcom/reflect/xptcall/md/win32/.*
+xpcom/reflect/xptcall/md/unix/.*
+
 # 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/.*
+dom/canvas/test/webgl-conf/checkout/closure-library/.*
+dom/media/gmp/rlz/.*
 dom/media/gmp/widevine-adapter/content_decryption_module.h
 dom/media/gmp/widevine-adapter/content_decryption_module_export.h
 dom/media/gmp/widevine-adapter/content_decryption_module_ext.h
 dom/media/gmp/widevine-adapter/content_decryption_module_proxy.h
+dom/media/platforms/ffmpeg/ffmpeg57/.*
+dom/media/platforms/ffmpeg/ffmpeg58/.*
+dom/media/platforms/ffmpeg/libav53/.*
+dom/media/platforms/ffmpeg/libav54/.*
+dom/media/platforms/ffmpeg/libav55/.*
+dom/media/webspeech/recognition/endpointer.cc
+dom/media/webspeech/recognition/endpointer.h
+dom/media/webspeech/recognition/energy_endpointer.cc
+dom/media/webspeech/recognition/energy_endpointer.h
+dom/media/webspeech/recognition/energy_endpointer_params.cc
+dom/media/webspeech/recognition/energy_endpointer_params.h
 editor/libeditor/tests/browserscope/lib/richtext/.*
 editor/libeditor/tests/browserscope/lib/richtext2/.*
 extensions/spellcheck/hunspell/src/.*
@@ -52,16 +106,15 @@ gfx/ots/.*
 gfx/qcms/.*
 gfx/sfntly/.*
 gfx/skia/.*
-gfx/vr/openvr/.*
-gfx/webrender/.*
-gfx/webrender_api/.*
-gfx/wrench/.*
+gfx/vr/service/openvr/.*
+gfx/wr/.*
 gfx/ycbcr/.*
 intl/hyphenation/hyphen/.*
 intl/icu/.*
-ipc/chromium/.*
+ipc/chromium/src/third_party/.*
 js/src/ctypes/libffi/.*
 js/src/dtoa.c.*
+js/src/editline/.*
 js/src/jit/arm64/vixl/.*
 js/src/vtune/disable_warnings.h
 js/src/vtune/ittnotify.h
@@ -75,7 +128,7 @@ js/src/vtune/legacy/.*
 media/ffvpx/.*
 media/gmp-clearkey/0.1/openaes/.*
 media/kiss_fft/.*
-media/libav/.*
+media/libaom/.*
 media/libcubeb/.*
 media/libjpeg/.*
 media/libmkv/.*
@@ -89,9 +142,11 @@ media/libtheora/.*
 media/libtremor/.*
 media/libvorbis/.*
 media/libvpx/.*
+media/libwebp/.*
 media/libyuv/.*
 media/mtransport/third_party/.*
 media/openmax_dl/.*
+media/openmax_il/.*
 media/webrtc/signaling/src/sdp/sipcc/.*
 media/webrtc/trunk/.*
 mfbt/decimal/.*
@@ -108,13 +163,15 @@ modules/pdfium/.*
 modules/woff2/.*
 modules/xz-embedded/.*
 modules/zlib/.*
+netwerk/dns/nsIDNKitInterface.h
 netwerk/sctp/src/.*
 netwerk/srtp/src/.*
 nsprpub/.*
 other-licenses/.*
 parser/expat/.*
 security/nss/.*
 security/sandbox/chromium/.*
+security/sandbox/chromium-shim/.*
 testing/gtest/gmock/.*
 testing/gtest/gtest/.*
 testing/talos/talos/tests/dromaeo/.*
@@ -130,6 +187,11 @@ toolkit/components/jsoncpp/.*
 toolkit/components/protobuf/.*
 toolkit/components/url-classifier/chromium/.*
 toolkit/components/url-classifier/protobuf/.*
+toolkit/crashreporter/breakpad-client/.*
 toolkit/crashreporter/google-breakpad/.*
 toolkit/recordreplay/udis86/.*
 tools/fuzzing/libfuzzer/.*
+tools/profiler/core/vtune/.*
+xpcom/build/mach_override.c
+xpcom/build/mach_override.h
+xpcom/io/crc32c.c
diff --git a/mozilla-release/.cron.yml b/mozilla-release/.cron.yml
@@ -87,7 +87,7 @@ jobs:
           - mozilla-central
       when:
           by-project:
-              mozilla-central: [{hour: 10, minute: 30}]
+              mozilla-central: [{hour: 10, minute: 0}]
               # No default
 
     - name: bouncer-check

diff --git a/mozilla-release/.eslintignore b/mozilla-release/.eslintignore
@@ -14,7 +14,9 @@ obj*/**
 # We ignore all these directories by default, until we get them enabled.
 # If you are enabling a directory, please add directory specific exclusions
 # below.
-docshell/**
+docshell/test/browser/**
+docshell/test/iframesandbox/**
+docshell/test/mochitest/**
 extensions/cookie/**
 extensions/spellcheck/**
 extensions/universalchardet/**
@@ -24,19 +26,11 @@ gfx/tests/chrome/**
 gfx/tests/mochitest/**
 image/**
 layout/**
-memory/replace/dmd/test/**
 modules/**
-netwerk/base/NetUtil.jsm
 netwerk/cookie/test/browser/**
-netwerk/cookie/test/unit/**
-netwerk/protocol/**
-netwerk/dns/**
 netwerk/test/browser/**
-netwerk/test/httpserver/**
 netwerk/test/mochitests/**
 netwerk/test/unit*/**
-netwerk/wifi/**
-parser/**
 tools/update-packaging/**
 uriloader/exthandler/**
 uriloader/exthandler/tests/mochitest/**
@@ -99,6 +93,8 @@ devtools/client/inspector/markup/test/doc_markup_events_*.html
 devtools/client/inspector/rules/test/doc_media_queries.html
 devtools/client/performance/components/test/test_jit_optimizations_01.html
 devtools/client/responsive.html/test/browser/touch.html
+devtools/client/shared/test/*.html
+devtools/client/shared/test/code_*.js
 devtools/client/shared/components/test/mochitest/*.html
 !devtools/client/shared/components/test/mochitest/test_stack-trace.html
 devtools/client/storage/test/*.html
@@ -173,7 +169,6 @@ devtools/server/tests/unit/xpcshell_debugging_script.js
 dom/abort/**
 dom/animation/**
 dom/asmjscache/**
-dom/audiochannel/**
 dom/base/**
 dom/battery/**
 dom/bindings/**
@@ -182,27 +177,19 @@ dom/browser-element/**
 dom/cache/test/mochitest/**
 dom/cache/test/xpcshell/**
 dom/canvas/**
-dom/commandhandler/**
 dom/console/**
 dom/crypto/**
 dom/encoding/**
 dom/events/**
 dom/fetch/**
 dom/file/**
-dom/filehandle/**
-dom/filesystem/**
 dom/flex/**
-dom/gamepad/**
-dom/geolocation/**
 dom/grid/**
 dom/html/**
-dom/imptests/**
-dom/interfaces/**
 dom/ipc/**
 dom/jsurl/**
-dom/locales/**
+dom/localstorage/**
 dom/manifest/**
-dom/mathml/**
 dom/media/test/**
 dom/media/tests/**
 dom/media/webaudio/**
@@ -213,17 +200,14 @@ dom/network/**
 dom/notification/Notification*.*
 dom/notification/test/browser/**
 dom/notification/test/mochitest/**
-dom/offline/**
 dom/payments/**
 dom/performance/**
 dom/permission/**
 dom/plugins/test/mochitest/**
 dom/plugins/test/unit/**
-dom/power/**
 dom/promise/**
 dom/push/**
 dom/quota/**
-dom/res/**
 dom/security/test/cors/**
 dom/security/test/csp/**
 dom/security/test/general/**
@@ -232,21 +216,17 @@ dom/security/test/sri/**
 dom/security/test/unit/**
 dom/serviceworkers/**
 dom/smil/**
-dom/storage/**
 dom/svg/**
 dom/system/**
 dom/tests/browser/**
 dom/tests/html/**
-dom/tests/js/**
 dom/tests/mochitest/**
 dom/tests/unit/**
 dom/u2f/**
 dom/url/**
 dom/vr/**
 dom/webauthn/**
-dom/webbrowserpersist/**
 dom/webgpu/**
-dom/webidl/**
 dom/websocket/**
 dom/workers/**
 dom/worklet/**
@@ -257,6 +237,8 @@ dom/xslt/**
 dom/xul/**
 
 # Third-party
+dom/canvas/test/webgl-conf/**
+dom/imptests/**
 dom/media/webvtt/**
 
 # Third-party
@@ -265,6 +247,7 @@ editor/libeditor/tests/browserscope/**
 # Third-party
 gfx/ots/**
 gfx/skia/**
+gfx/wr/**
 
 # intl/ exclusions
 intl/icu/**
@@ -305,6 +288,11 @@ mobile/android/locales/
 # Non-standard `(catch ex if ...)`
 mobile/android/chrome/content/browser.js
 
+# Pre-processed/pref files
+modules/libpref/greprefs.js
+modules/libpref/init/all.js
+modules/libpref/test/unit/*data/**
+
 # Only contains non-standard test files.
 python/**
 

diff --git a/mozilla-release/.flake8 b/mozilla-release/.flake8
@@ -10,7 +10,7 @@ exclude =
     dom/canvas/test/webgl-conf/checkout/closure-library/,
     editor/libeditor/tests/browserscope/,
     intl/icu/,
-    ipc/chromium/,
+    ipc/chromium/src/third_party/,
     gfx/angle/,
     gfx/harfbuzz,
     glx/skia/,
@@ -22,3 +22,4 @@ exclude =
     testing/mochitest/pywebsocket,
     tools/lint/test/files,
     build/build-infer/build-infer.py,
+    tools/infer/test/*.configure,    tools/infer/test/*.configure,