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:           Wed Jan 24 16:52:08 UTC 2018

Modified Files:
        pkgsrc/www/firefox: Makefile PLIST distinfo mozilla-common.mk
        pkgsrc/www/firefox/patches: patch-aa patch-dom_media_moz.build
            patch-intl_unicharutil_util_moz.build patch-js_src_build_moz.build
            patch-media_libcubeb_src_cubeb__alsa.c patch-netwerk_dns_moz.build
            patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h
            patch-toolkit_moz.configure
Added Files:
        pkgsrc/www/firefox/patches: patch-config_system-headers.mozbuild
            patch-dom_media_flac_FlacDecoder.cpp
            patch-ipc_glue_MessageChannel.cpp
            patch-servo_components_style_properties_helpers_animated__properties.mako.rs
            patch-third__party_python_futures_concurrent_futures_process.py
            patch-toolkit_mozapps_installer_packager.mk
Removed Files:
        pkgsrc/www/firefox/patches:
            patch-build_moz.configure_keyfiles.configure
            patch-config_Makefile.in patch-config_system-headers
            patch-ipc_chromium_src_base_process__util.h
            patch-media_libsoundtouch_src_cpu__detect__x86.cpp
            patch-servo_components_gfx_font.rs
            patch-servo_components_net__traits_response.rs
            patch-servo_components_net_fetch_cors__cache.rs
            patch-servo_components_net_fetch_methods.rs
            patch-servo_components_net_websocket__loader.rs
            patch-servo_components_script_dom_bindings_str.rs
            patch-servo_components_script_dom_blob.rs
            patch-servo_components_script_dom_cssstyledeclaration.rs
            patch-servo_components_script_dom_document.rs
            patch-servo_components_script_dom_element.rs
            patch-servo_components_script_dom_htmlelement.rs
            patch-servo_components_script_dom_htmllinkelement.rs
            patch-servo_components_script_dom_htmlmetaelement.rs
            patch-servo_components_script_dom_htmlscriptelement.rs
            patch-servo_components_script_dom_macros.rs
            patch-servo_components_script_dom_namednodemap.rs
            patch-servo_components_script_dom_serviceworkercontainer.rs
            patch-servo_components_script_dom_servoparser_async__html.rs
            patch-servo_components_script_dom_websocket.rs
            patch-servo_components_script_dom_window.rs
            patch-servo_components_script_dom_xmlhttprequest.rs
            patch-servo_components_selectors_attr.rs
            patch-servo_components_selectors_parser.rs
            patch-servo_components_style__traits_viewport.rs
            patch-servo_components_style_attr.rs
            patch-servo_components_style_counter__style_mod.rs
            patch-servo_components_style_custom__properties.rs
            patch-servo_components_style_gecko__string__cache_mod.rs
            patch-servo_components_style_gecko_generated_pseudo__element__definition.rs
            patch-servo_components_style_gecko_pseudo__element__definition.mako.rs
            patch-servo_components_style_properties_longhand_font.mako.rs
            patch-servo_components_style_properties_longhand_pointing.mako.rs
            patch-servo_components_style_servo_selector__parser.rs
            patch-servo_components_style_str.rs
            patch-servo_components_style_stylesheets_viewport__rule.rs
            patch-servo_components_style_values_mod.rs
            patch-servo_components_style_values_specified_align.rs
            patch-servo_components_style_values_specified_angle.rs
            patch-servo_components_style_values_specified_calc.rs
            patch-servo_components_style_values_specified_grid.rs
            patch-servo_components_style_values_specified_length.rs
            patch-servo_components_style_values_specified_mod.rs
            patch-servo_components_style_values_specified_percentage.rs
            patch-servo_components_style_values_specified_text.rs
            patch-servo_components_style_values_specified_time.rs
            patch-xpcom_reflect_xptcall_md_unix_Makefile.in

Log Message:
Update to 58.0

Changelog:
New
    Performance improvements, including:
        Rendering graphics for Windows users by using Off-Main-Threa
           Painting (OMTP)
        Loading pages faster by changing how Firefox caches and retrieves
           JavaScript

    Improvements to Firefox Screenshots:
        Copy and paste screenshots directly to your clipboard
        Firefox Screenshots now works in Private Browsing mode

    Added Nepali (ne-NP) locale

    In case you missed it--57 Release privacy and performance feature:
      Users can enable Tracking Protection at all times. Learn how to turn
      Tracking Protection on.

Fixed
    Fonts installed in non-standard directories will no longer appear
      blank for Linux users

    Various security fixes

Changed
    User profiles created in Firefox 58 (and in future releases) are not
    supported in previous versions of Firefox. Users who downgrade to
    a previous version should create a new profile for that version.
    Learn about alternatives to downgrading on our support site.

    Added a warning to alert users and site owners of planned security
    changes to sites affected by the gradual distrust plan for
    the Symantec certificate authority

#CVE-2018-5091: Use-after-free with DTMF timers
#CVE-2018-5092: Use-after-free in Web Workers
#CVE-2018-5093: Buffer overflow in WebAssembly during Memory/Table resizing
#CVE-2018-5094: Buffer overflow in WebAssembly with garbage collection on
 uninitialized memory
#CVE-2018-5095: Integer overflow in Skia library during edge builder allocation
#CVE-2018-5097: Use-after-free when source document is manipulated during XSLT
#CVE-2018-5098: Use-after-free while manipulating form input elements
#CVE-2018-5099: Use-after-free with widget listener
#CVE-2018-5100: Use-after-free when IsPotentiallyScrollable arguments are
 freed from memory
#CVE-2018-5101: Use-after-free with floating first-letter style elements
#CVE-2018-5102: Use-after-free in HTML media elements
#CVE-2018-5103: Use-after-free during mouse event handling
#CVE-2018-5104: Use-after-free during font face manipulation
#CVE-2018-5105: WebExtensions can save and execute files on local file
 system without user prompts
#CVE-2018-5106: Developer Tools can expose style editor information
 cross-origin through service worker
#CVE-2018-5107: Printing process will follow symlinks for local file access
#CVE-2018-5108: Manually entered blob URL can be accessed by subsequent
 private browsing tabs
#CVE-2018-5109: Audio capture prompts and starts with incorrect origin
 attribution
#CVE-2018-5110: Cursor can be made invisible on OS X
#CVE-2018-5117: URL spoofing with right-to-left text aligned left-to-right
#CVE-2018-5118: Activity Stream images can attempt to load local content
 through file:
#CVE-2018-5119: Reader view will load cross-origin content in violation
 of CORS headers
#CVE-2018-5121: OS X Tibetan characters render incompletely in the addressbar
#CVE-2018-5122: Potential integer overflow in DoCrypt
#CVE-2018-5090: Memory safety bugs fixed in Firefox 58
#CVE-2018-5089: Memory safety bugs fixed in Firefox 58 and Firefox ESR 52.6


To generate a diff of this commit:
cvs rdiff -u -r1.317 -r1.318 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.125 -r1.126 pkgsrc/www/firefox/PLIST
cvs rdiff -u -r1.305 -r1.306 pkgsrc/www/firefox/distinfo
cvs rdiff -u -r1.103 -r1.104 pkgsrc/www/firefox/mozilla-common.mk
cvs rdiff -u -r1.54 -r1.55 pkgsrc/www/firefox/patches/patch-aa
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/www/firefox/patches/patch-build_moz.configure_keyfiles.configure \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_cssstyledeclaration.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_document.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_servoparser_async__html.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_xmlhttprequest.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_selectors_parser.rs \
    pkgsrc/www/firefox/patches/patch-xpcom_reflect_xptcall_md_unix_Makefile.in
cvs rdiff -u -r1.11 -r0 pkgsrc/www/firefox/patches/patch-config_Makefile.in
cvs rdiff -u -r1.25 -r0 \
    pkgsrc/www/firefox/patches/patch-config_system-headers
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/firefox/patches/patch-config_system-headers.mozbuild \
    pkgsrc/www/firefox/patches/patch-dom_media_flac_FlacDecoder.cpp \
    pkgsrc/www/firefox/patches/patch-ipc_glue_MessageChannel.cpp \
    pkgsrc/www/firefox/patches/patch-servo_components_style_properties_helpers_animated__properties.mako.rs \
    pkgsrc/www/firefox/patches/patch-toolkit_mozapps_installer_packager.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/firefox/patches/patch-dom_media_moz.build
cvs rdiff -u -r1.6 -r1.7 \
    pkgsrc/www/firefox/patches/patch-intl_unicharutil_util_moz.build \
    pkgsrc/www/firefox/patches/patch-netwerk_dns_moz.build
cvs rdiff -u -r1.6 -r0 \
    pkgsrc/www/firefox/patches/patch-ipc_chromium_src_base_process__util.h
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/firefox/patches/patch-js_src_build_moz.build
cvs rdiff -u -r1.25 -r1.26 \
    pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
cvs rdiff -u -r1.5 -r0 \
    pkgsrc/www/firefox/patches/patch-media_libsoundtouch_src_cpu__detect__x86.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/www/firefox/patches/patch-servo_components_gfx_font.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_net__traits_response.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_net_fetch_cors__cache.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_net_fetch_methods.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_net_websocket__loader.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_bindings_str.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_blob.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_element.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_htmlelement.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_htmllinkelement.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_htmlmetaelement.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_htmlscriptelement.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_macros.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_namednodemap.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_serviceworkercontainer.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_websocket.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_script_dom_window.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_selectors_attr.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style__traits_viewport.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_attr.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_counter__style_mod.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_custom__properties.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_gecko__string__cache_mod.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_gecko_generated_pseudo__element__definition.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_gecko_pseudo__element__definition.mako.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_properties_longhand_font.mako.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_properties_longhand_pointing.mako.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_servo_selector__parser.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_str.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_stylesheets_viewport__rule.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_values_mod.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_values_specified_align.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_values_specified_angle.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_values_specified_calc.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_values_specified_grid.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_values_specified_length.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_values_specified_mod.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_values_specified_percentage.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_values_specified_text.rs \
    pkgsrc/www/firefox/patches/patch-servo_components_style_values_specified_time.rs
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/www/firefox/patches/patch-third__party_python_futures_concurrent_futures_process.py
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h
cvs rdiff -u -r1.8 -r1.9 \
    pkgsrc/www/firefox/patches/patch-toolkit_moz.configure

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.317 pkgsrc/www/firefox/Makefile:1.318
--- pkgsrc/www/firefox/Makefile:1.317   Mon Jan  8 09:37:56 2018
+++ pkgsrc/www/firefox/Makefile Wed Jan 24 16:52:08 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.317 2018/01/08 09:37:56 ryoon Exp $
+# $NetBSD: Makefile,v 1.318 2018/01/24 16:52:08 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
-MOZ_BRANCH=            57.0
-MOZ_BRANCH_MINOR=      .4
+MOZ_BRANCH=            58.0
+MOZ_BRANCH_MINOR=      
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
@@ -92,6 +92,10 @@ post-build:
 
 INSTALLATION_DIRS+=    share/applications share/pixmaps
 post-install:
+       ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
+       ${ECHO} '${PREFIX}/lib/firefox/firefox "$$@"' >> \
+               ${DESTDIR}${PREFIX}/bin/${MOZILLA}
+       ${CHMOD} 755 ${DESTDIR}${PREFIX}/bin/${MOZILLA}
        ${INSTALL_DATA} ${WRKDIR}/desktop                               \
          ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
        ${INSTALL_DATA} ${MOZILLA_ICON}                                 \

Index: pkgsrc/www/firefox/PLIST
diff -u pkgsrc/www/firefox/PLIST:1.125 pkgsrc/www/firefox/PLIST:1.126
--- pkgsrc/www/firefox/PLIST:1.125      Thu Nov 16 01:04:38 2017
+++ pkgsrc/www/firefox/PLIST    Wed Jan 24 16:52:08 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.125 2017/11/16 01:04:38 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.126 2018/01/24 16:52:08 ryoon Exp $
 bin/firefox
 lib/firefox/application.ini
 lib/firefox/browser/blocklist.xml
@@ -33,11 +33,6 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/aboutTabCrashed.js
 lib/firefox/browser/chrome/browser/content/browser/aboutTabCrashed.xhtml
 lib/firefox/browser/chrome/browser/content/browser/aboutWelcomeBack.xhtml
-lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.css
-lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.js
-lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/aboutaccounts.xhtml
-lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/main.css
-lib/firefox/browser/chrome/browser/content/browser/aboutaccounts/normalize.css
 lib/firefox/browser/chrome/browser/content/browser/abouthealthreport/abouthealth.css
 lib/firefox/browser/chrome/browser/content/browser/abouthealthreport/abouthealth.js
 lib/firefox/browser/chrome/browser/content/browser/abouthealthreport/abouthealth.xhtml
@@ -158,6 +153,7 @@ lib/firefox/browser/chrome/browser/conte
 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-pkcs11.js
 lib/firefox/browser/chrome/browser/content/browser/ext-sessions.js
 lib/firefox/browser/chrome/browser/content/browser/ext-sidebarAction.js
 lib/firefox/browser/chrome/browser/content/browser/ext-tabs.js
@@ -185,7 +181,6 @@ lib/firefox/browser/chrome/browser/conte
 lib/firefox/browser/chrome/browser/content/browser/pageinfo/feeds.xml
 lib/firefox/browser/chrome/browser/content/browser/pageinfo/pageInfo.css
 lib/firefox/browser/chrome/browser/content/browser/pageinfo/pageInfo.js
-lib/firefox/browser/chrome/browser/content/browser/pageinfo/pageInfo.xml
 lib/firefox/browser/chrome/browser/content/browser/pageinfo/pageInfo.xul
 lib/firefox/browser/chrome/browser/content/browser/pageinfo/permissions.js
 lib/firefox/browser/chrome/browser/content/browser/pageinfo/security.js
@@ -277,6 +272,7 @@ lib/firefox/browser/chrome/browser/conte
 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/pkcs11.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/sessions.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/sidebar_action.json
 lib/firefox/browser/chrome/browser/content/browser/schemas/tabs.json
@@ -366,19 +362,13 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/density-touch.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/empty-overflow-panel.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/empty-overflow-panel%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/menuPanel-customizeFinish.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/menuPanel-customizeFinish%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/panelUI.css
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted-rtl.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted-rtl%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/customizableui/subView-arrow-back-inverted.png
-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/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/device-tablet.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/devtools/common.css
 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
