pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/firefox
Module Name: pkgsrc
Committed By: ryoon
Date: Thu Aug 10 14:46:15 UTC 2017
Modified Files:
pkgsrc/www/firefox: Makefile PLIST distinfo mozilla-common.mk
options.mk
pkgsrc/www/firefox/patches: patch-aa patch-browser_confvars.sh
patch-build_moz.configure_rust.configure
patch-config_system-headers
patch-ipc_chromium_src_base_platform__thread.h
patch-ipc_chromium_src_base_platform__thread__posix.cc
patch-ipc_glue_CrossProcessSemaphore__posix.cpp
patch-ipc_glue_GeckoChildProcessHost.cpp
patch-js_xpconnect_src_xpcprivate.h
patch-media_libcubeb_src_cubeb.c patch-media_libcubeb_src_moz.build
patch-media_libcubeb_update.sh
patch-media_libstagefright_binding_DecoderData.cpp
patch-media_libstagefright_binding_MP4Metadata.cpp
patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h
patch-mobile_android_confvars.sh
patch-toolkit_components_telemetry_Histograms.json
patch-toolkit_library_moz.build patch-toolkit_moz.configure
Added Files:
pkgsrc/www/firefox/patches:
patch-browser_base_content_baseMenuOverlay.xul
patch-browser_components_nsBrowserGlue.js
patch-browser_components_preferences_in-content-new_main.xul
patch-browser_components_preferences_in-content-new_privacy.js
patch-browser_components_preferences_in-content-new_privacy.xul
patch-browser_components_preferences_in-content_advanced.js
patch-browser_components_preferences_in-content_advanced.xul
patch-browser_locales_en-US_chrome_browser_preferences-old_advanced.dtd
patch-browser_locales_en-US_chrome_browser_preferences_advanced.dtd
patch-build_gyp.mozbuild patch-build_moz.configure_init.configure
patch-build_moz.configure_keyfiles.configure
patch-build_pgo_profileserver.py patch-config_rules.mk
patch-dom_media_gtest_moz.build patch-js_src_build_moz.build
patch-media_libstagefright_gtest_moz.build
patch-media_libstagefright_moz.build patch-netwerk_base_moz.build
patch-netwerk_base_nsStandardURL.cpp
patch-third__party_python_futures_concurrent_futures_process.py
patch-toolkit_components_resistfingerprinting_nsRFPService.cpp
patch-toolkit_library_gtest_moz.build
patch-toolkit_toolkit.mozbuild patch-toolkit_xre_nsAppRunner.cpp
patch-xpcom_base_nsDebugImpl.cpp
patch-xpcom_rust_nsstring_gtest_moz.build
Removed Files:
pkgsrc/www/firefox/patches: patch-browser_app_nsBrowserApp.cpp
patch-dom_plugins_ipc_PluginModuleChild.cpp
patch-dom_plugins_ipc_PluginModuleChild.h
patch-ipc_chromium_src_base_process__util__posix.cc
patch-ipc_chromium_src_base_sys__info__posix.cc
patch-ipc_chromium_src_base_time__posix.cc
patch-ipc_chromium_src_build_build__config.h
patch-ipc_chromium_src_chrome_common_transport__dib.h
patch-js_src_jit_none_AtomicOperations-sparc.h
patch-js_src_moz.build
patch-media_webrtc_signaling_test_common.build
patch-mfbt_Poison.cpp
Log Message:
Update to 55.0
Changelog:
New
Launched Windows support for WebVR, bringing immersive experiences to the web. See examples and try working demos at Mozilla VR.
Added options that let users optimize recent performance improvements
Setting to enable Hardware VP9 acceleration on Windows 10 Anniversary Edition for better battery life and lower CPU usage while watching videos
Setting to modify the number of concurrent content processes for faster page loading and more responsive tab switching
Simplified installation process with a streamlined Windows stub installer
Firefox for Windows 64-bit is now installed by default on 64-bit systems with at least 2GB of RAM
Full installers with advanced installation options are still available
Improved address bar functionality
Search with any installed one-click search engine directly from the address bar
Search suggestions appear by default
When entering a hostname (like pinterest.com) in the URL bar, Firefox resolves to the secure version of the site (https://www.pinterest.com) instead of the insecure version
(http://www.pinterest.com) when possible
Updated Sidebar for bookmarks, history, and synced tabs so it can appear at the right edge of the window as well as the left
Added support for stereo microphones with WebRTC
Pages can be simplified before printing from within Print Preview
Updated Firefox for OSX and macOS to allow users to assign custom keyboard shortcuts to Firefox menu items via System Preferences
Browsing sessions with a high number of tabs are now restored in an instant
Make screenshots of webpages, and save them locally or upload them to the cloud. This feature will undergo A/B testing and will not be visible for some users.
Added Belarusian (be) locale
Fixed
Various security fixes
Changed
Made the Adobe Flash plugin click-to-activate by default and allowed only on http:// and https:// URL schemes. (This change will not be visible to all users immediately. For more information see
the Firefox plugin roadmap)
Firefox does not support downgrades, even though this may have worked in past versions. Users who install Firefox 55+ and later downgrade to an earlier version may experience issues with Firefox.
Modernized application update UI to be less intrusive and more aligned with the rest of the browser. Only users who have not restarted their browser 8 days after downloading an update or users
who opted out of automatic updates will see this change.
Security fixes:
CVE-2017-7798: XUL injection in the style editor in devtools
Reporter
Frederik Braun
Impact
critical
Description
The Developer Tools feature suffers from a XUL injection vulnerability due to improper sanitization of the web page source code. In the worst case, this could allow arbitrary code execution when
opening a malicious page with the style editor tool.
References
Bug 1371586, 1372112
#CVE-2017-7800: Use-after-free in WebSockets during disconnection
Reporter
Looben Yang
Impact
critical
Description
A use-after-free vulnerability can occur in WebSockets when the object holding the connection is freed before the disconnection operation is finished. This results in an exploitable crash.
References
Bug 1374047
#CVE-2017-7801: Use-after-free with marquee during window resizing
Reporter
Nils
Impact
critical
Description
A use-after-free vulnerability can occur while re-computing layout for a marquee element during window resizing where the updated style object is freed while still in use. This results in a
potentially exploitable crash.
References
Bug 1371259
#CVE-2017-7809: Use-after-free while deleting attached editor DOM node
Reporter
Nils
Impact
high
Description
A use-after-free vulnerability can occur when an editor DOM node is deleted prematurely during tree traversal while still bound to the document. This results in a potentially exploitable crash.
References
Bug 1380284
#CVE-2017-7784: Use-after-free with image observers
Reporter
Nils
Impact
high
Description
A use-after-free vulnerability can occur when reading an image observer during frame reconstruction after the observer has been freed. This results in a potentially exploitable crash.
References
Bug 1376087
#CVE-2017-7802: Use-after-free resizing image elements
Reporter
Nils
Impact
high
Description
A use-after-free vulnerability can occur when manipulating the DOM during the resize event of an image element. If these elements have been freed due to a lack of strong references, a potentially
exploitable crash may occur when the freed elements are accessed.
References
Bug 1378147
#CVE-2017-7785: Buffer overflow manipulating ARIA attributes in DOM
Reporter
Nils
Impact
high
Description
A buffer overflow can occur when manipulating Accessible Rich Internet Applications (ARIA) attributes within the DOM. This results in a potentially exploitable crash.
References
Bug 1356985
#CVE-2017-7786: Buffer overflow while painting non-displayable SVG
Reporter
Nils
Impact
high
Description
A buffer overflow can occur when the image renderer attempts to paint non-displayable SVG elements. This results in a potentially exploitable crash.
References
Bug 1365189
#CVE-2017-7806: Use-after-free in layer manager with SVG
Reporter
Nils
Impact
high
Description
A use-after-free vulnerability can occur when the layer manager is freed too early when rendering specific SVG content, resulting in a potentially exploitable crash.
References
Bug 1378113
#CVE-2017-7753: Out-of-bounds read with cached style data and pseudo-elements
Reporter
SkyLined
Impact
high
Description
An out-of-bounds read occurs when applying style rules to pseudo-elements, such as ::first-line, using cached style data.
References
Bug 1353312
#CVE-2017-7787: Same-origin policy bypass with iframes through page reloads
Reporter
Oliver Wagner
Impact
high
Description
Same-origin policy protections can be bypassed on pages with embedded iframes during page reloads, allowing the iframes to access content on the top level page, leading to information disclosure.
References
Bug 1322896
#CVE-2017-7807: Domain hijacking through AppCache fallback
Reporter
Mathias Karlsson
Impact
high
Description
A mechanism that uses AppCache to hijack a URL in a domain using fallback by serving the files from a sub-path on the domain. This has been addressed by requiring fallback files be inside the
manifest directory.
References
Bug 1376459
#CVE-2017-7792: Buffer overflow viewing certificates with an extremely long OID
Reporter
Fraser Tweedale
Impact
high
Description
A buffer overflow will occur when viewing a certificate in the certificate manager if the certificate has an extremely long object identifier (OID). This results in a potentially exploitable crash.
References
Bug 1368652
#CVE-2017-7804: Memory protection bypass through WindowsDllDetourPatcher
Reporter
Stephen Fewer
Impact
high
Description
The destructor function for the WindowsDllDetourPatcher class can be re-purposed by malicious code in concert with another vulnerability to write arbitrary data to an attacker controlled location in
memory. This can be used to bypass existing memory protections in this situation.
Note: This attack only affects Windows operating systems. Other operating systems are not affected.
References
Bug 1372849
#CVE-2017-7791: Spoofing following page navigation with data: protocol and modal alerts
Reporter
Jose María Acuña
Impact
moderate
Description
On pages containing an iframe, the data: protocol can be used to create a modal alert that will render over arbitrary domains following page navigation, spoofing of the origin of the modal alert from
the iframe content.
References
Bug 1365875
#CVE-2017-7808: CSP information leak with frame-ancestors containing paths
Reporter
Jun Kokatsu
Impact
moderate
Description
A content security policy (CSP) frame-ancestors directive containing origins with paths allows for comparisons against those paths instead of the origin. This results in a cross-origin information
leak of this path information.
References
Bug 1367531
#CVE-2017-7782: WindowsDllDetourPatcher allocates memory without DEP protections
Reporter
Arthur Edelstein
Impact
moderate
Description
An error in the WindowsDllDetourPatcher where a RWX ("Read/Write/Execute") 4k block is allocated but never protected, violating DEP protections.
Note: This attack only affects Windows operating systems. Other operating systems are not affected.
References
Bug 1344034
#CVE-2017-7781: Elliptic curve point addition error when using mixed Jacobian-affine coordinates
Reporter
Antonio Sanso
Impact
moderate
Description
An error occurs in the elliptic curve point addition algorithm that uses mixed Jacobian-affine coordinates where it can yield a result POINT_AT_INFINITY when it should not. A man-in-the-middle
attacker could use this to interfere with a connection, resulting in an attacked party computing an incorrect shared secret.
References
Bug 1352039
#CVE-2017-7794: Linux file truncation via sandbox broker
Reporter
Jann Horn
Impact
moderate
Description
On Linux systems, if the content process is compromised, the sandbox broker will allow files to be truncated even though the sandbox explicitly only has read access to the local file system and no
write permissions.
Note: This attack only affects the Linux operating system. Other operating systems are not affected.
References
Bug 1374281
#CVE-2017-7803: CSP containing 'sandbox' improperly applied
Reporter
Rhys Enniks
Impact
moderate
Description
When a page’s content security policy (CSP) header contains a sandbox directive, other directives are ignored. This results in the incorrect enforcement of CSP.
References
Bug 1377426
#CVE-2017-7799: Self-XSS XUL injection in about:webrtc
Reporter
Frederik Braun
Impact
moderate
Description
JavaScript in the about:webrtc page is not sanitized properly being being assigned to innerHTML. Data on this page is supplied by WebRTC usage and is not under third-party control, making this
difficult to exploit, but the vulnerability could possibly be used for a cross-site scripting (XSS) attack.
References
Bug 1372509
#CVE-2017-7783: DOS attack through long username in URL
Reporter
Amit Sangra
Impact
low
Description
If a long user name is used in a username/password combination in a site URL (such as http://UserName:Password%example.com@localhost), the resulting modal prompt will hang in a non-responsive state
or crash, causing a denial of service.
References
Bug 1360842
#CVE-2017-7788: Sandboxed about:srcdoc iframes do not inherit CSP directives
Reporter
Muneaki Nishimura
Impact
low
Description
When an iframe has a sandbox attribute and its content is specified using srcdoc, that content does not inherit the containing page's Content Security Policy (CSP) as it should unless the sandbox
attribute included allow-same-origin.
References
Bug 1073952
#CVE-2017-7789: Failure to enable HSTS when two STS headers are sent for a connection
Reporter
Muneaki Nishimura
Impact
low
Description
If a server sends two Strict-Transport-Security (STS) headers for a single connection, they will be rejected as invalid and HTTP Strict Transport Security (HSTS) will not be enabled for the
connection.
References
Bug 1074642
#CVE-2017-7790: Windows crash reporter reads extra memory for some non-null-terminated registry values
Reporter
Xiaoyin Liu
Impact
low
Description
On Windows systems, if non-null-terminated strings are copied into the crash reporter for some specific registry keys, stack memory data can be copied until a null is found. This can potentially
contain private data from the local system.
Note: This attack only affects Windows operating systems. Other operating systems are not affected.
References
Bug 1350460
#CVE-2017-7796: Windows updater can delete any file named update.log
Reporter
Matt Howell
Impact
low
Description
On Windows systems, the logger run by the Windows updater deletes the file "update.log" before it runs in order to write a new log of that name. The path to this file is supplied at the command line
to the updater and could be used in concert with another local exploit to delete a different file named "update.log" instead of the one intended.
Note: This attack only affects Windows operating systems. Other operating systems are not affected.
References
Bug 1234401
#CVE-2017-7797: Response header name interning leaks across origins
Reporter
Anne van Kesteren
Impact
low
Description
Response header name interning does not have same-origin protections and these headers are stored in a global registry. This allows stored header names to be available cross-origin.
References
Bug 1334776
#CVE-2017-7780: Memory safety bugs fixed in Firefox 55
Reporter
Mozilla developers and community
Impact
critical
Description
Mozilla developers and community members Gary Kwong, Christian Holler, André Bargull, Bob Clary, Carsten Book, Emilio Cobos Álvarez, Masayuki Nakano, Sebastian Hengst, Franziskus Kiefer, Tyson Smith,
and Ronald Crane reported memory safety bugs present in Firefox 54. Some of these bugs showed evidence of memory corruption and we presume that with enough effort that some of these could be
exploited to run arbitrary code.
References
Memory safety bugs fixed in Firefox 55
#CVE-2017-7779: Memory safety bugs fixed in Firefox 55 and Firefox ESR 52.3
Reporter
Mozilla developers and community
Impact
critical
Description
Mozilla developers and community members Masayuki Nakano, Gary Kwong, Ronald Crane, Andrew McCreight, Tyson Smith, Bevis Tseng, Christian Holler, Bryce Van Dyk, Dragana Damjanovic, Kartikaya Gupta,
Philipp, Tristan Bourvon, and Andi-Bogdan Postelnicu reported memory safety bugs present in Firefox 54 and Firefox ESR 52.2. Some of these bugs showed evidence of memory corruption and we presume
that with enough effort that some of these could be exploited to run arbitrary code.
References
Memory safety bugs fixed in Firefox 55 and Firefox ESR 52.3
To generate a diff of this commit:
cvs rdiff -u -r1.300 -r1.301 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.120 -r1.121 pkgsrc/www/firefox/PLIST
cvs rdiff -u -r1.286 -r1.287 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.96 -r1.97 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.41 -r1.42 pkgsrc/www/firefox/options.mk
cvs rdiff -u -r1.52 -r1.53 pkgsrc/www/firefox/patches/patch-aa
cvs rdiff -u -r1.13 -r0 \
pkgsrc/www/firefox/patches/patch-browser_app_nsBrowserApp.cpp
cvs rdiff -u -r0 -r1.1 \
pkgsrc/www/firefox/patches/patch-browser_base_content_baseMenuOverlay.xul \
pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_main.xul \
pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_privacy.js \
pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_privacy.xul \
pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content_advanced.js \
pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content_advanced.xul \
pkgsrc/www/firefox/patches/patch-browser_locales_en-US_chrome_browser_preferences-old_advanced.dtd \
pkgsrc/www/firefox/patches/patch-browser_locales_en-US_chrome_browser_preferences_advanced.dtd \
pkgsrc/www/firefox/patches/patch-dom_media_gtest_moz.build \
pkgsrc/www/firefox/patches/patch-js_src_build_moz.build \
pkgsrc/www/firefox/patches/patch-media_libstagefright_gtest_moz.build \
pkgsrc/www/firefox/patches/patch-media_libstagefright_moz.build \
pkgsrc/www/firefox/patches/patch-netwerk_base_moz.build \
pkgsrc/www/firefox/patches/patch-netwerk_base_nsStandardURL.cpp \
pkgsrc/www/firefox/patches/patch-third__party_python_futures_concurrent_futures_process.py \
pkgsrc/www/firefox/patches/patch-toolkit_components_resistfingerprinting_nsRFPService.cpp \
pkgsrc/www/firefox/patches/patch-toolkit_library_gtest_moz.build \
pkgsrc/www/firefox/patches/patch-xpcom_rust_nsstring_gtest_moz.build
cvs rdiff -u -r0 -r1.3 \
pkgsrc/www/firefox/patches/patch-browser_components_nsBrowserGlue.js \
pkgsrc/www/firefox/patches/patch-build_moz.configure_init.configure \
pkgsrc/www/firefox/patches/patch-build_moz.configure_keyfiles.configure \
pkgsrc/www/firefox/patches/patch-xpcom_base_nsDebugImpl.cpp
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/firefox/patches/patch-browser_confvars.sh \
pkgsrc/www/firefox/patches/patch-build_moz.configure_rust.configure \
pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp \
pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_DecoderData.cpp \
pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_MP4Metadata.cpp \
pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h \
pkgsrc/www/firefox/patches/patch-mobile_android_confvars.sh \
pkgsrc/www/firefox/patches/patch-toolkit_components_telemetry_Histograms.json
cvs rdiff -u -r0 -r1.7 pkgsrc/www/firefox/patches/patch-build_gyp.mozbuild \
pkgsrc/www/firefox/patches/patch-build_pgo_profileserver.py \
pkgsrc/www/firefox/patches/patch-toolkit_xre_nsAppRunner.cpp
cvs rdiff -u -r0 -r1.5 pkgsrc/www/firefox/patches/patch-config_rules.mk
cvs rdiff -u -r1.24 -r1.25 \
pkgsrc/www/firefox/patches/patch-config_system-headers
cvs rdiff -u -r1.9 -r0 \
pkgsrc/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.cpp
cvs rdiff -u -r1.4 -r0 \
pkgsrc/www/firefox/patches/patch-dom_plugins_ipc_PluginModuleChild.h \
pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_process__util__posix.cc \
pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_time__posix.cc \
pkgsrc/www/firefox/patches/patch-ipc_chromium_src_build_build__config.h \
pkgsrc/www/firefox/patches/patch-ipc_chromium_src_chrome_common_transport__dib.h
cvs rdiff -u -r1.5 -r1.6 \
pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread.h
cvs rdiff -u -r1.8 -r1.9 \
pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
cvs rdiff -u -r1.6 -r0 \
pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_sys__info__posix.cc \
pkgsrc/www/firefox/patches/patch-mfbt_Poison.cpp
cvs rdiff -u -r1.12 -r1.13 \
pkgsrc/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
cvs rdiff -u -r1.3 -r0 \
pkgsrc/www/firefox/patches/patch-js_src_jit_none_AtomicOperations-sparc.h
cvs rdiff -u -r1.2 -r0 pkgsrc/www/firefox/patches/patch-js_src_moz.build
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/www/firefox/patches/patch-js_xpconnect_src_xpcprivate.h \
pkgsrc/www/firefox/patches/patch-toolkit_moz.configure
cvs rdiff -u -r1.6 -r1.7 \
pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb.c
cvs rdiff -u -r1.11 -r1.12 \
pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/www/firefox/patches/patch-media_libcubeb_update.sh
cvs rdiff -u -r1.7 -r0 \
pkgsrc/www/firefox/patches/patch-media_webrtc_signaling_test_common.build
cvs rdiff -u -r1.13 -r1.14 \
pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build
cvs rdiff -u -r0 -r1.6 \
pkgsrc/www/firefox/patches/patch-toolkit_toolkit.mozbuild
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.300 pkgsrc/www/firefox/Makefile:1.301
--- pkgsrc/www/firefox/Makefile:1.300 Sun Jul 9 09:04:00 2017
+++ pkgsrc/www/firefox/Makefile Thu Aug 10 14:46:15 2017
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.300 2017/07/09 09:04:00 maya Exp $
+# $NetBSD: Makefile,v 1.301 2017/08/10 14:46:15 ryoon Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-PKGREVISION= 1
-MOZ_BRANCH= 54.0
-MOZ_BRANCH_MINOR= .1
+MOZ_BRANCH= 55.0
+MOZ_BRANCH_MINOR=
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
Index: pkgsrc/www/firefox/PLIST
diff -u pkgsrc/www/firefox/PLIST:1.120 pkgsrc/www/firefox/PLIST:1.121
--- pkgsrc/www/firefox/PLIST:1.120 Wed Jun 14 11:28:44 2017
+++ pkgsrc/www/firefox/PLIST Thu Aug 10 14:46:15 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.120 2017/06/14 11:28:44 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.121 2017/08/10 14:46:15 ryoon Exp $
bin/firefox
lib/firefox/application.ini
lib/firefox/browser/blocklist.xml
@@ -80,7 +80,6 @@ lib/firefox/browser/chrome/browser/conte
lib/firefox/browser/chrome/browser/content/browser/browser-feeds.js
lib/firefox/browser/chrome/browser/content/browser/browser-fullScreenAndPointerLock.js
lib/firefox/browser/chrome/browser/content/browser/browser-fullZoom.js
-lib/firefox/browser/chrome/browser/content/browser/browser-fxaccounts.js
lib/firefox/browser/chrome/browser/content/browser/browser-gestureSupport.js
lib/firefox/browser/chrome/browser/content/browser/browser-media.js
lib/firefox/browser/chrome/browser/content/browser/browser-places.js
@@ -89,7 +88,7 @@ lib/firefox/browser/chrome/browser/conte
lib/firefox/browser/chrome/browser/content/browser/browser-safebrowsing.js
lib/firefox/browser/chrome/browser/content/browser/browser-sidebar.js
lib/firefox/browser/chrome/browser/content/browser/browser-social.js
-lib/firefox/browser/chrome/browser/content/browser/browser-syncui.js
+lib/firefox/browser/chrome/browser/content/browser/browser-sync.js
lib/firefox/browser/chrome/browser/content/browser/browser-tabPreviews.xml
lib/firefox/browser/chrome/browser/content/browser/browser-tabsintitlebar.js
lib/firefox/browser/chrome/browser/content/browser/browser-thumbnails.js
@@ -107,23 +106,18 @@ lib/firefox/browser/chrome/browser/conte
lib/firefox/browser/chrome/browser/content/browser/customizableui/panelUI.xml
lib/firefox/browser/chrome/browser/content/browser/customizableui/toolbar.xml
lib/firefox/browser/chrome/browser/content/browser/default-theme-icon.svg
-lib/firefox/browser/chrome/browser/content/browser/defaultthemes/1.footer.jpg
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/1.header.jpg
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/1.icon.jpg
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/1.preview.jpg
-lib/firefox/browser/chrome/browser/content/browser/defaultthemes/2.footer.jpg
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/2.header.jpg
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/2.icon.jpg
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/2.preview.jpg
-lib/firefox/browser/chrome/browser/content/browser/defaultthemes/3.footer.png
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/3.header.png
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/3.icon.png
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/3.preview.png
-lib/firefox/browser/chrome/browser/content/browser/defaultthemes/4.footer.png
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/4.header.png
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/4.icon.png
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/4.preview.png
-lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.footer.png
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.header.png
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.icon.jpg
lib/firefox/browser/chrome/browser/content/browser/defaultthemes/5.preview.jpg
@@ -142,21 +136,25 @@ lib/firefox/browser/chrome/browser/conte
lib/firefox/browser/chrome/browser/content/browser/downloads/indicator.js
lib/firefox/browser/chrome/browser/content/browser/downloads/indicatorOverlay.xul
lib/firefox/browser/chrome/browser/content/browser/ext-bookmarks.js
+lib/firefox/browser/chrome/browser/content/browser/ext-browser.js
lib/firefox/browser/chrome/browser/content/browser/ext-browserAction.js
lib/firefox/browser/chrome/browser/content/browser/ext-browsingData.js
-lib/firefox/browser/chrome/browser/content/browser/ext-c-contextMenus.js
+lib/firefox/browser/chrome/browser/content/browser/ext-c-browser.js
lib/firefox/browser/chrome/browser/content/browser/ext-c-devtools-inspectedWindow.js
lib/firefox/browser/chrome/browser/content/browser/ext-c-devtools-panels.js
+lib/firefox/browser/chrome/browser/content/browser/ext-c-devtools.js
+lib/firefox/browser/chrome/browser/content/browser/ext-c-menus.js
lib/firefox/browser/chrome/browser/content/browser/ext-c-omnibox.js
lib/firefox/browser/chrome/browser/content/browser/ext-c-tabs.js
+lib/firefox/browser/chrome/browser/content/browser/ext-chrome-settings-overrides.js
lib/firefox/browser/chrome/browser/content/browser/ext-commands.js
-lib/firefox/browser/chrome/browser/content/browser/ext-contextMenus.js
-lib/firefox/browser/chrome/browser/content/browser/ext-desktop-runtime.js
lib/firefox/browser/chrome/browser/content/browser/ext-devtools-inspectedWindow.js
lib/firefox/browser/chrome/browser/content/browser/ext-devtools-network.js
lib/firefox/browser/chrome/browser/content/browser/ext-devtools-panels.js
lib/firefox/browser/chrome/browser/content/browser/ext-devtools.js
+lib/firefox/browser/chrome/browser/content/browser/ext-geckoProfiler.js
lib/firefox/browser/chrome/browser/content/browser/ext-history.js
+lib/firefox/browser/chrome/browser/content/browser/ext-menus.js
lib/firefox/browser/chrome/browser/content/browser/ext-omnibox.js
lib/firefox/browser/chrome/browser/content/browser/ext-pageAction.js
lib/firefox/browser/chrome/browser/content/browser/ext-sessions.js
@@ -169,9 +167,6 @@ lib/firefox/browser/chrome/browser/conte
lib/firefox/browser/chrome/browser/content/browser/extension.svg
lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.js
lib/firefox/browser/chrome/browser/content/browser/feeds/subscribe.xhtml
-lib/firefox/browser/chrome/browser/content/browser/gcli_sec_bad.svg
-lib/firefox/browser/chrome/browser/content/browser/gcli_sec_good.svg
-lib/firefox/browser/chrome/browser/content/browser/gcli_sec_moderate.svg
lib/firefox/browser/chrome/browser/content/browser/hiddenWindow.xul
lib/firefox/browser/chrome/browser/content/browser/history/history-panel.xul
lib/firefox/browser/chrome/browser/content/browser/license.html
@@ -180,7 +175,6 @@ lib/firefox/browser/chrome/browser/conte
lib/firefox/browser/chrome/browser/content/browser/migration/migration.xul
lib/firefox/browser/chrome/browser/content/browser/newtab/alternativeDefaultSites.json
lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.css
-lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.inadjacent.json
lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.js
lib/firefox/browser/chrome/browser/content/browser/newtab/newTab.xhtml
lib/firefox/browser/chrome/browser/content/browser/nsContextMenu.js
@@ -227,6 +221,16 @@ lib/firefox/browser/chrome/browser/conte
lib/firefox/browser/chrome/browser/content/browser/preferences/fonts.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/handlers.css
lib/firefox/browser/chrome/browser/content/browser/preferences/handlers.xml
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/advanced.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/applications.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/containers.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/findInPage.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/main.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/preferences.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/preferences.xul
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/privacy.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/subdialogs.js
+lib/firefox/browser/chrome/browser/content/browser/preferences/in-content-new/sync.js
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/advanced.js
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/applications.js
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/containers.js
@@ -256,6 +260,7 @@ lib/firefox/browser/chrome/browser/conte
lib/firefox/browser/chrome/browser/content/browser/preferences/translation.js
lib/firefox/browser/chrome/browser/content/browser/preferences/translation.xul
lib/firefox/browser/chrome/browser/content/browser/report-phishing-overlay.xul
+lib/firefox/browser/chrome/browser/content/browser/robot.ico
lib/firefox/browser/chrome/browser/content/browser/safeMode.css
lib/firefox/browser/chrome/browser/content/browser/safeMode.js
lib/firefox/browser/chrome/browser/content/browser/safeMode.xul
@@ -266,14 +271,16 @@ lib/firefox/browser/chrome/browser/conte
lib/firefox/browser/chrome/browser/content/browser/schemas/bookmarks.json
lib/firefox/browser/chrome/browser/content/browser/schemas/browser_action.json
lib/firefox/browser/chrome/browser/content/browser/schemas/browsing_data.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/chrome_settings_overrides.json
lib/firefox/browser/chrome/browser/content/browser/schemas/commands.json
-lib/firefox/browser/chrome/browser/content/browser/schemas/context_menus.json
-lib/firefox/browser/chrome/browser/content/browser/schemas/context_menus_internal.json
lib/firefox/browser/chrome/browser/content/browser/schemas/devtools.json
lib/firefox/browser/chrome/browser/content/browser/schemas/devtools_inspected_window.json
lib/firefox/browser/chrome/browser/content/browser/schemas/devtools_network.json
lib/firefox/browser/chrome/browser/content/browser/schemas/devtools_panels.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/geckoProfiler.json
lib/firefox/browser/chrome/browser/content/browser/schemas/history.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/menus.json
+lib/firefox/browser/chrome/browser/content/browser/schemas/menus_internal.json
lib/firefox/browser/chrome/browser/content/browser/schemas/omnibox.json
lib/firefox/browser/chrome/browser/content/browser/schemas/page_action.json
lib/firefox/browser/chrome/browser/content/browser/schemas/sessions.json
@@ -288,10 +295,7 @@ lib/firefox/browser/chrome/browser/conte
lib/firefox/browser/chrome/browser/content/browser/setDesktopBackground.js
lib/firefox/browser/chrome/browser/content/browser/setDesktopBackground.xul
lib/firefox/browser/chrome/browser/content/browser/social-content.js
-lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs-bindings.xml
-lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs.css
-lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs.js
-lib/firefox/browser/chrome/browser/content/browser/sync/aboutSyncTabs.xul
+lib/firefox/browser/chrome/browser/content/browser/static-robot.png
lib/firefox/browser/chrome/browser/content/browser/syncedtabs/sidebar.js
lib/firefox/browser/chrome/browser/content/browser/syncedtabs/sidebar.xhtml
lib/firefox/browser/chrome/browser/content/browser/tab-content.js
@@ -299,7 +303,11 @@ lib/firefox/browser/chrome/browser/conte
lib/firefox/browser/chrome/browser/content/browser/tabbrowser.xml
lib/firefox/browser/chrome/browser/content/browser/translation-infobar.xml
lib/firefox/browser/chrome/browser/content/browser/urlbarBindings.xml
-lib/firefox/browser/chrome/browser/content/browser/usercontext.svg
+lib/firefox/browser/chrome/browser/content/browser/usercontext-briefcase.svg
+lib/firefox/browser/chrome/browser/content/browser/usercontext-cart.svg
+lib/firefox/browser/chrome/browser/content/browser/usercontext-circle.svg
+lib/firefox/browser/chrome/browser/content/browser/usercontext-dollar.svg
+lib/firefox/browser/chrome/browser/content/browser/usercontext-fingerprint.svg
lib/firefox/browser/chrome/browser/content/browser/usercontext/usercontext.css
lib/firefox/browser/chrome/browser/content/browser/utilityOverlay.js
lib/firefox/browser/chrome/browser/content/browser/viewSourceOverlay.xul
@@ -310,20 +318,15 @@ lib/firefox/browser/chrome/browser/conte
lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.js
lib/firefox/browser/chrome/browser/content/browser/webrtcIndicator.xul
lib/firefox/browser/chrome/browser/skin/classic/browser/Info.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/Privacy-16.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar-inverted.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar-inverted%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar-small.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/Toolbar%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/aboutNetError.css
lib/firefox/browser/chrome/browser/skin/classic/browser/aboutProviderDirectory.css
lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSessionRestore-window-icon.png
lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSessionRestore.css
lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSocialError.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/aboutSyncTabs.css
lib/firefox/browser/chrome/browser/skin/classic/browser/aboutTabCrashed.css
lib/firefox/browser/chrome/browser/skin/classic/browser/aboutWelcomeBack.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/addons.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-anchor.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-blocked.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-confirm.svg
@@ -332,12 +335,22 @@ lib/firefox/browser/chrome/browser/skin/
lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-installed.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-restart.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/addons/addon-install-warning.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/arrow-dropdown.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/arrow-left.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/back-12.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/back-large.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/back.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/badge-add-engine.png
lib/firefox/browser/chrome/browser/skin/classic/browser/badge-add-engine%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/blockedSite.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/bookmark-hollow.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/bookmark.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/bookmarksMenu.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/browser.css
lib/firefox/browser/chrome/browser/skin/classic/browser/cert-error.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/click-to-play-warning-stripes.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/characterEncoding.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/check.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/chevron.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/compacttheme.css
lib/firefox/browser/chrome/browser/skin/classic/browser/compacttheme/loading-inverted.png
lib/firefox/browser/chrome/browser/skin/classic/browser/compacttheme/loading-inverted%2x.png@localhost
@@ -345,11 +358,12 @@ lib/firefox/browser/chrome/browser/skin/
lib/firefox/browser/chrome/browser/skin/classic/browser/connection-mixed-active-loaded.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/connection-mixed-passive-loaded.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/connection-secure.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/content-contextmenu.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/containers.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/arrow-subview-back.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/arrow-subview.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/conn-not-secure.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/connection.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/extension.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/mcb-disabled.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/panel.css
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/permissions.svg
@@ -378,7 +392,12 @@ lib/firefox/browser/chrome/browser/skin/
lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy.png
lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/whimsy%2x.png@localhost
+lib/firefox/browser/chrome/browser/skin/classic/browser/customize.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/developer.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/device-desktop.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/device-mobile.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/common.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/download.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/allDownloadsViewOverlay.css
lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/contentAreaDownloadsView.css
lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-blocked.svg
@@ -388,11 +407,22 @@ lib/firefox/browser/chrome/browser/skin/
lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/download-summary.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/downloads/downloads.css
lib/firefox/browser/chrome/browser/skin/classic/browser/drm-icon.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/edit-copy.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/edit-cut.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/edit-paste.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/email-link.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/error-pages.css
lib/firefox/browser/chrome/browser/skin/classic/browser/favicon-search-16.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/feed.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/feedIcon.png
lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/feedIcon16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/feeds/subscribe.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/find.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/forget.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/forward.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen-enter.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen-exit.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen/insecure.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen/secure.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/android.png
@@ -404,12 +434,19 @@ lib/firefox/browser/chrome/browser/skin/
lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/logo%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/sync-illustration.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/gear.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/heartbeat-icon.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/heartbeat-star-lit.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/heartbeat-star-off.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/help.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/history.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/home.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/icon-search-64.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icon-hover.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icon-notice-hover.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icon-notice.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/identity-icon.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/info.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/library.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/link.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/mail.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/menu.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-customize.png
lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-customize%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-exit.png
@@ -420,14 +457,22 @@ lib/firefox/browser/chrome/browser/skin/
lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/monitor.png
lib/firefox/browser/chrome/browser/skin/classic/browser/monitor_16-10.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/new-tab.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/new-window.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/close.png
lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/controls.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/newTab.css
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/open.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/page-action.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/page-livemarks.png
lib/firefox/browser/chrome/browser/skin/classic/browser/pageInfo.css
lib/firefox/browser/chrome/browser/skin/classic/browser/pageInfo.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/panel-icons.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/panel-icon-arrow-left.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/panel-icon-arrow-right.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/panel-icon-cancel.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/panel-icon-folder.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/panel-icon-retry.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/header-small.png
lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/header-small%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/header.png
@@ -436,6 +481,7 @@ lib/firefox/browser/chrome/browser/skin/
lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/icons%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarks-menu-arrow.png
lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarks-notification-finish.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarks-notification-finish%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksMenu.png
lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar-menuPanel.png
lib/firefox/browser/chrome/browser/skin/classic/browser/places/bookmarksToolbar.png
@@ -455,27 +501,35 @@ lib/firefox/browser/chrome/browser/skin/
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/applications.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/containers.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/containers.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/dialog.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/favicon.ico
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/icons.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/preferences.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/search.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content-new/siteDataSettings.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/containers.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/favicon.ico
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/icons.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/search.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/siteDataSettings.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/preferences.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/print.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/privateBrowsing.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing-mask.png
lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/aboutPrivateBrowsing.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/check.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/favicon.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/private-browsing.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/tracking-protection-off.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/privatebrowsing/tracking-protection.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/reader-tour.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/reader-tour%2x.png@localhost
+lib/firefox/browser/chrome/browser/skin/classic/browser/quit.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/readerMode.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/reload-stop-go.png
lib/firefox/browser/chrome/browser/skin/classic/browser/reload-stop-go%2x.png@localhost
+lib/firefox/browser/chrome/browser/skin/classic/browser/reload.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/sanitizeDialog.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/save.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/search-arrow-go.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/search-engine-placeholder.png
lib/firefox/browser/chrome/browser/skin/classic/browser/search-engine-placeholder%2x.png@localhost
@@ -489,18 +543,22 @@ lib/firefox/browser/chrome/browser/skin/
lib/firefox/browser/chrome/browser/skin/classic/browser/searchbar.css
lib/firefox/browser/chrome/browser/skin/classic/browser/session-restore.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/setDesktopBackground.css
+lib/firefox/browser/chrome/browser/skin/classic/browser/settings.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/share.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/sidebar/close.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/sidebars.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/slowStartup-16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/social/services-16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/social/services-64.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/sync-16.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/sync-32.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/sync-bg.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/stop.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/sync-desktopIcon.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/sync-horizontalbar.png
lib/firefox/browser/chrome/browser/skin/classic/browser/sync-horizontalbar%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/sync-mobileIcon.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/sync.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-horizontalbar.png
lib/firefox/browser/chrome/browser/skin/classic/browser/syncProgress-horizontalbar%2x.png@localhost
+lib/firefox/browser/chrome/browser/skin/classic/browser/synced-tabs.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/syncedtabs/sidebar.css
lib/firefox/browser/chrome/browser/skin/classic/browser/tab-crashed.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/alltabs-inverted.png
@@ -515,8 +573,10 @@ lib/firefox/browser/chrome/browser/skin/
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-active-middle%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-arrow-left-inverted.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-arrow-left.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-blocked.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-muted.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-playing.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio-small.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-audio.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-end.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-end%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-background-middle.png
@@ -531,25 +591,28 @@ lib/firefox/browser/chrome/browser/skin/
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-start.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-stroke-start%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tabDragIndicator.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/toolbarbutton-dropdown-arrow-inverted.png
lib/firefox/browser/chrome/browser/skin/classic/browser/toolbarbutton-dropdown-arrow.png
lib/firefox/browser/chrome/browser/skin/classic/browser/tracking-protection-16.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/translating-16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/translating-16%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/translation-16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/translation-16%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/undoCloseTab.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/undoCloseTab%2x.png@localhost
lib/firefox/browser/chrome/browser/skin/classic/browser/update-badge-failed.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/update-badge.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-star.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/urlbar-tab.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/warning-white.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/warning.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/webIDE.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/webRTC-indicator.css
lib/firefox/browser/chrome/browser/skin/classic/browser/welcome-back.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/wifi.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/zoom-in.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/zoom-out.svg
lib/firefox/browser/chrome/browser/skin/classic/communicator/communicator.css
lib/firefox/browser/chrome/chrome.manifest
+lib/firefox/browser/chrome/devtools-shim/content/DevToolsShim.jsm
lib/firefox/browser/chrome/devtools/content/aboutdebugging/aboutdebugging.css
lib/firefox/browser/chrome/devtools/content/aboutdebugging/aboutdebugging.xhtml
lib/firefox/browser/chrome/devtools/content/aboutdebugging/initializer.js
@@ -598,8 +661,8 @@ lib/firefox/browser/chrome/devtools/cont
lib/firefox/browser/chrome/devtools/content/inspector/markup/markup.xhtml
lib/firefox/browser/chrome/devtools/content/memory/initializer.js
lib/firefox/browser/chrome/devtools/content/memory/memory.xhtml
-lib/firefox/browser/chrome/devtools/content/netmonitor/netmonitor.js
-lib/firefox/browser/chrome/devtools/content/netmonitor/netmonitor.xhtml
+lib/firefox/browser/chrome/devtools/content/netmonitor/index.html
+lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/netmonitor.css
lib/firefox/browser/chrome/devtools/content/performance/performance-controller.js
lib/firefox/browser/chrome/devtools/content/performance/performance-view.js
lib/firefox/browser/chrome/devtools/content/performance/performance.xul
@@ -613,8 +676,6 @@ lib/firefox/browser/chrome/devtools/cont
lib/firefox/browser/chrome/devtools/content/performance/views/overview.js
lib/firefox/browser/chrome/devtools/content/performance/views/recordings.js
lib/firefox/browser/chrome/devtools/content/performance/views/toolbar.js
-lib/firefox/browser/chrome/devtools/content/projecteditor/chrome/content/projecteditor.xul
-lib/firefox/browser/chrome/devtools/content/projecteditor/lib/helpers/readdir.js
lib/firefox/browser/chrome/devtools/content/responsive.html/index.js
lib/firefox/browser/chrome/devtools/content/responsive.html/index.xhtml
lib/firefox/browser/chrome/devtools/content/scratchpad/scratchpad.js
@@ -676,6 +737,7 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-timeline.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components/keyframes.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components/rate-selector.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/graph-helper.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/canvasdebugger/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/content/actions/breakpoints.js
@@ -696,8 +758,9 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/debugger.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/debugger.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/parser-worker.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/pretty-print-worker.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/source-map-worker.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/new/search-worker.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/definitions.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/actions/filter.js
@@ -726,12 +789,11 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/devtools-browser.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/devtools.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/gDevTools.jsm
-lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/location-store.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/menu-item.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/menu.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/selection.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/sidebar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/source-map-service.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/source-map-url-service.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/target-from-url.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/target.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-highlighter-utils.js
@@ -793,11 +855,13 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/rule.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/models/text-property.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/rules.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/views/class-list-previewer.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/views/rule-editor.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/rules/views/text-property-editor.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/dom-node-preview.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/highlighters-overlay.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/node-types.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/reflow-tracker.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/style-inspector-menu.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/tooltips-overlay.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/utils.js
@@ -812,7 +876,6 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/text-panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/converter-child.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/converter-observer.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/converter-sniffer.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/general.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/headers-panel.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/css/json-panel.css
@@ -878,70 +941,95 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/telemetry.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/menus.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/batching.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/filters.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/index.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/requests.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/selection.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/sort.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/timing-markers.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/actions/ui.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/monitor-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/network-monitor.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/request-list-content.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/request-list-empty.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/request-list-header.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/request-list-item.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/request-list.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/statistics-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/components/toolbar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/constants.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-automation.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-builder.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-collector.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-exporter.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/har-utils.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/har/toolbox-overlay.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/middleware/batching.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/middleware/prefs.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/netmonitor-controller.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/batching.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/filters.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/index.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/requests.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/sort.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/timing-markers.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/reducers/ui.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/request-list-context-menu.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/request-list-tooltip.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/selectors/filters.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/selectors/index.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/selectors/requests.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/selectors/ui.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/cookies-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/custom-request-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/editor.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/headers-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/mdn-link.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/network-details-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/params-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/preview-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/properties-view.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/response-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/security-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/tabbox-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/shared/components/timings-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/store.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/client.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/filter-predicates.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/format-utils.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/l10n.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/mdn-utils.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/prefs.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/request-utils.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/utils/sort-predicates.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/waterfall-background.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/batching.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/filters.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/requests.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/selection.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/sort.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/timing-markers.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/ui.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/app.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/cookies-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/custom-request-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/headers-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/mdn-link.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/monitor-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/network-details-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/params-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/properties-view.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-cause.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-content-size.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-cookies.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-domain.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-duration.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-end-time.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-file.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-latency.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-method.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-protocol.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-remote-ip.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-response-time.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-scheme.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-set-cookies.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-start-time.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-status.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-transferred-size.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-type.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-column-waterfall.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-content.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-empty-notice.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-header.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list-item.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/request-list.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/response-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/security-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/source-editor.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/stack-trace-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/statistics-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/status-bar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/tabbox-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/timings-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/toolbar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/firefox-connector.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/constants.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-automation.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-builder.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-collector.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-exporter.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/har-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/har/toolbox-overlay.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/middleware/batching.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/middleware/prefs.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/middleware/thunk.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/batching.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/filters.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/requests.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/sort.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/timing-markers.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/ui.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/request-list-context-menu.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/request-list-header-context-menu.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/request-list-tooltip.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/filters.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/requests.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/timing-markers.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/selectors/ui.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/create-store.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-predicates.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/filter-text-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/format-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/l10n.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/mdn-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/menu.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/prefs.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/request-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/sort-predicates.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/waterfall-background.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/jit-optimizations-item.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/jit-optimizations.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/recording-button.js
@@ -953,10 +1041,6 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/waterfall-tree.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/components/waterfall.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/events.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/legacy/actors.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/legacy/compatibility.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/legacy/front.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/legacy/recording.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/categories.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/constants.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/modules/global.js
@@ -989,30 +1073,6 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/tab-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/urls.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance/test/helpers/wait-utils.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/editors.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/event.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/file-picker.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/l10n.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/helpers/prompts.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/app-manager/app-project-editor.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/app-manager/plugin.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/core.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/delete/delete.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/dirty/dirty.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/image-view/image-editor.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/image-view/plugin.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/logging/logging.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/new/new.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/rename/rename.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/save/save.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/plugins/status-bar/plugin.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/project.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/projecteditor.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/shells.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/stores/base.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/stores/local.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/stores/resource.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/projecteditor/lib/tree.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/devices.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/display-pixel-ratio.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/index.js
@@ -1056,9 +1116,11 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/responsive-ua.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/store.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/types.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/css.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/e10s.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/l10n.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/message.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/utils/window.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsivedesign/resize-commands.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsivedesign/responsivedesign-child.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsivedesign/responsivedesign.jsm
@@ -1072,6 +1134,7 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/SplitView.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/autocomplete-popup.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/browser-loader.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/autocomplete-popup.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/frame.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/h-split-box.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/notification-box.css
@@ -1113,12 +1176,14 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/inplace-editor.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/key-shortcuts.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/keycodes.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/natural-sort.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/network-throttling-profiles.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/node-attribute-parser.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/options-view.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/output-parser.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/poller.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/prefs.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/react-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/create-store.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/history.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/log.js
@@ -1129,7 +1194,10 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/non-react-subscriber.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/scroll.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/shim/Services.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/source-map/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/source-map/worker.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/source-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/stylesheet-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/suggestion-picker.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/telemetry.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/theme.js
@@ -1175,6 +1243,7 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/EventTooltipHelper.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/HTMLTooltip.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/ImageTooltipHelper.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/InlineTooltip.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/SwatchBasedEditorTooltip.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/SwatchColorPickerTooltip.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/SwatchCubicBezierTooltip.js
@@ -1204,7 +1273,9 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/styleeditor-commands.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/styleeditor-panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/audio/shutter.wav
+lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/commandline-browser.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/common.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/responsivedesign.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/splitters.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/toolbars.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/themes/variables.css
@@ -1288,6 +1359,7 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole-connection-proxy.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole-l10n.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/addons.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/app-manager.js
@@ -1316,8 +1388,6 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/css-properties.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/csscoverage.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/device.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/director-manager.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/director-registry.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/emulation.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/environment.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/errordocs.js
@@ -1335,9 +1405,10 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/eye-dropper.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/geometry-editor.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/measuring-tool.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/rect.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/paused-debugger.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/rulers.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/selector.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/shapes.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/simple-outline.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/utils/markup.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/inspector.js
@@ -1380,13 +1451,14 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webbrowser.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webconsole.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webextension-inspected-window.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webextension-parent.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webextension.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webgl.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/window.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/worker-list.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/worker.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/child.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/content-globals.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/content-process-debugger-server.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/content-server.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/server/css-logic.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/event-parsers.js
@@ -1437,8 +1509,6 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/css-properties.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/csscoverage.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/device.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/director-manager.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/director-registry.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/emulation.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/eventlooplag.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/framerate.js
@@ -1564,6 +1634,7 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beautify-js.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/jsbeautify/src/beautify-tests.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/l10n.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/layout/dom-matrix-2d.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/layout/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/loader-plugin-raw.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/shared/node-properties/node-properties.js
@@ -1594,8 +1665,6 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/css-properties.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/csscoverage.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/device.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/director-manager.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/director-registry.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/emulation.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/environment.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/eventlooplag.js
@@ -1625,6 +1694,7 @@ lib/firefox/browser/chrome/devtools/modu
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/timeline.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/webaudio.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/webextension-inspected-window.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/webextension-parent.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/webgl.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/worker.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/sprintfjs/sprintf.js
@@ -1693,7 +1763,6 @@ lib/firefox/browser/chrome/devtools/skin
lib/firefox/browser/chrome/devtools/skin/images/debugger-step-over.svg
lib/firefox/browser/chrome/devtools/skin/images/debugger-toggleBreakpoints.svg
lib/firefox/browser/chrome/devtools/skin/images/debugging-addons.svg
-lib/firefox/browser/chrome/devtools/skin/images/debugging-devices.svg
lib/firefox/browser/chrome/devtools/skin/images/debugging-tabs.svg
lib/firefox/browser/chrome/devtools/skin/images/debugging-workers.svg
lib/firefox/browser/chrome/devtools/skin/images/diff.svg
@@ -1702,7 +1771,6 @@ lib/firefox/browser/chrome/devtools/skin
lib/firefox/browser/chrome/devtools/skin/images/dock-undock.svg
lib/firefox/browser/chrome/devtools/skin/images/dropmarker.svg
lib/firefox/browser/chrome/devtools/skin/images/editor-error.png
-lib/firefox/browser/chrome/devtools/skin/images/fast-forward.svg
lib/firefox/browser/chrome/devtools/skin/images/filetypes/dir-close.svg
lib/firefox/browser/chrome/devtools/skin/images/filetypes/dir-open.svg
lib/firefox/browser/chrome/devtools/skin/images/filetypes/globe.svg
@@ -1742,25 +1810,29 @@ lib/firefox/browser/chrome/devtools/skin
lib/firefox/browser/chrome/devtools/skin/images/firebug/play.svg
lib/firefox/browser/chrome/devtools/skin/images/firebug/read-only.svg
lib/firefox/browser/chrome/devtools/skin/images/firebug/rewind.svg
-lib/firefox/browser/chrome/devtools/skin/images/firebug/spinner.png
lib/firefox/browser/chrome/devtools/skin/images/firebug/tool-debugger-paused.svg
lib/firefox/browser/chrome/devtools/skin/images/firebug/tool-options.svg
lib/firefox/browser/chrome/devtools/skin/images/firebug/twisty-closed-firebug.svg
lib/firefox/browser/chrome/devtools/skin/images/firebug/twisty-open-firebug.svg
+lib/firefox/browser/chrome/devtools/skin/images/gcli_sec_bad.svg
+lib/firefox/browser/chrome/devtools/skin/images/gcli_sec_good.svg
+lib/firefox/browser/chrome/devtools/skin/images/gcli_sec_moderate.svg
lib/firefox/browser/chrome/devtools/skin/images/geometry-editor.svg
lib/firefox/browser/chrome/devtools/skin/images/globe.svg
lib/firefox/browser/chrome/devtools/skin/images/grid.svg
+lib/firefox/browser/chrome/devtools/skin/images/help.svg
lib/firefox/browser/chrome/devtools/skin/images/import.svg
lib/firefox/browser/chrome/devtools/skin/images/item-arrow-dark-ltr.svg
lib/firefox/browser/chrome/devtools/skin/images/item-arrow-dark-rtl.svg
lib/firefox/browser/chrome/devtools/skin/images/item-arrow-ltr.svg
lib/firefox/browser/chrome/devtools/skin/images/item-arrow-rtl.svg
lib/firefox/browser/chrome/devtools/skin/images/item-toggle.svg
-lib/firefox/browser/chrome/devtools/skin/images/noise.png
lib/firefox/browser/chrome/devtools/skin/images/pane-collapse.svg
lib/firefox/browser/chrome/devtools/skin/images/pane-expand.svg
lib/firefox/browser/chrome/devtools/skin/images/pause.svg
-lib/firefox/browser/chrome/devtools/skin/images/performance-icons.svg
+lib/firefox/browser/chrome/devtools/skin/images/performance-details-call-tree.svg
+lib/firefox/browser/chrome/devtools/skin/images/performance-details-flamegraph.svg
+lib/firefox/browser/chrome/devtools/skin/images/performance-details-waterfall.svg
lib/firefox/browser/chrome/devtools/skin/images/play.svg
lib/firefox/browser/chrome/devtools/skin/images/power.svg
lib/firefox/browser/chrome/devtools/skin/images/profiler-stopwatch.svg
@@ -1780,6 +1852,7 @@ lib/firefox/browser/chrome/devtools/skin
lib/firefox/browser/chrome/devtools/skin/images/responsivemode/responsiveui-touch.png
lib/firefox/browser/chrome/devtools/skin/images/responsivemode/responsiveui-touch%2x.png@localhost
lib/firefox/browser/chrome/devtools/skin/images/rewind.svg
+lib/firefox/browser/chrome/devtools/skin/images/sad-face.svg
lib/firefox/browser/chrome/devtools/skin/images/search-clear-dark.svg
lib/firefox/browser/chrome/devtools/skin/images/search-clear-failed.svg
lib/firefox/browser/chrome/devtools/skin/images/search-clear-light.svg
@@ -1788,7 +1861,8 @@ lib/firefox/browser/chrome/devtools/skin
lib/firefox/browser/chrome/devtools/skin/images/security-state-insecure.svg
lib/firefox/browser/chrome/devtools/skin/images/security-state-secure.svg
lib/firefox/browser/chrome/devtools/skin/images/security-state-weak.svg
-lib/firefox/browser/chrome/devtools/skin/images/sort-arrows.svg
+lib/firefox/browser/chrome/devtools/skin/images/sort-ascending-arrow.svg
+lib/firefox/browser/chrome/devtools/skin/images/sort-descending-arrow.svg
lib/firefox/browser/chrome/devtools/skin/images/toggle-tools.png
lib/firefox/browser/chrome/devtools/skin/images/toggle-tools%2x.png@localhost
lib/firefox/browser/chrome/devtools/skin/images/tool-canvas.svg
@@ -1825,9 +1899,7 @@ lib/firefox/browser/chrome/devtools/skin
lib/firefox/browser/chrome/devtools/skin/light-theme.css
lib/firefox/browser/chrome/devtools/skin/markup.css
lib/firefox/browser/chrome/devtools/skin/memory.css
-lib/firefox/browser/chrome/devtools/skin/netmonitor.css
lib/firefox/browser/chrome/devtools/skin/performance.css
-lib/firefox/browser/chrome/devtools/skin/projecteditor/projecteditor.css
lib/firefox/browser/chrome/devtools/skin/rules.css
lib/firefox/browser/chrome/devtools/skin/scratchpad.css
lib/firefox/browser/chrome/devtools/skin/shadereditor.css
@@ -1861,7 +1933,6 @@ lib/firefox/browser/chrome/en-US/locale/
lib/firefox/browser/chrome/en-US/locale/browser/aboutRobots.dtd
lib/firefox/browser/chrome/en-US/locale/browser/aboutSearchReset.dtd
lib/firefox/browser/chrome/en-US/locale/browser/aboutSessionRestore.dtd
-lib/firefox/browser/chrome/en-US/locale/browser/aboutSyncTabs.dtd
lib/firefox/browser/chrome/en-US/locale/browser/aboutTabCrashed.dtd
lib/firefox/browser/chrome/en-US/locale/browser/accounts.properties
lib/firefox/browser/chrome/en-US/locale/browser/appstrings.properties
@@ -1889,6 +1960,19 @@ lib/firefox/browser/chrome/en-US/locale/
lib/firefox/browser/chrome/en-US/locale/browser/places/moveBookmarks.dtd
lib/firefox/browser/chrome/en-US/locale/browser/places/places.dtd
lib/firefox/browser/chrome/en-US/locale/browser/places/places.properties
+lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/advanced.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/applications.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/containers.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/containers.properties
+lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/content.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/main.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/preferences.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/preferences.properties
+lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/privacy.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/search.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/security.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/sync.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/preferences-old/tabs.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/advanced.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/applicationManager.dtd
lib/firefox/browser/chrome/en-US/locale/browser/preferences/applicationManager.properties
@@ -1919,6 +2003,7 @@ lib/firefox/browser/chrome/en-US/locale/
lib/firefox/browser/chrome/en-US/locale/browser/safeMode.dtd
lib/firefox/browser/chrome/en-US/locale/browser/safebrowsing/phishing-afterload-warning-message.dtd
lib/firefox/browser/chrome/en-US/locale/browser/safebrowsing/report-phishing.dtd
+lib/firefox/browser/chrome/en-US/locale/browser/safebrowsing/safebrowsing.properties
lib/firefox/browser/chrome/en-US/locale/browser/sanitize.dtd
lib/firefox/browser/chrome/en-US/locale/browser/search.properties
lib/firefox/browser/chrome/en-US/locale/browser/searchbar.dtd
@@ -1927,8 +2012,11 @@ lib/firefox/browser/chrome/en-US/locale/
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/ddg.xml
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/google-nocodes.xml
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/google.xml
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/amazon.ico
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/wikipedia.ico
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/yahoo.ico
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/yandex-en.ico
+lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/images/yandex-ru.ico
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/list.json
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/twitter.xml
lib/firefox/browser/chrome/en-US/locale/browser/searchplugins/wikipedia.xml
@@ -1961,7 +2049,6 @@ lib/firefox/browser/chrome/en-US/locale/
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/debugger.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/device.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/dom.properties
-lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/eyedropper.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/filterwidget.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/font-inspector.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/graphs.properties
@@ -1976,7 +2063,6 @@ lib/firefox/browser/chrome/en-US/locale/
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/netmonitor.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/performance.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/performance.properties
-lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/projecteditor.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/responsive.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/responsiveUI.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/scratchpad.dtd
@@ -2002,6 +2088,7 @@ lib/firefox/browser/chrome/en-US/locale/
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/csscoverage.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/csscoverage.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/debugger.properties
+lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/eyedropper.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/gcli.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/gclicommands.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/shared.properties
@@ -2019,6 +2106,7 @@ lib/firefox/browser/chrome/pdfjs/content
lib/firefox/browser/chrome/pdfjs/content/PdfjsContentUtils.jsm
lib/firefox/browser/chrome/pdfjs/content/build/pdf.js
lib/firefox/browser/chrome/pdfjs/content/build/pdf.worker.js
+lib/firefox/browser/chrome/pdfjs/content/pdfjschildbootstrap-enabled.js
lib/firefox/browser/chrome/pdfjs/content/pdfjschildbootstrap.js
lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-EUC-H.bcmap
lib/firefox/browser/chrome/pdfjs/content/web/cmaps/78-EUC-V.bcmap
@@ -2224,6 +2312,8 @@ lib/firefox/browser/chrome/pdfjs/content
lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-rotateCcw%2x.png@localhost
lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-rotateCw.png
lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-rotateCw%2x.png@localhost
+lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-selectTool.png
+lib/firefox/browser/chrome/pdfjs/content/web/images/secondaryToolbarButton-selectTool%2x.png@localhost
lib/firefox/browser/chrome/pdfjs/content/web/images/shadow.png
lib/firefox/browser/chrome/pdfjs/content/web/images/texture.png
lib/firefox/browser/chrome/pdfjs/content/web/images/toolbarButton-bookmark.png
@@ -2274,7 +2364,6 @@ lib/firefox/browser/chrome/pdfjs/content
lib/firefox/browser/chrome/pdfjs/content/web/images/treeitem-collapsed%2x.png@localhost
lib/firefox/browser/chrome/pdfjs/content/web/images/treeitem-expanded.png
lib/firefox/browser/chrome/pdfjs/content/web/images/treeitem-expanded%2x.png@localhost
-lib/firefox/browser/chrome/pdfjs/content/web/l10n.js
lib/firefox/browser/chrome/pdfjs/content/web/viewer.css
lib/firefox/browser/chrome/pdfjs/content/web/viewer.html
lib/firefox/browser/chrome/pdfjs/content/web/viewer.js
@@ -2332,6 +2421,7 @@ lib/firefox/browser/components/ProfileMi
lib/firefox/browser/components/SelfSupportService.js
lib/firefox/browser/components/WebContentConverter.js
lib/firefox/browser/components/aboutNewTabService.js
+lib/firefox/browser/components/aboutdebugging-registration.js
lib/firefox/browser/components/components.manifest
lib/firefox/browser/components/devtools-startup.js
lib/firefox/browser/components/interfaces.xpt
@@ -2346,6 +2436,7 @@ lib/firefox/browser/defaults/blocklists/
lib/firefox/browser/defaults/blocklists/gfx.json
lib/firefox/browser/defaults/blocklists/plugins.json
lib/firefox/browser/defaults/permissions
+lib/firefox/browser/defaults/pinning/pins.json
lib/firefox/browser/defaults/preferences/debugger.js
lib/firefox/browser/defaults/preferences/devtools.js
lib/firefox/browser/defaults/preferences/firefox-branding.js
@@ -2356,6 +2447,8 @@ lib/firefox/browser/extensions/{972ce4c6
lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/firefox/browser/features/aushelper%mozilla.org@localhost/bootstrap.js
lib/firefox/browser/features/aushelper%mozilla.org@localhost/install.rdf
+lib/firefox/browser/features/clicktoplay-rollout%mozilla.org@localhost/bootstrap.js
+lib/firefox/browser/features/clicktoplay-rollout%mozilla.org@localhost/install.rdf
lib/firefox/browser/features/e10srollout%mozilla.org@localhost/bootstrap.js
lib/firefox/browser/features/e10srollout%mozilla.org@localhost/install.rdf
lib/firefox/browser/features/firefox%getpocket.com@localhost/bootstrap.js
@@ -2408,51 +2501,28 @@ lib/firefox/browser/features/firefox@get
lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/content/panels/tmpl/signupstoryboard_shell.handlebars
lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/content/pktApi.jsm
lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/content/pocket-content-process.js
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/linux/Toolbar-inverted.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/linux/Toolbar-inverted%2x.png@localhost
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/linux/Toolbar.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/linux/Toolbar%2x.png@localhost
lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/linux/menuPanel.png
lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/linux/menuPanel%2x.png@localhost
lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/linux/pocket.css
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/osx/Toolbar-inverted.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/osx/Toolbar-inverted%2x.png@localhost
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/osx/Toolbar-yosemite.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/osx/Toolbar-yosemite%2x.png@localhost
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/osx/Toolbar.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/osx/Toolbar%2x.png@localhost
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/osx/menuPanel-yosemite.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/osx/menuPanel-yosemite%2x.png@localhost
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/osx/menuPanel.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/osx/menuPanel%2x.png@localhost
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/osx/pocket.css
lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/shared/pocket.css
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/Toolbar-XP.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/Toolbar-aero.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/Toolbar-aero%2x.png@localhost
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/Toolbar-inverted.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/Toolbar-inverted%2x.png@localhost
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/Toolbar-lunaSilver.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/Toolbar-win8.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/Toolbar-win8%2x.png@localhost
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/Toolbar.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/Toolbar%2x.png@localhost
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/menuPanel-aero.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/menuPanel-aero%2x.png@localhost
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/menuPanel.png
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/menuPanel%2x.png@localhost
-lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/windows/pocket.css
+lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/skin/shared/pocket.svg
lib/firefox/browser/features/firefox%getpocket.com@localhost/en-US/locale/en-US/pocket.properties
lib/firefox/browser/features/firefox%getpocket.com@localhost/install.rdf
+lib/firefox/browser/features/followonsearch%mozilla.com@localhost/bootstrap.js
+lib/firefox/browser/features/followonsearch%mozilla.com@localhost/chrome.manifest
+lib/firefox/browser/features/followonsearch%mozilla.com@localhost/chrome/content/followonsearch-fs.js
+lib/firefox/browser/features/followonsearch%mozilla.com@localhost/install.rdf
lib/firefox/browser/features/screenshots%mozilla.org@localhost/bootstrap.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/install.rdf
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/ach/messages.json
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/ar/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/az/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/be/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/bg/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/bn_BD/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/cs/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/cy/messages.json
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/da/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/de/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/dsb/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/el/messages.json
@@ -2500,6 +2570,7 @@ lib/firefox/browser/features/screenshots
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/sq/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/sr/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/sv_SE/messages.json
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/ta/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/te/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/th/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/tl/messages.json
@@ -2509,6 +2580,7 @@ lib/firefox/browser/features/screenshots
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/uz/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/zh_CN/messages.json
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/zh_TW/messages.json
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/assertIsBlankDocument.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/assertIsTrusted.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/background/analytics.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/background/auth.js
@@ -2517,6 +2589,7 @@ lib/firefox/browser/features/screenshots
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/background/main.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/background/selectorLoader.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/background/senderror.js
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/background/startBackground.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/background/takeshot.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/blank.html
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/build/buildSettings.js
@@ -2525,28 +2598,20 @@ lib/firefox/browser/features/screenshots
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/build/onboardingHtml.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/build/raven.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/build/shot.js
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/buildSettings.js.template
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/catcher.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/clipboard.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/domainFromUrl.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/back-highlight.svg
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/back.svg
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/cancel.svg
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/cloud.svg
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/copy.png
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/done.svg
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/download.svg
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-128.png
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-16.png
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-16.svg
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-19.png
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-256.png
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-32.png
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-32.svg
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-38.png
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-48.png
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-64.png
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-highlight-32.svg
-lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-starred-32.svg
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-16-v2.svg
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-32-v2.svg
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-highlight-32-v2.svg
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-starred-32-v2.svg
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/icon-welcome-face-without-eyes.svg
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/menu-fullpage.svg
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/icons/menu-myshot.svg
@@ -2568,6 +2633,40 @@ lib/firefox/browser/features/screenshots
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/selector/uicontrol.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/selector/util.js
lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/sitehelper.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/bootstrap.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome.manifest
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/ActionSandboxManager.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/CleanupManager.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/ClientEnvironment.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/EventEmitter.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/FilterExpressions.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/Heartbeat.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/LogManager.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/NormandyApi.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/NormandyDriver.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/PreferenceExperiments.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/PreferenceFilters.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/RecipeRunner.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/Sampling.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/SandboxManager.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/ShieldRecipeClient.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/Storage.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/lib/Utils.jsm
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/LICENSE.txt
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/Jexl.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/Lexer.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/evaluator/Evaluator.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/evaluator/handlers.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/grammar.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/parser/Parser.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/parser/handlers.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/node_modules/jexl/lib/parser/states.js
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/skin/osx/Heartbeat.css
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/skin/shared/Heartbeat.css
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/skin/shared/heartbeat-icon.svg
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/skin/shared/heartbeat-star-lit.svg
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/chrome/content/skin/shared/heartbeat-star-off.svg
+lib/firefox/browser/features/shield-recipe-client%mozilla.org@localhost/install.rdf
lib/firefox/browser/features/webcompat%mozilla.org@localhost/bootstrap.js
lib/firefox/browser/features/webcompat%mozilla.org@localhost/chrome.manifest
lib/firefox/browser/features/webcompat%mozilla.org@localhost/chrome/content/data/ua_overrides.jsm
@@ -2584,7 +2683,7 @@ lib/firefox/browser/modules/CastingApps.
lib/firefox/browser/modules/ContentClick.jsm
lib/firefox/browser/modules/ContentCrashHandlers.jsm
lib/firefox/browser/modules/ContentLinkHandler.jsm
-lib/firefox/browser/modules/ContentObservers.jsm
+lib/firefox/browser/modules/ContentObservers.js
lib/firefox/browser/modules/ContentSearch.jsm
lib/firefox/browser/modules/ContentWebRTC.jsm
lib/firefox/browser/modules/CustomizableUI.jsm
@@ -2602,19 +2701,18 @@ lib/firefox/browser/modules/Feeds.jsm
lib/firefox/browser/modules/FormSubmitObserver.jsm
lib/firefox/browser/modules/FormValidationHandler.jsm
lib/firefox/browser/modules/FullZoomUI.jsm
-lib/firefox/browser/modules/HiddenFrame.jsm
lib/firefox/browser/modules/LaterRun.jsm
lib/firefox/browser/modules/MigrationUtils.jsm
-lib/firefox/browser/modules/NetworkPrioritizer.jsm
-lib/firefox/browser/modules/NewTabMessages.jsm
lib/firefox/browser/modules/NewTabPrefsProvider.jsm
lib/firefox/browser/modules/NewTabRemoteResources.jsm
lib/firefox/browser/modules/NewTabSearchProvider.jsm
lib/firefox/browser/modules/NewTabURL.jsm
lib/firefox/browser/modules/NewTabWebChannel.jsm
+lib/firefox/browser/modules/PanelMultiView.jsm
lib/firefox/browser/modules/PanelWideWidgetTracker.jsm
+lib/firefox/browser/modules/ParseSymbols-worker.js
+lib/firefox/browser/modules/ParseSymbols.jsm
lib/firefox/browser/modules/PermissionUI.jsm
-lib/firefox/browser/modules/PlacesProvider.jsm
lib/firefox/browser/modules/PlacesUIUtils.jsm
lib/firefox/browser/modules/PluginContent.jsm
lib/firefox/browser/modules/PreviewProvider.jsm
@@ -2624,7 +2722,7 @@ lib/firefox/browser/modules/RecentWindow
lib/firefox/browser/modules/RemotePrompt.jsm
lib/firefox/browser/modules/Sanitizer.jsm
lib/firefox/browser/modules/ScrollbarSampler.jsm
-lib/firefox/browser/modules/SelfSupportBackend.jsm
+lib/firefox/browser/modules/SearchWidgetTracker.jsm
lib/firefox/browser/modules/ShellService.jsm
lib/firefox/browser/modules/SiteDataManager.jsm
lib/firefox/browser/modules/SitePermissions.jsm
@@ -2632,6 +2730,7 @@ lib/firefox/browser/modules/Social.jsm
lib/firefox/browser/modules/SocialService.jsm
lib/firefox/browser/modules/TransientPrefs.jsm
lib/firefox/browser/modules/UITour.jsm
+lib/firefox/browser/modules/devtools/devtools.js
lib/firefox/browser/modules/devtools/gDevTools.jsm
lib/firefox/browser/modules/distribution.js
lib/firefox/browser/modules/experiments/Experiments.jsm
@@ -2646,7 +2745,6 @@ lib/firefox/browser/modules/sessionstore
lib/firefox/browser/modules/sessionstore/RunState.jsm
lib/firefox/browser/modules/sessionstore/SessionCookies.jsm
lib/firefox/browser/modules/sessionstore/SessionFile.jsm
-lib/firefox/browser/modules/sessionstore/SessionHistory.jsm
lib/firefox/browser/modules/sessionstore/SessionMigration.jsm
lib/firefox/browser/modules/sessionstore/SessionSaver.jsm
lib/firefox/browser/modules/sessionstore/SessionStorage.jsm
@@ -2703,6 +2801,8 @@ lib/firefox/chrome/en-US/locale/en-US/gl
lib/firefox/chrome/en-US/locale/en-US/global/aboutSupport.properties
lib/firefox/chrome/en-US/locale/en-US/global/aboutTelemetry.dtd
lib/firefox/chrome/en-US/locale/en-US/global/aboutTelemetry.properties
+lib/firefox/chrome/en-US/locale/en-US/global/aboutUrlClassifier.dtd
+lib/firefox/chrome/en-US/locale/en-US/global/aboutUrlClassifier.properties
lib/firefox/chrome/en-US/locale/en-US/global/aboutWebrtc.properties
lib/firefox/chrome/en-US/locale/en-US/global/appPicker.dtd
lib/firefox/chrome/en-US/locale/en-US/global/appstrings.properties
@@ -2721,6 +2821,7 @@ lib/firefox/chrome/en-US/locale/en-US/gl
lib/firefox/chrome/en-US/locale/en-US/global/css.properties
lib/firefox/chrome/en-US/locale/en-US/global/customizeToolbar.dtd
lib/firefox/chrome/en-US/locale/en-US/global/customizeToolbar.properties
+lib/firefox/chrome/en-US/locale/en-US/global/datetimebox.dtd
lib/firefox/chrome/en-US/locale/en-US/global/datetimepicker.dtd
lib/firefox/chrome/en-US/locale/en-US/global/dialog.properties
lib/firefox/chrome/en-US/locale/en-US/global/dialogOverlay.dtd
@@ -2820,7 +2921,6 @@ lib/firefox/chrome/en-US/locale/en-US/pi
lib/firefox/chrome/en-US/locale/en-US/pippki/pippki.properties
lib/firefox/chrome/en-US/locale/en-US/places/places.properties
lib/firefox/chrome/en-US/locale/en-US/pluginproblem/pluginproblem.dtd
-lib/firefox/chrome/en-US/locale/en-US/services/errors.properties
lib/firefox/chrome/en-US/locale/en-US/services/sync.properties
lib/firefox/chrome/marionette/content/accessibility.js
lib/firefox/chrome/marionette/content/action.js
@@ -2845,10 +2945,12 @@ lib/firefox/chrome/marionette/content/lo
lib/firefox/chrome/marionette/content/message.js
lib/firefox/chrome/marionette/content/modal.js
lib/firefox/chrome/marionette/content/navigate.js
+lib/firefox/chrome/marionette/content/packets.js
lib/firefox/chrome/marionette/content/proxy.js
lib/firefox/chrome/marionette/content/server.js
lib/firefox/chrome/marionette/content/session.js
-lib/firefox/chrome/marionette/content/simpletest.js
+lib/firefox/chrome/marionette/content/stream-utils.js
+lib/firefox/chrome/marionette/content/transport.js
lib/firefox/chrome/marionette/content/wait.js
lib/firefox/chrome/pippki/content/pippki/CAOverlay.xul
lib/firefox/chrome/pippki/content/pippki/MineOverlay.xul
@@ -2878,6 +2980,7 @@ lib/firefox/chrome/pippki/content/pippki
lib/firefox/chrome/pippki/content/pippki/editcacert.xul
lib/firefox/chrome/pippki/content/pippki/exceptionDialog.js
lib/firefox/chrome/pippki/content/pippki/exceptionDialog.xul
+lib/firefox/chrome/pippki/content/pippki/load_device.js
lib/firefox/chrome/pippki/content/pippki/load_device.xul
lib/firefox/chrome/pippki/content/pippki/pippki.js
lib/firefox/chrome/pippki/content/pippki/protectedAuth.js
@@ -2895,9 +2998,11 @@ lib/firefox/chrome/toolkit/content/exten
lib/firefox/chrome/toolkit/content/extensions/ext-c-backgroundPage.js
lib/firefox/chrome/toolkit/content/extensions/ext-c-extension.js
lib/firefox/chrome/toolkit/content/extensions/ext-c-identity.js
+lib/firefox/chrome/toolkit/content/extensions/ext-c-permissions.js
lib/firefox/chrome/toolkit/content/extensions/ext-c-runtime.js
lib/firefox/chrome/toolkit/content/extensions/ext-c-storage.js
lib/firefox/chrome/toolkit/content/extensions/ext-c-test.js
+lib/firefox/chrome/toolkit/content/extensions/ext-c-toolkit.js
lib/firefox/chrome/toolkit/content/extensions/ext-contextualIdentities.js
lib/firefox/chrome/toolkit/content/extensions/ext-cookies.js
lib/firefox/chrome/toolkit/content/extensions/ext-downloads.js
@@ -2907,11 +3012,14 @@ lib/firefox/chrome/toolkit/content/exten
lib/firefox/chrome/toolkit/content/extensions/ext-idle.js
lib/firefox/chrome/toolkit/content/extensions/ext-management.js
lib/firefox/chrome/toolkit/content/extensions/ext-notifications.js
+lib/firefox/chrome/toolkit/content/extensions/ext-permissions.js
lib/firefox/chrome/toolkit/content/extensions/ext-privacy.js
lib/firefox/chrome/toolkit/content/extensions/ext-protocolHandlers.js
+lib/firefox/chrome/toolkit/content/extensions/ext-proxy.js
lib/firefox/chrome/toolkit/content/extensions/ext-runtime.js
lib/firefox/chrome/toolkit/content/extensions/ext-storage.js
lib/firefox/chrome/toolkit/content/extensions/ext-theme.js
+lib/firefox/chrome/toolkit/content/extensions/ext-toolkit.js
lib/firefox/chrome/toolkit/content/extensions/ext-topSites.js
lib/firefox/chrome/toolkit/content/extensions/ext-webNavigation.js
lib/firefox/chrome/toolkit/content/extensions/ext-webRequest.js
@@ -2931,7 +3039,9 @@ lib/firefox/chrome/toolkit/content/exten
lib/firefox/chrome/toolkit/content/extensions/schemas/manifest.json
lib/firefox/chrome/toolkit/content/extensions/schemas/native_host_manifest.json
lib/firefox/chrome/toolkit/content/extensions/schemas/notifications.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/permissions.json
lib/firefox/chrome/toolkit/content/extensions/schemas/privacy.json
+lib/firefox/chrome/toolkit/content/extensions/schemas/proxy.json
lib/firefox/chrome/toolkit/content/extensions/schemas/runtime.json
lib/firefox/chrome/toolkit/content/extensions/schemas/storage.json
lib/firefox/chrome/toolkit/content/extensions/schemas/test.json
@@ -2970,6 +3080,9 @@ lib/firefox/chrome/toolkit/content/globa
lib/firefox/chrome/toolkit/content/global/aboutTelemetry.css
lib/firefox/chrome/toolkit/content/global/aboutTelemetry.js
lib/firefox/chrome/toolkit/content/global/aboutTelemetry.xhtml
+lib/firefox/chrome/toolkit/content/global/aboutUrlClassifier.css
+lib/firefox/chrome/toolkit/content/global/aboutUrlClassifier.js
+lib/firefox/chrome/toolkit/content/global/aboutUrlClassifier.xhtml
lib/firefox/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.css
lib/firefox/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.html
lib/firefox/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.js
@@ -3128,8 +3241,6 @@ lib/firefox/chrome/toolkit/content/mozap
lib/firefox/chrome/toolkit/content/mozapps/extensions/extensions.xml
lib/firefox/chrome/toolkit/content/mozapps/extensions/extensions.xul
lib/firefox/chrome/toolkit/content/mozapps/extensions/gmpPrefs.xul
-lib/firefox/chrome/toolkit/content/mozapps/extensions/list.js
-lib/firefox/chrome/toolkit/content/mozapps/extensions/list.xul
lib/firefox/chrome/toolkit/content/mozapps/extensions/newaddon.js
lib/firefox/chrome/toolkit/content/mozapps/extensions/newaddon.xul
lib/firefox/chrome/toolkit/content/mozapps/extensions/pluginPrefs.xul
@@ -3157,8 +3268,6 @@ lib/firefox/chrome/toolkit/content/mozap
lib/firefox/chrome/toolkit/content/passwordmgr/passwordManager.js
lib/firefox/chrome/toolkit/content/passwordmgr/passwordManager.xul
lib/firefox/chrome/toolkit/content/passwordmgr/recipes.json
-lib/firefox/chrome/toolkit/content/requestautocomplete/requestAutocomplete.js
-lib/firefox/chrome/toolkit/content/requestautocomplete/requestAutocomplete.xhtml
lib/firefox/chrome/toolkit/content/satchel/formSubmitListener.js
lib/firefox/chrome/toolkit/content/xbl-marquee/xbl-marquee.css
lib/firefox/chrome/toolkit/content/xbl-marquee/xbl-marquee.xml
@@ -3210,33 +3319,21 @@ lib/firefox/chrome/toolkit/skin/classic/
lib/firefox/chrome/toolkit/skin/classic/global/alerts/alert-common.css
lib/firefox/chrome/toolkit/skin/classic/global/alerts/alert.css
lib/firefox/chrome/toolkit/skin/classic/global/appPicker.css
-lib/firefox/chrome/toolkit/skin/classic/global/arrow.css
lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-dn-dis.gif
lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-dn-hov.gif
-lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-dn-sharp.gif
lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-dn.gif
-lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-down.png
lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-lft-dis.gif
-lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-lft-sharp-end.gif
-lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-lft-sharp.gif
lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-lft.gif
lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-rit-dis.gif
-lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-rit-sharp-end.gif
-lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-rit-sharp.gif
lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-rit.gif
lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-up-dis.gif
lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-up-hov.gif
-lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-up-sharp.gif
lib/firefox/chrome/toolkit/skin/classic/global/arrow/arrow-up.gif
lib/firefox/chrome/toolkit/skin/classic/global/arrow/panelarrow-horizontal-themed.svg
-lib/firefox/chrome/toolkit/skin/classic/global/arrow/panelarrow-horizontal.svg
lib/firefox/chrome/toolkit/skin/classic/global/arrow/panelarrow-vertical-themed.svg
-lib/firefox/chrome/toolkit/skin/classic/global/arrow/panelarrow-vertical.svg
lib/firefox/chrome/toolkit/skin/classic/global/autocomplete.css
lib/firefox/chrome/toolkit/skin/classic/global/button.css
lib/firefox/chrome/toolkit/skin/classic/global/checkbox.css
-lib/firefox/chrome/toolkit/skin/classic/global/checkbox/cbox-check-dis.gif
-lib/firefox/chrome/toolkit/skin/classic/global/checkbox/cbox-check.gif
lib/firefox/chrome/toolkit/skin/classic/global/colorpicker.css
lib/firefox/chrome/toolkit/skin/classic/global/commonDialog.css
lib/firefox/chrome/toolkit/skin/classic/global/config.css
@@ -3246,10 +3343,6 @@ lib/firefox/chrome/toolkit/skin/classic/
lib/firefox/chrome/toolkit/skin/classic/global/datetimepopup.css
lib/firefox/chrome/toolkit/skin/classic/global/dialog.css
lib/firefox/chrome/toolkit/skin/classic/global/dirListing/dirListing.css
-lib/firefox/chrome/toolkit/skin/classic/global/dirListing/folder.png
-lib/firefox/chrome/toolkit/skin/classic/global/dirListing/local.png
-lib/firefox/chrome/toolkit/skin/classic/global/dirListing/remote.png
-lib/firefox/chrome/toolkit/skin/classic/global/dirListing/up.png
lib/firefox/chrome/toolkit/skin/classic/global/dropmarker.css
lib/firefox/chrome/toolkit/skin/classic/global/expander.css
lib/firefox/chrome/toolkit/skin/classic/global/filefield.css
@@ -3261,37 +3354,19 @@ lib/firefox/chrome/toolkit/skin/classic/
lib/firefox/chrome/toolkit/skin/classic/global/groupbox.css
lib/firefox/chrome/toolkit/skin/classic/global/icons/Authentication.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/Close.gif
-lib/firefox/chrome/toolkit/skin/classic/global/icons/Error.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/Landscape.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/Minimize.gif
-lib/firefox/chrome/toolkit/skin/classic/global/icons/Portrait.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/Print-preview.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/Question.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/Restore.gif
-lib/firefox/chrome/toolkit/skin/classic/global/icons/Search-close.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/Search-glass.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/Warning.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/autocomplete-search.svg
lib/firefox/chrome/toolkit/skin/classic/global/icons/autoscroll.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/blacklist_favicon.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/blacklist_large.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/blocked.svg
-lib/firefox/chrome/toolkit/skin/classic/global/icons/calendar-arrows.svg
-lib/firefox/chrome/toolkit/skin/classic/global/icons/close-inverted.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/close-inverted%2x.png@localhost
-lib/firefox/chrome/toolkit/skin/classic/global/icons/close.png
+lib/firefox/chrome/toolkit/skin/classic/global/icons/calendar-arrow-left.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/calendar-arrow-right.svg
lib/firefox/chrome/toolkit/skin/classic/global/icons/close.svg
-lib/firefox/chrome/toolkit/skin/classic/global/icons/close%2x.png@localhost
-lib/firefox/chrome/toolkit/skin/classic/global/icons/collapse.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/error-16.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/error-64.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/expand.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/find-arrows.svg
-lib/firefox/chrome/toolkit/skin/classic/global/icons/folder-item.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/info.svg
-lib/firefox/chrome/toolkit/skin/classic/global/icons/information-16.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/information-24.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/information-32.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/input-clear.svg
lib/firefox/chrome/toolkit/skin/classic/global/icons/loading.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/loading%2x.png@localhost
@@ -3300,14 +3375,14 @@ lib/firefox/chrome/toolkit/skin/classic/
lib/firefox/chrome/toolkit/skin/classic/global/icons/question-64.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/resizer-rtl.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/resizer.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/spinner-arrows.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/search-textbox.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/spinner-arrow-down.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/spinner-arrow-up.svg
lib/firefox/chrome/toolkit/skin/classic/global/icons/sslWarning.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/tabprompts-bgtexture.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/warning-16.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/warning-64.png
-lib/firefox/chrome/toolkit/skin/classic/global/icons/warning-large.png
lib/firefox/chrome/toolkit/skin/classic/global/icons/warning.svg
-lib/firefox/chrome/toolkit/skin/classic/global/icons/windowControls.png
lib/firefox/chrome/toolkit/skin/classic/global/in-content/check-partial.svg
lib/firefox/chrome/toolkit/skin/classic/global/in-content/check.svg
lib/firefox/chrome/toolkit/skin/classic/global/in-content/common.css
@@ -3315,11 +3390,9 @@ lib/firefox/chrome/toolkit/skin/classic/
lib/firefox/chrome/toolkit/skin/classic/global/in-content/help-glyph.svg
lib/firefox/chrome/toolkit/skin/classic/global/in-content/info-pages.css
lib/firefox/chrome/toolkit/skin/classic/global/in-content/radio.svg
-lib/firefox/chrome/toolkit/skin/classic/global/linkTree.css
lib/firefox/chrome/toolkit/skin/classic/global/listbox.css
lib/firefox/chrome/toolkit/skin/classic/global/media/TopLevelImageDocument.css
lib/firefox/chrome/toolkit/skin/classic/global/media/TopLevelVideoDocument.css
-lib/firefox/chrome/toolkit/skin/classic/global/media/clicktoplay-bgtexture.png
lib/firefox/chrome/toolkit/skin/classic/global/media/closedCaptionButton.svg
lib/firefox/chrome/toolkit/skin/classic/global/media/error.png
lib/firefox/chrome/toolkit/skin/classic/global/media/fullscreenButton.svg
@@ -3330,7 +3403,6 @@ lib/firefox/chrome/toolkit/skin/classic/
lib/firefox/chrome/toolkit/skin/classic/global/media/playButton.svg
lib/firefox/chrome/toolkit/skin/classic/global/media/stalled.png
lib/firefox/chrome/toolkit/skin/classic/global/media/throbber.png
-lib/firefox/chrome/toolkit/skin/classic/global/media/videoClickToPlayButton.svg
lib/firefox/chrome/toolkit/skin/classic/global/media/videocontrols.css
lib/firefox/chrome/toolkit/skin/classic/global/menu.css
lib/firefox/chrome/toolkit/skin/classic/global/menu/shared-menu-check-active.svg
@@ -3372,9 +3444,6 @@ lib/firefox/chrome/toolkit/skin/classic/
lib/firefox/chrome/toolkit/skin/classic/global/resizer.css
lib/firefox/chrome/toolkit/skin/classic/global/richlistbox.css
lib/firefox/chrome/toolkit/skin/classic/global/scale.css
-lib/firefox/chrome/toolkit/skin/classic/global/scale/scale-tray-horiz.gif
-lib/firefox/chrome/toolkit/skin/classic/global/scale/scale-tray-vert.gif
-lib/firefox/chrome/toolkit/skin/classic/global/scrollbar/slider.gif
lib/firefox/chrome/toolkit/skin/classic/global/scrollbars.css
lib/firefox/chrome/toolkit/skin/classic/global/scrollbox.css
lib/firefox/chrome/toolkit/skin/classic/global/spinbuttons.css
@@ -3415,11 +3484,11 @@ lib/firefox/chrome/toolkit/skin/classic/
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/cancel.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-available.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-discover.png
+lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-legacy.svg
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-plugins.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-recent.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-search.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/category-service.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric-16.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/dictionaryGeneric.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/discover-logo.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/eula.css
@@ -3433,16 +3502,11 @@ lib/firefox/chrome/toolkit/skin/classic/
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/newaddon.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/rating-not-won.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/rating-won.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric-16.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/themeGeneric.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/update.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/utilities.svg
-lib/firefox/chrome/toolkit/skin/classic/mozapps/formautofill/requestAutocomplete.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/handling/handling.css
-lib/firefox/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon-inverted.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon-inverted%2x.png@localhost
-lib/firefox/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon%2x.png@localhost
+lib/firefox/chrome/toolkit/skin/classic/mozapps/places/defaultFavicon.svg
lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginActivate.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginBlocked.png
lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginClose.png
@@ -3467,8 +3531,6 @@ lib/firefox/components/ContentProcessSin
lib/firefox/components/DownloadLegacy.js
lib/firefox/components/EditorUtils.js
lib/firefox/components/FeedProcessor.js
-lib/firefox/components/FormAutofillContentService.js
-lib/firefox/components/FormAutofillStartup.js
lib/firefox/components/FormHistoryStartup.js
lib/firefox/components/FxAccountsPush.js
lib/firefox/components/MainProcessSingleton.js
@@ -3486,10 +3548,10 @@ lib/firefox/components/Push.js
lib/firefox/components/PushComponents.js
lib/firefox/components/RemoteWebNavigation.js
lib/firefox/components/SecurityReporter.js
-lib/firefox/components/SiteSpecificUserAgent.js
lib/firefox/components/SlowScriptDebug.js
lib/firefox/components/TelemetryStartup.js
lib/firefox/components/TooltipTextProvider.js
+lib/firefox/components/UAOverridesBootstrapper.js
lib/firefox/components/UnifiedComplete.js
lib/firefox/components/Weave.js
lib/firefox/components/WebVTTParserWrapper.js
@@ -3504,10 +3566,10 @@ lib/firefox/components/components.manife
lib/firefox/components/contentAreaDropListener.js
lib/firefox/components/crypto-SDR.js
lib/firefox/components/defaultShims.js
+lib/firefox/components/extension-process-script.js
lib/firefox/components/htmlMenuBuilder.js
lib/firefox/components/interfaces.xpt
lib/firefox/components/marionette.js
-lib/firefox/components/messageWakeupService.js
lib/firefox/components/mozIntl.js
lib/firefox/components/mozProtocolHandler.js
lib/firefox/components/multiprocessShims.js
@@ -3521,6 +3583,7 @@ lib/firefox/components/nsDNSServiceDisco
lib/firefox/components/nsDefaultCLH.js
lib/firefox/components/nsFilePicker.js
lib/firefox/components/nsFormAutoComplete.js
+lib/firefox/components/nsHandlerService-json.js
lib/firefox/components/nsHandlerService.js
lib/firefox/components/nsHelperAppDlg.js
lib/firefox/components/nsINIProcessor.js
@@ -3558,7 +3621,7 @@ lib/firefox/firefox-bin
lib/firefox/gmp-clearkey/0.1/libclearkey.so
lib/firefox/gmp-clearkey/0.1/manifest.json
lib/firefox/greprefs.js
-${PLIST.gtk3}lib/firefox/gtk2/libmozgtk.so
+lib/firefox/gtk2/libmozgtk.so
lib/firefox/hyphenation/hyph_af.dic
lib/firefox/hyphenation/hyph_bg.dic
lib/firefox/hyphenation/hyph_ca.dic
@@ -3598,16 +3661,15 @@ lib/firefox/hyphenation/hyph_uk.dic
lib/firefox/liblgpllibs.so
${PLIST.avx86}lib/firefox/libmozavcodec.so
${PLIST.avx86}lib/firefox/libmozavutil.so
-${PLIST.gtk3}lib/firefox/libmozgtk.so
+lib/firefox/libmozgtk.so
lib/firefox/libmozsqlite3.so
lib/firefox/libxul.so
lib/firefox/modules/AboutReader.jsm
lib/firefox/modules/AddonManager.jsm
-lib/firefox/modules/AddonWatcher.jsm
lib/firefox/modules/AppConstants.jsm
+lib/firefox/modules/AppMenuNotifications.jsm
lib/firefox/modules/AsyncPrefs.jsm
lib/firefox/modules/AsyncShutdown.jsm
-lib/firefox/modules/AsyncSpellCheckTestHelper.jsm
lib/firefox/modules/AutoCompletePopup.jsm
lib/firefox/modules/BackgroundPageThumbs.jsm
lib/firefox/modules/Battery.jsm
@@ -3622,14 +3684,6 @@ lib/firefox/modules/CertUtils.jsm
lib/firefox/modules/CharsetMenu.jsm
lib/firefox/modules/ChromeManifestParser.jsm
lib/firefox/modules/ClientID.jsm
-lib/firefox/modules/CloudSync.jsm
-lib/firefox/modules/CloudSyncAdapters.jsm
-lib/firefox/modules/CloudSyncBookmarks.jsm
-lib/firefox/modules/CloudSyncBookmarksFolderCache.jsm
-lib/firefox/modules/CloudSyncEventSource.jsm
-lib/firefox/modules/CloudSyncLocal.jsm
-lib/firefox/modules/CloudSyncPlacesWrapper.jsm
-lib/firefox/modules/CloudSyncTabs.jsm
lib/firefox/modules/ClusterLib.js
lib/firefox/modules/Color.jsm
lib/firefox/modules/ColorAnalyzer_worker.js
@@ -3658,7 +3712,6 @@ lib/firefox/modules/DeferredSave.jsm
lib/firefox/modules/DeferredTask.jsm
lib/firefox/modules/Deprecated.jsm
lib/firefox/modules/DownloadCore.jsm
-lib/firefox/modules/DownloadImport.jsm
lib/firefox/modules/DownloadIntegration.jsm
lib/firefox/modules/DownloadLastDir.jsm
lib/firefox/modules/DownloadList.jsm
@@ -3667,13 +3720,16 @@ lib/firefox/modules/DownloadStore.jsm
lib/firefox/modules/DownloadUIHelper.jsm
lib/firefox/modules/DownloadUtils.jsm
lib/firefox/modules/Downloads.jsm
+lib/firefox/modules/EventEmitter.jsm
lib/firefox/modules/Extension.jsm
lib/firefox/modules/ExtensionAPI.jsm
lib/firefox/modules/ExtensionChild.jsm
+lib/firefox/modules/ExtensionChildDevToolsUtils.jsm
lib/firefox/modules/ExtensionCommon.jsm
lib/firefox/modules/ExtensionContent.jsm
-lib/firefox/modules/ExtensionManagement.jsm
+lib/firefox/modules/ExtensionPageChild.jsm
lib/firefox/modules/ExtensionParent.jsm
+lib/firefox/modules/ExtensionPermissions.jsm
lib/firefox/modules/ExtensionPreferencesManager.jsm
lib/firefox/modules/ExtensionSearchHandler.jsm
lib/firefox/modules/ExtensionSettingsStore.jsm
@@ -3686,8 +3742,6 @@ lib/firefox/modules/Finder.jsm
lib/firefox/modules/FinderHighlighter.jsm
lib/firefox/modules/FinderIterator.jsm
lib/firefox/modules/ForgetAboutSite.jsm
-lib/firefox/modules/FormAutofill.jsm
-lib/firefox/modules/FormAutofillIntegration.jsm
lib/firefox/modules/FormData.jsm
lib/firefox/modules/FormHistory.jsm
lib/firefox/modules/FormLikeFactory.jsm
@@ -3704,10 +3758,12 @@ lib/firefox/modules/GCTelemetry.jsm
lib/firefox/modules/GMPInstallManager.jsm
lib/firefox/modules/GMPUtils.jsm
lib/firefox/modules/Geometry.jsm
+lib/firefox/modules/HiddenFrame.jsm
lib/firefox/modules/History.jsm
lib/firefox/modules/Http.jsm
lib/firefox/modules/ISO8601DateUtils.jsm
lib/firefox/modules/ImageObjectProcessor.jsm
+lib/firefox/modules/IndexedDB.jsm
lib/firefox/modules/IndexedDBHelper.jsm
lib/firefox/modules/InlineSpellChecker.jsm
lib/firefox/modules/InlineSpellCheckerContent.jsm
@@ -3773,7 +3829,7 @@ lib/firefox/modules/Promise.jsm
lib/firefox/modules/PromiseMessage.jsm
lib/firefox/modules/PromiseUtils.jsm
lib/firefox/modules/PromiseWorker.jsm
-lib/firefox/modules/PropertyListUtils.jsm
+lib/firefox/modules/ProxyScriptContext.jsm
lib/firefox/modules/PushCrypto.jsm
lib/firefox/modules/PushDB.jsm
lib/firefox/modules/PushRecord.jsm
@@ -3788,7 +3844,6 @@ lib/firefox/modules/RemoteFinder.jsm
lib/firefox/modules/RemotePageManager.jsm
lib/firefox/modules/RemoteSecurityUI.jsm
lib/firefox/modules/RemoteWebProgress.jsm
-lib/firefox/modules/RequestAutocompleteUI.jsm
lib/firefox/modules/ResetProfile.jsm
lib/firefox/modules/ResponsivenessMonitor.jsm
lib/firefox/modules/RokuApp.jsm
@@ -3801,12 +3856,10 @@ lib/firefox/modules/SelectContentHelper.
lib/firefox/modules/SelectParentHelper.jsm
lib/firefox/modules/ServiceRequest.jsm
lib/firefox/modules/Services.jsm
-lib/firefox/modules/SessionRecorder.jsm
lib/firefox/modules/SharedPromptUtils.jsm
lib/firefox/modules/ShimWaiver.jsm
lib/firefox/modules/ShortcutUtils.jsm
lib/firefox/modules/SimpleServiceDiscovery.jsm
-lib/firefox/modules/Sntp.jsm
lib/firefox/modules/Sqlite.jsm
lib/firefox/modules/Subprocess.jsm
lib/firefox/modules/Task.jsm
@@ -3854,10 +3907,9 @@ lib/firefox/modules/accessibility/Presen
lib/firefox/modules/accessibility/Traversal.jsm
lib/firefox/modules/accessibility/Utils.jsm
lib/firefox/modules/addons/APIExtensionBootstrap.js
-lib/firefox/modules/addons/AddonConstants.jsm
-lib/firefox/modules/addons/AddonLogging.jsm
lib/firefox/modules/addons/AddonRepository.jsm
lib/firefox/modules/addons/AddonRepository_SQLiteMigrator.jsm
+lib/firefox/modules/addons/AddonSettings.jsm
lib/firefox/modules/addons/AddonUpdateChecker.jsm
lib/firefox/modules/addons/Content.js
lib/firefox/modules/addons/E10SAddonsRollout.jsm
@@ -3867,6 +3919,7 @@ lib/firefox/modules/addons/PluginProvide
lib/firefox/modules/addons/ProductAddonChecker.jsm
lib/firefox/modules/addons/SpellCheckDictionaryBootstrap.js
lib/firefox/modules/addons/WebExtensionBootstrap.js
+lib/firefox/modules/addons/XPIInstall.jsm
lib/firefox/modules/addons/XPIProvider.jsm
lib/firefox/modules/addons/XPIProviderUtils.js
lib/firefox/modules/commonjs/dev/debuggee.js
@@ -4120,6 +4173,7 @@ lib/firefox/modules/commonjs/sdk/zip/uti
lib/firefox/modules/commonjs/test.js
lib/firefox/modules/commonjs/toolkit/loader.js
lib/firefox/modules/commonjs/toolkit/require.js
+lib/firefox/modules/css-selector.js
lib/firefox/modules/ctypes.jsm
lib/firefox/modules/debug.js
lib/firefox/modules/devtools/Console.jsm
@@ -4154,8 +4208,6 @@ lib/firefox/modules/osfile/ospath_win.js
lib/firefox/modules/presentation/ControllerStateMachine.jsm
lib/firefox/modules/presentation/ReceiverStateMachine.jsm
lib/firefox/modules/presentation/StateMachineHelper.jsm
-lib/firefox/modules/psm/DER.jsm
-lib/firefox/modules/psm/X509.jsm
lib/firefox/modules/reader/JSDOMParser.js
lib/firefox/modules/reader/Readability.js
lib/firefox/modules/reader/ReaderWorker.js
@@ -4174,13 +4226,14 @@ lib/firefox/modules/services-common/kint
lib/firefox/modules/services-common/logmanager.js
lib/firefox/modules/services-common/observers.js
lib/firefox/modules/services-common/rest.js
-lib/firefox/modules/services-common/stringbundle.js
lib/firefox/modules/services-common/tokenserverclient.js
+lib/firefox/modules/services-common/uptake-telemetry.js
lib/firefox/modules/services-common/utils.js
lib/firefox/modules/services-crypto/WeaveCrypto.js
lib/firefox/modules/services-crypto/jwcrypto.jsm
lib/firefox/modules/services-crypto/utils.js
lib/firefox/modules/services-sync/SyncedTabs.jsm
+lib/firefox/modules/services-sync/UIState.jsm
lib/firefox/modules/services-sync/addonsreconciler.js
lib/firefox/modules/services-sync/addonutils.js
lib/firefox/modules/services-sync/bookmark_repair.js
@@ -4213,6 +4266,7 @@ lib/firefox/modules/services-sync/status
lib/firefox/modules/services-sync/telemetry.js
lib/firefox/modules/services-sync/util.js
lib/firefox/modules/sessionstore/PrivacyLevel.jsm
+lib/firefox/modules/sessionstore/SessionHistory.jsm
lib/firefox/modules/sessionstore/Utils.jsm
lib/firefox/modules/subprocess/subprocess_common.jsm
lib/firefox/modules/subprocess/subprocess_shared.js
Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.286 pkgsrc/www/firefox/distinfo:1.287
--- pkgsrc/www/firefox/distinfo:1.286 Mon Jul 3 12:27:49 2017
+++ pkgsrc/www/firefox/distinfo Thu Aug 10 14:46:15 2017
@@ -1,31 +1,43 @@
-$NetBSD: distinfo,v 1.286 2017/07/03 12:27:49 ryoon Exp $
+$NetBSD: distinfo,v 1.287 2017/08/10 14:46:15 ryoon Exp $
-SHA1 (firefox-54.0.1.source.tar.xz) = 1378f3e4f481fb3d6fcc67e20390d932bdff67ae
-RMD160 (firefox-54.0.1.source.tar.xz) = 51b16822922c8368ab26e9f2597e6ed81f98790c
-SHA512 (firefox-54.0.1.source.tar.xz) = 43607c2c0af995a21dc7f0f68b24b7e5bdb3faa5ee06025901c826bfe4d169256ea1c9eb5fcc604c4d6426ced53e80787c12fc07cda014eca09199ef3df783a2
-Size (firefox-54.0.1.source.tar.xz) = 229935420 bytes
-SHA1 (patch-aa) = 3ba9735f6b2da91f9699e54e9390ec90d3cc5577
-SHA1 (patch-browser_app_nsBrowserApp.cpp) = 915f03770ac4a73d7554f213ce3c7f76d7a34cf0
-SHA1 (patch-browser_confvars.sh) = d4f70fd4672416ce5c98181b974f8d8df9a6069f
+SHA1 (firefox-55.0.source.tar.xz) = b22a4b66fc7af4706d0838ef2a1d0639bc184055
+RMD160 (firefox-55.0.source.tar.xz) = 2cf480a5b96e6fa983aa3f0789b2ad4bcb2e7eec
+SHA512 (firefox-55.0.source.tar.xz) = b3ca0a926faedfc12c859965629330489ac6c05730a0dc38748704a1a25e876decfba78a3d665e22a6773b0a3bfed3109cd624be77d130785b4097d6d9f9c94b
+Size (firefox-55.0.source.tar.xz) = 235014712 bytes
+SHA1 (patch-aa) = 373af8f1df58d20e015b231625e60914554fb779
+SHA1 (patch-browser_base_content_baseMenuOverlay.xul) = 1d8959e2df0b546e381cf0e5af71808e8e7bebd7
+SHA1 (patch-browser_components_nsBrowserGlue.js) = c27a9a57056ed3227e60f5663d9275ef4204ab39
+SHA1 (patch-browser_components_preferences_in-content-new_main.xul) = 86395a554db4b052e9f05d3b39e1cab662a752c6
+SHA1 (patch-browser_components_preferences_in-content-new_privacy.js) = 17ffeaefa884e0a4a5bd9c2fc62369911fa46b98
+SHA1 (patch-browser_components_preferences_in-content-new_privacy.xul) = 3113d2ff23e6e74edf23d4486b4fa8d2cac167f1
+SHA1 (patch-browser_components_preferences_in-content_advanced.js) = 931d612d167e5d11d93fdc16bb6e3e5012571889
+SHA1 (patch-browser_components_preferences_in-content_advanced.xul) = 1d88c1cac70e9f90d5cd96cdedfa129389bda005
+SHA1 (patch-browser_confvars.sh) = 6acc570e22c82c3b48ac32dc5d0301468252b979
+SHA1 (patch-browser_locales_en-US_chrome_browser_preferences-old_advanced.dtd) = 10cbe84c1c91afb3a5c35091a78b222513dc426c
+SHA1 (patch-browser_locales_en-US_chrome_browser_preferences_advanced.dtd) = 786423776f159c1303efefd63f0ae3680b397ec8
+SHA1 (patch-build_gyp.mozbuild) = bb3a2f8c1cad0e9cfdaefa721c5992cba2e2bf50
+SHA1 (patch-build_moz.configure_init.configure) = 5ec8da6b5aad7682a88b010a99e19f5d4403e6db
+SHA1 (patch-build_moz.configure_keyfiles.configure) = 4d346c6298e08853681aac018f9289190bc1841a
SHA1 (patch-build_moz.configure_memory.configure) = 46237c1415eff3f99d4889a6300ec96af925f0a6
SHA1 (patch-build_moz.configure_old.configure) = 2f452e717f0c9dc8224019b58e531e5e95cc7697
-SHA1 (patch-build_moz.configure_rust.configure) = de808375f731e9caa5ca8e572054a39acb715a85
+SHA1 (patch-build_moz.configure_rust.configure) = 5dd3c36429ae297335556d55b99a6acb7dccf93c
+SHA1 (patch-build_pgo_profileserver.py) = b5ca4f309053090aa27521c42c95d2ab2e9130ce
SHA1 (patch-config_Makefile.in) = 2ad29cef869171aa29b6c3e4ba4a5c99311e0742
SHA1 (patch-config_baseconfig.mk) = fbc3fd75bf5d794284e5703a9df227949e819136
SHA1 (patch-config_external_moz.build) = 68708dc0fb94119b9f140d05dd737e69bb6bba81
+SHA1 (patch-config_rules.mk) = f23b183d0201252245e82b775e9566d76ec854b4
SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
-SHA1 (patch-config_system-headers) = eaa6e692e2cfbbbf2fa1f365fb561e6faa08a57f
+SHA1 (patch-config_system-headers) = 96bc5e296d1ec9db9d764edadc36605a8f3aebe9
SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
SHA1 (patch-dom_base_moz.build) = 5200cbfcf7b781324dca4c55d01bc8559a56aa4c
SHA1 (patch-dom_media_AudioStream.cpp) = 3d2e3d92849a355c05d7ec0ded61d551ffe0c581
SHA1 (patch-dom_media_AudioStream.h) = 26f70000cc4810834204d15b45e1469dd5f23617
SHA1 (patch-dom_media_CubebUtils.cpp) = 3632cd0dd4b95f53f01050b8898b33fe198916b6
SHA1 (patch-dom_media_MediaPrefs.h) = b5815efdfbf79a7ff92197bbd906f702565ea46f
+SHA1 (patch-dom_media_gtest_moz.build) = 6a58e050327ffcdcf2a4041946ddb79d6793d2d9
SHA1 (patch-dom_media_moz.build) = 844dbb94463b8aab11649a5aa11142de0179d86c
SHA1 (patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp) = f2965930c50961b42576a983e93a08d67da50a2a
-SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = 308548409c2117209ed277a6d2b0a37c2efa5ec7
-SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = 15c01df2fa7f989b533ef769ce77438b5e9bfdb9
SHA1 (patch-extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 30abff0aaabff07e13939a1571cefc5216760109
SHA1 (patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 6e91ca436b73affe42ed4e683b3400beb28c4bc6
SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2cc997cab71a84c1f50a791693519a0626564426
@@ -42,55 +54,57 @@ SHA1 (patch-intl_unicharutil_util_moz.bu
SHA1 (patch-ipc_chromium_src_base_atomicops.h) = 24b63a6e51d9ab27f2788ee02f2ffa7e1c36f29a
SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = 16e37fe54ba1d8d233f6b04dbd06e248305d7f6e
SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = 99b9f3f9dd88f1c8008d2fb6058450695394f5cf
-SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = c81930280bd76a00fbad37aad02fb8451d80b1ee
-SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 45409f2152d5ffc376c18c0c9bc696e08e3910ce
+SHA1 (patch-ipc_chromium_src_base_platform__thread.h) = 3ed4f482a8ccbd5db216c2623bf6dd93b0bbc1c9
+SHA1 (patch-ipc_chromium_src_base_platform__thread__posix.cc) = 937a843a7acf3085056e309ea5ab047bd9b95088
SHA1 (patch-ipc_chromium_src_base_process__util.h) = 4b24c3467866a601d68bb83f44e5fd38fb27188d
-SHA1 (patch-ipc_chromium_src_base_process__util__posix.cc) = aa6dee9678eeb0eb3d50e74f6e629ee0f4bc9d4b
-SHA1 (patch-ipc_chromium_src_base_sys__info__posix.cc) = 5313c4097c278640573c7e1cb089f6f76b48c1a8
-SHA1 (patch-ipc_chromium_src_base_time__posix.cc) = ba4e0872490f870e7d2f468e1fe87c33cf9a3500
-SHA1 (patch-ipc_chromium_src_build_build__config.h) = 9e4f15226c494f5015dbea3a0df6af851449ae15
-SHA1 (patch-ipc_chromium_src_chrome_common_transport__dib.h) = 33ea11a8c23f2fefcb318342ac9e94d3885cb3b1
SHA1 (patch-ipc_glue_CrossProcessSemaphore.h) = 778a569887d8ad082abc2fa2fe89a0a943e84d64
-SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = fc07bb12aa304c184e523072ad496a3863cb7f07
-SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 37fca99dc5359a7c1403b7674080bd27b0a5eafe
+SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = d1afeb74af97cf30c520b42a8d444ff95ef592a9
+SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
+SHA1 (patch-js_src_build_moz.build) = 4597a427262d0eb6ce8d14c0f557bfbe3f053e61
SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = f0b554c169643b8447b4f29168d61ea257b18782
-SHA1 (patch-js_src_jit_none_AtomicOperations-sparc.h) = b44992a869d6d08809a9edc28f1ad6f40632d392
-SHA1 (patch-js_src_moz.build) = ce9110506086d15a011d0985b58dd4e7d1b6ec5f
SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
-SHA1 (patch-js_xpconnect_src_xpcprivate.h) = e09e37819961bae40a9f276ae1ee510d2956c23e
+SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 97a221c76593be712f670aa409f2f1ad5dc20628
SHA1 (patch-media_libcubeb_gtest_moz.build) = ebb4be6e6bca4a0ed6858516ec9fdb7828bbe2e1
-SHA1 (patch-media_libcubeb_src_cubeb.c) = c689537aa7c3c40758d4b74e471e4dad1adeef5d
+SHA1 (patch-media_libcubeb_src_cubeb.c) = 1b1b8d57eb710cad13518ded79a0ddee2681881b
SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 8c99af543c49c23fea102c4ad9ffd617cc90631e
SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 88cdfb9b9aa8c2607ca79bfa7fce4353e65638f7
-SHA1 (patch-media_libcubeb_src_moz.build) = 59a2f95300b26c8047532c80445b958e7b8e738c
-SHA1 (patch-media_libcubeb_update.sh) = 7bd5145466c2af086a501be4e77432c0857236ce
+SHA1 (patch-media_libcubeb_src_moz.build) = 54fa1221f80d460de115bfad9fbb5936403d2980
+SHA1 (patch-media_libcubeb_update.sh) = e8babe57ea7f0f32658b391e9c4f6310e57fc38c
SHA1 (patch-media_libsoundtouch_src_cpu__detect__x86.cpp) = db61737afa7773e8cbd82976de3a02c917174696
SHA1 (patch-media_libsoundtouch_src_soundtouch__perms.h) = 2d08a3b4176c155c57b458cb78043318b68d8fe2
-SHA1 (patch-media_libstagefright_binding_DecoderData.cpp) = 513bd02034156fa51fff08bf42e50a8e1b566031
-SHA1 (patch-media_libstagefright_binding_MP4Metadata.cpp) = dfe536b847dd665235b3debeae6fa4d7e3c69366
+SHA1 (patch-media_libstagefright_binding_DecoderData.cpp) = 6815fbab38ea39b260583724ee95c32e6196a030
+SHA1 (patch-media_libstagefright_binding_MP4Metadata.cpp) = 7246a674a475b2b23a82798f74fa5d5fbbbfb968
SHA1 (patch-media_libstagefright_binding_include_mp4__demuxer_DecoderData.h) = eb7d82470943ad8eecd1c955a578c23aa2c390e1
-SHA1 (patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h) = 2f02aa4049d0575b60492ef76fa48633185698f1
+SHA1 (patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h) = 514212cd98f74eea72f0a3acd0b4205aa4c0d3a2
+SHA1 (patch-media_libstagefright_gtest_moz.build) = a1436e6289a8eb1a00ab7d5836052a3cd721154b
+SHA1 (patch-media_libstagefright_moz.build) = 35abbfee1d35533dc77a8362053f797208b58535
SHA1 (patch-media_libtheora_lib_arm_armcpu.c) = 3ef05c05799d56b3c160634327d90dd33764c3df
SHA1 (patch-media_libtheora_moz.build) = cbcb61331fea274b720a4b5c51db1f763fc10d81
SHA1 (patch-media_libtremor_moz.build) = 87f66296be4db8487eae95b2779a9c02463555cf
SHA1 (patch-media_libvorbis_moz.build) = cad67e49169ddab075fbfae2e6f0f950c1eccaf0
SHA1 (patch-media_libyuv_libyuv_source_mjpeg__decoder.cc) = 8a264c439fa4749cd7c5acf96e1ae3f9bae0a886
SHA1 (patch-media_openmax__dl_dl_api_armCOMM__s.h) = 40b3fa8aaec77d3bfec810f0bc4e76eae449d7c7
-SHA1 (patch-media_webrtc_signaling_test_common.build) = 8becbb00cbe9e10b95d53f30c6d16b6f7afc38e8
SHA1 (patch-memory_mozalloc_mozalloc__abort.cpp) = 9e94002b01664a42af415639dc94caa127a73ac0
-SHA1 (patch-mfbt_Poison.cpp) = f502581db96b3e5eca25a9aa9035f436e9167503
-SHA1 (patch-mobile_android_confvars.sh) = c8889907009c8a9a14df93a8193df96e2d12e1ca
+SHA1 (patch-mobile_android_confvars.sh) = 42d4ba1737dc5b4591f892c804c78fa4e6ddfd71
SHA1 (patch-modules_libjar_nsZipArchive.cpp) = 133b1658839d9b0f932a601670862c1f4cd70881
SHA1 (patch-mozglue_build_arm.cpp) = f41ace63b3f1d2a8ccaffc98c3c64d1e22af5249
SHA1 (patch-mozglue_build_arm.h) = 5e272f4e19b9681d43a63c45d78b0e44a392c7dc
+SHA1 (patch-netwerk_base_moz.build) = fba8c69b33cbf9ed59f54a7daf63e6dfa313a36b
+SHA1 (patch-netwerk_base_nsStandardURL.cpp) = d0aec4ac554ab53994179fa76c9df67ccc2495e3
SHA1 (patch-netwerk_dns_moz.build) = d4ad35ee7152ca206156403954cbd247d1252ab0
+SHA1 (patch-third__party_python_futures_concurrent_futures_process.py) = 5e5c77334d29814f7548450163b625f451b74942
SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 5ffb0782bbbff2fd17ad71e98b349b4ec3dc6c8c
-SHA1 (patch-toolkit_components_telemetry_Histograms.json) = 25af1d3da8f474942ac1766bfb2c9bba1b2c6492
+SHA1 (patch-toolkit_components_resistfingerprinting_nsRFPService.cpp) = 14d71a5197b09730b7065f95ee6c4ba3572d8241
+SHA1 (patch-toolkit_components_telemetry_Histograms.json) = 5232d568a68b3396b8deff04820a913f7e85cf99
SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce
-SHA1 (patch-toolkit_library_moz.build) = 7691379b70c317a4be4ee066489739417f61872e
-SHA1 (patch-toolkit_moz.configure) = 2ca61cfd7e338dbc142acd30f43894d05ce92071
+SHA1 (patch-toolkit_library_gtest_moz.build) = a8ac2a2930ac00f891a695639acfadef2679a599
+SHA1 (patch-toolkit_library_moz.build) = f77301bd81d37e7a599dbff57fba47428e4a00e2
+SHA1 (patch-toolkit_moz.configure) = 78388529e8450d1db0c3f58848d7466a354ddf4b
+SHA1 (patch-toolkit_toolkit.mozbuild) = e7c56631a061f80bfb5a6c8825ba42d5f2c1e76a
SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
+SHA1 (patch-toolkit_xre_nsAppRunner.cpp) = 40c3822ed227108fa6d90323dc19828d5e3ac996
SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 4a6ae13adfdfc63d50c1a53ee71aad1ee82e6131
+SHA1 (patch-xpcom_base_nsDebugImpl.cpp) = 80d251f2227ddc78f435ec2a5aa19c6512c1c15c
SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4
SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 1e7cc3a7fd9515b10307fafa2b01ed689320bd54
SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 950874fbc255c93a828bddd84ffe8478094214cc
@@ -104,3 +118,4 @@ SHA1 (patch-xpcom_reflect_xptcall_md_uni
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__mips.S) = 79a4686d368132aff804f217baa685b2e06bc396
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__asm__sparc64__netbsd.s) = 522bc237bc90d85c98b61a467a431fddd91d8c3c
SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcstubs__netbsd__m68k.cpp) = 75db49c9cb6bf2993afba82b731d80389d866212
+SHA1 (patch-xpcom_rust_nsstring_gtest_moz.build) = 3ab2c533b57e9f55a20afffb521a4498418b33eb
Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.96 pkgsrc/www/firefox/mozilla-common.mk:1.97
--- pkgsrc/www/firefox/mozilla-common.mk:1.96 Wed Jul 12 01:47:10 2017
+++ pkgsrc/www/firefox/mozilla-common.mk Thu Aug 10 14:46:15 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.96 2017/07/12 01:47:10 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.97 2017/08/10 14:46:15 ryoon Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@@ -67,8 +67,6 @@ CONFIGURE_ARGS+= --disable-libjpeg-turbo
CONFIGURE_ARGS+= --disable-elf-hack
CONFIGURE_ARGS+= --disable-gconf
-CONFIGURE_ARGS+= --enable-gio
-CONFIGURE_ARGS+= --enable-extensions=gio
#CONFIGURE_ARGS+= --enable-readline
CONFIGURE_ARGS+= --enable-url-classifier
CONFIGURE_ARGS+= --disable-icf
Index: pkgsrc/www/firefox/options.mk
diff -u pkgsrc/www/firefox/options.mk:1.41 pkgsrc/www/firefox/options.mk:1.42
--- pkgsrc/www/firefox/options.mk:1.41 Mon May 15 15:49:27 2017
+++ pkgsrc/www/firefox/options.mk Thu Aug 10 14:46:15 2017
@@ -1,11 +1,7 @@
-# $NetBSD: options.mk,v 1.41 2017/05/15 15:49:27 maya Exp $
+# $NetBSD: options.mk,v 1.42 2017/08/10 14:46:15 ryoon Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
-PKG_OPTIONS_REQUIRED_GROUPS= gtk
-PKG_OPTIONS_GROUP.gtk= gtk2 gtk3
-PKG_SUGGESTED_OPTIONS= gtk3
-
PKG_SUPPORTED_OPTIONS= official-mozilla-branding
PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus
@@ -22,22 +18,9 @@ PKG_SUGGESTED_OPTIONS.Linux+= webrtc
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= gtk3
-.if !empty(PKG_OPTIONS:Mgtk2)
-CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1
-.include "../../x11/gtk2/buildlink3.mk"
-.endif
-
-# As of firefox-51 gtk2 is still pulled in implicitly
-.if !empty(PKG_OPTIONS:Mgtk3)
CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk3
-# gtk2 needed even if --enable-default-toolkit=cairo-gtk3
-BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1
.include "../../x11/gtk2/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
-PLIST.gtk3= yes
-.endif
.if !empty(PKG_OPTIONS:Malsa)
CONFIGURE_ARGS+= --enable-alsa
Index: pkgsrc/www/firefox/patches/patch-aa
diff -u pkgsrc/www/firefox/patches/patch-aa:1.52 pkgsrc/www/firefox/patches/patch-aa:1.53
--- pkgsrc/www/firefox/patches/patch-aa:1.52 Wed Jun 14 11:28:44 2017
+++ pkgsrc/www/firefox/patches/patch-aa Thu Aug 10 14:46:15 2017
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.52 2017/06/14 11:28:44 ryoon Exp $
+$NetBSD: patch-aa,v 1.53 2017/08/10 14:46:15 ryoon Exp $
* Disable libjpeg-turbo check
* Add system libraries option
* Add OSS audio support
---- old-configure.in.orig 2017-06-05 20:45:16.000000000 +0000
+--- old-configure.in.orig 2017-07-31 16:20:51.000000000 +0000
+++ old-configure.in
-@@ -2049,11 +2049,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
+@@ -2061,11 +2061,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
#include <jpeglib.h> ],
[ #if JPEG_LIB_VERSION < $MOZJPEG
#error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -19,7 +19,35 @@ $NetBSD: patch-aa,v 1.52 2017/06/14 11:2
MOZ_SYSTEM_JPEG=1,
AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
fi
-@@ -2825,7 +2821,7 @@ dnl Use integers over floats for audio o
+@@ -2333,9 +2329,14 @@ if test -n "$MOZ_MULET"; then
+ fi
+
+ # Propagate feature switches for code written in rust from confvars.sh
+-if test -n "$MOZ_RUST_URLPARSE"; then
+- AC_DEFINE(MOZ_RUST_URLPARSE)
+- AC_SUBST(MOZ_RUST_URLPARSE)
++if test -n "$MOZ_RUST"; then
++ if test -n "$MOZ_RUST_MP4PARSE"; then
++ AC_DEFINE(MOZ_RUST_MP4PARSE)
++ fi
++ if test -n "$MOZ_RUST_URLPARSE"; then
++ AC_DEFINE(MOZ_RUST_URLPARSE)
++ AC_SUBST(MOZ_RUST_URLPARSE)
++ fi
+ fi
+
+ AC_SUBST(MOZ_PHOENIX)
+@@ -2712,6 +2713,9 @@ if test -n "$MOZ_WEBRTC"; then
+ AC_DEFINE(MOZ_WEBRTC_ASSERT_ALWAYS)
+ MOZ_RAW=1
+
++ dnl with libv4l2 we can support more cameras
++ PKG_CHECK_MODULES(MOZ_LIBV4L2, libv4l2)
++
+ dnl enable once Signaling lands
+ MOZ_WEBRTC_SIGNALING=1
+ AC_DEFINE(MOZ_WEBRTC_SIGNALING)
+@@ -2754,7 +2758,7 @@ dnl Use integers over floats for audio o
dnl (regarless of the CPU architecture, because audio
dnl backends for those platforms don't support floats. We also
dnl use integers on ARM with other OS, because it's more efficient.
@@ -28,7 +56,7 @@ $NetBSD: patch-aa,v 1.52 2017/06/14 11:2
MOZ_SAMPLE_TYPE_S16=1
AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
AC_SUBST(MOZ_SAMPLE_TYPE_S16)
-@@ -2933,6 +2929,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then
+@@ -2845,6 +2849,111 @@ if test -n "$MOZ_OMX_PLUGIN"; then
fi
fi
@@ -140,7 +168,7 @@ $NetBSD: patch-aa,v 1.52 2017/06/14 11:2
dnl system libvpx Support
dnl ========================================================
MOZ_ARG_WITH_BOOL(system-libvpx,
-@@ -3093,6 +3194,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
+@@ -3005,6 +3114,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
AC_SUBST(MOZ_WEBM_ENCODER)
dnl ==================================
@@ -208,7 +236,7 @@ $NetBSD: patch-aa,v 1.52 2017/06/14 11:2
dnl = Check alsa availability on Linux
dnl ==================================
-@@ -4818,6 +4980,27 @@ dnl ====================================
+@@ -4690,6 +4860,27 @@ dnl ====================================
AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
dnl ========================================================
Index: pkgsrc/www/firefox/patches/patch-browser_confvars.sh
diff -u pkgsrc/www/firefox/patches/patch-browser_confvars.sh:1.1 pkgsrc/www/firefox/patches/patch-browser_confvars.sh:1.2
--- pkgsrc/www/firefox/patches/patch-browser_confvars.sh:1.1 Wed Jun 14 11:28:44 2017
+++ pkgsrc/www/firefox/patches/patch-browser_confvars.sh Thu Aug 10 14:46:15 2017
@@ -1,6 +1,6 @@
-$NetBSD: patch-browser_confvars.sh,v 1.1 2017/06/14 11:28:44 ryoon Exp $
+$NetBSD: patch-browser_confvars.sh,v 1.2 2017/08/10 14:46:15 ryoon Exp $
---- browser/confvars.sh.orig 2017-06-05 20:45:14.000000000 +0000
+--- browser/confvars.sh.orig 2017-07-31 16:20:48.000000000 +0000
+++ browser/confvars.sh
@@ -30,6 +30,7 @@ if test "$OS_ARCH" = "WINNT"; then
fi
Index: pkgsrc/www/firefox/patches/patch-build_moz.configure_rust.configure
diff -u pkgsrc/www/firefox/patches/patch-build_moz.configure_rust.configure:1.1 pkgsrc/www/firefox/patches/patch-build_moz.configure_rust.configure:1.2
--- pkgsrc/www/firefox/patches/patch-build_moz.configure_rust.configure:1.1 Wed Jun 14 11:28:44 2017
+++ pkgsrc/www/firefox/patches/patch-build_moz.configure_rust.configure Thu Aug 10 14:46:15 2017
@@ -1,6 +1,6 @@
-$NetBSD: patch-build_moz.configure_rust.configure,v 1.1 2017/06/14 11:28:44 ryoon Exp $
+$NetBSD: patch-build_moz.configure_rust.configure,v 1.2 2017/08/10 14:46:15 ryoon Exp $
---- build/moz.configure/rust.configure.orig 2017-06-05 20:45:15.000000000 +0000
+--- build/moz.configure/rust.configure.orig 2017-07-31 16:20:49.000000000 +0000
+++ build/moz.configure/rust.configure
@@ -4,10 +4,20 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -42,3 +42,30 @@ $NetBSD: patch-build_moz.configure_rust.
if not rustc_info:
die(dedent('''\
Rust compiler not found.
+@@ -97,6 +110,9 @@ def rust_compiler(rustc_info, cargo_info
+
+ return True
+
++set_define('MOZ_RUST', rust_compiler)
++set_config('MOZ_RUST', rust_compiler)
++
+ @template
+ def rust_triple_alias(host_or_target):
+ """Template defining the alias used for rustc's --target flag.
+@@ -227,7 +243,8 @@ set_config('RUST_HOST_TARGET', rust_host
+
+ @depends(rust_target_triple)
+ def rust_target_env_name(triple):
+- return triple.upper().replace('-','_')
++ if triple:
++ return triple.upper().replace('-','_')
+
+ # We need this to form various Cargo environment variables, as there is no
+ # uppercase function in make, and we don't want to shell out just for
+@@ -235,5 +252,6 @@ def rust_target_env_name(triple):
+ set_config('RUST_TARGET_ENV_NAME', rust_target_env_name)
+
+ # Until we remove all the other Rust checks in old-configure.
++add_old_configure_assignment('MOZ_RUST', rust_compiler)
+ add_old_configure_assignment('RUSTC', rustc)
+ add_old_configure_assignment('RUST_TARGET', rust_target_triple)
Index: pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp
diff -u pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp:1.1 pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp:1.2
--- pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp:1.1 Thu Jun 29 08:07:59 2017
+++ pkgsrc/www/firefox/patches/patch-ipc_glue_CrossProcessSemaphore__posix.cpp Thu Aug 10 14:46:15 2017
@@ -1,9 +1,9 @@
-$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.1 2017/06/29 08:07:59 martin Exp $
+$NetBSD: patch-ipc_glue_CrossProcessSemaphore__posix.cpp,v 1.2 2017/08/10 14:46:15 ryoon Exp $
- avoid use of sem_t on NetBSD
http://mail-index.netbsd.org/pkgsrc-bugs/2017/06/23/msg062225.html
---- ipc/glue/CrossProcessSemaphore_posix.cpp.orig 2017-06-25 05:29:49.000000000 +0000
+--- ipc/glue/CrossProcessSemaphore_posix.cpp.orig 2017-07-31 16:20:47.000000000 +0000
+++ ipc/glue/CrossProcessSemaphore_posix.cpp
@@ -9,6 +9,11 @@
#include "nsDebug.h"
@@ -50,8 +50,8 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
CrossProcessSemaphore* sem = new CrossProcessSemaphore;
sem->mSharedBuffer = sharedBuffer;
+#if defined(__NetBSD__)
-+ sem->mMutex = &data->mMutex;
-+ sem->mNotZero = &data->mNotZero;
++ sem->mMutex = &data->mMutex;
++ sem->mNotZero = &data->mNotZero;
+ sem->mValue = &data->mValue;
+#else
sem->mSemaphore = &data->mSemaphore;
@@ -82,8 +82,8 @@ $NetBSD: patch-ipc_glue_CrossProcessSema
CrossProcessSemaphore* sem = new CrossProcessSemaphore;
sem->mSharedBuffer = sharedBuffer;
+#if defined(__NetBSD__)
-+ sem->mMutex = &data->mMutex;
-+ sem->mNotZero = &data->mNotZero;
++ sem->mMutex = &data->mMutex;
++ sem->mNotZero = &data->mNotZero;
+ sem->mValue = &data->mValue;
+#else
sem->mSemaphore = &data->mSemaphore;
Index: pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_DecoderData.cpp
diff -u pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_DecoderData.cpp:1.1 pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_DecoderData.cpp:1.2
--- pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_DecoderData.cpp:1.1 Wed Jun 14 11:28:44 2017
+++ pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_DecoderData.cpp Thu Aug 10 14:46:15 2017
@@ -1,6 +1,6 @@
-$NetBSD: patch-media_libstagefright_binding_DecoderData.cpp,v 1.1 2017/06/14 11:28:44 ryoon Exp $
+$NetBSD: patch-media_libstagefright_binding_DecoderData.cpp,v 1.2 2017/08/10 14:46:15 ryoon Exp $
---- media/libstagefright/binding/DecoderData.cpp.orig 2017-06-05 20:45:14.000000000 +0000
+--- media/libstagefright/binding/DecoderData.cpp.orig 2017-07-31 16:20:49.000000000 +0000
+++ media/libstagefright/binding/DecoderData.cpp
@@ -13,9 +13,11 @@
#include "mozilla/ArrayUtils.h"
@@ -13,16 +13,16 @@ $NetBSD: patch-media_libstagefright_bind
+#endif // MOZ_RUST_MP4PARSE
using namespace stagefright;
-
-@@ -187,6 +189,7 @@ MP4VideoInfo::Update(const MetaData* aMe
-
+ using mozilla::media::TimeUnit;
+@@ -177,6 +179,7 @@ MP4VideoInfo::Update(const MetaData* aMe
+ FindData(aMetaData, kKeyAVCC, mExtraData);
}
+#ifdef MOZ_RUST_MP4PARSE
static void
UpdateTrackProtectedInfo(mozilla::TrackInfo& aConfig,
const mp4parse_sinf_info& aSinf)
-@@ -266,6 +269,7 @@ MP4VideoInfo::Update(const mp4parse_trac
+@@ -263,6 +266,7 @@ MP4VideoInfo::Update(const mp4parse_trac
mExtraData->AppendElements(video->extra_data.data, video->extra_data.length);
}
}
Index: pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_MP4Metadata.cpp
diff -u pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_MP4Metadata.cpp:1.1 pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_MP4Metadata.cpp:1.2
--- pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_MP4Metadata.cpp:1.1 Wed Jun 14 11:28:44 2017
+++ pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_MP4Metadata.cpp Thu Aug 10 14:46:15 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-media_libstagefright_binding_MP4Metadata.cpp,v 1.1 2017/06/14 11:28:44 ryoon Exp $
+$NetBSD: patch-media_libstagefright_binding_MP4Metadata.cpp,v 1.2 2017/08/10 14:46:15 ryoon Exp $
---- media/libstagefright/binding/MP4Metadata.cpp.orig 2017-06-05 20:45:14.000000000 +0000
+--- media/libstagefright/binding/MP4Metadata.cpp.orig 2017-07-31 16:20:49.000000000 +0000
+++ media/libstagefright/binding/MP4Metadata.cpp
-@@ -19,14 +19,18 @@
+@@ -20,14 +20,18 @@
#include "mp4_demuxer/MP4Metadata.h"
#include "mp4_demuxer/Stream.h"
#include "MediaPrefs.h"
@@ -20,8 +20,8 @@ $NetBSD: patch-media_libstagefright_bind
+#endif // MOZ_RUST_MP4PARSE
using namespace stagefright;
-
-@@ -101,6 +105,7 @@ private:
+ using mozilla::media::TimeUnit;
+@@ -105,6 +109,7 @@ private:
bool mCanSeek;
};
@@ -29,19 +29,35 @@ $NetBSD: patch-media_libstagefright_bind
// Wrap an mp4_demuxer::Stream to remember the read offset.
class RustStreamAdaptor {
-@@ -145,9 +150,11 @@ private:
+@@ -151,6 +156,7 @@ private:
RustStreamAdaptor mRustSource;
mozilla::UniquePtr<mp4parse_parser, FreeMP4Parser> mRustParser;
};
+#endif // MOZ_RUST_MP4PARSE
+ class IndiceWrapperStagefright : public IndiceWrapper {
+ public:
+@@ -187,6 +193,7 @@ IndiceWrapperStagefright::GetIndice(size
+ return true;
+ }
+
++#ifdef MOZ_RUST_MP4PARSE
+ // the owner of mIndice is rust mp4 paser, so lifetime of this class
+ // SHOULD NOT longer than rust parser.
+ class IndiceWrapperRust : public IndiceWrapper
+@@ -232,9 +239,11 @@ IndiceWrapperRust::GetIndice(size_t aInd
+ aIndice.sync = indice->sync;
+ return true;
+ }
++#endif // MOZ_RUST_MP4PARSE
+
MP4Metadata::MP4Metadata(Stream* aSource)
: mStagefright(MakeUnique<MP4MetadataStagefright>(aSource))
+#ifdef MOZ_RUST_MP4PARSE
, mRust(MakeUnique<MP4MetadataRust>(aSource))
- , mPreferRust(false)
+ , mPreferRust(MediaPrefs::EnableRustMP4Parser())
, mReportedAudioTrackTelemetry(false)
-@@ -155,6 +162,7 @@ MP4Metadata::MP4Metadata(Stream* aSource
+@@ -242,6 +251,7 @@ MP4Metadata::MP4Metadata(Stream* aSource
#ifndef RELEASE_OR_BETA
, mRustTestMode(MediaPrefs::RustTestMode())
#endif
@@ -49,44 +65,46 @@ $NetBSD: patch-media_libstagefright_bind
{
}
-@@ -186,6 +194,7 @@ MP4Metadata::GetNumberTracks(mozilla::Tr
- {
- uint32_t numTracks = mStagefright->GetNumberTracks(aType);
+@@ -274,8 +284,11 @@ MP4Metadata::GetNumberTracks(mozilla::Tr
+ MP4Metadata::ResultAndTrackCount numTracks =
+ mStagefright->GetNumberTracks(aType);
+#ifdef MOZ_RUST_MP4PARSE
if (!mRust) {
++#endif // MOZ_RUST_MP4PARSE
return numTracks;
++#ifdef MOZ_RUST_MP4PARSE
}
-@@ -211,10 +220,12 @@ MP4Metadata::GetNumberTracks(mozilla::Tr
- mPreferRust = true;
- return numTracksRust;
- }
-+#endif // MOZ_RUST_MP4PARSE
- return numTracks;
+ MP4Metadata::ResultAndTrackCount numTracksRust =
+@@ -350,8 +363,10 @@ MP4Metadata::GetNumberTracks(mozilla::Tr
+ // Same non-error numbers, just return any.
+ // (Choosing Rust here, in case it carries a warning, we'd want to know that.)
+ return numTracksRust;
++#endif // MOZ_RUST_MP4PARSE
}
+#ifdef MOZ_RUST_MP4PARSE
bool MP4Metadata::ShouldPreferRust() const {
if (!mRust) {
return false;
-@@ -245,6 +256,7 @@ bool MP4Metadata::ShouldPreferRust() con
+@@ -389,6 +404,7 @@ bool MP4Metadata::ShouldPreferRust() con
// Otherwise, fall back.
return false;
}
+#endif // MOZ_RUST_MP4PARSE
- mozilla::UniquePtr<mozilla::TrackInfo>
- MP4Metadata::GetTrackInfo(mozilla::TrackInfo::TrackType aType,
-@@ -253,6 +265,7 @@ MP4Metadata::GetTrackInfo(mozilla::Track
- mozilla::UniquePtr<mozilla::TrackInfo> info =
- mStagefright->GetTrackInfo(aType, aTrackNumber);
+ static const char*
+ GetDifferentField(const mozilla::TrackInfo& info,
+@@ -443,6 +459,7 @@ MP4Metadata::GetTrackInfo(mozilla::Track
+ MP4Metadata::ResultAndTrackInfo info =
+ mStagefright->GetTrackInfo(aType, aTrackNumber);
+#ifdef MOZ_RUST_MP4PARSE
if (!mRust) {
return info;
}
-@@ -305,6 +318,7 @@ MP4Metadata::GetTrackInfo(mozilla::Track
+@@ -514,6 +531,7 @@ MP4Metadata::GetTrackInfo(mozilla::Track
if (mPreferRust) {
return infoRust;
}
@@ -94,15 +112,15 @@ $NetBSD: patch-media_libstagefright_bind
return info;
}
-@@ -319,6 +333,7 @@ const CryptoFile&
+@@ -528,6 +546,7 @@ MP4Metadata::ResultAndCryptoFile
MP4Metadata::Crypto() const
{
- const CryptoFile& crypto = mStagefright->Crypto();
+ MP4Metadata::ResultAndCryptoFile crypto = mStagefright->Crypto();
+#ifdef MOZ_RUST_MP4PARSE
- const CryptoFile& rustCrypto = mRust->Crypto();
+ MP4Metadata::ResultAndCryptoFile rustCrypto = mRust->Crypto();
#ifndef RELEASE_OR_BETA
-@@ -330,6 +345,7 @@ MP4Metadata::Crypto() const
+@@ -548,6 +567,7 @@ MP4Metadata::Crypto() const
if (mPreferRust) {
return rustCrypto;
}
@@ -110,17 +128,59 @@ $NetBSD: patch-media_libstagefright_bind
return crypto;
}
-@@ -594,6 +610,7 @@ MP4MetadataStagefright::Metadata(Stream*
- return parser->Metadata();
+@@ -556,17 +576,22 @@ MP4Metadata::ResultAndIndice
+ MP4Metadata::GetTrackIndice(mozilla::TrackID aTrackID)
+ {
+ FallibleTArray<Index::Indice> indiceSF;
++#ifdef MOZ_RUST_MP4PARSE
+ if (!mPreferRust
+ #ifndef RELEASE_OR_BETA
+ || mRustTestMode
+ #endif
+ ) {
++#endif // MOZ_RUST_MP4PARSE
+ MediaResult rv = mStagefright->ReadTrackIndex(indiceSF, aTrackID);
+ if (NS_FAILED(rv)) {
+ return {Move(rv), nullptr};
+ }
++#ifdef MOZ_RUST_MP4PARSE
+ }
++#endif // MOZ_RUST_MP4PARSE
+
++#ifdef MOZ_RUST_MP4PARSE
+ mp4parse_byte_data indiceRust = {};
+ if (mPreferRust
+ #ifndef RELEASE_OR_BETA
+@@ -592,13 +617,18 @@ MP4Metadata::GetTrackIndice(mozilla::Tra
+ }
+ }
+ #endif
++#endif // MOZ_RUST_MP4PARSE
+
+ UniquePtr<IndiceWrapper> indice;
++#ifdef MOZ_RUST_MP4PARSE
+ if (mPreferRust) {
+ indice = mozilla::MakeUnique<IndiceWrapperRust>(indiceRust);
+ } else {
++#endif // MOZ_RUST_MP4PARSE
+ indice = mozilla::MakeUnique<IndiceWrapperStagefright>(indiceSF);
++#ifdef MOZ_RUST_MP4PARSE
+ }
++#endif // MOZ_RUST_MP4PARSE
+
+ return {NS_OK, Move(indice)};
+ }
+@@ -856,6 +886,7 @@ MP4MetadataStagefright::Metadata(Stream*
+ return {NS_OK, Move(buffer)};
}
+#ifdef MOZ_RUST_MP4PARSE
bool
RustStreamAdaptor::Read(uint8_t* buffer, uintptr_t size, size_t* bytes_read)
{
-@@ -859,5 +876,6 @@ MP4MetadataRust::Metadata(Stream* aSourc
+@@ -1152,5 +1183,6 @@ MP4MetadataRust::Metadata(Stream* aSourc
MOZ_ASSERT(false, "Not yet implemented");
- return nullptr;
+ return {NS_ERROR_NOT_IMPLEMENTED, nullptr};
}
+#endif // MOZ_RUST_MP4PARSE
Index: pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h
diff -u pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h:1.1
pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h:1.2
--- pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h:1.1 Wed Jun 14 11:28:44 2017
+++ pkgsrc/www/firefox/patches/patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h Thu Aug 10 14:46:15 2017
@@ -1,8 +1,18 @@
-$NetBSD: patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h,v 1.1 2017/06/14 11:28:44 ryoon Exp $
+$NetBSD: patch-media_libstagefright_binding_include_mp4__demuxer_MP4Metadata.h,v 1.2 2017/08/10 14:46:15 ryoon Exp $
---- media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h.orig 2017-06-05 20:45:14.000000000 +0000
+--- media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h.orig 2017-07-31 16:20:49.000000000 +0000
+++ media/libstagefright/binding/include/mp4_demuxer/MP4Metadata.h
-@@ -36,6 +36,7 @@ public:
+@@ -13,7 +13,9 @@
+ #include "MediaInfo.h"
+ #include "MediaResult.h"
+ #include "Stream.h"
++#ifdef MOZ_RUST_MP4PARSE
+ #include "mp4parse.h"
++#endif // MOZ_RUST_MP4PARSE
+
+ namespace mp4_demuxer {
+
+@@ -82,6 +84,7 @@ public:
private:
UniquePtr<MP4MetadataStagefright> mStagefright;
@@ -10,7 +20,7 @@ $NetBSD: patch-media_libstagefright_bind
UniquePtr<MP4MetadataRust> mRust;
mutable bool mPreferRust;
mutable bool mReportedAudioTrackTelemetry;
-@@ -44,6 +45,7 @@ private:
+@@ -90,6 +93,7 @@ private:
mutable bool mRustTestMode;
#endif
bool ShouldPreferRust() const;
Index: pkgsrc/www/firefox/patches/patch-mobile_android_confvars.sh
diff -u pkgsrc/www/firefox/patches/patch-mobile_android_confvars.sh:1.1 pkgsrc/www/firefox/patches/patch-mobile_android_confvars.sh:1.2
--- pkgsrc/www/firefox/patches/patch-mobile_android_confvars.sh:1.1 Wed Jun 14 11:28:44 2017
+++ pkgsrc/www/firefox/patches/patch-mobile_android_confvars.sh Thu Aug 10 14:46:15 2017
@@ -1,6 +1,6 @@
-$NetBSD: patch-mobile_android_confvars.sh,v 1.1 2017/06/14 11:28:44 ryoon Exp $
+$NetBSD: patch-mobile_android_confvars.sh,v 1.2 2017/08/10 14:46:15 ryoon Exp $
---- mobile/android/confvars.sh.orig 2017-06-05 20:45:15.000000000 +0000
+--- mobile/android/confvars.sh.orig 2017-07-31 16:20:50.000000000 +0000
+++ mobile/android/confvars.sh
@@ -30,6 +30,8 @@ MOZ_XULRUNNER=
MOZ_CAPTURE=1
Index: pkgsrc/www/firefox/patches/patch-toolkit_components_telemetry_Histograms.json
diff -u pkgsrc/www/firefox/patches/patch-toolkit_components_telemetry_Histograms.json:1.1 pkgsrc/www/firefox/patches/patch-toolkit_components_telemetry_Histograms.json:1.2
--- pkgsrc/www/firefox/patches/patch-toolkit_components_telemetry_Histograms.json:1.1 Wed Jun 14 11:28:44 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_components_telemetry_Histograms.json Thu Aug 10 14:46:15 2017
@@ -1,18 +1,18 @@
-$NetBSD: patch-toolkit_components_telemetry_Histograms.json,v 1.1 2017/06/14 11:28:44 ryoon Exp $
+$NetBSD: patch-toolkit_components_telemetry_Histograms.json,v 1.2 2017/08/10 14:46:15 ryoon Exp $
---- toolkit/components/telemetry/Histograms.json.orig 2017-06-05 20:45:22.000000000 +0000
+--- toolkit/components/telemetry/Histograms.json.orig 2017-07-31 16:20:51.000000000 +0000
+++ toolkit/components/telemetry/Histograms.json
-@@ -7022,7 +7022,8 @@
- "expires_in_version": "55",
+@@ -8337,7 +8337,8 @@
+ "expires_in_version": "60",
"kind": "boolean",
"bug_numbers": [1220885],
-- "description": "(Bug 1220885) Whether the rust mp4 demuxer successfully parsed a stream segment."
-+ "description": "(Bug 1220885) Whether the rust mp4 demuxer successfully parsed a stream segment.",
+- "description": "Whether the rust mp4 demuxer successfully parsed a stream segment."
++ "description": "Whether the rust mp4 demuxer successfully parsed a stream segment.",
+ "cpp_guard": "MOZ_RUST_MP4PARSE"
},
"MEDIA_RUST_MP4PARSE_ERROR_CODE": {
- "alert_emails": ["giles%mozilla.com@localhost", "kinetik%flim.org@localhost"],
-@@ -7030,21 +7031,24 @@
+ "record_in_processes": ["main", "content"],
+@@ -8346,7 +8347,8 @@
"kind": "enumerated",
"n_values": 32,
"bug_numbers": [1238420],
@@ -21,8 +21,9 @@ $NetBSD: patch-toolkit_components_teleme
+ "cpp_guard": "MOZ_RUST_MP4PARSE"
},
"MEDIA_RUST_MP4PARSE_TRACK_MATCH_AUDIO": {
- "alert_emails": ["giles%mozilla.com@localhost", "kinetik%flim.org@localhost"],
- "expires_in_version": "55",
+ "record_in_processes": ["main", "content"],
+@@ -8354,7 +8356,8 @@
+ "expires_in_version": "60",
"kind": "boolean",
"bug_numbers": [1231169],
- "description": "Whether rust and stagefight mp4 parser audio track results match."
@@ -30,8 +31,9 @@ $NetBSD: patch-toolkit_components_teleme
+ "cpp_guard": "MOZ_RUST_MP4PARSE"
},
"MEDIA_RUST_MP4PARSE_TRACK_MATCH_VIDEO": {
- "alert_emails": ["giles%mozilla.com@localhost", "kinetik%flim.org@localhost"],
- "expires_in_version": "55",
+ "record_in_processes": ["main", "content"],
+@@ -8362,7 +8365,8 @@
+ "expires_in_version": "60",
"kind": "boolean",
"bug_numbers": [1231169],
- "description": "Whether rust and stagefight mp4 parser video track results match."
@@ -39,4 +41,4 @@ $NetBSD: patch-toolkit_components_teleme
+ "cpp_guard": "MOZ_RUST_MP4PARSE"
},
"MEDIA_WMF_DECODE_ERROR": {
- "expires_in_version": "55",
+ "record_in_processes": ["main", "content", "gpu"],
Index: pkgsrc/www/firefox/patches/patch-config_system-headers
diff -u pkgsrc/www/firefox/patches/patch-config_system-headers:1.24 pkgsrc/www/firefox/patches/patch-config_system-headers:1.25
--- pkgsrc/www/firefox/patches/patch-config_system-headers:1.24 Wed Jun 14 11:28:44 2017
+++ pkgsrc/www/firefox/patches/patch-config_system-headers Thu Aug 10 14:46:15 2017
@@ -1,12 +1,12 @@
-$NetBSD: patch-config_system-headers,v 1.24 2017/06/14 11:28:44 ryoon Exp $
+$NetBSD: patch-config_system-headers,v 1.25 2017/08/10 14:46:15 ryoon Exp $
* Try to support Video4Linux2
* Resolve libm undefined error
* Support system libraries
---- config/system-headers.orig 2017-06-05 20:45:15.000000000 +0000
+--- config/system-headers.orig 2017-07-31 16:20:50.000000000 +0000
+++ config/system-headers
-@@ -625,6 +625,7 @@ libgnome/libgnome.h
+@@ -626,6 +626,7 @@ libgnome/libgnome.h
libgnomeui/gnome-icon-lookup.h
libgnomeui/gnome-icon-theme.h
libgnomeui/gnome-ui-init.h
@@ -14,7 +14,7 @@ $NetBSD: patch-config_system-headers,v 1
limits.h
link.h
#ifdef ANDROID
-@@ -1268,6 +1269,24 @@ libsn/sn-launcher.h
+@@ -1267,6 +1268,15 @@ libsn/sn-launcher.h
libsn/sn-monitor.h
libsn/sn-util.h
#endif
@@ -27,19 +27,10 @@ $NetBSD: patch-config_system-headers,v 1
+harfbuzz/hb-ot.h
+harfbuzz/hb.h
+#endif
-+#if MOZ_SYSTEM_GRAPHITE2==1
-+graphite2/Font.h
-+graphite2/Segment.h
-+#endif
-+#if MOZ_SYSTEM_HARFBUZZ==1
-+harfbuzz/hb-glib.h
-+harfbuzz/hb-ot.h
-+harfbuzz/hb.h
-+#endif
#if MOZ_SYSTEM_HUNSPELL==1
hunspell.hxx
#endif
-@@ -1338,3 +1357,31 @@ unicode/utypes.h
+@@ -1335,3 +1345,17 @@ unicode/utypes.h
libutil.h
unwind.h
fenv.h
@@ -57,17 +48,3 @@ $NetBSD: patch-config_system-headers,v 1
+#if MOZ_SYSTEM_TREMOR==1
+tremor/ivorbiscodec.h
+#endif
-+#if MOZ_SYSTEM_OGG==1
-+ogg/ogg.h
-+ogg/os_types.h
-+#endif
-+#if MOZ_SYSTEM_THEORA==1
-+theora/theoradec.h
-+#endif
-+#if MOZ_SYSTEM_VORBIS==1
-+vorbis/codec.h
-+vorbis/vorbisenc.h
-+#endif
-+#if MOZ_SYSTEM_TREMOR==1
-+tremor/ivorbiscodec.h
-+#endif
Index: pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread.h
diff -u pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread.h:1.5 pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread.h:1.6
--- pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread.h:1.5 Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread.h Thu Aug 10 14:46:15 2017
@@ -1,11 +1,11 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.5 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_platform__thread.h,v 1.6 2017/08/10 14:46:15 ryoon Exp $
* Support Solaris
---- ipc/chromium/src/base/platform_thread.h.orig 2016-05-12 17:13:13.000000000 +0000
+--- ipc/chromium/src/base/platform_thread.h.orig 2017-07-31 16:20:47.000000000 +0000
+++ ipc/chromium/src/base/platform_thread.h
-@@ -25,6 +25,9 @@ typedef pthread_t PlatformThreadHandle;
- #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(__GLIBC__)
+@@ -27,6 +27,9 @@ typedef pthread_t PlatformThreadHandle;
+ #if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(__GLIBC__)
#include <unistd.h>
typedef pid_t PlatformThreadId;
+#elif defined(OS_SOLARIS)
Index: pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc
diff -u pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc:1.8 pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc:1.9
--- pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc:1.8 Thu Jun 16 12:08:21 2016
+++ pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_platform__thread__posix.cc Thu Aug 10 14:46:15 2017
@@ -1,11 +1,11 @@
-$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.8 2016/06/16 12:08:21 ryoon Exp $
+$NetBSD: patch-ipc_chromium_src_base_platform__thread__posix.cc,v 1.9 2017/08/10 14:46:15 ryoon Exp $
* Support NetBSD
* Support Solaris
---- ipc/chromium/src/base/platform_thread_posix.cc.orig 2016-05-12 17:13:13.000000000 +0000
+--- ipc/chromium/src/base/platform_thread_posix.cc.orig 2017-07-31 16:20:47.000000000 +0000
+++ ipc/chromium/src/base/platform_thread_posix.cc
-@@ -10,7 +10,9 @@
+@@ -12,7 +12,9 @@
#if defined(OS_MACOSX)
#include <mach/mach.h>
#elif defined(OS_NETBSD)
@@ -15,13 +15,3 @@ $NetBSD: patch-ipc_chromium_src_base_pla
#elif defined(OS_LINUX)
#include <sys/syscall.h>
#include <sys/prctl.h>
-@@ -105,7 +107,8 @@ void PlatformThread::SetName(const char*
- pthread_setname_np(pthread_self(), "%s", (void *)name);
- #elif defined(OS_BSD) && !defined(__GLIBC__)
- pthread_set_name_np(pthread_self(), name);
--#else
-+#elif !defined(OS_SOLARIS)
-+ prctl(PR_SET_NAME, reinterpret_cast<uintptr_t>(name), 0, 0, 0);
- #endif
- }
- #endif // !OS_MACOSX
Index: pkgsrc/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp
diff -u pkgsrc/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp:1.12 pkgsrc/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp:1.13
--- pkgsrc/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp:1.12 Thu Apr 27 01:49:47 2017
+++ pkgsrc/www/firefox/patches/patch-ipc_glue_GeckoChildProcessHost.cpp Thu Aug 10 14:46:15 2017
@@ -1,9 +1,9 @@
-$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.12 2017/04/27 01:49:47 ryoon Exp $
+$NetBSD: patch-ipc_glue_GeckoChildProcessHost.cpp,v 1.13 2017/08/10 14:46:15 ryoon Exp $
* Support Solaris
* Fix NetBSD linking
---- ipc/glue/GeckoChildProcessHost.cpp.orig 2017-04-11 04:15:17.000000000 +0000
+--- ipc/glue/GeckoChildProcessHost.cpp.orig 2017-07-31 16:20:47.000000000 +0000
+++ ipc/glue/GeckoChildProcessHost.cpp
@@ -4,7 +4,13 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,30 +19,3 @@ $NetBSD: patch-ipc_glue_GeckoChildProces
#include "base/command_line.h"
#include "base/string_util.h"
-@@ -730,7 +736,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
- // and passing wstrings from one config to the other is unsafe. So
- // we split the logic here.
-
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || defined(OS_SOLARIS)
- base::environment_map newEnvVars;
- ChildPrivileges privs = mPrivileges;
- if (privs == base::PRIVILEGES_DEFAULT ||
-@@ -865,7 +871,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
- childArgv.push_back(pidstring);
-
- #if defined(MOZ_CRASHREPORTER)
--# if defined(OS_LINUX) || defined(OS_BSD)
-+# if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_SOLARIS)
- int childCrashFd, childCrashRemapFd;
- if (!CrashReporter::CreateNotificationPipeForChild(
- &childCrashFd, &childCrashRemapFd))
-@@ -901,7 +907,7 @@ GeckoChildProcessHost::PerformAsyncLaunc
- LaunchAndroidService(childProcessType, childArgv, mFileMap, &process);
- #else
- base::LaunchApp(childArgv, mFileMap,
--#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
-+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) || defined(OS_SOLARIS)
- newEnvVars, privs,
- #endif
- false, &process, arch);
Index: pkgsrc/www/firefox/patches/patch-js_xpconnect_src_xpcprivate.h
diff -u pkgsrc/www/firefox/patches/patch-js_xpconnect_src_xpcprivate.h:1.3 pkgsrc/www/firefox/patches/patch-js_xpconnect_src_xpcprivate.h:1.4
--- pkgsrc/www/firefox/patches/patch-js_xpconnect_src_xpcprivate.h:1.3 Sat Dec 3 09:58:26 2016
+++ pkgsrc/www/firefox/patches/patch-js_xpconnect_src_xpcprivate.h Thu Aug 10 14:46:15 2017
@@ -1,12 +1,12 @@
-$NetBSD: patch-js_xpconnect_src_xpcprivate.h,v 1.3 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-js_xpconnect_src_xpcprivate.h,v 1.4 2017/08/10 14:46:15 ryoon Exp $
From commit log 1.1:
Instantiate WeakMapPtr explicitly to get the right visibility with
clang.
---- js/xpconnect/src/xpcprivate.h.orig 2016-10-31 20:15:38.000000000 +0000
+--- js/xpconnect/src/xpcprivate.h.orig 2017-07-31 16:20:47.000000000 +0000
+++ js/xpconnect/src/xpcprivate.h
-@@ -860,6 +860,8 @@ typedef nsTArray<InterpositionWhitelistP
+@@ -884,6 +884,8 @@ typedef nsTArray<InterpositionWhitelistP
/***************************************************************************/
// XPCWrappedNativeScope is one-to-one with a JS global object.
@@ -14,4 +14,4 @@ From commit log 1.1:
+
class nsIAddonInterposition;
class nsXPCComponentsBase;
- class XPCWrappedNativeScope final : public PRCList
+ class XPCWrappedNativeScope final
Index: pkgsrc/www/firefox/patches/patch-toolkit_moz.configure
diff -u pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.3 pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.4
--- pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.3 Wed Jun 14 11:28:44 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_moz.configure Thu Aug 10 14:46:15 2017
@@ -1,12 +1,22 @@
-$NetBSD: patch-toolkit_moz.configure,v 1.3 2017/06/14 11:28:44 ryoon Exp $
+$NetBSD: patch-toolkit_moz.configure,v 1.4 2017/08/10 14:46:15 ryoon Exp $
* Enable widevide CDM for NetBSD
---- toolkit/moz.configure.orig 2017-06-05 20:45:23.000000000 +0000
+--- toolkit/moz.configure.orig 2017-07-31 16:20:52.000000000 +0000
+++ toolkit/moz.configure
-@@ -343,6 +343,26 @@ add_old_configure_assignment('FT2_LIBS',
+@@ -88,8 +88,7 @@ include('../js/moz.configure')
+
+ # Rust
+ # ==============================================================
+-include('../build/moz.configure/rust.configure',
+- when='--enable-compile-environment')
++include('../build/moz.configure/rust.configure')
+
+
+ # L10N
+@@ -356,6 +355,26 @@ add_old_configure_assignment('FT2_LIBS',
add_old_configure_assignment('FT2_CFLAGS',
- delayed_getattr(ft2_info, 'cflags'))
+ ft2_info.cflags)
+# Graphite2
+# ==============================================================
@@ -23,7 +33,7 @@ $NetBSD: patch-toolkit_moz.configure,v 1
+option('--with-system-harfbuzz',
+ help="Use system harfbuzz (located with pkgconfig)")
+
-+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.3',
++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.6',
+ when='--with-system-harfbuzz')
+
+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
@@ -31,3 +41,38 @@ $NetBSD: patch-toolkit_moz.configure,v 1
# Apple platform decoder support
# ==============================================================
@depends(toolkit)
+@@ -623,13 +642,13 @@ id_and_secret_keyfile('Leanplum SDK')
+ option('--enable-stylo', nargs='?', choices=('build',),
+ help='Include Stylo in the build and/or enable it at runtime')
+
+-@depends('--enable-stylo')
+-def stylo_config(value):
++@depends('--enable-stylo', '--enable-rust')
++def stylo_config(value, rust_enabled):
+ build_stylo = None
+ enable_stylo = None
+
+ # The default is to not build Stylo at all.
+- if value.origin == 'default':
++ if not rust_enabled or value.origin == 'default':
+ pass
+ elif value == 'build':
+ build_stylo = True
+@@ -769,12 +788,14 @@ set_config('SERVO_TARGET_DIR', servo_tar
+ option('--enable-webrender', nargs='?', choices=('build',),
+ help='Include WebRender in the build and/or enable it at runtime')
+
+-@depends('--enable-webrender', milestone)
+-def webrender(value, milestone):
++@depends('--enable-webrender', '--enable-rust', milestone)
++def webrender(value, rust_enabled, milestone):
+ build_webrender = None
+ enable_webrender = None
+
+- if value.origin == 'default':
++ if not rust_enabled:
++ pass
++ elif value.origin == 'default':
+ # if nothing is specified, default to just building on Nightly
+ build_webrender = milestone.is_nightly
+ elif value == 'build':
Index: pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb.c
diff -u pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb.c:1.6 pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb.c:1.7
--- pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb.c:1.6 Thu Apr 27 01:49:47 2017
+++ pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb.c Thu Aug 10 14:46:15 2017
@@ -1,10 +1,10 @@
-$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.6 2017/04/27 01:49:47 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb.c,v 1.7 2017/08/10 14:46:15 ryoon Exp $
* Support OSS audio
---- media/libcubeb/src/cubeb.c.orig 2017-04-11 04:15:21.000000000 +0000
+--- media/libcubeb/src/cubeb.c.orig 2017-07-31 16:20:49.000000000 +0000
+++ media/libcubeb/src/cubeb.c
-@@ -54,6 +54,9 @@ int audiotrack_init(cubeb ** context, ch
+@@ -55,6 +55,9 @@ int audiotrack_init(cubeb ** context, ch
#if defined(USE_KAI)
int kai_init(cubeb ** context, char const * context_name);
#endif
@@ -14,7 +14,18 @@ $NetBSD: patch-media_libcubeb_src_cubeb.
static int
validate_stream_params(cubeb_stream_params * input_stream_params,
-@@ -138,6 +141,9 @@ cubeb_init(cubeb ** context, char const
+@@ -155,6 +158,10 @@ cubeb_init(cubeb ** context, char const
+ #if defined(USE_KAI)
+ init_oneshot = kai_init;
+ #endif
++ } else if (!strcmp(backend_name, "oss")) {
++#if defined(USE_OSS)
++ init_oneshot = oss_init;
++#endif
+ } else {
+ /* Already set */
+ }
+@@ -199,6 +206,9 @@ cubeb_init(cubeb ** context, char const
#if defined(USE_KAI)
kai_init,
#endif
Index: pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build
diff -u pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build:1.11 pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build:1.12
--- pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build:1.11 Thu Apr 27 01:49:47 2017
+++ pkgsrc/www/firefox/patches/patch-media_libcubeb_src_moz.build Thu Aug 10 14:46:15 2017
@@ -1,11 +1,11 @@
-$NetBSD: patch-media_libcubeb_src_moz.build,v 1.11 2017/04/27 01:49:47 ryoon Exp $
+$NetBSD: patch-media_libcubeb_src_moz.build,v 1.12 2017/08/10 14:46:15 ryoon Exp $
* Add OSS audio support
* Support system library
---- media/libcubeb/src/moz.build.orig 2017-04-11 04:15:21.000000000 +0000
+--- media/libcubeb/src/moz.build.orig 2017-07-31 16:20:49.000000000 +0000
+++ media/libcubeb/src/moz.build
-@@ -20,6 +20,12 @@ if CONFIG['MOZ_ALSA']:
+@@ -22,6 +22,12 @@ if CONFIG['MOZ_ALSA']:
]
DEFINES['USE_ALSA'] = True
@@ -18,9 +18,19 @@ $NetBSD: patch-media_libcubeb_src_moz.bu
if CONFIG['MOZ_PULSEAUDIO'] or CONFIG['MOZ_JACK']:
SOURCES += [
'cubeb_resampler.cpp',
-@@ -92,6 +98,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk
- '%' + '%s/system/media/wilhelm/include' % CONFIG['ANDROID_SOURCE'],
- ]
+@@ -32,7 +38,8 @@ if CONFIG['MOZ_PULSEAUDIO']:
+ 'cubeb_pulse.c',
+ ]
+ DEFINES['USE_PULSE'] = True
+- DEFINES['USE_PULSE_RUST'] = True
++ if CONFIG['MOZ_RUST']:
++ DEFINES['USE_PULSE_RUST'] = True
+
+ if CONFIG['MOZ_JACK']:
+ SOURCES += [
+@@ -85,6 +92,7 @@ if CONFIG['OS_TARGET'] == 'Android':
+
+ FINAL_LIBRARY = 'gkmedias'
+CFLAGS += CONFIG['MOZ_OSS_CFLAGS']
CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
Index: pkgsrc/www/firefox/patches/patch-media_libcubeb_update.sh
diff -u pkgsrc/www/firefox/patches/patch-media_libcubeb_update.sh:1.2 pkgsrc/www/firefox/patches/patch-media_libcubeb_update.sh:1.3
--- pkgsrc/www/firefox/patches/patch-media_libcubeb_update.sh:1.2 Thu Apr 27 01:49:47 2017
+++ pkgsrc/www/firefox/patches/patch-media_libcubeb_update.sh Thu Aug 10 14:46:15 2017
@@ -1,12 +1,12 @@
-$NetBSD: patch-media_libcubeb_update.sh,v 1.2 2017/04/27 01:49:47 ryoon Exp $
+$NetBSD: patch-media_libcubeb_update.sh,v 1.3 2017/08/10 14:46:15 ryoon Exp $
---- media/libcubeb/update.sh.orig 2017-04-11 04:15:21.000000000 +0000
+--- media/libcubeb/update.sh.orig 2017-07-31 16:20:49.000000000 +0000
+++ media/libcubeb/update.sh
-@@ -17,6 +17,7 @@ cp $1/src/cubeb_audiounit.cpp src
- cp $1/src/cubeb_osx_run_loop.h src
- cp $1/src/cubeb_jack.cpp src
+@@ -20,6 +20,7 @@ cp $1/src/cubeb_log.h src
+ cp $1/src/cubeb_mixer.cpp src
+ cp $1/src/cubeb_mixer.h src
cp $1/src/cubeb_opensl.c src
+cp $1/src/cubeb_oss.c src
- cp $1/src/cubeb_array_queue.h src
+ cp $1/src/cubeb_osx_run_loop.h src
cp $1/src/cubeb_panner.cpp src
cp $1/src/cubeb_panner.h src
Index: pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build
diff -u pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build:1.13 pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build:1.14
--- pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build:1.13 Wed Jun 14 11:28:44 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_library_moz.build Thu Aug 10 14:46:15 2017
@@ -1,11 +1,28 @@
-$NetBSD: patch-toolkit_library_moz.build,v 1.13 2017/06/14 11:28:44 ryoon Exp $
+$NetBSD: patch-toolkit_library_moz.build,v 1.14 2017/08/10 14:46:15 ryoon Exp $
* Support system libraries
* Restore OSS support
---- toolkit/library/moz.build.orig 2017-06-05 20:45:23.000000000 +0000
+--- toolkit/library/moz.build.orig 2017-07-31 16:20:52.000000000 +0000
+++ toolkit/library/moz.build
-@@ -228,9 +228,30 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
+@@ -63,7 +63,7 @@ def Libxul(name):
+
+ # This option should go away in bug 1290972, but we need to wait until
+ # Rust 1.12 has been released.
+- if CONFIG['OS_ARCH'] == 'Darwin':
++ if CONFIG['MOZ_RUST'] and CONFIG['OS_ARCH'] == 'Darwin':
+ LDFLAGS += ['-Wl,-no_compact_unwind']
+
+ Libxul('xul')
+@@ -197,6 +197,7 @@ if CONFIG['OS_ARCH'] == 'Linux' and CONF
+ ]
+
+ OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']
++OS_LIBS += CONFIG['MOZ_LIBV4L2_LIBS']
+ OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']
+
+ if CONFIG['SERVO_TARGET_DIR']:
+@@ -211,9 +212,30 @@ if CONFIG['MOZ_SYSTEM_JPEG']:
if CONFIG['MOZ_SYSTEM_PNG']:
OS_LIBS += CONFIG['MOZ_PNG_LIBS']
@@ -36,7 +53,7 @@ $NetBSD: patch-toolkit_library_moz.build
if CONFIG['MOZ_SYSTEM_LIBEVENT']:
OS_LIBS += CONFIG['MOZ_LIBEVENT_LIBS']
-@@ -240,8 +261,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
+@@ -223,8 +245,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
if not CONFIG['MOZ_TREE_PIXMAN']:
OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
@@ -47,3 +64,10 @@ $NetBSD: patch-toolkit_library_moz.build
if CONFIG['HAVE_CLOCK_MONOTONIC']:
OS_LIBS += CONFIG['REALTIME_LIBS']
+@@ -343,4 +365,5 @@ USE_LIBS += ['StaticXULComponentsEnd']
+ # The above library needs to be last for C++ purposes. This library,
+ # however, is entirely composed of Rust code, and needs to come after
+ # all the C++ code so any possible C++ -> Rust calls can be resolved.
+-USE_LIBS += ['gkrust']
++if CONFIG['MOZ_RUST']:
++ USE_LIBS += ['gkrust']
Added files:
Index: pkgsrc/www/firefox/patches/patch-browser_base_content_baseMenuOverlay.xul
diff -u /dev/null pkgsrc/www/firefox/patches/patch-browser_base_content_baseMenuOverlay.xul:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-browser_base_content_baseMenuOverlay.xul Thu Aug 10 14:46:15 2017
@@ -0,0 +1,13 @@
+$NetBSD: patch-browser_base_content_baseMenuOverlay.xul,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- browser/base/content/baseMenuOverlay.xul.orig 2017-07-31 16:20:46.000000000 +0000
++++ browser/base/content/baseMenuOverlay.xul
+@@ -61,7 +61,7 @@
+ onclick="checkForMiddleClick(this, event);"
+ label="&helpKeyboardShortcuts.label;"
+ accesskey="&helpKeyboardShortcuts.accesskey;"/>
+-#ifdef MOZ_TELEMETRY_REPORTING
++#ifdef MOZ_SERVICES_HEALTHREPORT
+ <menuitem id="healthReport"
+ label="&healthReport2.label;"
+ accesskey="&healthReport2.accesskey;"
Index: pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_main.xul
diff -u /dev/null pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_main.xul:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_main.xul Thu Aug 10 14:46:15 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-browser_components_preferences_in-content-new_main.xul,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- browser/components/preferences/in-content-new/main.xul.orig 2017-07-31 16:20:48.000000000 +0000
++++ browser/components/preferences/in-content-new/main.xul
+@@ -183,11 +183,9 @@
+ name="layout.spellcheckDefault"
+ type="int"/>
+
+-#ifdef MOZ_TELEMETRY_REPORTING
+ <preference id="toolkit.telemetry.enabled"
+ name="toolkit.telemetry.enabled"
+ type="bool"/>
+-#endif
+
+ <preference id="browser.preferences.defaultPerformanceSettings.enabled"
+ name="browser.preferences.defaultPerformanceSettings.enabled"
Index: pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_privacy.js
diff -u /dev/null pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_privacy.js:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_privacy.js Thu Aug 10 14:46:15 2017
@@ -0,0 +1,79 @@
+$NetBSD: patch-browser_components_preferences_in-content-new_privacy.js,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- browser/components/preferences/in-content-new/privacy.js.orig 2017-07-31 16:20:48.000000000 +0000
++++ browser/components/preferences/in-content-new/privacy.js
+@@ -321,11 +321,9 @@ var gPrivacyPane = {
+ this.initSubmitCrashes();
+ }
+ this.initTelemetry();
+- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
+- this.initSubmitHealthReport();
+- setEventListener("submitHealthReportBox", "command",
+- gPrivacyPane.updateSubmitHealthReport);
+- }
++ this.initSubmitHealthReport();
++ setEventListener("submitHealthReportBox", "command",
++ gPrivacyPane.updateSubmitHealthReport);
+
+ // Append search keywords into the elements could open subdialogs.
+ let bundlePrefs = document.getElementById("bundlePreferences");
+@@ -1414,8 +1412,10 @@ var gPrivacyPane = {
+ * In all cases, set up the Learn More link sanely.
+ */
+ initTelemetry() {
+- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
+- this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore");
++ this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore");
++ // If we're not sending any Telemetry, disable the telemetry upload checkbox as well.
++ if (!AppConstants.MOZ_TELEMETRY_REPORTING) {
++ document.getElementById("submitTelemetryBox").setAttribute("disabled", "true");
+ }
+ },
+
+@@ -1439,9 +1439,6 @@ var gPrivacyPane = {
+ * @param {Boolean} aEnabled False disables the controls, true enables them.
+ */
+ setTelemetrySectionEnabled(aEnabled) {
+- if (!AppConstants.MOZ_TELEMETRY_REPORTING) {
+- return;
+- }
+ // If FHR is disabled, additional data sharing should be disabled as well.
+ let disabled = !aEnabled;
+ document.getElementById("submitTelemetryBox").disabled = disabled;
+@@ -1456,19 +1453,21 @@ var gPrivacyPane = {
+ * Initialize the health report service reference and checkbox.
+ */
+ initSubmitHealthReport() {
+- if (!AppConstants.MOZ_TELEMETRY_REPORTING) {
+- return;
+- }
+ this._setupLearnMoreLink("datareporting.healthreport.infoURL", "FHRLearnMore");
+
+ let checkbox = document.getElementById("submitHealthReportBox");
+
+- if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED)) {
++ // Telemetry is only sending data if MOZ_TELEMETRY_REPORTING is defined.
++ // We still want to display the preferences panel if that's not the case, but
++ // we want it to be disabled and unchecked.
++ if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED) ||
++ !AppConstants.MOZ_TELEMETRY_REPORTING) {
+ checkbox.setAttribute("disabled", "true");
+ return;
+ }
+
+- checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED);
++ checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED) &&
++ AppConstants.MOZ_TELEMETRY_REPORTING;
+ this.setTelemetrySectionEnabled(checkbox.checked);
+ },
+
+@@ -1476,9 +1475,6 @@ var gPrivacyPane = {
+ * Update the health report preference with state from checkbox.
+ */
+ updateSubmitHealthReport() {
+- if (!AppConstants.MOZ_TELEMETRY_REPORTING) {
+- return;
+- }
+ let checkbox = document.getElementById("submitHealthReportBox");
+ Services.prefs.setBoolPref(PREF_UPLOAD_ENABLED, checkbox.checked);
+ this.setTelemetrySectionEnabled(checkbox.checked);
Index: pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_privacy.xul
diff -u /dev/null pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_privacy.xul:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content-new_privacy.xul Thu Aug 10 14:46:15 2017
@@ -0,0 +1,36 @@
+$NetBSD: patch-browser_components_preferences_in-content-new_privacy.xul,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- browser/components/preferences/in-content-new/privacy.xul.orig 2017-07-31 16:20:48.000000000 +0000
++++ browser/components/preferences/in-content-new/privacy.xul
+@@ -760,9 +760,14 @@
+ </groupbox>
+
+ <!-- Data Choices -->
+-#ifdef MOZ_TELEMETRY_REPORTING
+-<groupbox id="historyGroup" data-category="panePrivacy" data-subcategory="reports" hidden="true">
++#ifdef MOZ_DATA_REPORTING
++
++<groupbox id="telemetryGroup" data-category="panePrivacy" data-subcategory="reports" hidden="true">
+ <caption><label>&reports.label;</label></caption>
++#ifndef MOZ_TELEMETRY_REPORTING
++ <description id="TelemetryDisabledDesc" control="telemetryGroup">&healthReportingDisabled.label;</description>
++#endif
++
+ <hbox align="center">
+ <checkbox id="submitHealthReportBox" label="&enableHealthReport.label;"
+ accesskey="&enableHealthReport.accesskey;"/>
+@@ -782,14 +787,9 @@
+ class="indent">&telemetryDesc.label;</description>
+ </vbox>
+ </groupbox>
+-#endif
+
+-#ifdef MOZ_DATA_REPORTING
+ #ifdef MOZ_CRASHREPORTER
+ <groupbox id="crashReporterGroup" data-category="panePrivacy" data-subcategory="reports" hidden="true">
+-#ifndef MOZ_TELEMETRY_REPORTING
+-<caption><label>&reports.label;</label></caption>
+-#endif
+ <hbox align="center">
+ <checkbox id="automaticallySubmitCrashesBox"
+ preference="browser.crashReports.unsubmittedCheck.autoSubmit"
Index: pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content_advanced.js
diff -u /dev/null pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content_advanced.js:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content_advanced.js Thu Aug 10 14:46:15 2017
@@ -0,0 +1,111 @@
+$NetBSD: patch-browser_components_preferences_in-content_advanced.js,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- browser/components/preferences/in-content/advanced.js.orig 2017-07-31 16:20:48.000000000 +0000
++++ browser/components/preferences/in-content/advanced.js
+@@ -46,9 +46,7 @@ var gAdvancedPane = {
+ this.initSubmitCrashes();
+ }
+ this.initTelemetry();
+- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
+- this.initSubmitHealthReport();
+- }
++ this.initSubmitHealthReport();
+ this.updateOnScreenKeyboardVisibility();
+ this.updateCacheSizeInputField();
+ this.updateActualCacheSize();
+@@ -78,10 +76,8 @@ var gAdvancedPane = {
+ gAdvancedPane.updateHardwareAcceleration);
+ setEventListener("advancedPrefs", "select",
+ gAdvancedPane.tabSelectionChanged);
+- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
+- setEventListener("submitHealthReportBox", "command",
+- gAdvancedPane.updateSubmitHealthReport);
+- }
++ setEventListener("submitHealthReportBox", "command",
++ gAdvancedPane.updateSubmitHealthReport);
+
+ setEventListener("connectionSettings", "command",
+ gAdvancedPane.showConnections);
+@@ -293,8 +289,10 @@ var gAdvancedPane = {
+ * In all cases, set up the Learn More link sanely.
+ */
+ initTelemetry() {
+- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
+- this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore");
++ this._setupLearnMoreLink("toolkit.telemetry.infoURL", "telemetryLearnMore");
++ // If we're not sending any Telemetry, disable the telemetry upload checkbox as well.
++ if (!AppConstants.MOZ_TELEMETRY_REPORTING) {
++ document.getElementById("submitTelemetryBox").setAttribute("disabled", "true");
+ }
+ },
+
+@@ -303,46 +301,45 @@ var gAdvancedPane = {
+ * @param {Boolean} aEnabled False disables the controls, true enables them.
+ */
+ setTelemetrySectionEnabled(aEnabled) {
+- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
+- // If FHR is disabled, additional data sharing should be disabled as well.
+- let disabled = !aEnabled;
+- document.getElementById("submitTelemetryBox").disabled = disabled;
+- if (disabled) {
+- // If we disable FHR, untick the telemetry checkbox.
+- Services.prefs.setBoolPref("toolkit.telemetry.enabled", false);
+- }
+- document.getElementById("telemetryDataDesc").disabled = disabled;
++ // If FHR is disabled, additional data sharing should be disabled as well.
++ let disabled = !aEnabled;
++ document.getElementById("submitTelemetryBox").disabled = disabled;
++ if (disabled) {
++ // If we disable FHR, untick the telemetry checkbox.
++ Services.prefs.setBoolPref("toolkit.telemetry.enabled", false);
+ }
++ document.getElementById("telemetryDataDesc").disabled = disabled;
+ },
+
+ /**
+ * Initialize the health report service reference and checkbox.
+ */
+ initSubmitHealthReport() {
+- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
+- this._setupLearnMoreLink("datareporting.healthreport.infoURL", "FHRLearnMore");
+-
+- let checkbox = document.getElementById("submitHealthReportBox");
++ this._setupLearnMoreLink("datareporting.healthreport.infoURL", "FHRLearnMore");
+
+- if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED)) {
+- checkbox.setAttribute("disabled", "true");
+- return;
+- }
++ let checkbox = document.getElementById("submitHealthReportBox");
+
+- checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED);
+- this.setTelemetrySectionEnabled(checkbox.checked);
++ // Telemetry is only sending data if MOZ_TELEMETRY_REPORTING is defined.
++ // We still want to display the preferences panel if that's not the case, but
++ // we want it to be disabled and unchecked.
++ if (Services.prefs.prefIsLocked(PREF_UPLOAD_ENABLED) ||
++ !AppConstants.MOZ_TELEMETRY_REPORTING) {
++ checkbox.setAttribute("disabled", "true");
++ return;
+ }
++
++ checkbox.checked = Services.prefs.getBoolPref(PREF_UPLOAD_ENABLED) &&
++ AppConstants.MOZ_TELEMETRY_REPORTING;
++ this.setTelemetrySectionEnabled(checkbox.checked);
+ },
+
+ /**
+ * Update the health report preference with state from checkbox.
+ */
+ updateSubmitHealthReport() {
+- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
+- let checkbox = document.getElementById("submitHealthReportBox");
+- Services.prefs.setBoolPref(PREF_UPLOAD_ENABLED, checkbox.checked);
+- this.setTelemetrySectionEnabled(checkbox.checked);
+- }
++ let checkbox = document.getElementById("submitHealthReportBox");
++ Services.prefs.setBoolPref(PREF_UPLOAD_ENABLED, checkbox.checked);
++ this.setTelemetrySectionEnabled(checkbox.checked);
+ },
+
+ updateOnScreenKeyboardVisibility() {
Index: pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content_advanced.xul
diff -u /dev/null pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content_advanced.xul:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-browser_components_preferences_in-content_advanced.xul Thu Aug 10 14:46:15 2017
@@ -0,0 +1,35 @@
+$NetBSD: patch-browser_components_preferences_in-content_advanced.xul,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- browser/components/preferences/in-content/advanced.xul.orig 2017-07-31 16:20:48.000000000 +0000
++++ browser/components/preferences/in-content/advanced.xul
+@@ -37,12 +37,9 @@
+ <preference id="layout.spellcheckDefault"
+ name="layout.spellcheckDefault"
+ type="int"/>
+-
+-#ifdef MOZ_TELEMETRY_REPORTING
+ <preference id="toolkit.telemetry.enabled"
+ name="toolkit.telemetry.enabled"
+ type="bool"/>
+-#endif
+
+ <!-- Data Choices tab -->
+ #ifdef MOZ_CRASHREPORTER
+@@ -189,6 +186,9 @@
+ <!-- Data Choices -->
+ <tabpanel id="dataChoicesPanel" orient="vertical">
+ #ifdef MOZ_TELEMETRY_REPORTING
++ <description>&healthReportingDisabled.label;</description>
++ <separator class="thin"/>
++#endif
+ <groupbox>
+ <caption>
+ <checkbox id="submitHealthReportBox" label="&enableHealthReport.label;"
+@@ -216,7 +216,6 @@
+ </hbox>
+ </vbox>
+ </groupbox>
+-#endif
+ #ifdef MOZ_CRASHREPORTER
+ <groupbox>
+ <caption>
Index: pkgsrc/www/firefox/patches/patch-browser_locales_en-US_chrome_browser_preferences-old_advanced.dtd
diff -u /dev/null pkgsrc/www/firefox/patches/patch-browser_locales_en-US_chrome_browser_preferences-old_advanced.dtd:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-browser_locales_en-US_chrome_browser_preferences-old_advanced.dtd Thu Aug 10 14:46:15 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-browser_locales_en-US_chrome_browser_preferences-old_advanced.dtd,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- browser/locales/en-US/chrome/browser/preferences-old/advanced.dtd.orig 2017-07-31 16:20:49.000000000 +0000
++++ browser/locales/en-US/chrome/browser/preferences-old/advanced.dtd
+@@ -28,6 +28,11 @@
+
+ <!ENTITY dataChoicesTab.label "Data Choices">
+
++<!-- LOCALIZATION NOTE (healthReportingDisabled.label): This message is displayed above
++disabled data sharing options in developer builds or builds with no Telemetry support
++available. -->
++<!ENTITY healthReportingDisabled.label "Data reporting is disabled for this build configuration">
++
+ <!ENTITY healthReportDesc.label "Helps you understand your browser performance and shares data with &vendorShortName; about your browser health">
+ <!ENTITY enableHealthReport.label "Enable &brandShortName; Health Report">
+ <!ENTITY enableHealthReport.accesskey "R">
Index: pkgsrc/www/firefox/patches/patch-browser_locales_en-US_chrome_browser_preferences_advanced.dtd
diff -u /dev/null pkgsrc/www/firefox/patches/patch-browser_locales_en-US_chrome_browser_preferences_advanced.dtd:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-browser_locales_en-US_chrome_browser_preferences_advanced.dtd Thu Aug 10 14:46:15 2017
@@ -0,0 +1,16 @@
+$NetBSD: patch-browser_locales_en-US_chrome_browser_preferences_advanced.dtd,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- browser/locales/en-US/chrome/browser/preferences/advanced.dtd.orig 2017-07-31 16:20:49.000000000 +0000
++++ browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+@@ -28,6 +28,11 @@
+
+ <!ENTITY dataChoicesTab.label "Data Choices">
+
++<!-- LOCALIZATION NOTE (healthReportingDisabled.label): This message is displayed above
++disabled data sharing options in developer builds or builds with no Telemetry support
++available. -->
++<!ENTITY healthReportingDisabled.label "Data reporting is disabled for this build configuration">
++
+ <!ENTITY healthReportDesc.label "Helps you understand your browser performance and shares data with &vendorShortName; about your browser health">
+ <!ENTITY enableHealthReport.label "Enable &brandShortName; Health Report">
+ <!ENTITY enableHealthReport.accesskey "R">
Index: pkgsrc/www/firefox/patches/patch-dom_media_gtest_moz.build
diff -u /dev/null pkgsrc/www/firefox/patches/patch-dom_media_gtest_moz.build:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-dom_media_gtest_moz.build Thu Aug 10 14:46:15 2017
@@ -0,0 +1,22 @@
+$NetBSD: patch-dom_media_gtest_moz.build,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- dom/media/gtest/moz.build.orig 2017-07-31 16:20:53.000000000 +0000
++++ dom/media/gtest/moz.build
+@@ -22,7 +22,6 @@ UNIFIED_SOURCES += [
+ 'TestMozPromise.cpp',
+ 'TestMP3Demuxer.cpp',
+ 'TestMP4Demuxer.cpp',
+- 'TestRust.cpp',
+ 'TestTrackEncoder.cpp',
+ 'TestVideoSegment.cpp',
+ 'TestVideoUtils.cpp',
+@@ -36,6 +35,9 @@ if CONFIG['MOZ_WEBM_ENCODER']:
+ 'TestWebMWriter.cpp',
+ ]
+
++if CONFIG['MOZ_RUST']:
++ UNIFIED_SOURCES += ['TestRust.cpp',]
++
+ TEST_HARNESS_FILES.gtest += [
+ '../test/gizmo-frag.mp4',
+ '../test/gizmo.mp4',
Index: pkgsrc/www/firefox/patches/patch-js_src_build_moz.build
diff -u /dev/null pkgsrc/www/firefox/patches/patch-js_src_build_moz.build:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-js_src_build_moz.build Thu Aug 10 14:46:15 2017
@@ -0,0 +1,12 @@
+$NetBSD: patch-js_src_build_moz.build,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- js/src/build/moz.build.orig 2017-07-31 16:20:47.000000000 +0000
++++ js/src/build/moz.build
+@@ -71,7 +71,3 @@ if CONFIG['OS_ARCH'] == 'SunOS':
+ ]
+
+ OS_LIBS += CONFIG['REALTIME_LIBS']
+-
+-NO_EXPAND_LIBS = True
+-
+-DIST_INSTALL = True
Index: pkgsrc/www/firefox/patches/patch-media_libstagefright_gtest_moz.build
diff -u /dev/null pkgsrc/www/firefox/patches/patch-media_libstagefright_gtest_moz.build:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-media_libstagefright_gtest_moz.build Thu Aug 10 14:46:15 2017
@@ -0,0 +1,25 @@
+$NetBSD: patch-media_libstagefright_gtest_moz.build,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- media/libstagefright/gtest/moz.build.orig 2017-07-31 16:20:49.000000000 +0000
++++ media/libstagefright/gtest/moz.build
+@@ -38,12 +38,13 @@ TEST_HARNESS_FILES.gtest += [
+ 'test_case_1351094.mp4',
+ ]
+
+-UNIFIED_SOURCES += ['TestMP4Rust.cpp',]
+-TEST_HARNESS_FILES.gtest += [
+- '../../../dom/media/test/street.mp4',
+-]
+-LOCAL_INCLUDES += [
+- '../binding/include',
+-]
++if CONFIG['MOZ_RUST']:
++ UNIFIED_SOURCES += ['TestMP4Rust.cpp',]
++ TEST_HARNESS_FILES.gtest += [
++ '../../../dom/media/test/street.mp4',
++ ]
++ LOCAL_INCLUDES += [
++ '../binding/include',
++ ]
+
+ FINAL_LIBRARY = 'xul-gtest'
Index: pkgsrc/www/firefox/patches/patch-media_libstagefright_moz.build
diff -u /dev/null pkgsrc/www/firefox/patches/patch-media_libstagefright_moz.build:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-media_libstagefright_moz.build Thu Aug 10 14:46:15 2017
@@ -0,0 +1,18 @@
+$NetBSD: patch-media_libstagefright_moz.build,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- media/libstagefright/moz.build.orig 2017-07-31 16:20:49.000000000 +0000
++++ media/libstagefright/moz.build
+@@ -83,9 +83,10 @@ SOURCES += [
+ 'system/core/libutils/VectorImpl.cpp',
+ ]
+
+-EXPORTS += [
+- 'binding/include/mp4parse.h',
+-]
++if CONFIG['MOZ_RUST']:
++ EXPORTS += [
++ 'binding/include/mp4parse.h',
++ ]
+
+ UNIFIED_SOURCES += [
+ 'binding/Adts.cpp',
Index: pkgsrc/www/firefox/patches/patch-netwerk_base_moz.build
diff -u /dev/null pkgsrc/www/firefox/patches/patch-netwerk_base_moz.build:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-netwerk_base_moz.build Thu Aug 10 14:46:15 2017
@@ -0,0 +1,13 @@
+$NetBSD: patch-netwerk_base_moz.build,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- netwerk/base/moz.build.orig 2017-07-31 16:20:51.000000000 +0000
++++ netwerk/base/moz.build
+@@ -256,7 +256,7 @@ UNIFIED_SOURCES += [
+ 'TLSServerSocket.cpp',
+ ]
+
+-if CONFIG['MOZ_RUST_URLPARSE']:
++if CONFIG['MOZ_RUST'] and CONFIG['MOZ_RUST_URLPARSE']:
+ EXPORTS.mozilla.net += [ 'RustURL.h' ]
+ UNIFIED_SOURCES += [ 'RustURL.cpp' ]
+
Index: pkgsrc/www/firefox/patches/patch-netwerk_base_nsStandardURL.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-netwerk_base_nsStandardURL.cpp:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-netwerk_base_nsStandardURL.cpp Thu Aug 10 14:46:15 2017
@@ -0,0 +1,42 @@
+$NetBSD: patch-netwerk_base_nsStandardURL.cpp,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- netwerk/base/nsStandardURL.cpp.orig 2017-07-31 16:20:51.000000000 +0000
++++ netwerk/base/nsStandardURL.cpp
+@@ -858,6 +858,7 @@ nsStandardURL::BuildNormalizedSpec(const
+ if (!SegmentIs(spec, mScheme, "resource") &&
+ !SegmentIs(spec, mScheme, "chrome")) {
+ nsAutoCString ipString;
++#ifdef MOZ_RUST
+ if (encHost.Length() > 0 &&
+ encHost.First() == '[' && encHost.Last() == ']' &&
+ ValidIPv6orHostname(encHost.get(), encHost.Length())) {
+@@ -866,7 +867,9 @@ nsStandardURL::BuildNormalizedSpec(const
+ return rv;
+ }
+ encHost = ipString;
+- } else if (NS_SUCCEEDED(NormalizeIPv4(encHost, ipString))) {
++ } else
++#endif
++ if (NS_SUCCEEDED(NormalizeIPv4(encHost, ipString))) {
+ encHost = ipString;
+ }
+ }
+@@ -2112,6 +2115,7 @@ nsStandardURL::SetHost(const nsACString
+
+ if (!SegmentIs(mScheme, "resource") && !SegmentIs(mScheme, "chrome")) {
+ nsAutoCString ipString;
++#ifdef MOZ_RUST
+ if (hostBuf.Length() > 0 &&
+ hostBuf.First() == '[' && hostBuf.Last() == ']' &&
+ ValidIPv6orHostname(hostBuf.get(), hostBuf.Length())) {
+@@ -2120,7 +2124,9 @@ nsStandardURL::SetHost(const nsACString
+ return rv;
+ }
+ hostBuf = ipString;
+- } else if (NS_SUCCEEDED(NormalizeIPv4(hostBuf, ipString))) {
++ } else
++#endif
++ if (NS_SUCCEEDED(NormalizeIPv4(hostBuf, ipString))) {
+ hostBuf = ipString;
+ }
+ }
Index: pkgsrc/www/firefox/patches/patch-third__party_python_futures_concurrent_futures_process.py
diff -u /dev/null pkgsrc/www/firefox/patches/patch-third__party_python_futures_concurrent_futures_process.py:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-third__party_python_futures_concurrent_futures_process.py Thu Aug 10 14:46:15 2017
@@ -0,0 +1,17 @@
+$NetBSD: patch-third__party_python_futures_concurrent_futures_process.py,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- third_party/python/futures/concurrent/futures/process.py.orig 2017-07-31 16:20:49.000000000 +0000
++++ third_party/python/futures/concurrent/futures/process.py
+@@ -247,7 +247,11 @@ def _check_system_limits():
+ _system_limits_checked = True
+ try:
+ import os
+- nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
++ if sys.platform.startswith('freebsd'):
++ # sem(4) confuses sysconf(3) on FreeBSD < 11.1
++ nsems_max = -1
++ else:
++ nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
+ except (AttributeError, ValueError):
+ # sysconf not available or setting not available
+ return
Index: pkgsrc/www/firefox/patches/patch-toolkit_components_resistfingerprinting_nsRFPService.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-toolkit_components_resistfingerprinting_nsRFPService.cpp:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_components_resistfingerprinting_nsRFPService.cpp Thu Aug 10 14:46:15 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-toolkit_components_resistfingerprinting_nsRFPService.cpp,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- toolkit/components/resistfingerprinting/nsRFPService.cpp.orig 2017-07-31 16:20:51.000000000 +0000
++++ toolkit/components/resistfingerprinting/nsRFPService.cpp
+@@ -152,14 +152,14 @@ nsRFPService::UpdatePref()
+ PR_SetEnv(tz);
+ }
+ } else {
+-#if defined(XP_LINUX) || defined (XP_MACOSX)
+- // For POSIX like system, we reset the TZ to the /etc/localtime, which is the
+- // system timezone.
+- PR_SetEnv("TZ=:/etc/localtime");
+-#else
++#if defined(XP_WIN)
+ // For Windows, we reset the TZ to an empty string. This will make Windows to use
+ // its system timezone.
+ PR_SetEnv("TZ=");
++#else
++ // For POSIX like system, we reset the TZ to the /etc/localtime, which is the
++ // system timezone.
++ PR_SetEnv("TZ=:/etc/localtime");
+ #endif
+ }
+ }
Index: pkgsrc/www/firefox/patches/patch-toolkit_library_gtest_moz.build
diff -u /dev/null pkgsrc/www/firefox/patches/patch-toolkit_library_gtest_moz.build:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_library_gtest_moz.build Thu Aug 10 14:46:15 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-toolkit_library_gtest_moz.build,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- toolkit/library/gtest/moz.build.orig 2017-07-31 16:20:52.000000000 +0000
++++ toolkit/library/gtest/moz.build
+@@ -7,7 +7,6 @@
+ FINAL_TARGET = 'dist/bin/gtest'
+
+ USE_LIBS += [
+- 'gkrust-gtest',
+ 'static:xul',
+ # xul-gtest is an intermediate static library. It is used as FINAL_TARGET
+ # for gtest code.
+@@ -21,6 +20,11 @@ USE_LIBS += [
+ # before StaticXULComponentStart.
+ Libxul('xul-gtest-real')
+
++if CONFIG['MOZ_RUST']:
++ USE_LIBS += [
++ 'gkrust-gtest',
++ ]
++
+ DIRS += [
+ 'static',
+ ]
Index: pkgsrc/www/firefox/patches/patch-xpcom_rust_nsstring_gtest_moz.build
diff -u /dev/null pkgsrc/www/firefox/patches/patch-xpcom_rust_nsstring_gtest_moz.build:1.1
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-xpcom_rust_nsstring_gtest_moz.build Thu Aug 10 14:46:15 2017
@@ -0,0 +1,17 @@
+$NetBSD: patch-xpcom_rust_nsstring_gtest_moz.build,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+
+--- xpcom/rust/nsstring/gtest/moz.build.orig 2017-07-31 16:20:53.000000000 +0000
++++ xpcom/rust/nsstring/gtest/moz.build
+@@ -4,8 +4,9 @@
+ # 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/.
+
+-UNIFIED_SOURCES += [
+- 'Test.cpp'
+-]
++if CONFIG['MOZ_RUST']:
++ UNIFIED_SOURCES += [
++ 'Test.cpp'
++ ]
+
+ FINAL_LIBRARY = 'xul-gtest'
Index: pkgsrc/www/firefox/patches/patch-browser_components_nsBrowserGlue.js
diff -u /dev/null pkgsrc/www/firefox/patches/patch-browser_components_nsBrowserGlue.js:1.3
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-browser_components_nsBrowserGlue.js Thu Aug 10 14:46:15 2017
@@ -0,0 +1,26 @@
+$NetBSD: patch-browser_components_nsBrowserGlue.js,v 1.3 2017/08/10 14:46:15 ryoon Exp $
+
+--- browser/components/nsBrowserGlue.js.orig 2017-07-31 16:20:47.000000000 +0000
++++ browser/components/nsBrowserGlue.js
+@@ -532,9 +532,7 @@ BrowserGlue.prototype = {
+ os.addObserver(this, "distribution-customization-complete");
+ os.addObserver(this, "handle-xul-text-link");
+ os.addObserver(this, "profile-before-change");
+- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
+- os.addObserver(this, "keyword-search");
+- }
++ os.addObserver(this, "keyword-search");
+ os.addObserver(this, "browser-search-engine-modified");
+ os.addObserver(this, "restart-in-safe-mode");
+ os.addObserver(this, "flash-plugin-hang");
+@@ -587,9 +585,7 @@ BrowserGlue.prototype = {
+ os.removeObserver(this, "places-database-locked");
+ os.removeObserver(this, "handle-xul-text-link");
+ os.removeObserver(this, "profile-before-change");
+- if (AppConstants.MOZ_TELEMETRY_REPORTING) {
+- os.removeObserver(this, "keyword-search");
+- }
++ os.removeObserver(this, "keyword-search");
+ os.removeObserver(this, "browser-search-engine-modified");
+ os.removeObserver(this, "flash-plugin-hang");
+ os.removeObserver(this, "xpi-signature-changed");
Index: pkgsrc/www/firefox/patches/patch-build_moz.configure_init.configure
diff -u /dev/null pkgsrc/www/firefox/patches/patch-build_moz.configure_init.configure:1.3
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-build_moz.configure_init.configure Thu Aug 10 14:46:15 2017
@@ -0,0 +1,37 @@
+$NetBSD: patch-build_moz.configure_init.configure,v 1.3 2017/08/10 14:46:15 ryoon Exp $
+
+--- build/moz.configure/init.configure.orig 2017-07-31 16:20:49.000000000 +0000
++++ build/moz.configure/init.configure
+@@ -157,6 +157,7 @@ option(env='PYTHON', nargs=1, help='Pyth
+ @imports(_from='mozbuild.configure.util', _import='LineIO')
+ @imports(_from='mozbuild.virtualenv', _import='VirtualenvManager')
+ @imports(_from='mozbuild.virtualenv', _import='verify_python_version')
++@imports(_from='__builtin__', _import='KeyError')
+ @imports('distutils.sysconfig')
+ def virtualenv_python(env_python, build_env, mozconfig, help):
+ if help:
+@@ -176,6 +177,12 @@ def virtualenv_python(env_python, build_
+ python = mozconfig['vars']['added']['PYTHON']
+ elif 'PYTHON' in mozconfig['vars']['modified']:
+ python = mozconfig['vars']['modified']['PYTHON'][1]
++ for i in ('env', 'vars'):
++ for j in ('added', 'modified'):
++ try:
++ del mozconfig[i][j]['PYTHON']
++ except KeyError:
++ pass
+
+ with LineIO(lambda l: log.error(l)) as out:
+ verify_python_version(out)
+@@ -211,7 +218,10 @@ def virtualenv_python(env_python, build_
+ if python != normsep(sys.executable):
+ log.info('Reexecuting in the virtualenv')
+ if env_python:
+- del os.environ['PYTHON']
++ try:
++ del os.environ['PYTHON']
++ except KeyError:
++ pass
+ # One would prefer to use os.execl, but that's completely borked on
+ # Windows.
+ sys.exit(subprocess.call([python] + sys.argv))
Index: pkgsrc/www/firefox/patches/patch-build_moz.configure_keyfiles.configure
diff -u /dev/null pkgsrc/www/firefox/patches/patch-build_moz.configure_keyfiles.configure:1.3
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-build_moz.configure_keyfiles.configure Thu Aug 10 14:46:15 2017
@@ -0,0 +1,21 @@
+$NetBSD: patch-build_moz.configure_keyfiles.configure,v 1.3 2017/08/10 14:46:15 ryoon Exp $
+
+--- build/moz.configure/keyfiles.configure.orig 2017-07-31 16:20:49.000000000 +0000
++++ build/moz.configure/keyfiles.configure
+@@ -18,6 +18,7 @@ def keyfile(desc, default=None, help=Non
+ @checking('for the %s key' % desc, lambda x: x and x is not no_key)
+ @imports(_from='__builtin__', _import='open')
+ @imports(_from='__builtin__', _import='IOError')
++ @imports(_from='os', _import='environ')
+ def keyfile(value):
+ if value:
+ try:
+@@ -28,7 +29,7 @@ def keyfile(desc, default=None, help=Non
+ raise FatalCheckError("'%s' is empty." % value[0])
+ except IOError as e:
+ raise FatalCheckError("'%s': %s." % (value[0], e.strerror))
+- return no_key
++ return environ.get('MOZ_%s_KEY' % desc.upper().replace(' ', '_')) or no_key
+
+ return keyfile
+
Index: pkgsrc/www/firefox/patches/patch-xpcom_base_nsDebugImpl.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-xpcom_base_nsDebugImpl.cpp:1.3
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-xpcom_base_nsDebugImpl.cpp Thu Aug 10 14:46:15 2017
@@ -0,0 +1,25 @@
+$NetBSD: patch-xpcom_base_nsDebugImpl.cpp,v 1.3 2017/08/10 14:46:15 ryoon Exp $
+
+--- xpcom/base/nsDebugImpl.cpp.orig 2017-07-31 16:20:53.000000000 +0000
++++ xpcom/base/nsDebugImpl.cpp
+@@ -148,14 +148,20 @@ nsDebugImpl::Abort(const char* aFile, in
+ return NS_OK;
+ }
+
++#ifdef MOZ_RUST
+ // From toolkit/library/rust/lib.rs
+ extern "C" void intentional_panic(const char* message);
++#endif
+
+ NS_IMETHODIMP
+ nsDebugImpl::RustPanic(const char* aMessage)
+ {
++#ifdef MOZ_RUST
+ intentional_panic(aMessage);
+ return NS_OK;
++#else
++ return NS_ERROR_NOT_IMPLEMENTED;
++#endif
+ }
+
+ NS_IMETHODIMP
Index: pkgsrc/www/firefox/patches/patch-build_gyp.mozbuild
diff -u /dev/null pkgsrc/www/firefox/patches/patch-build_gyp.mozbuild:1.7
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-build_gyp.mozbuild Thu Aug 10 14:46:15 2017
@@ -0,0 +1,12 @@
+$NetBSD: patch-build_gyp.mozbuild,v 1.7 2017/08/10 14:46:15 ryoon Exp $
+
+--- build/gyp.mozbuild.orig 2017-07-31 16:20:49.000000000 +0000
++++ build/gyp.mozbuild
+@@ -16,6 +16,7 @@ gyp_vars.update({
+ 'have_ethtool_cmd_speed_hi': 1 if CONFIG['MOZ_WEBRTC_HAVE_ETHTOOL_SPEED_HI'] else 0,
+ 'include_alsa_audio': 1 if CONFIG['MOZ_ALSA'] else 0,
+ 'include_pulse_audio': 1 if CONFIG['MOZ_PULSEAUDIO'] else 0,
++ 'use_libv4l2': 1 if CONFIG['MOZ_LIBV4L2_LIBS'] else 0,
+ # basic stuff for everything
+ 'include_internal_video_render': 0,
+ 'clang': 1 if CONFIG['CLANG_CXX'] else 0,
Index: pkgsrc/www/firefox/patches/patch-build_pgo_profileserver.py
diff -u /dev/null pkgsrc/www/firefox/patches/patch-build_pgo_profileserver.py:1.7
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-build_pgo_profileserver.py Thu Aug 10 14:46:15 2017
@@ -0,0 +1,13 @@
+$NetBSD: patch-build_pgo_profileserver.py,v 1.7 2017/08/10 14:46:15 ryoon Exp $
+
+--- build/pgo/profileserver.py.orig 2017-06-15 20:52:02.000000000 +0000
++++ build/pgo/profileserver.py
+@@ -80,7 +80,7 @@ if __name__ == '__main__':
+ env["MOZ_JAR_LOG_FILE"] = os.path.abspath(jarlog)
+ print "jarlog: %s" % env["MOZ_JAR_LOG_FILE"]
+
+- cmdargs = ["http://localhost:%d/index.html"; % PORT]
++ cmdargs = ["http://127.0.0.1:%d/index.html"; % PORT]
+ runner = FirefoxRunner(profile=profile,
+ binary=build.get_binary_path(where="staged-package"),
+ cmdargs=cmdargs,
Index: pkgsrc/www/firefox/patches/patch-toolkit_xre_nsAppRunner.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-toolkit_xre_nsAppRunner.cpp:1.7
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_xre_nsAppRunner.cpp Thu Aug 10 14:46:15 2017
@@ -0,0 +1,29 @@
+$NetBSD: patch-toolkit_xre_nsAppRunner.cpp,v 1.7 2017/08/10 14:46:15 ryoon Exp $
+
+--- toolkit/xre/nsAppRunner.cpp.orig 2017-07-31 16:20:53.000000000 +0000
++++ toolkit/xre/nsAppRunner.cpp
+@@ -227,11 +227,13 @@
+ extern uint32_t gRestartMode;
+ extern void InstallSignalHandlers(const char *ProgramName);
+
++#ifdef MOZ_RUST
+ // This workaround is fixed in Rust 1.19. For details, see bug 1358151.
+ // Implementation in toolkit/library/rust/shared/lib.rs
+ extern "C" {
+ void rust_init_please_remove_this_after_updating_rust_1_19();
+ }
++#endif
+
+ #define FILE_COMPATIBILITY_INFO NS_LITERAL_CSTRING("compatibility.ini")
+ #define FILE_INVALIDATE_CACHES NS_LITERAL_CSTRING(".purgecaches")
+@@ -3120,8 +3122,10 @@ XREMain::XRE_mainInit(bool* aExitFlag)
+ return 1;
+ *aExitFlag = false;
+
++#ifdef MOZ_RUST
+ // This workaround is fixed in Rust 1.19. For details, see bug 1358151.
+ rust_init_please_remove_this_after_updating_rust_1_19();
++#endif
+
+ atexit(UnexpectedExit);
+ auto expectedShutdown = mozilla::MakeScopeExit([&] {
Index: pkgsrc/www/firefox/patches/patch-config_rules.mk
diff -u /dev/null pkgsrc/www/firefox/patches/patch-config_rules.mk:1.5
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-config_rules.mk Thu Aug 10 14:46:15 2017
@@ -0,0 +1,20 @@
+$NetBSD: patch-config_rules.mk,v 1.5 2017/08/10 14:46:15 ryoon Exp $
+
+--- config/rules.mk.orig 2017-07-31 16:20:50.000000000 +0000
++++ config/rules.mk
+@@ -900,6 +900,7 @@ endif
+
+ $(foreach file,$(DUMP_SYMS_TARGETS),$(eval $(call syms_template,$(file),$(file)_syms.track)))
+
++ifdef MOZ_RUST
+ cargo_host_flag := --target=$(RUST_HOST_TARGET)
+ cargo_target_flag := --target=$(RUST_TARGET)
+
+@@ -1055,6 +1056,7 @@ force-cargo-host-program-build:
+
+ $(HOST_RUST_PROGRAMS): force-cargo-host-program-build
+ endif # HOST_RUST_PROGRAMS
++endif # MOZ_RUST
+
+ $(SOBJS):
+ $(REPORT_BUILD)
Index: pkgsrc/www/firefox/patches/patch-toolkit_toolkit.mozbuild
diff -u /dev/null pkgsrc/www/firefox/patches/patch-toolkit_toolkit.mozbuild:1.6
--- /dev/null Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_toolkit.mozbuild Thu Aug 10 14:46:15 2017
@@ -0,0 +1,32 @@
+$NetBSD: patch-toolkit_toolkit.mozbuild,v 1.6 2017/08/10 14:46:15 ryoon Exp $
+
+--- toolkit/toolkit.mozbuild.orig 2017-07-31 16:20:53.000000000 +0000
++++ toolkit/toolkit.mozbuild
+@@ -133,16 +133,23 @@ if CONFIG['MOZ_PREF_EXTENSIONS']:
+
+ DIRS += [
+ '/devtools',
+- '/toolkit/library',
+- '/toolkit/library/gtest/rust',
+- '/toolkit/library/rust',
+- '/toolkit/library/StaticXULComponentsEnd',
+ '/services',
+ '/startupcache',
+ '/js/ductwork/debugger',
+ '/other-licenses/snappy',
+ ]
+
++if CONFIG['MOZ_RUST']:
++ DIRS += [
++ '/toolkit/library/gtest/rust',
++ '/toolkit/library/rust',
++ ]
++
++DIRS += [
++ '/toolkit/library/StaticXULComponentsEnd',
++ '/toolkit/library',
++]
++
+ if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+ DIRS += ['/toolkit/system/gnome']
+
Home |
Main Index |
Thread Index |
Old Index