@@ -411,6 +401,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/icon-search-64.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/illustrations/error-session-restore.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/info.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/library-bookmark-animation.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/library.svg
@@ -418,12 +409,6 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/mail.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/menu-badged.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
-lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-exit%2x.png@localhost
-lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-help.png
-lib/firefox/browser/chrome/browser/skin/classic/browser/menuPanel-help%2x.png@localhost
 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
@@ -433,6 +418,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/newtab/newTab.css
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/camera-blocked.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/camera.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/canvas.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/default-info.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/desktop-notification-blocked.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/desktop-notification.svg
@@ -440,7 +426,6 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/geo-blocked.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/geo-detailed.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/geo.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/indexedDB-blocked.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/indexedDB.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/login-detailed.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/login.svg
@@ -450,8 +435,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage-blocked.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/persistent-storage.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/plugin-badge.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/plugin-blocked.svg
-lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/plugin.svg
+lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/popup-subitem.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/popup.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/screen-blocked.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/screen.svg
@@ -466,8 +450,6 @@ lib/firefox/browser/chrome/browser/skin/
 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
 lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/header%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/panic-panel/icons.png
@@ -541,7 +523,7 @@ lib/firefox/browser/chrome/browser/skin/
 lib/firefox/browser/chrome/browser/skin/classic/browser/search-indicator-badge-add.svg
 lib/firefox/browser/chrome/browser/skin/classic/browser/searchReset.css
 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/send-to-device.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/sidebars-right.svg
@@ -565,9 +547,14 @@ lib/firefox/browser/chrome/browser/skin/
 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-connecting.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-connecting%2x.png@localhost
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-loading-inverted.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-loading-inverted%2x.png@localhost
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-loading.png
+lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-loading%2x.png@localhost
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-overflow-indicator.png
 lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tabDragIndicator.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
@@ -588,6 +575,23 @@ lib/firefox/browser/chrome/browser/skin/
 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-shim/content/aboutdevtools/aboutdevtools.css
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/aboutdevtools.js
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/aboutdevtools.xhtml
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/images/dev-edition-logo.svg
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/images/external-link.svg
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-console.svg
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-debugger.svg
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-inspector.svg
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-memory.svg
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-network.svg
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-performance.svg
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-responsive.svg
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-storage.svg
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/images/feature-visualediting.svg
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/images/otter.svg
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/subscribe.css
+lib/firefox/browser/chrome/devtools-shim/content/aboutdevtools/subscribe.js
 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
@@ -636,7 +640,15 @@ lib/firefox/browser/chrome/devtools/cont
 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/index.html
+lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/MdnLink.css
+lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/NetworkDetailsPanel.css
+lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/RequestList.css
+lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/StatisticsPanel.css
+lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/StatusBar.css
+lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/Toolbar.css
+lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/httpi.css
 lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/netmonitor.css
+lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/variables.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
@@ -666,7 +678,6 @@ lib/firefox/browser/chrome/devtools/cont
 lib/firefox/browser/chrome/devtools/content/shared/widgets/cubic-bezier.css
 lib/firefox/browser/chrome/devtools/content/shared/widgets/filter-widget.css
 lib/firefox/browser/chrome/devtools/content/shared/widgets/graphs-frame.xhtml
-lib/firefox/browser/chrome/devtools/content/shared/widgets/mdn-docs.css
 lib/firefox/browser/chrome/devtools/content/shared/widgets/spectrum.css
 lib/firefox/browser/chrome/devtools/content/shared/widgets/widgets.css
 lib/firefox/browser/chrome/devtools/content/sourceeditor/codemirror/addon/dialog/dialog.css
@@ -688,23 +699,23 @@ lib/firefox/browser/chrome/devtools/cont
 lib/firefox/browser/chrome/devtools/content/webaudioeditor/views/properties.js
 lib/firefox/browser/chrome/devtools/content/webaudioeditor/views/utils.js
 lib/firefox/browser/chrome/devtools/content/webaudioeditor/webaudioeditor.xul
-lib/firefox/browser/chrome/devtools/content/webconsole/webconsole.xhtml
+lib/firefox/browser/chrome/devtools/content/webconsole/webconsole.html
 lib/firefox/browser/chrome/devtools/content/webconsole/webconsole.xul
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/aboutdebugging.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/controls.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/install-error.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/target.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/panel-header.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/panel-menu-entry.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/panel-menu.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tabs/panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tabs/target.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/target-list.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/multi-e10s-warning.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/service-worker-target.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/target.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/Aboutdebugging.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/PanelHeader.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/PanelMenu.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/PanelMenuEntry.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/TargetList.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/Controls.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/InstallError.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/Panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/addons/Target.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tabs/Panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/tabs/Target.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/MultiE10sWarning.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/Panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/ServiceWorkerTarget.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/components/workers/Target.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/modules/addon.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/modules/worker.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/animationinspector/components/animation-details.js
@@ -777,6 +788,17 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-hosts.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox-options.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/framework/toolbox.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/actions/animations.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/actions/element-picker.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/actions/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/animation.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationItem.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/AnimationList.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/App.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/components/NoAnimationPanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/reducers/animations.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/reducers/element-picker.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/animation/utils/utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/actions/box-model.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/actions/index.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/box-model.js
@@ -791,21 +813,37 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/types.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/boxmodel/utils/editing-session.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/breadcrumbs.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/components/inspector-tab-panel.css
-lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/components/inspector-tab-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/changes/actions/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/changes/changes.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/changes/components/ChangesApp.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/changes/reducers/changes.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/changes/reducers/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/components/InspectorTabPanel.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/components/InspectorTabPanel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/computed/computed.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/events/actions/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/events/components/EventsApp.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/events/events.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/events/reducers/events.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/events/reducers/index.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/actions/index.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/actions/sidebar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ExtensionSidebar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/components/ObjectTreeView.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/extension-sidebar.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/extensions/reducers/sidebar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/actions/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/components/Flexbox.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/flexbox.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/reducers/flexboxes.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/reducers/index.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/flexbox/types.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/font-options.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/fonts.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/actions/index.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/App.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/Font.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/FontList.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/components/FontsApp.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/fonts.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/reducers/font-options.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/fonts/reducers/fonts.js
@@ -829,8 +867,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/inspector-search.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/Accordion.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/Accordion.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/App.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/LayoutPromoteBar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/components/LayoutApp.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/layout/layout.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/markup.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/markup/utils.js
@@ -861,13 +898,13 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/shared/utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/store.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/toolsidebar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/headers-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/headers.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/json-panel.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/main-tabbed-area.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/toolbar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/search-box.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/text-panel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/Headers.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/HeadersPanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/JsonPanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/MainTabbedArea.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/SearchBox.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/TextPanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/jsonview/components/reps/Toolbar.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/css/general.css
@@ -894,20 +931,20 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/tree-map-display.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/actions/view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/app.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/census-header.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/census-tree-item.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/census.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/dominator-tree-header.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/dominator-tree-item.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/dominator-tree.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/heap.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/individuals-header.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/individuals.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/list.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/shortest-paths.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/snapshot-list-item.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/toolbar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/Census.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/CensusHeader.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/CensusTreeItem.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/DominatorTree.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/DominatorTreeHeader.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/DominatorTreeItem.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/Heap.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/Individuals.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/IndividualsHeader.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/List.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/ShortestPaths.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/SnapshotListItem.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/Toolbar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/TreeMap.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/canvas-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/color-coarse-type.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/components/tree-map/drag-zoom.js
@@ -930,7 +967,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/tree-map-display.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/reducers/view.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/memory/store.js
-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/panel.js
@@ -942,49 +978,49 @@ lib/firefox/browser/chrome/devtools/modu
 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-header.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/components/App.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/CookiesPanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/CustomRequestPanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/HeadersPanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/MdnLink.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/MonitorPanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/NetworkDetailsPanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/ParamsPanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/PropertiesView.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestList.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnCause.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnContentSize.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnCookies.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnDomain.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnDuration.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnEndTime.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnFile.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnLatency.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnMethod.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnProtocol.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnRemoteIp.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnResponseHeader.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnResponseTime.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnScheme.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnSetCookies.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnStartTime.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnStatus.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnTransferredSize.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnType.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListColumnWaterfall.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListContent.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListEmptyNotice.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListHeader.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/RequestListItem.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/ResponsePanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/SecurityPanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/SourceEditor.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/StackTracePanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/StatisticsPanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/StatusBar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/TabboxPanel.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/TimingsPanel.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/firefox-data-provider.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/connector/index.js
@@ -997,6 +1033,7 @@ lib/firefox/browser/chrome/devtools/modu
 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/recording.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
@@ -1024,6 +1061,7 @@ lib/firefox/browser/chrome/devtools/modu
 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/utils/sort-utils.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
@@ -1077,21 +1115,23 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/touch-simulation.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/actions/viewports.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/app.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/browser/content.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/browser/swap.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/browser/tunnel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/browser/web-navigation.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/browser.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/device-adder.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/device-modal.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/device-selector.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/dpr-selector.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/global-toolbar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/network-throttling-selector.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/resizable-viewport.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/viewport-dimension.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/viewport-toolbar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/viewport.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/viewports.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/commands.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/Browser.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/DeviceAdder.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/DeviceModal.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/DeviceSelector.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/DprSelector.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/GlobalToolbar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/NetworkThrottlingSelector.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/ResizableViewport.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/Viewport.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/ViewportDimension.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/ViewportToolbar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/components/Viewports.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/constants.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/images/grippers.svg
 lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive.html/images/rotate-viewport.svg
@@ -1116,46 +1156,41 @@ lib/firefox/browser/chrome/devtools/modu
 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-old.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/responsivedesign/responsivedesign.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/scratchpad/scratchpad-commands.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/scratchpad/scratchpad-manager.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/client/scratchpad/scratchpad-panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shadereditor/panel.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/AppCacheUtils.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/DOMHelpers.jsm
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/Jsbeautify.jsm
 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
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/notification-box.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/AutoCompletePopup.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/Frame.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/HSplitBox.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/NotificationBox.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/NotificationBox.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/SearchBox.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/SidebarToggle.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/SidebarToggle.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/StackTrace.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/Tree.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/reps.css
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/reps.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/search-box.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/sidebar-toggle.css
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/sidebar-toggle.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/splitter/draggable.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/splitter/split-box.css
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/splitter/split-box.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/stack-trace.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/tabbar.css
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/tabbar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/tabs.css
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/tabs.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/label-cell.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/object-provider.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-cell.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-header.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-row.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-view.css
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/tree-view.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/splitter/Draggable.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/splitter/SplitBox.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/splitter/SplitBox.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/TabBar.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/TabBar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/Tabs.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tabs/Tabs.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/LabelCell.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/ObjectProvider.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/TreeCell.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/TreeHeader.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/TreeRow.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/TreeView.css
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/tree/TreeView.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/css-angle.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/curl.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/demangle.js
@@ -1213,6 +1248,8 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/stringvalidator/validator.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/view-source.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/webgl-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/webpack/shims/platform-clipboard-stub.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/webpack/shims/platform-stack-stub.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/AbstractTreeItem.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/BarGraphWidget.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/BreadcrumbsWidget.jsm
@@ -1226,7 +1263,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/Graphs.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/GraphsWorker.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/LineGraphWidget.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/MdnDocsWidget.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/MountainGraphWidget.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/SideMenuWidget.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/SimpleListWidget.jsm
@@ -1235,7 +1271,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/TreeWidget.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/VariablesView.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/VariablesViewController.jsm
-lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/tooltip/CssDocsTooltip.js
 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
@@ -1267,12 +1302,12 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/StyleEditorUI.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/StyleEditorUtil.jsm
 lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/StyleSheetEditor.jsm
+lib/firefox/browser/chrome/devtools/modules/devtools/client/styleeditor/original-source.js
 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
@@ -1309,24 +1344,24 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/index.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/messages.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/actions/ui.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/collapse-button.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/console-output.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/console-table.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/filter-bar.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/filter-button.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/filter-checkbox.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/grip-message-body.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-container.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-icon.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-indent.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-repeat.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/console-api-call.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/console-command.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/default-renderer.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/evaluation-result.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/network-event-message.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/page-error.js
-lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/CollapseButton.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/ConsoleOutput.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/ConsoleTable.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/FilterBar.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/FilterButton.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/FilterCheckbox.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/GripMessageBody.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/Message.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/MessageContainer.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/MessageIcon.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/MessageIndent.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/MessageRepeat.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/ConsoleApiCall.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/ConsoleCommand.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/DefaultRenderer.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/EvaluationResult.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/NetworkEventMessage.js
+lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/components/message-types/PageError.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/constants.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/main.js
 lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/new-console-output/new-console-output-wrapper.js
@@ -1383,6 +1418,7 @@ lib/firefox/browser/chrome/devtools/modu
 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/emulation.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/emulation/touch-simulator.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/environment.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/errordocs.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/eventlooplag.js
@@ -1397,6 +1433,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/css-grid.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/css-transform.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/eye-dropper.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/flexbox.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/paused-debugger.js
@@ -1404,13 +1441,13 @@ lib/firefox/browser/chrome/devtools/modu
 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/canvas.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
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/layout.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/memory.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/monitor.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/object.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/performance-entries.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/performance-recording.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/performance.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/preference.js
@@ -1434,7 +1471,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/css-grid-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/make-debugger.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/map-uri-to-addon-id.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/shapes-geometry-utils.js
+lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/shapes-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/stack.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/walker-search.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/webaudio.js
@@ -1463,7 +1500,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/server/performance/recorder.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/performance/timeline.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/primitive.js
-lib/firefox/browser/chrome/devtools/modules/devtools/server/protocol.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/service-worker-child.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/websocket-server.js
 lib/firefox/browser/chrome/devtools/modules/devtools/server/worker.js
@@ -1480,8 +1516,24 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/async-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/base-loader.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/builtin-modules.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/addon-client.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/array-buffer-client.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/breakpoint-client.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/connection-manager.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/main.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/constants.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/debugger-client.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/environment-client.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/event-source.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/long-string-client.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/object-client.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/property-iterator-client.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/root-client.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/source-client.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/symbol-iterator-client.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/tab-client.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/thread-client.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/trace-client.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/worker-client.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/content-observer.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/css/color-db.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/css/color.js
@@ -1515,7 +1567,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/inspector.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/layout.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/memory.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/performance-entries.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/node.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/performance-recording.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/performance.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/preference.js
@@ -1542,7 +1594,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/commands/inject.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/commands/jsb.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/commands/listen.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/commands/mdn.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/commands/measure.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/commands/media.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/gcli/commands/pagemod.js
@@ -1641,10 +1692,8 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/path.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/performance/recording-common.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/performance/recording-utils.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/platform/chrome/clipboard.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/platform/chrome/stack.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/platform/content/clipboard.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/platform/content/stack.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/platform/clipboard.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/platform/stack.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/plural-form.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/pretty-fast/pretty-fast.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/protocol.js
@@ -1679,7 +1728,6 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/layout.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/memory.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/node.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/performance-entries.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/performance-recording.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/performance.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/preference.js
@@ -1700,9 +1748,7 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/sprintfjs/sprintf.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/system.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/task.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/touch/simulator-content.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/touch/simulator-core.js
-lib/firefox/browser/chrome/devtools/modules/devtools/shared/touch/simulator.js
+lib/firefox/browser/chrome/devtools/modules/devtools/shared/throttle.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/transport/packets.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/transport/stream-utils.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/transport/transport.js
@@ -1718,8 +1764,10 @@ lib/firefox/browser/chrome/devtools/modu
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/worker/helper.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/worker/loader.js
 lib/firefox/browser/chrome/devtools/modules/devtools/shared/worker/worker.js
+lib/firefox/browser/chrome/devtools/skin/animation.css
 lib/firefox/browser/chrome/devtools/skin/animationinspector.css
 lib/firefox/browser/chrome/devtools/skin/boxmodel.css
+lib/firefox/browser/chrome/devtools/skin/breadcrumbs.css
 lib/firefox/browser/chrome/devtools/skin/canvasdebugger.css
 lib/firefox/browser/chrome/devtools/skin/commandline.css
 lib/firefox/browser/chrome/devtools/skin/components-frame.css
@@ -1739,8 +1787,8 @@ lib/firefox/browser/chrome/devtools/skin
 lib/firefox/browser/chrome/devtools/skin/images/animation-fast-track.svg
 lib/firefox/browser/chrome/devtools/skin/images/arrow-e.png
 lib/firefox/browser/chrome/devtools/skin/images/arrow-e%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/breadcrumbs-scrollbutton.png
-lib/firefox/browser/chrome/devtools/skin/images/breadcrumbs-scrollbutton%2x.png@localhost
+lib/firefox/browser/chrome/devtools/skin/images/breadcrumbs-divider.svg
+lib/firefox/browser/chrome/devtools/skin/images/breadcrumbs-scrollbutton.svg
 lib/firefox/browser/chrome/devtools/skin/images/breakpoint.svg
 lib/firefox/browser/chrome/devtools/skin/images/clear.svg
 lib/firefox/browser/chrome/devtools/skin/images/close.svg
@@ -1763,6 +1811,18 @@ lib/firefox/browser/chrome/devtools/skin
 lib/firefox/browser/chrome/devtools/skin/images/debugger-step-out.svg
 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/debugger/arrow.svg
+lib/firefox/browser/chrome/devtools/skin/images/debugger/blackBox.svg
+lib/firefox/browser/chrome/devtools/skin/images/debugger/domain.svg
+lib/firefox/browser/chrome/devtools/skin/images/debugger/file.svg
+lib/firefox/browser/chrome/devtools/skin/images/debugger/folder.svg
+lib/firefox/browser/chrome/devtools/skin/images/debugger/pause-exceptions.svg
+lib/firefox/browser/chrome/devtools/skin/images/debugger/pause.svg
+lib/firefox/browser/chrome/devtools/skin/images/debugger/prettyPrint.svg
+lib/firefox/browser/chrome/devtools/skin/images/debugger/resume.svg
+lib/firefox/browser/chrome/devtools/skin/images/debugger/stepIn.svg
+lib/firefox/browser/chrome/devtools/skin/images/debugger/stepOut.svg
+lib/firefox/browser/chrome/devtools/skin/images/debugger/stepOver.svg
 lib/firefox/browser/chrome/devtools/skin/images/debugging-addons.svg
 lib/firefox/browser/chrome/devtools/skin/images/debugging-tabs.svg
 lib/firefox/browser/chrome/devtools/skin/images/debugging-workers.svg
@@ -1780,7 +1840,6 @@ lib/firefox/browser/chrome/devtools/skin
 lib/firefox/browser/chrome/devtools/skin/images/filters.svg
 lib/firefox/browser/chrome/devtools/skin/images/firebug/arrow-down.svg
 lib/firefox/browser/chrome/devtools/skin/images/firebug/arrow-up.svg
-lib/firefox/browser/chrome/devtools/skin/images/firebug/breadcrumbs-divider.svg
 lib/firefox/browser/chrome/devtools/skin/images/firebug/breakpoint.svg
 lib/firefox/browser/chrome/devtools/skin/images/firebug/close.svg
 lib/firefox/browser/chrome/devtools/skin/images/firebug/command-console.svg
@@ -1839,19 +1898,6 @@ lib/firefox/browser/chrome/devtools/skin
 lib/firefox/browser/chrome/devtools/skin/images/profiler-stopwatch.svg
 lib/firefox/browser/chrome/devtools/skin/images/pseudo-class.svg
 lib/firefox/browser/chrome/devtools/skin/images/reload.svg
-lib/firefox/browser/chrome/devtools/skin/images/responsivemode/responsive-horizontal-resizer.png
-lib/firefox/browser/chrome/devtools/skin/images/responsivemode/responsive-horizontal-resizer%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/responsivemode/responsive-se-resizer.png
-lib/firefox/browser/chrome/devtools/skin/images/responsivemode/responsive-se-resizer%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/responsivemode/responsive-vertical-resizer.png
-lib/firefox/browser/chrome/devtools/skin/images/responsivemode/responsive-vertical-resizer%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/responsivemode/responsiveui-home.png
-lib/firefox/browser/chrome/devtools/skin/images/responsivemode/responsiveui-rotate.png
-lib/firefox/browser/chrome/devtools/skin/images/responsivemode/responsiveui-rotate%2x.png@localhost
-lib/firefox/browser/chrome/devtools/skin/images/responsivemode/responsiveui-screenshot.png
-lib/firefox/browser/chrome/devtools/skin/images/responsivemode/responsiveui-screenshot%2x.png@localhost
-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
@@ -1867,15 +1913,12 @@ lib/firefox/browser/chrome/devtools/skin
 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
-lib/firefox/browser/chrome/devtools/skin/images/tool-debugger-paused.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-debugger.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-dom.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-inspector.svg
-lib/firefox/browser/chrome/devtools/skin/images/tool-memory-active.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-memory.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-network.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-options.svg
-lib/firefox/browser/chrome/devtools/skin/images/tool-profiler-active.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-profiler.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-scratchpad.svg
 lib/firefox/browser/chrome/devtools/skin/images/tool-shadereditor.svg
@@ -1925,7 +1968,6 @@ lib/firefox/browser/chrome/en-US/locale/
 lib/firefox/browser/chrome/en-US/locale/branding/brand.properties
 lib/firefox/browser/chrome/en-US/locale/branding/browserconfig.properties
 lib/firefox/browser/chrome/en-US/locale/browser-region/region.properties
-lib/firefox/browser/chrome/en-US/locale/browser/aboutAccounts.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/aboutDialog.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/aboutHealthReport.dtd
 lib/firefox/browser/chrome/en-US/locale/browser/aboutHome.dtd
@@ -2063,7 +2105,6 @@ lib/firefox/browser/chrome/en-US/locale/
 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/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
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/scratchpad.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/shadereditor.dtd
@@ -2092,8 +2133,10 @@ lib/firefox/browser/chrome/en-US/locale/
 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
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/styleinspector.properties
+lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shim/aboutdevtools.dtd
+lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shim/aboutdevtools.properties
 lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shim/key-shortcuts.properties
-lib/firefox/browser/chrome/en-US/locale/en-US/formautofill.properties
+lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shim/startup.properties
 lib/firefox/browser/chrome/en-US/locale/pdfviewer/chrome.properties
 lib/firefox/browser/chrome/en-US/locale/pdfviewer/viewer.properties
 lib/firefox/browser/chrome/icons/default/default16.png
@@ -2417,6 +2460,7 @@ lib/firefox/browser/components/SelfSuppo
 lib/firefox/browser/components/WebContentConverter.js
 lib/firefox/browser/components/aboutNewTabService.js
 lib/firefox/browser/components/aboutdebugging-registration.js
+lib/firefox/browser/components/aboutdevtools-registration.js
 lib/firefox/browser/components/components.manifest
 lib/firefox/browser/components/devtools-startup.js
 lib/firefox/browser/components/interfaces.xpt
@@ -2447,11 +2491,9 @@ lib/firefox/browser/features/activity-st
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/PerfService.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/PrerenderData.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/common/Reducers.jsm
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/activity-stream-initial-state.js
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/css/activity-stream.css
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/activity-stream.bundle.js
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/activity-stream.css
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-arrowhead-down-12.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-delete-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-dismiss-16.svg
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/assets/glyph-edit-16.svg
@@ -2486,16 +2528,16 @@ lib/firefox/browser/features/activity-st
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/wykop-pl%2x.png@localhost
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/images/youtube-com%2x.png@localhost
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/content/tippytop/top_sites.json
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/data/locales.json
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/ActivityStream.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/ActivityStreamMessageChannel.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/ActivityStreamPrefs.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/FaviconFeed.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/FilterAdult.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/HighlightsFeed.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/LinksCache.jsm
-lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/LocalizationFeed.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/ManualMigration.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/NewTabInit.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/PersistentCache.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/PlacesFeed.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/PrefsFeed.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/Screenshots.jsm
@@ -2509,6 +2551,280 @@ lib/firefox/browser/features/activity-st
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/TopSitesFeed.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/TopStoriesFeed.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/lib/UserDomainAffinityProvider.jsm
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ach/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ach/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ach/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ar/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ar/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ar/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ast/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ast/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ast/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/az/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/az/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/az/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/be/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/be/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/be/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/bg/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/bg/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/bg/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/bn-BD/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/bn-BD/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/bn-BD/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/bn-IN/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/bn-IN/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/bn-IN/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/br/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/br/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/br/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/bs/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/bs/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/bs/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ca/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ca/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ca/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/cak/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/cak/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/cak/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/cs/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/cs/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/cs/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/cy/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/cy/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/cy/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/da/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/da/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/da/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/de/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/de/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/de/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/dsb/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/dsb/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/dsb/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/el/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/el/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/el/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/en-GB/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/en-GB/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/en-GB/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/en-US/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/en-US/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/en-US/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/eo/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/eo/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/eo/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/es-AR/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/es-AR/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/es-AR/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/es-CL/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/es-CL/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/es-CL/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/es-ES/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/es-ES/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/es-ES/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/es-MX/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/es-MX/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/es-MX/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/et/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/et/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/et/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/eu/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/eu/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/eu/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/fa/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/fa/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/fa/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ff/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ff/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ff/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/fi/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/fi/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/fi/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/fr/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/fr/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/fr/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/fy-NL/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/fy-NL/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/fy-NL/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ga-IE/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ga-IE/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ga-IE/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/gd/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/gd/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/gd/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/gl/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/gl/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/gl/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/gn/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/gn/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/gn/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/gu-IN/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/gu-IN/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/gu-IN/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/he/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/he/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/he/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hi-IN/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hi-IN/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hi-IN/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hr/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hr/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hr/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hsb/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hsb/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hsb/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hu/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hu/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hu/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hy-AM/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hy-AM/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/hy-AM/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ia/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ia/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ia/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/id/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/id/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/id/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/it/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/it/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/it/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ja/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ja/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ja/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ka/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ka/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ka/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/kab/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/kab/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/kab/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/kk/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/kk/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/kk/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/km/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/km/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/km/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/kn/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/kn/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/kn/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ko/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ko/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ko/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/lij/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/lij/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/lij/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/lo/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/lo/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/lo/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/lt/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/lt/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/lt/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ltg/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ltg/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ltg/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/lv/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/lv/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/lv/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/mk/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/mk/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/mk/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ml/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ml/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ml/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/mr/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/mr/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/mr/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ms/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ms/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ms/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/my/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/my/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/my/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/nb-NO/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/nb-NO/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/nb-NO/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ne-NP/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ne-NP/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ne-NP/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/nl/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/nl/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/nl/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/nn-NO/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/nn-NO/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/nn-NO/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/pa-IN/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/pa-IN/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/pa-IN/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/pl/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/pl/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/pl/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/pt-BR/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/pt-BR/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/pt-BR/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/pt-PT/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/pt-PT/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/pt-PT/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/rm/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/rm/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/rm/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ro/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ro/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ro/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ru/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ru/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ru/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/si/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/si/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/si/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sk/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sk/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sk/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sl/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sl/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sl/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sq/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sq/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sq/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sr/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sr/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sr/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/static/activity-stream-initial-state.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sv-SE/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sv-SE/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/sv-SE/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ta/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ta/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ta/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/te/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/te/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/te/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/th/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/th/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/th/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/tl/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/tl/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/tl/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/tr/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/tr/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/tr/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/uk/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/uk/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/uk/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ur/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ur/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/ur/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/uz/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/uz/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/uz/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/vi/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/vi/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/vi/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/zh-CN/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/zh-CN/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/zh-CN/activity-stream.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/zh-TW/activity-stream-prerendered.html
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/zh-TW/activity-stream-strings.js
+lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/prerendered/zh-TW/activity-stream.html
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/vendor/Redux.jsm
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/vendor/react-dom.js
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/chrome/content/vendor/react-intl.js
@@ -2518,8 +2834,6 @@ lib/firefox/browser/features/activity-st
 lib/firefox/browser/features/activity-stream%mozilla.org@localhost/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/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
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome.manifest
 lib/firefox/browser/features/firefox%getpocket.com@localhost/chrome/content/AboutPocket.jsm
@@ -2627,6 +2941,7 @@ lib/firefox/browser/features/formautofil
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/shared/editDialog.css
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/windows/autocomplete-item.css
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/chrome/skin/windows/editDialog.css
+lib/firefox/browser/features/formautofill%mozilla.org@localhost/en-US/locale/en-US/formautofill.properties
 lib/firefox/browser/features/formautofill%mozilla.org@localhost/install.rdf
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/bootstrap.js
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome.manifest
@@ -2639,23 +2954,14 @@ lib/firefox/browser/features/onboarding@
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_screenshots.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_singlesearch.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/figure_sync.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_addons-colored.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_addons.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_customize-colored.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_customize.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_default-colored.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_default.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_library-colored.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_library.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_performance-colored.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_performance.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_private-colored.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_private.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_screenshots-colored.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_screenshots.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_singlesearch-colored.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_singlesearch.svg
-lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_sync-colored.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_sync.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/icons_tour-complete.svg
 lib/firefox/browser/features/onboarding%mozilla.org@localhost/chrome/content/img/watermark.svg
@@ -2676,6 +2982,7 @@ lib/firefox/browser/features/screenshots
 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/bs/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/ca/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/cak/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/cs/messages.json
@@ -2694,6 +3001,7 @@ lib/firefox/browser/features/screenshots
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/et/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/eu/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/fa/messages.json
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/ff/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/fi/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/fr/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/fy_NL/messages.json
@@ -2705,6 +3013,7 @@ lib/firefox/browser/features/screenshots
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/hsb/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/hu/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/hy_AM/messages.json
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/ia/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/id/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/it/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/ja/messages.json
@@ -2712,6 +3021,7 @@ lib/firefox/browser/features/screenshots
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/kab/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/kk/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/km/messages.json
+lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/kn/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/ko/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/lij/messages.json
 lib/firefox/browser/features/screenshots%mozilla.org@localhost/webextension/_locales/lo/messages.json
@@ -2773,12 +3083,13 @@ lib/firefox/browser/features/screenshots
 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/copy.svg
 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/help-16.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-white.svg
@@ -2852,6 +3163,7 @@ lib/firefox/browser/features/webcompat@m
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/chrome/content/lib/ua_overrider.jsm
 lib/firefox/browser/features/webcompat%mozilla.org@localhost/install.rdf
 lib/firefox/browser/icons/mozicon128.png
+lib/firefox/browser/localization/en-US/browser/preferences/main.ftl
 lib/firefox/browser/modules/AboutHome.jsm
 lib/firefox/browser/modules/AboutNewTab.jsm
 lib/firefox/browser/modules/AttributionCode.jsm
@@ -2905,6 +3217,7 @@ lib/firefox/browser/modules/ReaderParent
 lib/firefox/browser/modules/RecentWindow.jsm
 lib/firefox/browser/modules/RemotePrompt.jsm
 lib/firefox/browser/modules/Sanitizer.jsm
+lib/firefox/browser/modules/SchedulePressure.jsm
 lib/firefox/browser/modules/ScrollbarSampler.jsm
 lib/firefox/browser/modules/SearchWidgetTracker.jsm
 lib/firefox/browser/modules/ShellService.jsm
@@ -2914,8 +3227,6 @@ lib/firefox/browser/modules/TransientPre
 lib/firefox/browser/modules/UITour.jsm
 lib/firefox/browser/modules/UpdateTopLevelContentWindowIDHelper.jsm
 lib/firefox/browser/modules/ZoomUI.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
 lib/firefox/browser/modules/offlineAppCache.jsm
@@ -3039,14 +3350,11 @@ lib/firefox/chrome/en-US/locale/en-US/gl
 lib/firefox/chrome/en-US/locale/en-US/global/nsWebBrowserPersist.properties
 lib/firefox/chrome/en-US/locale/en-US/global/plugins.properties
 lib/firefox/chrome/en-US/locale/en-US/global/preferences.dtd
-lib/firefox/chrome/en-US/locale/en-US/global/printPageSetup.dtd
 lib/firefox/chrome/en-US/locale/en-US/global/printPreview.dtd
 lib/firefox/chrome/en-US/locale/en-US/global/printPreviewProgress.dtd
 lib/firefox/chrome/en-US/locale/en-US/global/printProgress.dtd
-lib/firefox/chrome/en-US/locale/en-US/global/printdialog.dtd
 lib/firefox/chrome/en-US/locale/en-US/global/printdialog.properties
 lib/firefox/chrome/en-US/locale/en-US/global/printing.properties
-lib/firefox/chrome/en-US/locale/en-US/global/printjoboptions.dtd
 lib/firefox/chrome/en-US/locale/en-US/global/regionNames.properties
 lib/firefox/chrome/en-US/locale/en-US/global/resetProfile.dtd
 lib/firefox/chrome/en-US/locale/en-US/global/resetProfile.properties
@@ -3117,6 +3425,7 @@ lib/firefox/chrome/marionette/content/el
 lib/firefox/chrome/marionette/content/error.js
 lib/firefox/chrome/marionette/content/evaluate.js
 lib/firefox/chrome/marionette/content/event.js
+lib/firefox/chrome/marionette/content/format.js
 lib/firefox/chrome/marionette/content/frame.js
 lib/firefox/chrome/marionette/content/interaction.js
 lib/firefox/chrome/marionette/content/l10n.js
@@ -3132,8 +3441,9 @@ lib/firefox/chrome/marionette/content/re
 lib/firefox/chrome/marionette/content/server.js
 lib/firefox/chrome/marionette/content/session.js
 lib/firefox/chrome/marionette/content/stream-utils.js
+lib/firefox/chrome/marionette/content/sync.js
 lib/firefox/chrome/marionette/content/transport.js
-lib/firefox/chrome/marionette/content/wait.js
+lib/firefox/chrome/marionette/content/wm.js
 lib/firefox/chrome/pippki/content/pippki/CAOverlay.xul
 lib/firefox/chrome/pippki/content/pippki/MineOverlay.xul
 lib/firefox/chrome/pippki/content/pippki/OrphanOverlay.xul
@@ -3286,6 +3596,7 @@ lib/firefox/chrome/toolkit/content/globa
 lib/firefox/chrome/toolkit/content/global/appPicker.js
 lib/firefox/chrome/toolkit/content/global/appPicker.xul
 lib/firefox/chrome/toolkit/content/global/autocomplete.css
+${PLIST.webrtc}lib/firefox/components/PeerConnection.js
 lib/firefox/chrome/toolkit/content/global/backgroundPageThumbs.xhtml
 lib/firefox/chrome/toolkit/content/global/backgroundPageThumbsContent.js
 lib/firefox/chrome/toolkit/content/global/bindings/autocomplete.xml
@@ -3362,6 +3673,7 @@ lib/firefox/chrome/toolkit/content/globa
 lib/firefox/chrome/toolkit/content/global/globalOverlay.js
 lib/firefox/chrome/toolkit/content/global/gmp-sources/openh264.json
 lib/firefox/chrome/toolkit/content/global/gmp-sources/widevinecdm.json
+lib/firefox/chrome/toolkit/content/global/l10n.js
 lib/firefox/chrome/toolkit/content/global/license.html
 lib/firefox/chrome/toolkit/content/global/manifestMessages.js
 lib/firefox/chrome/toolkit/content/global/menulist.css
@@ -3372,18 +3684,12 @@ lib/firefox/chrome/toolkit/content/globa
 lib/firefox/chrome/toolkit/content/global/platformHTMLBindings.xml
 lib/firefox/chrome/toolkit/content/global/plugins.css
 lib/firefox/chrome/toolkit/content/global/plugins.html
-lib/firefox/chrome/toolkit/content/global/printPageSetup.js
-lib/firefox/chrome/toolkit/content/global/printPageSetup.xul
 lib/firefox/chrome/toolkit/content/global/printPreviewBindings.xml
 lib/firefox/chrome/toolkit/content/global/printPreviewProgress.js
 lib/firefox/chrome/toolkit/content/global/printPreviewProgress.xul
 lib/firefox/chrome/toolkit/content/global/printProgress.js
 lib/firefox/chrome/toolkit/content/global/printProgress.xul
 lib/firefox/chrome/toolkit/content/global/printUtils.js
-lib/firefox/chrome/toolkit/content/global/printdialog.js
-lib/firefox/chrome/toolkit/content/global/printdialog.xul
-lib/firefox/chrome/toolkit/content/global/printjoboptions.js
-lib/firefox/chrome/toolkit/content/global/printjoboptions.xul
 lib/firefox/chrome/toolkit/content/global/process-content.js
 lib/firefox/chrome/toolkit/content/global/reader/aboutReader.html
 lib/firefox/chrome/toolkit/content/global/reader/aboutReader.js
@@ -3502,6 +3808,7 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/about.css
 lib/firefox/chrome/toolkit/skin/classic/global/aboutCache.css
 lib/firefox/chrome/toolkit/skin/classic/global/aboutCacheEntry.css
+lib/firefox/chrome/toolkit/skin/classic/global/aboutLicense.css
 lib/firefox/chrome/toolkit/skin/classic/global/aboutMemory.css
 lib/firefox/chrome/toolkit/skin/classic/global/aboutReader.css
 lib/firefox/chrome/toolkit/skin/classic/global/aboutReaderContent.css
@@ -3540,7 +3847,6 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/filepicker.css
 lib/firefox/chrome/toolkit/skin/classic/global/findBar.css
 lib/firefox/chrome/toolkit/skin/classic/global/global.css
-lib/firefox/chrome/toolkit/skin/classic/global/globalBindings.xml
 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
@@ -3548,7 +3854,9 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/icons/Restore.gif
 lib/firefox/chrome/toolkit/skin/classic/global/icons/arrow-dropdown-12.svg
 lib/firefox/chrome/toolkit/skin/classic/global/icons/arrow-dropdown-16.svg
-lib/firefox/chrome/toolkit/skin/classic/global/icons/autoscroll.png
+lib/firefox/chrome/toolkit/skin/classic/global/icons/autoscroll-horizontal.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/autoscroll-vertical.svg
+lib/firefox/chrome/toolkit/skin/classic/global/icons/autoscroll.svg
 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
@@ -3576,6 +3884,7 @@ lib/firefox/chrome/toolkit/skin/classic/
 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.svg
+lib/firefox/chrome/toolkit/skin/classic/global/illustrations/about-license.svg
 lib/firefox/chrome/toolkit/skin/classic/global/illustrations/about-rights.svg
 lib/firefox/chrome/toolkit/skin/classic/global/in-content/check-partial.svg
 lib/firefox/chrome/toolkit/skin/classic/global/in-content/check.svg
@@ -3606,8 +3915,6 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/menu/shared-menu-check-active.svg
 lib/firefox/chrome/toolkit/skin/classic/global/menu/shared-menu-check-black.svg
 lib/firefox/chrome/toolkit/skin/classic/global/menu/shared-menu-check-hover.svg
-lib/firefox/chrome/toolkit/skin/classic/global/menu/shared-menu-check.png
-lib/firefox/chrome/toolkit/skin/classic/global/menu/shared-menu-check%2x.png@localhost
 lib/firefox/chrome/toolkit/skin/classic/global/menulist.css
 lib/firefox/chrome/toolkit/skin/classic/global/narrate.css
 lib/firefox/chrome/toolkit/skin/classic/global/narrate/arrow.svg
@@ -3624,12 +3931,9 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/global/passwordmgr.css
 lib/firefox/chrome/toolkit/skin/classic/global/popup.css
 lib/firefox/chrome/toolkit/skin/classic/global/preferences.css
-lib/firefox/chrome/toolkit/skin/classic/global/printPageSetup.css
 lib/firefox/chrome/toolkit/skin/classic/global/printPreview.css
 lib/firefox/chrome/toolkit/skin/classic/global/progressmeter.css
 lib/firefox/chrome/toolkit/skin/classic/global/radio.css
-lib/firefox/chrome/toolkit/skin/classic/global/radio/radio-check-dis.gif
-lib/firefox/chrome/toolkit/skin/classic/global/radio/radio-check.gif
 lib/firefox/chrome/toolkit/skin/classic/global/reader/RM-Close-24x24.svg
 lib/firefox/chrome/toolkit/skin/classic/global/reader/RM-Content-Width-Minus-42x16.svg
 lib/firefox/chrome/toolkit/skin/classic/global/reader/RM-Content-Width-Plus-44x16.svg
@@ -3692,7 +3996,6 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extensionGeneric.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/extensions.css
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/heart.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/navigation.svg
 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
@@ -3700,12 +4003,11 @@ lib/firefox/chrome/toolkit/skin/classic/
 lib/firefox/chrome/toolkit/skin/classic/mozapps/extensions/utilities.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/handling/handling.css
 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
 lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginCrashed.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/contentPluginStripe.png
-lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginBlocked.svg
+lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/plugin-blocked.svg
+lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/plugin.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginGeneric.svg
 lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginHelp-16.png
 lib/firefox/chrome/toolkit/skin/classic/mozapps/plugins/pluginProblem.css
@@ -3729,8 +4031,7 @@ lib/firefox/components/MainProcessSingle
 lib/firefox/components/NetworkGeolocationProvider.js
 lib/firefox/components/NotificationStorage.js
 lib/firefox/components/PageIconProtocolHandler.js
-lib/firefox/components/PageThumbsProtocol.js
-${PLIST.webrtc}lib/firefox/components/PeerConnection.js
+lib/firefox/components/PageThumbsStorageService.js
 lib/firefox/components/PlacesCategoriesStarter.js
 lib/firefox/components/PresentationControlService.js
 lib/firefox/components/PresentationDataChannelSessionTransport.js
@@ -3904,7 +4205,6 @@ lib/firefox/modules/DOMRequestHelper.jsm
 lib/firefox/modules/DataReader.jsm
 lib/firefox/modules/DataWriter.jsm
 lib/firefox/modules/DateTimePickerHelper.jsm
-lib/firefox/modules/DeferredSave.jsm
 lib/firefox/modules/DeferredTask.jsm
 lib/firefox/modules/Deprecated.jsm
 lib/firefox/modules/DownloadCore.jsm
@@ -3957,7 +4257,6 @@ lib/firefox/modules/GMPUtils.jsm
 lib/firefox/modules/Geometry.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
@@ -3985,7 +4284,7 @@ lib/firefox/modules/ManifestFinder.jsm
 lib/firefox/modules/ManifestIcons.jsm
 lib/firefox/modules/ManifestObtainer.jsm
 lib/firefox/modules/ManifestProcessor.jsm
-lib/firefox/modules/MatchPattern.jsm
+lib/firefox/modules/MatchURLFilters.jsm
 lib/firefox/modules/Memory.jsm
 lib/firefox/modules/MessageChannel.jsm
 lib/firefox/modules/MessageContext.jsm
@@ -4106,11 +4405,9 @@ lib/firefox/modules/accessibility/Traver
 lib/firefox/modules/accessibility/Utils.jsm
 lib/firefox/modules/addons/APIExtensionBootstrap.js
 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
 lib/firefox/modules/addons/GMPProvider.jsm
 lib/firefox/modules/addons/LightweightThemeImageOptimizer.jsm
 lib/firefox/modules/addons/PluginProvider.jsm
@@ -4122,12 +4419,6 @@ lib/firefox/modules/addons/XPIProviderUt
 lib/firefox/modules/css-selector.js
 lib/firefox/modules/ctypes.jsm
 lib/firefox/modules/debug.js
-lib/firefox/modules/devtools/Console.jsm
-lib/firefox/modules/devtools/Loader.jsm
-lib/firefox/modules/devtools/dbg-client.jsm
-lib/firefox/modules/devtools/dbg-server.jsm
-lib/firefox/modules/devtools/event-emitter.js
-lib/firefox/modules/devtools/shared/Loader.jsm
 lib/firefox/modules/jsdebugger.jsm
 lib/firefox/modules/lz4.js
 lib/firefox/modules/lz4_internal.js
@@ -4202,7 +4493,6 @@ lib/firefox/modules/services-sync/main.j
 lib/firefox/modules/services-sync/policies.js
 lib/firefox/modules/services-sync/record.js
 lib/firefox/modules/services-sync/resource.js
-lib/firefox/modules/services-sync/rest.js
 lib/firefox/modules/services-sync/service.js
 lib/firefox/modules/services-sync/stages/declined.js
 lib/firefox/modules/services-sync/stages/enginesync.js
@@ -4236,6 +4526,7 @@ lib/firefox/res/fonts/mathfontUnicode.pr
 lib/firefox/res/grabber.gif
 lib/firefox/res/html/folder.png
 lib/firefox/res/language.properties
+lib/firefox/res/multilocale.json
 lib/firefox/res/svg.css
 lib/firefox/res/table-add-column-after-active.gif
 lib/firefox/res/table-add-column-after-hover.gif
@@ -4255,6 +4546,5 @@ lib/firefox/res/table-remove-column.gif
 lib/firefox/res/table-remove-row-active.gif
 lib/firefox/res/table-remove-row-hover.gif
 lib/firefox/res/table-remove-row.gif
-lib/firefox/run-mozilla.sh
 share/applications/firefox.desktop
 share/pixmaps/firefox.png

Index: pkgsrc/www/firefox/distinfo
diff -u pkgsrc/www/firefox/distinfo:1.305 pkgsrc/www/firefox/distinfo:1.306
--- pkgsrc/www/firefox/distinfo:1.305   Mon Jan  8 09:37:56 2018
+++ pkgsrc/www/firefox/distinfo Wed Jan 24 16:52:08 2018
@@ -1,27 +1,26 @@
-$NetBSD: distinfo,v 1.305 2018/01/08 09:37:56 ryoon Exp $
+$NetBSD: distinfo,v 1.306 2018/01/24 16:52:08 ryoon Exp $
 
-SHA1 (firefox-57.0.4.source.tar.xz) = c7e3aa5db3c711b9bc3e82224fae49c829cc857d
-RMD160 (firefox-57.0.4.source.tar.xz) = 0034f1bcea7651e80eb3eb9e452fe81628569c1f
-SHA512 (firefox-57.0.4.source.tar.xz) = 58846037aebbf14b85e6b3a46dbe617c780c6916e437ea4ee32a2502a6b55e3689921a0be28b920dedf2f966195df04ac8e45411caeb2601a168ec08b4827cf0
-Size (firefox-57.0.4.source.tar.xz) = 250217612 bytes
-SHA1 (patch-aa) = a2b7c767773f462452701237b2b06c9a4f01d1b5
+SHA1 (firefox-58.0.source.tar.xz) = 253d1bcd2256fa013eadac40f04b5ddacc2b5e74
+RMD160 (firefox-58.0.source.tar.xz) = 0d8c5018f7d6ef90f480068555635547290c1430
+SHA512 (firefox-58.0.source.tar.xz) = 17a2c520973c68c5dd130bcb27407b1c20b03f74c97aeb486e86d422ab5c012e549787ae53275d6840b9d324f261ae282b98f61764ee5e0a6df1cc3e3c9e2632
+Size (firefox-58.0.source.tar.xz) = 247185892 bytes
+SHA1 (patch-aa) = b4a6359c2c22617fed31636250b3ff12a03aafa8
 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) = 9fd2e46440733aeca8dd81b7aa26e9a4029eb956
 SHA1 (patch-build_moz.configure_old.configure) = 2f452e717f0c9dc8224019b58e531e5e95cc7697
-SHA1 (patch-config_Makefile.in) = 2ad29cef869171aa29b6c3e4ba4a5c99311e0742
 SHA1 (patch-config_baseconfig.mk) = fbc3fd75bf5d794284e5703a9df227949e819136
 SHA1 (patch-config_external_moz.build) = 0a198c8578a8e8335be8d080f37c77f24c2d8b32
 SHA1 (patch-config_stl__wrappers_ios) = 00d723e2f2f252485350ede5833f0bb84c1235c1
 SHA1 (patch-config_stl__wrappers_ostream) = 7be7fe36704ffbdc070a113b46b4f391a598206b
-SHA1 (patch-config_system-headers) = 96bc5e296d1ec9db9d764edadc36605a8f3aebe9
+SHA1 (patch-config_system-headers.mozbuild) = adf2fd70379165672b3b27215ffc18de178152cd
 SHA1 (patch-config_system__wrappers_unwind.h) = b3bdac0710179b9c8f8eabd824216d0114504491
 SHA1 (patch-dom_base_moz.build) = 5200cbfcf7b781324dca4c55d01bc8559a56aa4c
 SHA1 (patch-dom_media_AudioStream.cpp) = 5ccc3b6a09e869a5a50998118157da7d6cc517ef
 SHA1 (patch-dom_media_AudioStream.h) = dec0f7e4ec7541b3e5b5574b6ebfae9a8957e165
 SHA1 (patch-dom_media_CubebUtils.cpp) = 3632cd0dd4b95f53f01050b8898b33fe198916b6
-SHA1 (patch-dom_media_moz.build) = 844dbb94463b8aab11649a5aa11142de0179d86c
+SHA1 (patch-dom_media_flac_FlacDecoder.cpp) = 43ed8e3ff32b6d965f423cac5b04e60db683546f
+SHA1 (patch-dom_media_moz.build) = 1636fa199dc30c05f3f059f58ff001662ffbc9f2
 SHA1 (patch-dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp) = f2965930c50961b42576a983e93a08d67da50a2a
 SHA1 (patch-gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 6e91ca436b73affe42ed4e683b3400beb28c4bc6
 SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 2cc997cab71a84c1f50a791693519a0626564426
@@ -34,27 +33,26 @@ SHA1 (patch-gfx_ycbcr_moz.build) = 705c3
 SHA1 (patch-gfx_ycbcr_yuv__row__arm.S) = 8ae94d3c10fc8472e0d6287a841f1366d4342770
 SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = ed86c3fbb3aef753eec6f6a97940594aac5f3f2f
 SHA1 (patch-intl_hyphenation_glue_hnjalloc.h) = abe01bea5872a57f3d00bbbf89f958621f08a655
-SHA1 (patch-intl_unicharutil_util_moz.build) = fffed7139faa3f15d6ab3be9b673cb0b14a30ce9
+SHA1 (patch-intl_unicharutil_util_moz.build) = 505967842bf0d38ab0edd44749ed79bc37ba5184
 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) = 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_glue_CrossProcessSemaphore.h) = 778a569887d8ad082abc2fa2fe89a0a943e84d64
 SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = 3052338871447cedaeafe8369afe82233183c884
 SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
-SHA1 (patch-js_src_build_moz.build) = 4597a427262d0eb6ce8d14c0f557bfbe3f053e61
+SHA1 (patch-ipc_glue_MessageChannel.cpp) = e955b70ac005cda2061d478d62ccf11da9f280c5
+SHA1 (patch-js_src_build_moz.build) = ab917deecf9adb6cffb8c5c42f169ea1293bf8a9
 SHA1 (patch-js_src_jit_arm_Architecture-arm.cpp) = f0b554c169643b8447b4f29168d61ea257b18782
 SHA1 (patch-js_xpconnect_src_XPCConvert.cpp) = 915777e9bb5366be41866cdb6ea0ad2b1c006dde
 SHA1 (patch-js_xpconnect_src_xpcprivate.h) = 97a221c76593be712f670aa409f2f1ad5dc20628
 SHA1 (patch-media_libcubeb_gtest_moz.build) = ebb4be6e6bca4a0ed6858516ec9fdb7828bbe2e1
 SHA1 (patch-media_libcubeb_src_cubeb.c) = 1b1b8d57eb710cad13518ded79a0ddee2681881b
-SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = b19e380278ca875600e49b76021b20f1f9e81980
+SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = af2b8f577d9e57811f51742c8ea8ef974c211667
 SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 88cdfb9b9aa8c2607ca79bfa7fce4353e65638f7
 SHA1 (patch-media_libcubeb_src_moz.build) = 5fca6701cc890120a04483f52c25242ee7b1c051
 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_libtheora_lib_arm_armcpu.c) = 3ef05c05799d56b3c160634327d90dd33764c3df
 SHA1 (patch-media_libtheora_moz.build) = cbcb61331fea274b720a4b5c51db1f763fc10d81
@@ -68,66 +66,23 @@ SHA1 (patch-media_webrtc_trunk_webrtc_mo
 SHA1 (patch-modules_pdfium_update.sh) = fb8e80310d8b6784140c8f6c4186427f7090b4db
 SHA1 (patch-mozglue_build_arm.cpp) = f41ace63b3f1d2a8ccaffc98c3c64d1e22af5249
 SHA1 (patch-mozglue_build_arm.h) = 5e272f4e19b9681d43a63c45d78b0e44a392c7dc
-SHA1 (patch-netwerk_dns_moz.build) = d4ad35ee7152ca206156403954cbd247d1252ab0
+SHA1 (patch-netwerk_dns_moz.build) = ee09d72e7f7cb76f7cec2b78287e25a8ac49862f
 SHA1 (patch-netwerk_srtp_src_crypto_hash_hmac.c) = 8ba57212adca077fb5cfa50d752a97b0e3becc6d
 SHA1 (patch-netwerk_srtp_src_crypto_kernel_crypto__kernel.c) = 08f3a347745b5529749328ad3a070fb78a75c1e9
-SHA1 (patch-servo_components_gfx_font.rs) = 590da7f189c51283633a033f3f04e30955b0d99d
-SHA1 (patch-servo_components_net__traits_response.rs) = f93356570a8e12b7879ff9293caa9def2bf1a2f2
-SHA1 (patch-servo_components_net_fetch_cors__cache.rs) = a617c30e74e9f376b3b9acc8aeb3746144ae6318
-SHA1 (patch-servo_components_net_fetch_methods.rs) = 66c437ae0d058f7cabfbac97c4f965d41390a92f
-SHA1 (patch-servo_components_net_websocket__loader.rs) = cb682e110d7eeaa54f41a032095f328b81ee370f
-SHA1 (patch-servo_components_script_dom_bindings_str.rs) = 94c86006af63270b68383d9089254cc8faa02c14
-SHA1 (patch-servo_components_script_dom_blob.rs) = 64c28919325fb1b2f41c8fdb20668ebe53c257a8
-SHA1 (patch-servo_components_script_dom_cssstyledeclaration.rs) = f4095f6d6ec30f1be5ca607a61eb754ee1127b9d
-SHA1 (patch-servo_components_script_dom_document.rs) = f3d9f324419bd288efc997973eb47c6965c27334
-SHA1 (patch-servo_components_script_dom_element.rs) = 38ff768616e967162e7b5df3247223a769daf273
-SHA1 (patch-servo_components_script_dom_htmlelement.rs) = 8e8bfcdfd78ff27ae8d5ca479fc3d5cd2e7e3ab2
-SHA1 (patch-servo_components_script_dom_htmllinkelement.rs) = 843569b0bae00cf6a577da68dff1c15a7f31393d
-SHA1 (patch-servo_components_script_dom_htmlmetaelement.rs) = 1dc1dc73ddbc2231266582b79af97c8689f66d30
-SHA1 (patch-servo_components_script_dom_htmlscriptelement.rs) = fc37ccfec29f5465890e4c9b760c89e6ba6e39f3
-SHA1 (patch-servo_components_script_dom_macros.rs) = f79eeec24c2cdbb8f679b12a51aa34596c5b9ae8
-SHA1 (patch-servo_components_script_dom_namednodemap.rs) = bd0edbd9f2f9791007fbf28e4fc2e016c3aaece3
-SHA1 (patch-servo_components_script_dom_serviceworkercontainer.rs) = a0a7ce97e146629c1f6925d091c05be15311b1a6
-SHA1 (patch-servo_components_script_dom_servoparser_async__html.rs) = adc10b69a3860cb093ab4510410874f4646d6d89
-SHA1 (patch-servo_components_script_dom_websocket.rs) = 0b9a5e770a5493d928bebeb9e811d991b78063b0
-SHA1 (patch-servo_components_script_dom_window.rs) = c4bf554e0cdd8b2a269b3fcfa94ded7f91933080
-SHA1 (patch-servo_components_script_dom_xmlhttprequest.rs) = e84bb3b87604edb57ac89452b1d16e55cf3cc5c6
-SHA1 (patch-servo_components_selectors_attr.rs) = 230f7cb3cbad449619c21df5246e3cae7d0dcaf4
-SHA1 (patch-servo_components_selectors_parser.rs) = f493f2673be170832a28e3e42f74cb00c6ad2fc9
-SHA1 (patch-servo_components_style__traits_viewport.rs) = fdd4ffb6b6b41afab5680661831cd420e3dd1da3
-SHA1 (patch-servo_components_style_attr.rs) = 2ecc18bc42d7ca2a63a0f0aab14427dffc285e55
 SHA1 (patch-servo_components_style_build__gecko.rs) = fca2260a70b496fc010f165ff4d68788b7e28632
-SHA1 (patch-servo_components_style_counter__style_mod.rs) = 2e62f6ebec9098f314bd6be1cf7b8a04b597459e
-SHA1 (patch-servo_components_style_custom__properties.rs) = f7db0e1f133ea60f7dd776cb637f69e712dc2f58
-SHA1 (patch-servo_components_style_gecko__string__cache_mod.rs) = ee2a830dc6d19f271f89f6be1c415ccbdc1f6f2d
-SHA1 (patch-servo_components_style_gecko_generated_pseudo__element__definition.rs) = 939336bd7a951f075d1dfcc567d42be6b481cadf
-SHA1 (patch-servo_components_style_gecko_pseudo__element__definition.mako.rs) = ec9bc6e6ff4b58b9925d03af0141002828bda39f
-SHA1 (patch-servo_components_style_properties_longhand_font.mako.rs) = 626e2945345749780773127befbcb70e98b671f5
-SHA1 (patch-servo_components_style_properties_longhand_pointing.mako.rs) = 7861c53cbb5e8da2906fce728712d3ef954d4309
-SHA1 (patch-servo_components_style_servo_selector__parser.rs) = 6b8e4d1b9284ff25f43e7c4bbf885c43d5505cc8
-SHA1 (patch-servo_components_style_str.rs) = 4c7d90b3482dd470287bf6e20a29dcd3aa4d73af
-SHA1 (patch-servo_components_style_stylesheets_viewport__rule.rs) = 3d0067dfe537b7dfc85bfd5859462d65ec55b192
-SHA1 (patch-servo_components_style_values_mod.rs) = fb80c59a02267230c1a41bff0e278cbdd7dad984
-SHA1 (patch-servo_components_style_values_specified_align.rs) = a114078bd111c956caf0fc413448734a5f3de627
-SHA1 (patch-servo_components_style_values_specified_angle.rs) = 1d38a30b0b49dd4903b6a95a57b36f16e190bbe2
-SHA1 (patch-servo_components_style_values_specified_calc.rs) = d1af305029930cb6d41e1c9b1484e1bc226510ba
-SHA1 (patch-servo_components_style_values_specified_grid.rs) = 9485998a3cd43a99f6c844a13f0c2ca15ed747af
-SHA1 (patch-servo_components_style_values_specified_length.rs) = 7d2a6eac9ad564aed604a35d3b1535f4ec94a7df
-SHA1 (patch-servo_components_style_values_specified_mod.rs) = c0e94565dba273f2c7e751cbf99483bf3a5fc50e
-SHA1 (patch-servo_components_style_values_specified_percentage.rs) = 0e77f98f3d70ca05b2d53de833490719163c2ae1
-SHA1 (patch-servo_components_style_values_specified_text.rs) = 18c431ee5ef6c4fb191c787bd3670665f7f60b0c
-SHA1 (patch-servo_components_style_values_specified_time.rs) = 716471976c073d983fb533ab4b602d9ffbdf387c
-SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = 5ffb0782bbbff2fd17ad71e98b349b4ec3dc6c8c
+SHA1 (patch-servo_components_style_properties_helpers_animated__properties.mako.rs) = 059381527942a6bf468c61977336076a5dbf1c0f
+SHA1 (patch-third__party_python_futures_concurrent_futures_process.py) = 5e5c77334d29814f7548450163b625f451b74942
+SHA1 (patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h) = e79aad01ad230e265717bd2eccbedcdd092d12d6
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce
 SHA1 (patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h) = 0730c0c5d8e0865aa8a2f311b27559a3f6793a52
 SHA1 (patch-toolkit_library_moz.build) = 34e757ad08ebaee1cbc69993ec0f6774d41a14a2
 SHA1 (patch-toolkit_modules_GMPUtils.jsm) = 85883d2064f7bb135913ee2019200a1caf48efe7
-SHA1 (patch-toolkit_moz.configure) = 264962a7bb3c25c2dd6f3d2bd41510a41cccbdc9
+SHA1 (patch-toolkit_moz.configure) = e396507fc2bbbedb55ba741e3599e6087f7af768
 SHA1 (patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js) = 73dcf54a069b806807d9c9ddf54f66bc347c3c33
+SHA1 (patch-toolkit_mozapps_installer_packager.mk) = 6f557fb732f0b9dabf059ffac0400d3db4e79e47
 SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
 SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 4a6ae13adfdfc63d50c1a53ee71aad1ee82e6131
 SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4
 SHA1 (patch-xpcom_build_XPCOMInit.cpp) = 1e7cc3a7fd9515b10307fafa2b01ed689320bd54
-SHA1 (patch-xpcom_reflect_xptcall_md_unix_Makefile.in) = 950874fbc255c93a828bddd84ffe8478094214cc
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_moz.build) = 528f7254966d883c18e33744e28780a93055d560
 SHA1 (patch-xpcom_reflect_xptcall_md_unix_xptcinvoke__sparc64__netbsd.cpp) = 0792c2c626d906e71c5183994cb32bf8cdb3e239

Index: pkgsrc/www/firefox/mozilla-common.mk
diff -u pkgsrc/www/firefox/mozilla-common.mk:1.103 pkgsrc/www/firefox/mozilla-common.mk:1.104
--- pkgsrc/www/firefox/mozilla-common.mk:1.103  Mon Jan  8 09:37:56 2018
+++ pkgsrc/www/firefox/mozilla-common.mk        Wed Jan 24 16:52:08 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.103 2018/01/08 09:37:56 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.104 2018/01/24 16:52:08 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -16,6 +16,9 @@ BUILD_DEPENDS+=               yasm>=1.1:../../devel/y
 
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
+# For rustc/cargo detection
+CONFIGURE_ARGS+=       --target=${MACHINE_GNU_PLATFORM:Q}
+CONFIGURE_ARGS+=       --host=${MACHINE_GNU_PLATFORM:Q}
 USE_TOOLS+=            pkg-config perl gmake autoconf213 unzip zip
 USE_LANGUAGES+=                c99 c++
 UNLIMIT_RESOURCES+=    datasize

Index: pkgsrc/www/firefox/patches/patch-aa
diff -u pkgsrc/www/firefox/patches/patch-aa:1.54 pkgsrc/www/firefox/patches/patch-aa:1.55
--- pkgsrc/www/firefox/patches/patch-aa:1.54    Sat Sep 30 05:34:11 2017
+++ pkgsrc/www/firefox/patches/patch-aa Wed Jan 24 16:52:08 2018
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.54 2017/09/30 05:34:11 ryoon Exp $
+$NetBSD: patch-aa,v 1.55 2018/01/24 16:52:08 ryoon Exp $
 
 * Disable libjpeg-turbo check
 * Add system libraries option
 * Add OSS audio support
 
---- old-configure.in.orig      2017-09-14 20:15:53.000000000 +0000
+--- old-configure.in.orig      2018-01-11 20:17:05.000000000 +0000
 +++ old-configure.in
-@@ -1963,11 +1963,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
+@@ -1959,11 +1959,7 @@ if test "$MOZ_SYSTEM_JPEG" = 1; then
                       #include <jpeglib.h> ],
                     [ #if JPEG_LIB_VERSION < $MOZJPEG
                       #error "Insufficient JPEG library version ($MOZJPEG required)."
@@ -19,17 +19,17 @@ $NetBSD: patch-aa,v 1.54 2017/09/30 05:3
                     MOZ_SYSTEM_JPEG=1,
                     AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
  fi
-@@ -2606,6 +2602,9 @@ if test -n "$MOZ_WEBRTC"; then
-     AC_DEFINE(MOZ_WEBRTC_ASSERT_ALWAYS)
-     MOZ_RAW=1
- 
+@@ -2552,6 +2548,9 @@ if test -n "$MOZ_WEBRTC"; then
+     if test -n "$MOZ_X11"; then
+       MOZ_WEBRTC_X11_LIBS="-lXext -lXdamage -lXfixes -lXcomposite"
+     fi
++
 +    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)
-@@ -2648,7 +2647,7 @@ dnl Use integers over floats for audio o
+ else
+     MOZ_SYNTH_PICO=
+ fi
+@@ -2577,7 +2576,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.
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.54 2017/09/30 05:3
      MOZ_SAMPLE_TYPE_S16=1
      AC_DEFINE(MOZ_SAMPLE_TYPE_S16)
      AC_SUBST(MOZ_SAMPLE_TYPE_S16)
-@@ -2686,6 +2685,111 @@ if test -n "$MOZ_APPLEMEDIA"; then
+@@ -2615,6 +2614,111 @@ if test -n "$MOZ_APPLEMEDIA"; then
  fi
  fi # COMPILE_ENVIRONMENT
  
@@ -150,7 +150,7 @@ $NetBSD: patch-aa,v 1.54 2017/09/30 05:3
  dnl system libvpx Support
  dnl ========================================================
  MOZ_ARG_WITH_BOOL(system-libvpx,
-@@ -2846,6 +2950,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
+@@ -2775,6 +2879,67 @@ AC_DEFINE(MOZ_WEBM_ENCODER)
  AC_SUBST(MOZ_WEBM_ENCODER)
  
  dnl ==================================
@@ -218,7 +218,7 @@ $NetBSD: patch-aa,v 1.54 2017/09/30 05:3
  dnl = Check alsa availability on Linux
  dnl ==================================
  
-@@ -4396,6 +4561,27 @@ dnl ====================================
+@@ -4260,6 +4425,27 @@ dnl ====================================
  AC_SUBST(MOZ_LINUX_32_SSE2_STARTUP_ERROR)
  
  dnl ========================================================

Index: pkgsrc/www/firefox/patches/patch-dom_media_moz.build
diff -u pkgsrc/www/firefox/patches/patch-dom_media_moz.build:1.7 pkgsrc/www/firefox/patches/patch-dom_media_moz.build:1.8
--- pkgsrc/www/firefox/patches/patch-dom_media_moz.build:1.7    Wed Jan 25 13:24:51 2017
+++ pkgsrc/www/firefox/patches/patch-dom_media_moz.build        Wed Jan 24 16:52:08 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-dom_media_moz.build,v 1.7 2017/01/25 13:24:51 ryoon Exp $
+$NetBSD: patch-dom_media_moz.build,v 1.8 2018/01/24 16:52:08 ryoon Exp $
 
 * Support system libraries
 
---- dom/media/moz.build.orig   2017-01-16 16:16:53.000000000 +0000
+--- dom/media/moz.build.orig   2018-01-11 20:17:02.000000000 +0000
 +++ dom/media/moz.build
-@@ -316,6 +316,21 @@ if CONFIG['MOZ_WEBRTC']:
+@@ -318,6 +318,21 @@ if CONFIG['MOZ_WEBRTC']:
  
  DEFINES['MOZILLA_INTERNAL_API'] = True
  
@@ -23,6 +23,6 @@ $NetBSD: patch-dom_media_moz.build,v 1.7
 +if CONFIG['MOZ_SYSTEM_SOUNDTOUCH']:
 +    CXXFLAGS += CONFIG['MOZ_SOUNDTOUCH_CFLAGS']
 +
- if CONFIG['OS_TARGET'] == 'WINNT':
-     DEFINES['WEBRTC_WIN'] = True
- else:
+ if CONFIG['MOZ_ANDROID_HLS_SUPPORT']:
+     DEFINES['MOZ_ANDROID_HLS_SUPPORT'] = True
+ 

Index: pkgsrc/www/firefox/patches/patch-intl_unicharutil_util_moz.build
diff -u pkgsrc/www/firefox/patches/patch-intl_unicharutil_util_moz.build:1.6 pkgsrc/www/firefox/patches/patch-intl_unicharutil_util_moz.build:1.7
--- pkgsrc/www/firefox/patches/patch-intl_unicharutil_util_moz.build:1.6        Wed Jun 14 11:28:44 2017
+++ pkgsrc/www/firefox/patches/patch-intl_unicharutil_util_moz.build    Wed Jan 24 16:52:08 2018
@@ -1,10 +1,10 @@
-$NetBSD: patch-intl_unicharutil_util_moz.build,v 1.6 2017/06/14 11:28:44 ryoon Exp $
+$NetBSD: patch-intl_unicharutil_util_moz.build,v 1.7 2018/01/24 16:52:08 ryoon Exp $
 
---- intl/unicharutil/util/moz.build.orig       2017-06-05 20:45:20.000000000 +0000
+--- intl/unicharutil/util/moz.build.orig       2018-01-11 20:17:05.000000000 +0000
 +++ intl/unicharutil/util/moz.build
-@@ -29,4 +29,7 @@ if CONFIG['ENABLE_INTL_API']:
-         'ICUUtils.cpp',
-     ]
+@@ -25,4 +25,7 @@ UNIFIED_SOURCES += [
+     'nsUnicodeProperties.cpp',
+ ]
  
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
Index: pkgsrc/www/firefox/patches/patch-netwerk_dns_moz.build
diff -u pkgsrc/www/firefox/patches/patch-netwerk_dns_moz.build:1.6 pkgsrc/www/firefox/patches/patch-netwerk_dns_moz.build:1.7
--- pkgsrc/www/firefox/patches/patch-netwerk_dns_moz.build:1.6  Sat Dec  3 09:58:26 2016
+++ pkgsrc/www/firefox/patches/patch-netwerk_dns_moz.build      Wed Jan 24 16:52:08 2018
@@ -1,14 +1,11 @@
-$NetBSD: patch-netwerk_dns_moz.build,v 1.6 2016/12/03 09:58:26 ryoon Exp $
+$NetBSD: patch-netwerk_dns_moz.build,v 1.7 2018/01/24 16:52:08 ryoon Exp $
 
---- netwerk/dns/moz.build.orig 2016-10-31 20:15:27.000000000 +0000
+--- netwerk/dns/moz.build.orig 2018-01-11 20:17:04.000000000 +0000
 +++ netwerk/dns/moz.build
-@@ -66,6 +66,9 @@ LOCAL_INCLUDES += [
-     '/netwerk/base',
- ]
+@@ -73,3 +73,6 @@ USE_LIBS += ['icu']
  
+ if CONFIG['GNU_CXX']:
+     CXXFLAGS += ['-Wno-error=shadow']
++
 +if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
 +    CXXFLAGS += CONFIG['MOZ_HARFBUZZ_CFLAGS']
-+
- if CONFIG['ENABLE_INTL_API']:
-     DEFINES['IDNA2008'] = True
-     USE_LIBS += ['icu']

Index: pkgsrc/www/firefox/patches/patch-js_src_build_moz.build
diff -u pkgsrc/www/firefox/patches/patch-js_src_build_moz.build:1.1 pkgsrc/www/firefox/patches/patch-js_src_build_moz.build:1.2
--- pkgsrc/www/firefox/patches/patch-js_src_build_moz.build:1.1 Thu Aug 10 14:46:15 2017
+++ pkgsrc/www/firefox/patches/patch-js_src_build_moz.build     Wed Jan 24 16:52:08 2018
@@ -1,12 +1,15 @@
-$NetBSD: patch-js_src_build_moz.build,v 1.1 2017/08/10 14:46:15 ryoon Exp $
+$NetBSD: patch-js_src_build_moz.build,v 1.2 2018/01/24 16:52:08 ryoon Exp $
 
---- js/src/build/moz.build.orig        2017-07-31 16:20:47.000000000 +0000
+--- js/src/build/moz.build.orig        2018-01-11 20:17:05.000000000 +0000
 +++ js/src/build/moz.build
-@@ -71,7 +71,3 @@ if CONFIG['OS_ARCH'] == 'SunOS':
-     ]
+@@ -72,10 +72,6 @@ if CONFIG['OS_ARCH'] == 'SunOS':
  
  OS_LIBS += CONFIG['REALTIME_LIBS']
--
+ 
 -NO_EXPAND_LIBS = True
 -
 -DIST_INSTALL = True
+-
+ # Ensure symbol versions of shared library on Linux do not conflict
+ # with those in libxul.
+ if CONFIG['OS_TARGET'] == 'Linux':

Index: pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c
diff -u pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.25 pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.26
--- pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c:1.25      Mon Oct 23 15:25:28 2017
+++ pkgsrc/www/firefox/patches/patch-media_libcubeb_src_cubeb__alsa.c   Wed Jan 24 16:52:08 2018
@@ -1,9 +1,9 @@
-$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.25 2017/10/23 15:25:28 tsutsui Exp $
+$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.26 2018/01/24 16:52:08 ryoon Exp $
 
 * Support alsa audio under NetBSD
 * Avoid https://github.com/kinetiknz/cubeb/issues/226
 
---- media/libcubeb/src/cubeb_alsa.c.orig       2017-09-14 20:16:05.000000000 +0000
+--- media/libcubeb/src/cubeb_alsa.c.orig       2017-11-02 16:16:36.000000000 +0000
 +++ media/libcubeb/src/cubeb_alsa.c
 @@ -8,10 +8,12 @@
  #define _DEFAULT_SOURCE
@@ -18,7 +18,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  #include <poll.h>
  #include <unistd.h>
  #include <alsa/asoundlib.h>
-@@ -26,6 +28,52 @@
+@@ -25,6 +27,52 @@
  
  #define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin"
  
@@ -71,7 +71,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  /* ALSA is not thread-safe.  snd_pcm_t instances are individually protected
     by the owning cubeb_stream's mutex.  snd_pcm_t creation and destruction
     is not thread-safe until ALSA 1.0.24 (see alsa-lib.git commit 91c9c8f1),
-@@ -66,6 +114,8 @@ struct cubeb {
+@@ -65,6 +113,8 @@ struct cubeb {
       workaround is not required. */
    snd_config_t * local_config;
    int is_pa;
@@ -80,7 +80,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  };
  
  enum stream_state {
-@@ -244,8 +294,8 @@ set_timeout(struct timeval * timeout, un
+@@ -243,8 +293,8 @@ set_timeout(struct timeval * timeout, un
  static void
  stream_buffer_decrement(cubeb_stream * stm, long count)
  {
@@ -91,7 +91,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    stm->bufframes -= count;
  }
  
-@@ -277,9 +327,9 @@ alsa_process_stream(cubeb_stream * stm)
+@@ -276,9 +326,9 @@ alsa_process_stream(cubeb_stream * stm)
    /* Call _poll_descriptors_revents() even if we don't use it
       to let underlying plugins clear null events.  Otherwise poll()
       may wake up again and again, producing unnecessary CPU usage. */
@@ -103,7 +103,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
    /* Got null event? Bail and wait for another wakeup. */
    if (avail == 0) {
-@@ -302,7 +352,7 @@ alsa_process_stream(cubeb_stream * stm)
+@@ -301,7 +351,7 @@ alsa_process_stream(cubeb_stream * stm)
        // TODO: should it be marked as DRAINING?
      }
  
@@ -112,7 +112,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
      if (got < 0) {
        avail = got; // the error handler below will recover us
-@@ -346,7 +396,7 @@ alsa_process_stream(cubeb_stream * stm)
+@@ -345,7 +395,7 @@ alsa_process_stream(cubeb_stream * stm)
        (!stm->other_stream || stm->other_stream->bufframes > 0)) {
      long got = avail - stm->bufframes;
      void * other_buffer = stm->other_stream ? stm->other_stream->buffer : NULL;
@@ -121,7 +121,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
      /* Correct read size to the other stream available frames */
      if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
-@@ -373,8 +423,8 @@ alsa_process_stream(cubeb_stream * stm)
+@@ -372,8 +422,8 @@ alsa_process_stream(cubeb_stream * stm)
      long drain_frames = avail - stm->bufframes;
      double drain_time = (double) drain_frames / stm->params.rate;
  
@@ -132,7 +132,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      stm->bufframes = avail;
  
      /* Mark as draining, unless we're waiting for capture */
-@@ -401,7 +451,7 @@ alsa_process_stream(cubeb_stream * stm)
+@@ -400,7 +450,7 @@ alsa_process_stream(cubeb_stream * stm)
        }
      }
  
@@ -141,7 +141,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (wrote < 0) {
        avail = wrote; // the error handler below will recover us
      } else {
-@@ -414,13 +464,13 @@ alsa_process_stream(cubeb_stream * stm)
+@@ -413,13 +463,13 @@ alsa_process_stream(cubeb_stream * stm)
  
    /* Got some error? Let's try to recover the stream. */
    if (avail < 0) {
@@ -158,7 +158,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      }
    }
  
-@@ -536,26 +586,26 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -535,26 +585,26 @@ get_slave_pcm_node(snd_config_t * lconf,
  
    slave_def = NULL;
  
@@ -190,7 +190,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -564,7 +614,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -563,7 +613,7 @@ get_slave_pcm_node(snd_config_t * lconf,
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -199,7 +199,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -573,7 +623,7 @@ get_slave_pcm_node(snd_config_t * lconf,
+@@ -572,7 +622,7 @@ get_slave_pcm_node(snd_config_t * lconf,
    } while (0);
  
    if (slave_def) {
@@ -208,7 +208,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    }
  
    return NULL;
-@@ -596,22 +646,22 @@ init_local_config_with_workaround(char c
+@@ -595,22 +645,22 @@ init_local_config_with_workaround(char c
  
    lconf = NULL;
  
@@ -235,7 +235,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -620,7 +670,7 @@ init_local_config_with_workaround(char c
+@@ -619,7 +669,7 @@ init_local_config_with_workaround(char c
      if (r < 0 || r > (int) sizeof(node_name)) {
        break;
      }
@@ -244,7 +244,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -631,12 +681,12 @@ init_local_config_with_workaround(char c
+@@ -630,12 +680,12 @@ init_local_config_with_workaround(char c
      }
  
      /* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
@@ -259,7 +259,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -647,18 +697,18 @@ init_local_config_with_workaround(char c
+@@ -646,18 +696,18 @@ init_local_config_with_workaround(char c
  
      /* Don't clobber an explicit existing handle_underrun value, set it only
         if it doesn't already exist. */
@@ -281,7 +281,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      if (r < 0) {
        break;
      }
-@@ -666,7 +716,7 @@ init_local_config_with_workaround(char c
+@@ -665,7 +715,7 @@ init_local_config_with_workaround(char c
      return lconf;
    } while (0);
  
@@ -290,7 +290,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
    return NULL;
  }
-@@ -678,9 +728,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, c
+@@ -677,9 +727,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, c
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
    if (local_config) {
@@ -302,7 +302,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
-@@ -693,7 +743,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
+@@ -692,7 +742,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
    int r;
  
    pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -311,7 +311,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    pthread_mutex_unlock(&cubeb_alsa_mutex);
  
    return r;
-@@ -756,12 +806,65 @@ alsa_init(cubeb ** context, char const *
+@@ -755,12 +805,65 @@ alsa_init(cubeb ** context, char const *
    pthread_attr_t attr;
    snd_pcm_t * dummy;
  
@@ -378,7 +378,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      cubeb_alsa_error_handler_set = 1;
    }
    pthread_mutex_unlock(&cubeb_alsa_mutex);
-@@ -769,6 +872,8 @@ alsa_init(cubeb ** context, char const *
+@@ -768,6 +871,8 @@ alsa_init(cubeb ** context, char const *
    ctx = calloc(1, sizeof(*ctx));
    assert(ctx);
  
@@ -387,7 +387,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    ctx->ops = &alsa_ops;
  
    r = pthread_mutex_init(&ctx->mutex, NULL);
-@@ -818,7 +923,7 @@ alsa_init(cubeb ** context, char const *
+@@ -817,7 +922,7 @@ alsa_init(cubeb ** context, char const *
         config fails with EINVAL, the PA PCM is too old for this workaround. */
      if (r == -EINVAL) {
        pthread_mutex_lock(&cubeb_alsa_mutex);
@@ -396,7 +396,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
        pthread_mutex_unlock(&cubeb_alsa_mutex);
        ctx->local_config = NULL;
      } else if (r >= 0) {
-@@ -858,9 +963,13 @@ alsa_destroy(cubeb * ctx)
+@@ -857,9 +962,13 @@ alsa_destroy(cubeb * ctx)
    pthread_mutex_destroy(&ctx->mutex);
    free(ctx->fds);
  
@@ -411,7 +411,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      pthread_mutex_unlock(&cubeb_alsa_mutex);
    }
  
-@@ -943,7 +1052,7 @@ alsa_stream_init_single(cubeb * ctx, cub
+@@ -942,7 +1051,7 @@ alsa_stream_init_single(cubeb * ctx, cub
      return CUBEB_ERROR;
    }
  
@@ -420,7 +420,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    assert(r == 0);
  
    latency_us = latency_frames * 1e6 / stm->params.rate;
-@@ -956,7 +1065,7 @@ alsa_stream_init_single(cubeb * ctx, cub
+@@ -955,7 +1064,7 @@ alsa_stream_init_single(cubeb * ctx, cub
      latency_us = latency_us < min_latency ? min_latency: latency_us;
    }
  
@@ -429,7 +429,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
                           stm->params.channels, stm->params.rate, 1,
                           latency_us);
    if (r < 0) {
-@@ -964,20 +1073,20 @@ alsa_stream_init_single(cubeb * ctx, cub
+@@ -963,20 +1072,20 @@ alsa_stream_init_single(cubeb * ctx, cub
      return CUBEB_ERROR_INVALID_FORMAT;
    }
  
@@ -454,7 +454,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    assert((nfds_t) r == stm->nfds);
  
    if (alsa_register_stream(ctx, stm) != 0) {
-@@ -1049,7 +1158,7 @@ alsa_stream_destroy(cubeb_stream * stm)
+@@ -1048,7 +1157,7 @@ alsa_stream_destroy(cubeb_stream * stm)
    pthread_mutex_lock(&stm->mutex);
    if (stm->pcm) {
      if (stm->state == DRAINING) {
@@ -463,7 +463,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      }
      alsa_locked_pcm_close(stm->pcm);
      stm->pcm = NULL;
-@@ -1095,12 +1204,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
+@@ -1094,12 +1203,12 @@ alsa_get_max_channel_count(cubeb * ctx, 
  
    assert(stm);
  
@@ -478,7 +478,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    if (r < 0) {
      return CUBEB_ERROR;
    }
-@@ -1121,34 +1230,34 @@ alsa_get_preferred_sample_rate(cubeb * c
+@@ -1120,34 +1229,34 @@ alsa_get_preferred_sample_rate(cubeb * c
  
    /* get a pcm, disabling resampling, so we get a rate the
     * hardware/dmix/pulse/etc. supports. */
@@ -521,7 +521,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
  
    return CUBEB_OK;
  }
-@@ -1181,10 +1290,10 @@ alsa_stream_start(cubeb_stream * stm)
+@@ -1180,10 +1289,10 @@ alsa_stream_start(cubeb_stream * stm)
    pthread_mutex_lock(&stm->mutex);
    /* Capture pcm must be started after initial setup/recover */
    if (stm->stream_type == SND_PCM_STREAM_CAPTURE &&
@@ -535,7 +535,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    gettimeofday(&stm->last_activity, NULL);
    pthread_mutex_unlock(&stm->mutex);
  
-@@ -1224,7 +1333,7 @@ alsa_stream_stop(cubeb_stream * stm)
+@@ -1223,7 +1332,7 @@ alsa_stream_stop(cubeb_stream * stm)
    pthread_mutex_unlock(&ctx->mutex);
  
    pthread_mutex_lock(&stm->mutex);
@@ -544,7 +544,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
    pthread_mutex_unlock(&stm->mutex);
  
    return CUBEB_OK;
-@@ -1240,8 +1349,8 @@ alsa_stream_get_position(cubeb_stream * 
+@@ -1239,8 +1348,8 @@ alsa_stream_get_position(cubeb_stream * 
    pthread_mutex_lock(&stm->mutex);
  
    delay = -1;
@@ -555,7 +555,7 @@ $NetBSD: patch-media_libcubeb_src_cubeb_
      *position = stm->last_position;
      pthread_mutex_unlock(&stm->mutex);
      return CUBEB_OK;
-@@ -1266,7 +1375,7 @@ alsa_stream_get_latency(cubeb_stream * s
+@@ -1265,7 +1374,7 @@ alsa_stream_get_latency(cubeb_stream * s
    snd_pcm_sframes_t delay;
    /* This function returns the delay in frames until a frame written using
       snd_pcm_writei is sent to the DAC. The DAC delay should be < 1ms anyways. */

Index: pkgsrc/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h
diff -u pkgsrc/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h:1.3 
pkgsrc/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h:1.4
--- pkgsrc/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h:1.3      Sat Aug  6 08:46:59 2016
+++ pkgsrc/www/firefox/patches/patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h  Wed Jan 24 16:52:08 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h,v 1.3 2016/08/06 08:46:59 ryoon Exp $
+$NetBSD: patch-toolkit_components_protobuf_src_google_protobuf_stubs_atomicops.h,v 1.4 2018/01/24 16:52:08 ryoon Exp $
 
---- toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h.orig     2016-07-25 20:22:06.000000000 +0000
+--- toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h.orig     2018-01-11 20:17:03.000000000 +0000
 +++ toolkit/components/protobuf/src/google/protobuf/stubs/atomicops.h
-@@ -76,6 +76,11 @@ typedef intptr_t Atomic64;
+@@ -87,6 +87,11 @@ typedef intptr_t Atomic64;
  #endif
  #endif
  
@@ -13,8 +13,8 @@ $NetBSD: patch-toolkit_components_protob
 +#else
  // Use AtomicWord for a machine-sized pointer.  It will use the Atomic32 or
  // Atomic64 routines below, depending on your architecture.
- #if defined(__OpenBSD__) && !defined(GOOGLE_PROTOBUF_ARCH_64_BIT)
-@@ -83,6 +88,7 @@ typedef Atomic32 AtomicWord;
+ #if defined(__OpenBSD__) && !defined(GOOGLE_PROTOBUF_ARCH_64_BIT) /* See Bug 1192556 */
+@@ -94,6 +99,7 @@ typedef Atomic32 AtomicWord;
  #else
  typedef intptr_t AtomicWord;
  #endif

Index: pkgsrc/www/firefox/patches/patch-toolkit_moz.configure
diff -u pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.8 pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.9
--- pkgsrc/www/firefox/patches/patch-toolkit_moz.configure:1.8  Sun Dec 10 00:45:09 2017
+++ pkgsrc/www/firefox/patches/patch-toolkit_moz.configure      Wed Jan 24 16:52:08 2018
@@ -1,37 +1,10 @@
-$NetBSD: patch-toolkit_moz.configure,v 1.8 2017/12/10 00:45:09 ryoon Exp $
+$NetBSD: patch-toolkit_moz.configure,v 1.9 2018/01/24 16:52:08 ryoon Exp $
 
 * skia part: support bigendian architectures
 
---- toolkit/moz.configure.orig 2017-11-02 16:16:34.000000000 +0000
+--- toolkit/moz.configure.orig 2018-01-11 20:17:05.000000000 +0000
 +++ toolkit/moz.configure
-@@ -317,6 +317,26 @@ def freetype2_combined_info(fontconfig_i
- add_old_configure_assignment('_HAVE_FREETYPE2',
-                              depends_if(freetype2_info)(lambda _: True))
- 
-+# Graphite2
-+# ==============================================================
-+option('--with-system-graphite2',
-+       help="Use system graphite2 (located with pkgconfig)")
-+
-+system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2',
-+                                     when='--with-system-graphite2')
-+
-+set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True))
-+
-+# HarfBuzz
-+# ==============================================================
-+option('--with-system-harfbuzz',
-+       help="Use system harfbuzz (located with pkgconfig)")
-+
-+system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.4.7',
-+                                    when='--with-system-harfbuzz')
-+
-+set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
-+
- # Apple platform decoder support
- # ==============================================================
- @depends(toolkit)
-@@ -418,7 +438,7 @@ option('--enable-eme',
+@@ -418,7 +418,7 @@ option('--enable-eme',
  def enable_eme(value, target):
      # Widevine EME by default enabled on desktop Windows, MacOS and Linux,
      # x86 and x64 builds.
@@ -40,7 +13,18 @@ $NetBSD: patch-toolkit_moz.configure,v 1
          target.os not in ('Android', 'iOS') and
          target.cpu in ('x86', 'x86_64')):
          return value
-@@ -940,11 +960,11 @@ include('nss.configure')
+@@ -829,8 +829,8 @@ def webrender(value, milestone):
+     enable_webrender = None
+ 
+     if value.origin == 'default':
+-        # if nothing is specified, default to just building on Nightly
+-        build_webrender = milestone.is_nightly
++        # build by default downstream
++        build_webrender = True
+     elif len(value) and value[0] == 'build':
+         # if explicitly set to 'build', then we build but don't enable
+         build_webrender = True
+@@ -938,11 +938,11 @@ include('nss.configure')
  # ==============================================================
  option('--disable-skia', help='Disable use of Skia')
  
@@ -57,3 +41,30 @@ $NetBSD: patch-toolkit_moz.configure,v 1
          return True
  
  set_config('MOZ_ENABLE_SKIA', skia)
+@@ -1065,6 +1065,26 @@ add_old_configure_assignment('FT2_LIBS',
+ add_old_configure_assignment('FT2_CFLAGS',
+                              ft2_info.cflags)
+ 
++# Graphite2
++# ==============================================================
++option('--with-system-graphite2',
++       help="Use system graphite2 (located with pkgconfig)")
++
++system_graphite2 = pkg_check_modules('MOZ_GRAPHITE2', 'graphite2',
++                                     when='--with-system-graphite2')
++
++set_config('MOZ_SYSTEM_GRAPHITE2', depends_if(system_graphite2)(lambda _: True))
++
++# HarfBuzz
++# ==============================================================
++option('--with-system-harfbuzz',
++       help="Use system harfbuzz (located with pkgconfig)")
++
++system_harfbuzz = pkg_check_modules('MOZ_HARFBUZZ', 'harfbuzz >= 1.7.2',
++                                    when='--with-system-harfbuzz')
++
++set_config('MOZ_SYSTEM_HARFBUZZ', depends_if(system_harfbuzz)(lambda _: True))
++
+ # Mortar
+ # ==============================================================
+ option('--enable-mortar', help='Enable mortar extension')

Added files:

Index: pkgsrc/www/firefox/patches/patch-config_system-headers.mozbuild
diff -u /dev/null pkgsrc/www/firefox/patches/patch-config_system-headers.mozbuild:1.1
--- /dev/null   Wed Jan 24 16:52:08 2018
+++ pkgsrc/www/firefox/patches/patch-config_system-headers.mozbuild     Wed Jan 24 16:52:08 2018
@@ -0,0 +1,54 @@
+$NetBSD: patch-config_system-headers.mozbuild,v 1.1 2018/01/24 16:52:08 ryoon Exp $
+
+--- config/system-headers.mozbuild.orig        2018-01-11 20:16:54.000000000 +0000
++++ config/system-headers.mozbuild
+@@ -428,6 +428,7 @@ system_headers = [
+     'libgnomeui/gnome-icon-theme.h',
+     'libgnomeui/gnome-ui-init.h',
+     'libutil.h',
++    'libv4l2.h',
+     'limits.h',
+     'link.h',
+     'linux/ioprio.h',
+@@ -1311,6 +1312,41 @@ if not CONFIG['MOZ_TREE_PIXMAN']:
+         'pixman.h',
+     ]
+ 
++if CONFIG['MOZ_SYSTEM_GRAPHITE2']:
++    system_headers += [
++        'graphite2/Font.h',
++        'graphite2/Segment.h',
++    ]
++
++if CONFIG['MOZ_SYSTEM_HARFBUZZ']:
++    system_headers += [
++        'harfbuzz/hb-glib.h',
++        'harfbuzz/hb-ot.h',
++        'harfbuzz/hb.h',
++    ]
++
++if CONFIG['MOZ_SYSTEM_OGG']:
++    system_headers += [
++        'ogg/ogg.h',
++        'ogg/os_types.h',
++    ]
++
++if CONFIG['MOZ_SYSTEM_THEORA']:
++    system_headers += [
++        'theora/theoradec.h',
++    ]
++
++if CONFIG['MOZ_SYSTEM_VORBIS']:
++    system_headers += [
++        'vorbis/codec.h',
++        'vorbis/vorbisenc.h',
++    ]
++
++if CONFIG['MOZ_SYSTEM_TREMOR']:
++    system_headers += [
++        'tremor/ivorbiscodec.h',
++    ]
++
+ if CONFIG['MOZ_SYSTEM_LIBVPX']:
+     system_headers += [
+         'vpx_mem/vpx_mem.h',
Index: pkgsrc/www/firefox/patches/patch-dom_media_flac_FlacDecoder.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-dom_media_flac_FlacDecoder.cpp:1.1
--- /dev/null   Wed Jan 24 16:52:08 2018
+++ pkgsrc/www/firefox/patches/patch-dom_media_flac_FlacDecoder.cpp     Wed Jan 24 16:52:08 2018
@@ -0,0 +1,23 @@
+$NetBSD: patch-dom_media_flac_FlacDecoder.cpp,v 1.1 2018/01/24 16:52:08 ryoon Exp $
+
+--- dom/media/flac/FlacDecoder.cpp.orig        2017-11-02 16:16:35.000000000 +0000
++++ dom/media/flac/FlacDecoder.cpp
+@@ -7,6 +7,7 @@
+ #include "FlacDecoder.h"
+ #include "MediaContainerType.h"
+ #include "MediaPrefs.h"
++#include "PDMFactory.h"
+ 
+ namespace mozilla {
+ 
+@@ -15,6 +16,10 @@ FlacDecoder::IsEnabled()
+ {
+ #ifdef MOZ_FFVPX
+   return MediaPrefs::FlacEnabled();
++#elif defined(MOZ_FFMPEG)
++  RefPtr<PDMFactory> platform = new PDMFactory();
++  return MediaPrefs::FlacEnabled() && platform->SupportsMimeType(NS_LITERAL_CSTRING("audio/flac"),
++                                    /* DecoderDoctorDiagnostics* */ nullptr);
+ #else
+   // Until bug 1295886 is fixed.
+   return false;
Index: pkgsrc/www/firefox/patches/patch-ipc_glue_MessageChannel.cpp
diff -u /dev/null pkgsrc/www/firefox/patches/patch-ipc_glue_MessageChannel.cpp:1.1
--- /dev/null   Wed Jan 24 16:52:08 2018
+++ pkgsrc/www/firefox/patches/patch-ipc_glue_MessageChannel.cpp        Wed Jan 24 16:52:08 2018
@@ -0,0 +1,16 @@
+$NetBSD: patch-ipc_glue_MessageChannel.cpp,v 1.1 2018/01/24 16:52:08 ryoon Exp $
+
+--- ipc/glue/MessageChannel.cpp.orig   2018-01-11 20:17:05.000000000 +0000
++++ ipc/glue/MessageChannel.cpp
+@@ -686,6 +686,11 @@ MessageChannel::WillDestroyCurrentMessag
+     mWorkerLoop = nullptr;
+ }
+ 
++#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION < 4000
++// Work around UB in __tree crashing mPendingPromises.clear()
++// http://llvm.org/viewvc/llvm-project?view=revision&revision=276003
++[[clang::optnone]]
++#endif
+ void
+ MessageChannel::Clear()
+ {
Index: pkgsrc/www/firefox/patches/patch-servo_components_style_properties_helpers_animated__properties.mako.rs
diff -u /dev/null pkgsrc/www/firefox/patches/patch-servo_components_style_properties_helpers_animated__properties.mako.rs:1.1
--- /dev/null   Wed Jan 24 16:52:08 2018
+++ pkgsrc/www/firefox/patches/patch-servo_components_style_properties_helpers_animated__properties.mako.rs     Wed Jan 24 16:52:08 2018
@@ -0,0 +1,12 @@
+$NetBSD: patch-servo_components_style_properties_helpers_animated__properties.mako.rs,v 1.1 2018/01/24 16:52:08 ryoon Exp $
+
+--- servo/components/style/properties/helpers/animated_properties.mako.rs.orig 2018-01-11 20:16:51.000000000 +0000
++++ servo/components/style/properties/helpers/animated_properties.mako.rs
+@@ -12,7 +12,6 @@ use cssparser::Parser;
+ #[cfg(feature = "gecko")] use gecko_bindings::structs::nsCSSPropertyID;
+ #[cfg(feature = "gecko")] use gecko_bindings::sugar::ownership::{HasFFI, HasSimpleFFI};
+ use itertools::{EitherOrBoth, Itertools};
+-use num_traits::Zero;
+ use properties::{CSSWideKeyword, PropertyDeclaration};
+ use properties::longhands;
+ use properties::longhands::font_weight::computed_value::T as FontWeight;
Index: pkgsrc/www/firefox/patches/patch-toolkit_mozapps_installer_packager.mk
diff -u /dev/null pkgsrc/www/firefox/patches/patch-toolkit_mozapps_installer_packager.mk:1.1
--- /dev/null   Wed Jan 24 16:52:08 2018
+++ pkgsrc/www/firefox/patches/patch-toolkit_mozapps_installer_packager.mk      Wed Jan 24 16:52:08 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-toolkit_mozapps_installer_packager.mk,v 1.1 2018/01/24 16:52:08 ryoon Exp $
+
+* Symbolic link to lib/firefox/firefox causes 'Couldn't load XPCOM.' error.
+
+--- toolkit/mozapps/installer/packager.mk.orig 2018-01-11 20:17:05.000000000 +0000
++++ toolkit/mozapps/installer/packager.mk
+@@ -137,7 +137,7 @@ endif
+         (cd $(DESTDIR)$(installdir) && tar -xf -)
+       $(NSINSTALL) -D $(DESTDIR)$(bindir)
+       $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME)
+-      ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
++      #ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)
+ 
+ checksum:
+       mkdir -p `dirname $(CHECKSUM_FILE)`

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.3
--- /dev/null   Wed Jan 24 16:52:08 2018
+++ pkgsrc/www/firefox/patches/patch-third__party_python_futures_concurrent_futures_process.py  Wed Jan 24 16:52:08 2018
@@ -0,0 +1,17 @@
+$NetBSD: patch-third__party_python_futures_concurrent_futures_process.py,v 1.3 2018/01/24 16:52:08 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



Home | Main Index | Thread Index | Old Index