Update to 71.0

* Remove oss option. Its patch is not usable for 71.0.

Changelog:
New
    Improvements to Lockwise, our integrated password manager:
        Firefox now recognizes subdomains and will autofill domain logins from Lockwise
        Integrated breach alerts from Firefox Monitor are now available to users with screen readers

    More information about Enhanced Tracking Protection in action:
        Notifications when Firefox blocks cryptominers
        A running tally of blocked trackers in the protection panel accessed by clicking the address bar shield

    Picture-in-picture video comes to Firefox for Windows: Select the blue icon from the right edge of a video to pop open a floating window so you can keep watching while working in other tabs. Learn how the feature works.

    Native MP3 decoding on Windows, Linux, and macOS

Security fixes:
Not available yet.
This commit is contained in:
ryoon 2019-12-03 14:21:20 +00:00
parent f42417c65d
commit 767f123e21
11 changed files with 146 additions and 1360 deletions

View file

@ -1,12 +1,11 @@
# $NetBSD: Makefile,v 1.402 2019/11/12 12:31:16 ryoon Exp $
# $NetBSD: Makefile,v 1.403 2019/12/03 14:21:20 ryoon Exp $
FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
MOZ_BRANCH= 70.0
MOZ_BRANCH_MINOR= .1
MOZ_BRANCH= 71.0
MOZ_BRANCH_MINOR=
DISTNAME= firefox-${FIREFOX_VER}.source
PKGNAME= ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
PKGREVISION= 1
CATEGORIES= www
MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
EXTRACT_SUFX= .tar.xz

View file

@ -1,7 +1,9 @@
@comment $NetBSD: PLIST,v 1.148 2019/11/02 19:45:46 gutteridge Exp $
@comment $NetBSD: PLIST,v 1.149 2019/12/03 14:21:20 ryoon Exp $
bin/firefox
lib/firefox/actors/AudioPlaybackChild.jsm
lib/firefox/actors/AudioPlaybackParent.jsm
lib/firefox/actors/AutoCompleteChild.jsm
lib/firefox/actors/AutoCompleteParent.jsm
lib/firefox/actors/AutoplayChild.jsm
lib/firefox/actors/AutoplayParent.jsm
lib/firefox/actors/BrowserElementChild.jsm
@ -11,6 +13,7 @@ lib/firefox/actors/DateTimePickerChild.jsm
lib/firefox/actors/DateTimePickerParent.jsm
lib/firefox/actors/ExtFindChild.jsm
lib/firefox/actors/FindBarChild.jsm
lib/firefox/actors/FindBarParent.jsm
lib/firefox/actors/FinderChild.jsm
lib/firefox/actors/FormSubmitChild.jsm
lib/firefox/actors/InlineSpellCheckerChild.jsm
@ -40,8 +43,8 @@ lib/firefox/browser/actors/ClickHandlerChild.jsm
lib/firefox/browser/actors/ContentSearchChild.jsm
lib/firefox/browser/actors/ContextMenuChild.jsm
lib/firefox/browser/actors/ContextMenuParent.jsm
lib/firefox/browser/actors/ContextMenuSpecialProcessChild.jsm
lib/firefox/browser/actors/DOMFullscreenChild.jsm
lib/firefox/browser/actors/DOMFullscreenParent.jsm
lib/firefox/browser/actors/FormValidationChild.jsm
lib/firefox/browser/actors/FormValidationParent.jsm
lib/firefox/browser/actors/LightweightThemeChild.jsm
@ -54,15 +57,15 @@ lib/firefox/browser/actors/PluginChild.jsm
lib/firefox/browser/actors/PluginParent.jsm
lib/firefox/browser/actors/PromptParent.jsm
lib/firefox/browser/actors/RFPHelperChild.jsm
lib/firefox/browser/actors/RFPHelperParent.jsm
lib/firefox/browser/actors/SearchTelemetryChild.jsm
lib/firefox/browser/actors/SwitchDocumentDirectionChild.jsm
lib/firefox/browser/actors/URIFixupChild.jsm
lib/firefox/browser/actors/WebRTCChild.jsm
lib/firefox/browser/blocklist.xml
lib/firefox/browser/chrome.manifest
${PLIST.nobranding}lib/firefox/browser/chrome/browser/content/branding/about-background.png
lib/firefox/browser/chrome/browser/content/branding/about-logo.png
${PLIST.branding}lib/firefox/browser/chrome/browser/content/branding/about-logo@2x.png
lib/firefox/browser/chrome/browser/content/branding/about-logo@2x.png
lib/firefox/browser/chrome/browser/content/branding/about-wordmark.svg
lib/firefox/browser/chrome/browser/content/branding/about.png
lib/firefox/browser/chrome/browser/content/branding/aboutDialog.css
@ -98,6 +101,10 @@ lib/firefox/browser/chrome/browser/content/browser/aboutTabCrashed.css
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/aboutconfig/aboutconfig.css
lib/firefox/browser/chrome/browser/content/browser/aboutconfig/aboutconfig.html
lib/firefox/browser/chrome/browser/content/browser/aboutconfig/aboutconfig.js
lib/firefox/browser/chrome/browser/content/browser/aboutconfig/background.svg
lib/firefox/browser/chrome/browser/content/browser/aboutlogins/aboutLogins.css
lib/firefox/browser/chrome/browser/content/browser/aboutlogins/aboutLogins.html
lib/firefox/browser/chrome/browser/content/browser/aboutlogins/aboutLogins.js
@ -233,6 +240,7 @@ lib/firefox/browser/chrome/browser/content/browser/aboutlogins/third-party/play-
lib/firefox/browser/chrome/browser/content/browser/aboutlogins/third-party/play-store/play_zh-tw.png
lib/firefox/browser/chrome/browser/content/browser/blockedSite.js
lib/firefox/browser/chrome/browser/content/browser/blockedSite.xhtml
lib/firefox/browser/chrome/browser/content/browser/browser-a11yUtils.js
lib/firefox/browser/chrome/browser/content/browser/browser-addons.js
lib/firefox/browser/chrome/browser/content/browser/browser-allTabsMenu.js
lib/firefox/browser/chrome/browser/content/browser/browser-captivePortal.js
@ -297,6 +305,7 @@ lib/firefox/browser/chrome/browser/content/browser/downloads/contentAreaDownload
lib/firefox/browser/chrome/browser/content/browser/downloads/contentAreaDownloadsView.xul
lib/firefox/browser/chrome/browser/content/browser/downloads/downloads.css
lib/firefox/browser/chrome/browser/content/browser/downloads/downloads.js
lib/firefox/browser/chrome/browser/content/browser/downloads/downloadsCommands.js
lib/firefox/browser/chrome/browser/content/browser/downloads/indicator.js
lib/firefox/browser/chrome/browser/content/browser/ext-browser.json
lib/firefox/browser/chrome/browser/content/browser/extension.css
@ -410,8 +419,8 @@ lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/privac
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/search.js
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/subdialogs.js
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/sync.js
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/syncDisconnect.js
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/syncDisconnect.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/syncChooseWhatToSync.js
lib/firefox/browser/chrome/browser/content/browser/preferences/in-content/syncChooseWhatToSync.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/languages.js
lib/firefox/browser/chrome/browser/content/browser/preferences/languages.xul
lib/firefox/browser/chrome/browser/content/browser/preferences/permissions.js
@ -567,7 +576,6 @@ lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/cfr_p
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/cfr_reddit_enhancement.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/cfr_wiki_search.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/firefox-wordmark.svg
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/fox-tail.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/gift-extension.svg
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/glyph-add-16.svg
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/glyph-arrow.svg
@ -610,12 +618,12 @@ lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/illus
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/protection-report-icon.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/spinner.svg
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/sync-devices-trailhead.svg
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/sync-devices.svg
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/topic-show-more-12.svg
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/accounts-form-bg.jpg
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/benefit-knowledge.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/benefit-privacy.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/benefit-products.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/benefit-sync.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/card-illo-devices.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/card-illo-fbcont.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/card-illo-ffmonitor.png
@ -628,6 +636,7 @@ lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trail
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/card-illo-sendtab.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/card-illo-tracking.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/firefox-logo.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/trailhead/firefox-systems.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/assets/whatsnew-send-icon.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/aliexpress-com@2x.png
lib/firefox/browser/chrome/browser/res/activity-stream/data/content/tippytop/images/allegro-pl@2x.png
@ -1036,6 +1045,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/3rdpartyco
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/cryptominers-disabled.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/cryptominers.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/dashboard.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/etp-milestone.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/extension.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/fingerprinters-disabled.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/controlcenter/fingerprinters.svg
@ -1087,6 +1097,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen/insecure.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/fullscreen/secure.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/add-device.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/avatar-alert.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/avatar-color.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/avatar-confirm.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/fxa/avatar-empty-badged.svg
@ -1122,6 +1133,10 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/newInstallPage.css
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/autoplay-media-blocked.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/autoplay-media-detailed.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/autoplay-media.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/block-cryptominer-dark.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/block-cryptominer.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/block-fingerprinter-dark.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/block-fingerprinter.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/block-social-dark.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/block-social.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/camera-blocked.svg
@ -1135,8 +1150,6 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/focus
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/images-blocked.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/images.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/indexedDB.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/microphone-blocked.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/notification-icons/microphone-detailed.svg
@ -1184,18 +1197,23 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/pocket.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/alwaysAsk.png
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/applications.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/containers.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/bookmark.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/containers.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/critters-postcard.jpg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/dialog.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/extensions.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/face-sad.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/face-smile.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/formfill.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/fxaPairDevice.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/general.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/history.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/logo-android.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/logo-ios.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/no-search-bar.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/no-search-results.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/preferences.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/privacy-security.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/privacy.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/search-arrow-indicator.svg
@ -1204,7 +1222,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/s
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/search.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/siteDataSettings.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/sync.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/syncDisconnect.css
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/in-content/tab.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/preferences/preferences.css
lib/firefox/browser/chrome/browser/skin/classic/browser/print.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/private-browsing.svg
@ -1229,6 +1247,7 @@ 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
lib/firefox/browser/chrome/browser/skin/classic/browser/sidebars.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/sign-out.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/slowStartup-16.png
lib/firefox/browser/chrome/browser/skin/classic/browser/sort.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/stop-to-reload.svg
@ -1257,6 +1276,7 @@ lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-loading.p
lib/firefox/browser/chrome/browser/skin/classic/browser/tabbrowser/tab-loading@2x.png
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/tip.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/toggle.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/tracking-protection-animation-brighttext.svg
lib/firefox/browser/chrome/browser/skin/classic/browser/tracking-protection-animation.svg
@ -1307,9 +1327,6 @@ lib/firefox/browser/chrome/devtools/content/application/index.html
lib/firefox/browser/chrome/devtools/content/debugger/index.html
lib/firefox/browser/chrome/devtools/content/dom/index.html
lib/firefox/browser/chrome/devtools/content/dom/main.js
lib/firefox/browser/chrome/devtools/content/framework/connect/connect.css
lib/firefox/browser/chrome/devtools/content/framework/connect/connect.js
lib/firefox/browser/chrome/devtools/content/framework/connect/connect.xhtml
lib/firefox/browser/chrome/devtools/content/framework/options-panel.css
lib/firefox/browser/chrome/devtools/content/framework/toolbox-init.js
lib/firefox/browser/chrome/devtools/content/framework/toolbox-options.xhtml
@ -1327,7 +1344,9 @@ lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/icons/blocked.
lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/icons/play.svg
lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/icons/shield.svg
lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/CustomRequestPanel.css
lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/NetworkActionBar.css
lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/NetworkDetailsPanel.css
lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/RequestBlockingPanel.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
@ -1340,12 +1359,11 @@ lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/variabl
lib/firefox/browser/chrome/devtools/content/netmonitor/src/assets/styles/websockets.css
lib/firefox/browser/chrome/devtools/content/performance-new/frame-script.js
lib/firefox/browser/chrome/devtools/content/performance-new/index.xhtml
lib/firefox/browser/chrome/devtools/content/performance-new/popup/icons/capture-profile-icon.svg
lib/firefox/browser/chrome/devtools/content/performance-new/popup/initializer.js
lib/firefox/browser/chrome/devtools/content/performance-new/popup/popup.css
lib/firefox/browser/chrome/devtools/content/performance-new/popup/popup.html
lib/firefox/browser/chrome/devtools/content/performance-new/popup/popup.xhtml
lib/firefox/browser/chrome/devtools/content/performance/index.xul
lib/firefox/browser/chrome/devtools/content/responsive/index.xhtml
lib/firefox/browser/chrome/devtools/content/responsive/toolbar.xhtml
lib/firefox/browser/chrome/devtools/content/scratchpad/index.xul
lib/firefox/browser/chrome/devtools/content/shared/sourceeditor/codemirror/addon/dialog/dialog.css
lib/firefox/browser/chrome/devtools/content/shared/sourceeditor/codemirror/addon/hint/show-hint.js
@ -1371,6 +1389,7 @@ lib/firefox/browser/chrome/devtools/content/shared/widgets/widgets.css
lib/firefox/browser/chrome/devtools/content/storage/index.xul
lib/firefox/browser/chrome/devtools/content/styleeditor/index.xul
lib/firefox/browser/chrome/devtools/content/webconsole/index.html
lib/firefox/browser/chrome/devtools/content/whats-new/index.html
lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/aboutdebugging.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/initializer.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/aboutdebugging/src/actions/debug-targets.js
@ -1520,19 +1539,30 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/base
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/App.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/App.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/Manifest.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestColorItem.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestColorItem.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestEmpty.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestIconItem.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestIconItem.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestIssue.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestIssue.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestIssueList.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestIssueList.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestItem.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestItem.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestJsonLink.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestJsonLink.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestLoader.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestLoader.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestPage.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestSection.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/manifest/ManifestSection.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/routing/PageSwitcher.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/routing/PageSwitcher.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/routing/Sidebar.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/routing/Sidebar.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/routing/SidebarItem.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/routing/SidebarItem.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/Worker.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/Worker.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/components/service-workers/WorkerList.css
@ -1552,6 +1582,10 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/redu
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/reducers/page-state.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/reducers/ui-state.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/reducers/workers-state.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/types/index.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/types/manifest.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/types/routing.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/application/src/types/service-workers.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/dist/parser-worker.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/dist/pretty-print-worker.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/dist/search-worker.js
@ -1576,6 +1610,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/help
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/home.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/info.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/loader.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/markup-breakpoint.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/next-circle.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/next.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/pane-collapse.svg
@ -1585,6 +1620,8 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/plus
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/prettyPrint.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/regex-match.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/reload.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/replay-pause.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/replay-resume.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/resume.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/rewind.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/search.svg
@ -1625,6 +1662,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/webc
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/whole-word-match.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/window.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/images/worker.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/packages/devtools-reps/src/object-inspector/reducer.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/ast/index.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/ast/setInScopeLines.js
@ -1649,6 +1687,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/mapScopes.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/pauseOnExceptions.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/paused.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/previewPausedLocation.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/resumed.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/selectFrame.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/actions/pause/skipPausing.js
@ -1700,7 +1739,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/compone
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/EmptyLines.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/Footer.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/Footer.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/Highlight.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/HighlightLine.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/HighlightLines.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/components/Editor/InlinePreview.css
@ -1860,13 +1898,11 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/e
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/editor/source-search.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/editor/token-events.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/expressions.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/fromJS.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/function.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/indentation.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/isMinified.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/location.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/log.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/makeRecord.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/memoizableAction.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/memoize.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/utils/memoizeLast.js
@ -1935,6 +1971,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/workers
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/workers/pretty-print/index.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/debugger/src/workers/search/index.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/definitions.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/devtools-fission-prefs.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/actions/filter.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/actions/grips.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/dom/content/components/DomTree.js
@ -2056,6 +2093,16 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/changes/re
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/changes/selectors/changes.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/changes/utils/changes-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/changes/utils/l10n.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/CompatibilityView.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/actions/compatibility.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/actions/index.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/CompatibilityApp.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/IssueItem.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/components/IssueList.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/lib/MDNCompatibility.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/lib/dataset/css-properties.json
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/reducers/compatibility.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/inspector/compatibility/types.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
@ -2271,6 +2318,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/batching.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/filters.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/index.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/request-blocking.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/requests.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/search.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/actions/selection.js
@ -2289,6 +2337,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/compo
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/HtmlPreview.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/JSONPreview.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/NetworkActionBar.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
@ -2325,7 +2374,9 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/compo
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/components/request-blocking/RequestBlockingPanel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/search/SearchPanel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/search/StatusBar.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/search/Toolbar.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/search/search-provider.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/components/websockets/FrameFilterMenu.js
@ -2368,11 +2419,13 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/middl
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/middleware/event-telemetry.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/request-blocking.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/middleware/throttling.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/middleware/thunk.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/batching.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/filters.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/index.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/request-blocking.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/requests.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/search.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/reducers/sort.js
@ -2395,6 +2448,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/mdn-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/open-request-in-tab.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/prefs.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/netmonitor/src/utils/request-blocking.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
@ -2415,9 +2469,9 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/performance-new/comp
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance-new/components/Settings.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance-new/initializer.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance-new/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance-new/popup/background.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance-new/popup/menu-button.jsm
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance-new/popup/popup.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance-new/popup/background.jsm.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance-new/popup/menu-button.jsm.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance-new/preference-management.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance-new/store/actions.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance-new/store/reducers.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/performance-new/store/selectors.js
@ -2513,9 +2567,10 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive/reducers/
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive/reducers/screenshot.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive/reducers/ui.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive/reducers/viewports.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive/setting-onboarding-tooltip.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive/responsive-browser.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive/store.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive/types.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive/ui.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive/utils/e10s.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive/utils/key.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/responsive/utils/l10n.js
@ -2560,7 +2615,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/me
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/images/input.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/images/jump-definition.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/images/open-inspector.svg
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/components/reps/reps-old.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/splitter/Draggable.js
@ -2608,6 +2662,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middlew
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/log.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/promise.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/task.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/thunk-with-options.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/thunk.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/middleware/wait-service.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/redux/non-react-subscriber.js
@ -2639,6 +2694,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/stylesheet-ut
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/suggestion-picker.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/telemetry.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/theme.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/thread-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/undo.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/unicode-url.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/WasmDis.js
@ -2651,13 +2707,13 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/lodash
${PLIST.debug}lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dev.js
${PLIST.debug}lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-dev.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-factories.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server.js
${PLIST.debug}lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server-dev.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-test-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-server.js
${PLIST.debug}lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-test-utils-dev.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom-test-utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-dom.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-prop-types.js
${PLIST.debug}lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-prop-types-dev.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-prop-types.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-redux.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-router-dom.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/react-test-renderer-shallow.js
@ -2671,8 +2727,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/string
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/vendor/whatwg-url.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/Chart.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/shared/widgets/CubicBezierPresets.js
@ -2723,11 +2777,15 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/actions/i
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/actions/input.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/actions/messages.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/actions/notifications.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/actions/object.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/actions/toolbox.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/actions/ui.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/browser-console-manager.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/browser-console.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/commands.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/components/App.css
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/components/App.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/components/FilterBar/ConsoleSettings.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/components/FilterBar/FilterBar.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/components/FilterBar/FilterButton.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/components/FilterBar/FilterCheckbox.js
@ -2762,7 +2820,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/enhancers
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/enhancers/net-provider.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/middleware/event-telemetry.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/middleware/history-persistence.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/middleware/thunk.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/reducers/autocomplete.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/reducers/filters.js
@ -2779,6 +2836,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/selectors
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/selectors/notifications.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/selectors/prefs.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/selectors/ui.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/service-container.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/store.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/test/browser/stub-generator-helpers.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/test/node/fixtures/stubs/consoleApi.js
@ -2800,18 +2858,11 @@ lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/webconsol
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole-ui.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole-wrapper.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webconsole/webconsole.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/app-manager.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/app-projects.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/app-validator.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/config-view.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/project-list.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/runtime-list.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/runtime-types.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/runtimes.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/tab-store.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webide/modules/utils.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webreplay/components/WebReplayPlayer.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/webreplay/menu.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/whats-new/panel.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/whats-new/src/main.js
lib/firefox/browser/chrome/devtools/modules/devtools/client/whats-new/src/whats-new.css
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/accessibility/accessibility-parent.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/accessibility/accessibility.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/accessibility/accessible.js
@ -2847,6 +2898,8 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters.
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/accessible.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/auto-refresh.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/box-model-observer.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/box-model-renderer.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/box-model.js
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
@ -2854,6 +2907,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/flexbox.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/fonts.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/geometry-editor.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/highlighter-renderer.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
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/highlighters/rulers.js
@ -2897,7 +2951,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/performance-r
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/performance.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/preference.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/process.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/promises.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/reflow.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/replay/control.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/replay/debugger.js
@ -2931,6 +2984,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/dbg-sou
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/event-breakpoints.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/event-loop.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/inactive-property-helper.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/logEvent.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/actors/utils/make-debugger.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
@ -2961,6 +3015,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/server/connectors/frame-con
lib/firefox/browser/chrome/devtools/modules/devtools/server/connectors/worker-connector.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/debugger-server-connection.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/debugger-server.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/performance-new/gecko-profiler-interface.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/performance/framerate.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/performance/memory.js
lib/firefox/browser/chrome/devtools/modules/devtools/server/performance/profiler.js
@ -3001,12 +3056,9 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/client/connection-ma
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/deprecated-thread-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/symbol-iterator-client.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/constants.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/content-observer.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/css/color-db.js
@ -3038,6 +3090,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/descriptors/p
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/descriptors/webextension.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/device.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/emulation.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/environment.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/framerate.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/highlighters.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/inspector.js
@ -3050,7 +3103,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/perf.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
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/promises.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/property-iterator.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/reflow.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/root.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/screenshot.js
@ -3059,7 +3112,7 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/storage.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/string.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/styles.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/stylesheets.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/targets/addon.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/symbol-iterator.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/targets/browsing-context.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/targets/content-process.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/fronts/targets/local-tab.js
@ -3155,7 +3208,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/perf.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
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/promises.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/property-iterator.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/reflow.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/root.js
@ -3167,7 +3219,6 @@ lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/styles.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/stylesheets.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/symbol-iterator.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/symbol.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/targets/addon.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/targets/browsing-context.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/targets/chrome-window.js
lib/firefox/browser/chrome/devtools/modules/devtools/shared/specs/targets/content-process.js
@ -3235,6 +3286,7 @@ lib/firefox/browser/chrome/devtools/skin/images/alert-tiny.svg
lib/firefox/browser/chrome/devtools/skin/images/alert.svg
lib/firefox/browser/chrome/devtools/skin/images/angle-swatch.svg
lib/firefox/browser/chrome/devtools/skin/images/animation-fast-track.svg
lib/firefox/browser/chrome/devtools/skin/images/application-manifest.svg
lib/firefox/browser/chrome/devtools/skin/images/arrow-big.svg
lib/firefox/browser/chrome/devtools/skin/images/arrow-e.svg
lib/firefox/browser/chrome/devtools/skin/images/arrow.svg
@ -3244,6 +3296,7 @@ lib/firefox/browser/chrome/devtools/skin/images/arrowhead-right.svg
lib/firefox/browser/chrome/devtools/skin/images/arrowhead-up.svg
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/case-match.svg
lib/firefox/browser/chrome/devtools/skin/images/checkbox.svg
lib/firefox/browser/chrome/devtools/skin/images/clear.svg
lib/firefox/browser/chrome/devtools/skin/images/close-3-pane.svg
@ -3320,7 +3373,6 @@ lib/firefox/browser/chrome/devtools/skin/images/rules-view-print-simulation.svg
lib/firefox/browser/chrome/devtools/skin/images/sad-face.svg
lib/firefox/browser/chrome/devtools/skin/images/search-clear.svg
lib/firefox/browser/chrome/devtools/skin/images/search.svg
lib/firefox/browser/chrome/devtools/skin/images/security-state-broken.svg
lib/firefox/browser/chrome/devtools/skin/images/security-state-insecure.svg
lib/firefox/browser/chrome/devtools/skin/images/security-state-secure.svg
lib/firefox/browser/chrome/devtools/skin/images/security-state-weak.svg
@ -3349,6 +3401,7 @@ lib/firefox/browser/chrome/devtools/skin/images/webconsole/editor.svg
lib/firefox/browser/chrome/devtools/skin/images/webconsole/input.svg
lib/firefox/browser/chrome/devtools/skin/images/webconsole/navigation.svg
lib/firefox/browser/chrome/devtools/skin/images/webconsole/return.svg
lib/firefox/browser/chrome/devtools/skin/images/webconsole/reverse-search.svg
lib/firefox/browser/chrome/devtools/skin/images/webconsole/run.svg
lib/firefox/browser/chrome/devtools/skin/inspector.css
lib/firefox/browser/chrome/devtools/skin/jit-optimizations.css
@ -3394,7 +3447,6 @@ lib/firefox/browser/chrome/en-US/locale/browser/places/editBookmarkOverlay.dtd
lib/firefox/browser/chrome/en-US/locale/browser/places/places.dtd
lib/firefox/browser/chrome/en-US/locale/browser/places/places.properties
lib/firefox/browser/chrome/en-US/locale/browser/pocket.properties
lib/firefox/browser/chrome/en-US/locale/browser/preferences/preferences.properties
lib/firefox/browser/chrome/en-US/locale/browser/safebrowsing/safebrowsing.properties
lib/firefox/browser/chrome/en-US/locale/browser/search.properties
lib/firefox/browser/chrome/en-US/locale/browser/setDesktopBackground.dtd
@ -3412,12 +3464,9 @@ lib/firefox/browser/chrome/en-US/locale/browser/webrtcIndicator.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/VariablesView.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/accessibility.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/animationinspector.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/app-manager.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/boxmodel.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/changes.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/components.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/connection-screen.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/connection-screen.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/debugger.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/device.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/dom.properties
@ -3450,8 +3499,6 @@ lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/styleeditor.proper
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/toolbox.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/toolbox.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/webconsole.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/webide.dtd
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/client/webide.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/accessibility.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/debugger.properties
lib/firefox/browser/chrome/en-US/locale/en-US/devtools/shared/eyedropper.properties
@ -3748,42 +3795,6 @@ lib/firefox/browser/chrome/pdfjs/content/web/images/treeitem-expanded@2x.png
lib/firefox/browser/chrome/pdfjs/content/web/viewer.css
lib/firefox/browser/chrome/pdfjs/content/web/viewer.html
lib/firefox/browser/chrome/pdfjs/content/web/viewer.js
lib/firefox/browser/chrome/webide/content/addons.js
lib/firefox/browser/chrome/webide/content/addons.xhtml
lib/firefox/browser/chrome/webide/content/details.js
lib/firefox/browser/chrome/webide/content/details.xhtml
lib/firefox/browser/chrome/webide/content/devicepreferences.js
lib/firefox/browser/chrome/webide/content/devicepreferences.xhtml
lib/firefox/browser/chrome/webide/content/newapp.js
lib/firefox/browser/chrome/webide/content/newapp.xul
lib/firefox/browser/chrome/webide/content/prefs.js
lib/firefox/browser/chrome/webide/content/prefs.xhtml
lib/firefox/browser/chrome/webide/content/project-listing.js
lib/firefox/browser/chrome/webide/content/project-listing.xhtml
lib/firefox/browser/chrome/webide/content/project-panel.js
lib/firefox/browser/chrome/webide/content/runtime-listing.js
lib/firefox/browser/chrome/webide/content/runtime-listing.xhtml
lib/firefox/browser/chrome/webide/content/runtime-panel.js
lib/firefox/browser/chrome/webide/content/runtimedetails.js
lib/firefox/browser/chrome/webide/content/runtimedetails.xhtml
lib/firefox/browser/chrome/webide/content/webide.js
lib/firefox/browser/chrome/webide/content/webide.xul
lib/firefox/browser/chrome/webide/content/wifi-auth.js
lib/firefox/browser/chrome/webide/content/wifi-auth.xhtml
lib/firefox/browser/chrome/webide/skin/addons.css
lib/firefox/browser/chrome/webide/skin/config-view.css
lib/firefox/browser/chrome/webide/skin/deck.css
lib/firefox/browser/chrome/webide/skin/default-app-icon.png
lib/firefox/browser/chrome/webide/skin/details.css
lib/firefox/browser/chrome/webide/skin/icons.png
lib/firefox/browser/chrome/webide/skin/newapp.css
lib/firefox/browser/chrome/webide/skin/noise.png
lib/firefox/browser/chrome/webide/skin/panel-listing.css
lib/firefox/browser/chrome/webide/skin/rocket.svg
lib/firefox/browser/chrome/webide/skin/runtimedetails.css
lib/firefox/browser/chrome/webide/skin/throbber.svg
lib/firefox/browser/chrome/webide/skin/webide.css
lib/firefox/browser/chrome/webide/skin/wifi-auth.css
lib/firefox/browser/components/components.manifest
${PLIST.debug}lib/firefox/browser/components/startupRecorder.js
lib/firefox/browser/defaults/permissions
@ -4046,7 +4057,6 @@ lib/firefox/browser/features/webcompat@mozilla.org/experiment-apis/sharedPrefere
lib/firefox/browser/features/webcompat@mozilla.org/experiment-apis/sharedPreferences.json
lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug0000000-testbed-css-injection.css
lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1305028-gaming.youtube.com-webkit-scrollbar.css
lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1432935-breitbart.com-webkit-scrollbar.css
lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1432935-discordapp.com-webkit-scorllbar-white-line.css
lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1518781-twitch.tv-webkit-scrollbar.css
lib/firefox/browser/features/webcompat@mozilla.org/injections/css/bug1526977-sreedharscce.in-login-fix.css
@ -4091,14 +4101,17 @@ lib/firefox/browser/localization/en-US/browser/aboutRobots.ftl
lib/firefox/browser/localization/en-US/browser/aboutSessionRestore.ftl
lib/firefox/browser/localization/en-US/browser/aboutTabCrashed.ftl
lib/firefox/browser/localization/en-US/browser/appMenuNotifications.ftl
lib/firefox/browser/localization/en-US/browser/appmenu.ftl
lib/firefox/browser/localization/en-US/browser/branding/brandings.ftl
lib/firefox/browser/localization/en-US/browser/branding/sync-brand.ftl
lib/firefox/browser/localization/en-US/browser/browser.ftl
lib/firefox/browser/localization/en-US/browser/customizeMode.ftl
lib/firefox/browser/localization/en-US/browser/menubar.ftl
lib/firefox/browser/localization/en-US/browser/newInstallPage.ftl
lib/firefox/browser/localization/en-US/browser/newtab/asrouter.ftl
lib/firefox/browser/localization/en-US/browser/newtab/newtab.ftl
lib/firefox/browser/localization/en-US/browser/newtab/onboarding.ftl
lib/firefox/browser/localization/en-US/browser/nsserrors.ftl
lib/firefox/browser/localization/en-US/browser/pageInfo.ftl
lib/firefox/browser/localization/en-US/browser/panicButton.ftl
lib/firefox/browser/localization/en-US/browser/policies/policies-descriptions.ftl
@ -4115,12 +4128,12 @@ lib/firefox/browser/localization/en-US/browser/preferences/permissions.ftl
lib/firefox/browser/localization/en-US/browser/preferences/preferences.ftl
lib/firefox/browser/localization/en-US/browser/preferences/selectBookmark.ftl
lib/firefox/browser/localization/en-US/browser/preferences/siteDataSettings.ftl
lib/firefox/browser/localization/en-US/browser/preferences/syncDisconnect.ftl
lib/firefox/browser/localization/en-US/browser/preferences/translation.ftl
lib/firefox/browser/localization/en-US/browser/protections.ftl
lib/firefox/browser/localization/en-US/browser/safeMode.ftl
lib/firefox/browser/localization/en-US/browser/safebrowsing/blockedSite.ftl
lib/firefox/browser/localization/en-US/browser/sanitize.ftl
lib/firefox/browser/localization/en-US/browser/sync.ftl
lib/firefox/browser/localization/en-US/browser/syncedTabs.ftl
lib/firefox/browser/localization/en-US/browser/tabContextMenu.ftl
lib/firefox/browser/localization/en-US/browser/toolbarContextMenu.ftl
@ -4206,6 +4219,7 @@ lib/firefox/browser/modules/UrlbarMuxerUnifiedComplete.jsm
lib/firefox/browser/modules/UrlbarPrefs.jsm
lib/firefox/browser/modules/UrlbarProviderExtension.jsm
lib/firefox/browser/modules/UrlbarProviderOpenTabs.jsm
lib/firefox/browser/modules/UrlbarProviderPrivateSearch.jsm
lib/firefox/browser/modules/UrlbarProviderUnifiedComplete.jsm
lib/firefox/browser/modules/UrlbarProvidersManager.jsm
lib/firefox/browser/modules/UrlbarResult.jsm
@ -4281,7 +4295,6 @@ lib/firefox/chrome/en-US/locale/en-US/global-platform/unix/platformKeys.properti
lib/firefox/chrome/en-US/locale/en-US/global-platform/win/accessible.properties
lib/firefox/chrome/en-US/locale/en-US/global-platform/win/intl.properties
lib/firefox/chrome/en-US/locale/en-US/global-platform/win/platformKeys.properties
lib/firefox/chrome/en-US/locale/en-US/global/AccessFu.properties
lib/firefox/chrome/en-US/locale/en-US/global/aboutReader.properties
lib/firefox/chrome/en-US/locale/en-US/global/aboutStudies.properties
lib/firefox/chrome/en-US/locale/en-US/global/aboutWebrtc.properties
@ -4464,6 +4477,7 @@ lib/firefox/chrome/remote/content/domains/parent/Input.jsm
lib/firefox/chrome/remote/content/domains/parent/Network.jsm
lib/firefox/chrome/remote/content/domains/parent/Page.jsm
lib/firefox/chrome/remote/content/domains/parent/Target.jsm
lib/firefox/chrome/remote/content/domains/parent/network/ChannelEventSink.jsm
lib/firefox/chrome/remote/content/domains/parent/network/NetworkObserver.jsm
lib/firefox/chrome/remote/content/domains/parent/page/DialogHandler.jsm
lib/firefox/chrome/remote/content/domains/parent/target/TabManager.jsm
@ -4600,7 +4614,6 @@ lib/firefox/chrome/toolkit/content/global/aboutUrlClassifier.xhtml
lib/firefox/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.css
lib/firefox/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.html
lib/firefox/chrome/toolkit/content/global/aboutwebrtc/aboutWebrtc.js
lib/firefox/chrome/toolkit/content/global/accessibility/content-script.js
lib/firefox/chrome/toolkit/content/global/alerts/alert.css
lib/firefox/chrome/toolkit/content/global/alerts/alert.js
lib/firefox/chrome/toolkit/content/global/alerts/alert.xul
@ -4609,16 +4622,11 @@ lib/firefox/chrome/toolkit/content/global/appPicker.xul
lib/firefox/chrome/toolkit/content/global/autocomplete.css
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
lib/firefox/chrome/toolkit/content/global/bindings/calendar.js
lib/firefox/chrome/toolkit/content/global/bindings/datekeeper.js
lib/firefox/chrome/toolkit/content/global/bindings/datepicker.js
lib/firefox/chrome/toolkit/content/global/bindings/datetimebox.css
lib/firefox/chrome/toolkit/content/global/bindings/general.xml
lib/firefox/chrome/toolkit/content/global/bindings/popup.xml
lib/firefox/chrome/toolkit/content/global/bindings/scrollbox.xml
lib/firefox/chrome/toolkit/content/global/bindings/spinner.js
lib/firefox/chrome/toolkit/content/global/bindings/textbox.xml
lib/firefox/chrome/toolkit/content/global/bindings/timekeeper.js
lib/firefox/chrome/toolkit/content/global/bindings/timepicker.js
lib/firefox/chrome/toolkit/content/global/browser-child.js
@ -4653,6 +4661,8 @@ lib/firefox/chrome/toolkit/content/global/contentAreaUtils.js
lib/firefox/chrome/toolkit/content/global/customElements.js
lib/firefox/chrome/toolkit/content/global/datepicker.xhtml
lib/firefox/chrome/toolkit/content/global/editMenuOverlay.js
lib/firefox/chrome/toolkit/content/global/elements/arrowscrollbox.js
lib/firefox/chrome/toolkit/content/global/elements/autocomplete-input.js
lib/firefox/chrome/toolkit/content/global/elements/autocomplete-popup.js
lib/firefox/chrome/toolkit/content/global/elements/autocomplete-richlistitem.js
lib/firefox/chrome/toolkit/content/global/elements/browser-custom-element.js
@ -4669,6 +4679,7 @@ lib/firefox/chrome/toolkit/content/global/elements/menu.js
lib/firefox/chrome/toolkit/content/global/elements/menulist.js
lib/firefox/chrome/toolkit/content/global/elements/menupopup.js
lib/firefox/chrome/toolkit/content/global/elements/notificationbox.js
lib/firefox/chrome/toolkit/content/global/elements/panel.js
lib/firefox/chrome/toolkit/content/global/elements/pluginProblem.js
lib/firefox/chrome/toolkit/content/global/elements/popupnotification.js
lib/firefox/chrome/toolkit/content/global/elements/radio.js
@ -4754,7 +4765,6 @@ lib/firefox/chrome/toolkit/content/mozapps/extensions/pluginPrefs.js
lib/firefox/chrome/toolkit/content/mozapps/extensions/pluginPrefs.xul
lib/firefox/chrome/toolkit/content/mozapps/extensions/rating-star.css
lib/firefox/chrome/toolkit/content/mozapps/extensions/shortcuts.css
lib/firefox/chrome/toolkit/content/mozapps/extensions/shortcuts.html
lib/firefox/chrome/toolkit/content/mozapps/extensions/shortcuts.js
lib/firefox/chrome/toolkit/content/mozapps/handling/dialog.js
lib/firefox/chrome/toolkit/content/mozapps/handling/dialog.xul
@ -4834,6 +4844,7 @@ lib/firefox/chrome/toolkit/res/normandy/lib/Heartbeat.jsm
lib/firefox/chrome/toolkit/res/normandy/lib/LogManager.jsm
lib/firefox/chrome/toolkit/res/normandy/lib/NormandyAddonManager.jsm
lib/firefox/chrome/toolkit/res/normandy/lib/NormandyApi.jsm
lib/firefox/chrome/toolkit/res/normandy/lib/NormandyUtils.jsm
lib/firefox/chrome/toolkit/res/normandy/lib/PrefUtils.jsm
lib/firefox/chrome/toolkit/res/normandy/lib/PreferenceExperiments.jsm
lib/firefox/chrome/toolkit/res/normandy/lib/PreferenceRollouts.jsm
@ -4861,6 +4872,7 @@ 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/aboutNetworking.css
lib/firefox/chrome/toolkit/skin/classic/global/aboutReader.css
lib/firefox/chrome/toolkit/skin/classic/global/aboutRights.css
lib/firefox/chrome/toolkit/skin/classic/global/aboutSupport.css
@ -4998,7 +5010,6 @@ lib/firefox/chrome/toolkit/skin/classic/global/toolbarbutton.css
lib/firefox/chrome/toolkit/skin/classic/global/tooltip.css
lib/firefox/chrome/toolkit/skin/classic/global/tree.css
lib/firefox/chrome/toolkit/skin/classic/global/wizard.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutNetworking.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutProfiles.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/aboutServiceWorkers.css
lib/firefox/chrome/toolkit/skin/classic/mozapps/downloads/downloadButtons.png
@ -5112,6 +5123,7 @@ lib/firefox/localization/en-US/toolkit/about/aboutServiceWorkers.ftl
lib/firefox/localization/en-US/toolkit/about/aboutSupport.ftl
lib/firefox/localization/en-US/toolkit/about/aboutTelemetry.ftl
lib/firefox/localization/en-US/toolkit/about/abuseReports.ftl
lib/firefox/localization/en-US/toolkit/about/certviewer.ftl
lib/firefox/localization/en-US/toolkit/about/url-classifier.ftl
lib/firefox/localization/en-US/toolkit/global/processTypes.ftl
lib/firefox/localization/en-US/toolkit/global/resetProfile.ftl
@ -5120,6 +5132,7 @@ lib/firefox/localization/en-US/toolkit/intl/regionNames.ftl
lib/firefox/localization/en-US/toolkit/main-window/editmenu.ftl
lib/firefox/localization/en-US/toolkit/main-window/findbar.ftl
lib/firefox/localization/en-US/toolkit/passwordmgr/passwordManagerList.ftl
lib/firefox/localization/en-US/toolkit/pictureinpicture/pictureinpicture.ftl
lib/firefox/localization/en-US/toolkit/preferences/preferences.ftl
lib/firefox/localization/en-US/toolkit/printing/printDialogs.ftl
lib/firefox/localization/en-US/toolkit/printing/printPreview.ftl
@ -5136,8 +5149,6 @@ lib/firefox/modules/AppMenuNotifications.jsm
lib/firefox/modules/AsyncPrefs.jsm
lib/firefox/modules/AsyncShutdown.jsm
lib/firefox/modules/AsyncStreamReader.jsm
lib/firefox/modules/AutoCompletePopup.jsm
lib/firefox/modules/AutoCompletePopupContent.jsm
lib/firefox/modules/AutoScrollController.jsm
lib/firefox/modules/BackgroundPageThumbs.jsm
lib/firefox/modules/BinarySearch.jsm
@ -5242,6 +5253,8 @@ lib/firefox/modules/FxAccountsClient.jsm
lib/firefox/modules/FxAccountsCommands.js
lib/firefox/modules/FxAccountsCommon.js
lib/firefox/modules/FxAccountsConfig.jsm
lib/firefox/modules/FxAccountsDevice.jsm
lib/firefox/modules/FxAccountsKeys.jsm
lib/firefox/modules/FxAccountsOAuthGrantClient.jsm
lib/firefox/modules/FxAccountsPairing.jsm
lib/firefox/modules/FxAccountsPairingChannel.js
@ -5249,6 +5262,7 @@ lib/firefox/modules/FxAccountsProfile.jsm
lib/firefox/modules/FxAccountsProfileClient.jsm
lib/firefox/modules/FxAccountsPush.jsm
lib/firefox/modules/FxAccountsStorage.jsm
lib/firefox/modules/FxAccountsTelemetry.jsm
lib/firefox/modules/FxAccountsWebChannel.jsm
lib/firefox/modules/GCTelemetry.jsm
lib/firefox/modules/GMPExtractorWorker.js
@ -5348,7 +5362,7 @@ lib/firefox/modules/PromiseMessage.jsm
lib/firefox/modules/PromiseUtils.jsm
lib/firefox/modules/PromiseWorker.jsm
lib/firefox/modules/Prompter.jsm
lib/firefox/modules/ProxyScriptContext.jsm
lib/firefox/modules/ProxyChannelFilter.jsm
lib/firefox/modules/Push.jsm
lib/firefox/modules/PushBroadcastService.jsm
lib/firefox/modules/PushComponents.jsm
@ -5409,7 +5423,6 @@ lib/firefox/modules/Timer.jsm
lib/firefox/modules/TooltipTextProvider.jsm
lib/firefox/modules/TrackingDBService.jsm
lib/firefox/modules/Troubleshoot.jsm
lib/firefox/modules/UAOverridesBootstrapper.jsm
lib/firefox/modules/UITelemetry.jsm
lib/firefox/modules/URLDecorationAnnotationsService.jsm
lib/firefox/modules/URLFormatter.jsm
@ -5422,8 +5435,6 @@ lib/firefox/modules/UrlClassifierHashCompleter.jsm
lib/firefox/modules/UrlClassifierLib.jsm
lib/firefox/modules/UrlClassifierListManager.jsm
lib/firefox/modules/UrlClassifierSkipListService.jsm
lib/firefox/modules/UserAgentOverrides.jsm
lib/firefox/modules/UserAgentUpdates.jsm
lib/firefox/modules/ValueExtractor.jsm
lib/firefox/modules/ViewSourceBrowser.jsm
lib/firefox/modules/WebChannel.jsm
@ -5439,13 +5450,6 @@ lib/firefox/modules/WebVTTParserWrapper.jsm
lib/firefox/modules/WellKnownOpportunisticUtils.jsm
lib/firefox/modules/XPCOMUtils.jsm
lib/firefox/modules/XULStore.jsm
lib/firefox/modules/ZipUtils.jsm
lib/firefox/modules/accessibility/AccessFu.jsm
lib/firefox/modules/accessibility/Constants.jsm
lib/firefox/modules/accessibility/ContentControl.jsm
lib/firefox/modules/accessibility/EventManager.jsm
lib/firefox/modules/accessibility/Traversal.jsm
lib/firefox/modules/accessibility/Utils.jsm
lib/firefox/modules/addonManager.js
lib/firefox/modules/addons/AddonRepository.jsm
lib/firefox/modules/addons/AddonSettings.jsm
@ -5469,6 +5473,7 @@ lib/firefox/modules/components-utils/mozjexl.js
lib/firefox/modules/crypto-SDR.js
lib/firefox/modules/css-selector.js
lib/firefox/modules/ctypes.jsm
lib/firefox/modules/extensionProcessScriptLoader.js
lib/firefox/modules/jsdebugger.jsm
lib/firefox/modules/kvstore.jsm
lib/firefox/modules/lz4.js
@ -5486,6 +5491,7 @@ lib/firefox/modules/nsAsyncShutdown.jsm
lib/firefox/modules/nsCrashMonitor.jsm
lib/firefox/modules/nsFormAutoCompleteResult.jsm
lib/firefox/modules/offlineAppCache.jsm
lib/firefox/modules/onExtensionBrowser.js
lib/firefox/modules/osfile.jsm
lib/firefox/modules/osfile/osfile_async_front.jsm
lib/firefox/modules/osfile/osfile_async_worker.js
@ -5535,7 +5541,6 @@ lib/firefox/modules/services-settings/RemoteSettingsWorker.js
lib/firefox/modules/services-settings/RemoteSettingsWorker.jsm
lib/firefox/modules/services-settings/Utils.jsm
lib/firefox/modules/services-settings/remote-settings.js
lib/firefox/modules/services-sync/SyncDisconnect.jsm
lib/firefox/modules/services-sync/SyncedTabs.jsm
lib/firefox/modules/services-sync/UIState.jsm
lib/firefox/modules/services-sync/Weave.jsm

View file

@ -1,14 +1,14 @@
$NetBSD: distinfo,v 1.373 2019/11/27 15:31:09 jmcneill Exp $
$NetBSD: distinfo,v 1.374 2019/12/03 14:21:20 ryoon Exp $
SHA1 (firefox-70.0.1.source.tar.xz) = 3abee69d9001e27d82b51aa9db2bb8558d590cb6
RMD160 (firefox-70.0.1.source.tar.xz) = a5e6645b3ee8a7423f64b6812a1887baf3aeee7c
SHA512 (firefox-70.0.1.source.tar.xz) = 798e18620e50ef10f184b6e43c88cfbad8a446ae005204582bccc2958107910617375b0ff622c85fb768b48d490a31ea7674eef9f0c415aa72cd958f09a9f725
Size (firefox-70.0.1.source.tar.xz) = 326335800 bytes
SHA1 (firefox-71.0.source.tar.xz) = 8cb0b0ba8473412e8e25cdcb0cfa225d15a15640
RMD160 (firefox-71.0.source.tar.xz) = 264397af3901b6905cfb9dd2111d28f628d5428b
SHA512 (firefox-71.0.source.tar.xz) = 2f60bb7513dc2e730d8d558faad30367e12d27cb24b630aaebeb0473d0a202a3d4838b253d631722d57fb26f54145e296a710ec1714d3ba27dd71c6c1c52e920
Size (firefox-71.0.source.tar.xz) = 312341460 bytes
SHA1 (patch-aa) = 1f292aae7d37bd480ba834324b737bfebee52503
SHA1 (patch-browser_app_profile_firefox.js) = 076cc2892547bac07fe907533f4e821f13f5738e
SHA1 (patch-build_moz.configure_old.configure) = 05963b12fd908d90e3378b30cff7e48291b8a447
SHA1 (patch-build_moz.configure_rust.configure) = ee9e207e67709f3c9455b4d22f5f254890e99ca8
SHA1 (patch-config__make_system_wrappers.py) = 18605b32428e96915c945a189548505deacd2333
SHA1 (patch-config__make_system_wrappers.py) = 4e0a23d5b1f3a4fcb358ce319f6a2421be535375
SHA1 (patch-dom_base_nsAttrName.h) = ac7ba441a3b27df2855cf2673eea36b1cb44ad49
SHA1 (patch-dom_media_CubebUtils.cpp) = b1b4f981c4bede877e3bd092d2648d4b8cbc73a5
SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = e458c9c8dc66edc69c1874734af28a77fc5e3993
@ -22,15 +22,11 @@ SHA1 (patch-ipc_glue_CrossProcessSemaphore__posix.cpp) = f8d155ee66008b7cc4052b6
SHA1 (patch-ipc_glue_GeckoChildProcessHost.cpp) = 260c29bacd8bf265951b7a412f850bf2b292c836
SHA1 (patch-js_src_util_NativeStack.cpp) = 2c6f844d38343f40ebbc8fd665279256e4ae6d35
SHA1 (patch-media_ffvpx_libavutil_arm_bswap.h) = de58daa0fd23d4fec50426602b65c9ea5862558a
SHA1 (patch-media_libcubeb_gtest_moz.build) = ea6dcc7ceeb76ce1fb9d508cf43080a2eef3a9e4
SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = f359a66a22f11142d05746e15894d998d3e3bf5a
SHA1 (patch-media_libcubeb_src_cubeb__oss.c) = 103f751d5a7bc14a81a6ed43e1afc722bc092f7e
SHA1 (patch-media_libcubeb_src_cubeb__alsa.c) = 31536f36cb33f16da309527b50eda9b721608115
SHA1 (patch-media_libcubeb_src_moz.build) = dcca90cb5132442877712cd7b1f4e832c93d2655
SHA1 (patch-media_libcubeb_update.sh) = 4508319d8534a0cc983e4767c2142169af9e5033
SHA1 (patch-media_libpng_pngpriv.h) = c8084332560017cd7c9b519b61d125fa28af0dbc
SHA1 (patch-rust-1.39.0) = a46cbc610892fbd061ac1b344beeb00737c0838a
SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = e5700d95302ef9672b404ab19e13ef7ba3ede5cf
SHA1 (patch-toolkit_library_moz.build) = 102e3713552c26f76e8b4e473846bb8fbc44b278
SHA1 (patch-toolkit_modules_subprocess_subprocess__shared__unix.js) = 22a39e54e042ab2270a3cb54e4e307c8900cad12
SHA1 (patch-toolkit_moz.configure) = 40ee147cc1d2c62dd6c83b3f67ce9e61f758ea57
SHA1 (patch-toolkit_mozapps_installer_packager.mk) = b2343fbad2556504dfd13601c02e6e2357c7d2bc

View file

@ -1,4 +1,4 @@
# $NetBSD: mozilla-common.mk,v 1.145 2019/11/23 22:31:58 fox Exp $
# $NetBSD: mozilla-common.mk,v 1.146 2019/12/03 14:21:20 ryoon Exp $
#
# common Makefile fragment for mozilla packages based on gecko 2.0.
#
@ -209,7 +209,7 @@ PLIST_SUBST+= DLL_SUFFIX=".so"
BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1
.include "../../devel/libevent/buildlink3.mk"
.include "../../devel/libffi/buildlink3.mk"
BUILDLINK_API_DEPENDS.nspr+= nspr>=4.21
BUILDLINK_API_DEPENDS.nspr+= nspr>=4.23
.include "../../devel/nspr/buildlink3.mk"
.include "../../textproc/icu/buildlink3.mk"
BUILDLINK_API_DEPENDS.nss+= nss>=3.46.1

View file

@ -1,10 +1,10 @@
# $NetBSD: options.mk,v 1.50 2019/11/04 22:09:54 rillig Exp $
# $NetBSD: options.mk,v 1.51 2019/12/03 14:21:20 ryoon Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
PKG_SUPPORTED_OPTIONS= official-mozilla-branding
PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
PKG_SUPPORTED_OPTIONS+= alsa oss pulseaudio dbus
PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus
PLIST_VARS+= gnome jemalloc debug
.if ${OPSYS} == "Linux"
@ -24,11 +24,6 @@ CONFIGURE_ARGS+= --enable-alsa
CONFIGURE_ARGS+= --disable-alsa
.endif
.if !empty(PKG_OPTIONS:Moss)
CONFIGURE_ARGS+= --with-oss
.include "../../mk/oss.buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
PLIST.jemalloc= yes
CONFIGURE_ARGS+= --enable-jemalloc
@ -70,16 +65,16 @@ CONFIGURE_ARGS+= --enable-dbus
CONFIGURE_ARGS+= --disable-dbus
.endif
PLIST_VARS+= branding nobranding
#PLIST_VARS+= branding nobranding
.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
CONFIGURE_ARGS+= --enable-official-branding
LICENSE= mozilla-trademark-license
RESTRICTED= Trademark holder prohibits distribution of modified versions.
NO_BIN_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
PLIST.branding= yes
#PLIST.branding= yes
.else
PLIST.nobranding= yes
#PLIST.nobranding= yes
.endif
PLIST_VARS+= webrtc

View file

@ -1,13 +1,13 @@
$NetBSD: patch-config__make_system_wrappers.py,v 1.1 2019/09/23 08:05:18 ng0 Exp $
$NetBSD: patch-config__make_system_wrappers.py,v 1.2 2019/12/03 14:21:20 ryoon Exp $
This is a workaround for building firefox with clang from base,
with a conflict with __isinf(__x) in libc++ vs netbsd headers.
--- config/make-system-wrappers.py.orig 2019-01-24 18:48:39.000000000 +0000
--- config/make-system-wrappers.py.orig 2019-12-02 12:22:52.000000000 +0000
+++ config/make-system-wrappers.py
@@ -6,6 +6,7 @@ import os
@@ -7,6 +7,7 @@ import os
from mozbuild.util import FileAvoidWrite
header_template = '''#pragma GCC system_header
+#define __isinf(x) __builtin_isinf(x)
#pragma GCC visibility push(default)

View file

@ -1,12 +0,0 @@
$NetBSD: patch-media_libcubeb_gtest_moz.build,v 1.3 2018/11/04 00:38:44 ryoon Exp $
--- media/libcubeb/gtest/moz.build.orig 2018-10-18 20:06:09.000000000 +0000
+++ media/libcubeb/gtest/moz.build
@@ -72,7 +72,6 @@ elif CONFIG['OS_TARGET'] == 'OpenBSD':
'sndio',
]
else:
- OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
OS_LIBS += CONFIG['MOZ_PULSEAUDIO_LIBS']
if CONFIG['CC_TYPE'] in ('clang', 'gcc'):

View file

@ -1,11 +1,8 @@
$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.29 2018/11/04 04:46:57 ryoon Exp $
$NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.30 2019/12/03 14:21:20 ryoon Exp $
* Support alsa audio under NetBSD
* Avoid https://github.com/kinetiknz/cubeb/issues/226
--- media/libcubeb/src/cubeb_alsa.c.orig 2018-10-18 20:06:09.000000000 +0000
--- media/libcubeb/src/cubeb_alsa.c.orig 2019-12-02 12:23:28.000000000 +0000
+++ media/libcubeb/src/cubeb_alsa.c
@@ -7,11 +7,13 @@
@@ -7,6 +7,7 @@
#undef NDEBUG
#define _DEFAULT_SOURCE
#define _BSD_SOURCE
@ -13,555 +10,3 @@ $NetBSD: patch-media_libcubeb_src_cubeb__alsa.c,v 1.29 2018/11/04 04:46:57 ryoon
#define _XOPEN_SOURCE 500
#include <pthread.h>
#include <sys/time.h>
#include <assert.h>
#include <limits.h>
+#include <dlfcn.h>
#include <poll.h>
#include <unistd.h>
#include <alsa/asoundlib.h>
@@ -25,6 +27,52 @@
#define ALSA_PA_PLUGIN "ALSA <-> PulseAudio PCM I/O Plugin"
+#ifdef DISABLE_LIBASOUND_DLOPEN
+#define WRAP(x) x
+#else
+#define WRAP(x) cubeb_##x
+#define MAKE_TYPEDEF(x) static typeof(x) * cubeb_##x
+MAKE_TYPEDEF(snd_config);
+MAKE_TYPEDEF(snd_config_add);
+MAKE_TYPEDEF(snd_config_copy);
+MAKE_TYPEDEF(snd_config_delete);
+MAKE_TYPEDEF(snd_config_get_id);
+MAKE_TYPEDEF(snd_config_get_string);
+MAKE_TYPEDEF(snd_config_imake_integer);
+MAKE_TYPEDEF(snd_config_search);
+MAKE_TYPEDEF(snd_config_search_definition);
+MAKE_TYPEDEF(snd_lib_error_set_handler);
+MAKE_TYPEDEF(snd_pcm_avail_update);
+MAKE_TYPEDEF(snd_pcm_close);
+MAKE_TYPEDEF(snd_pcm_delay);
+MAKE_TYPEDEF(snd_pcm_drain);
+MAKE_TYPEDEF(snd_pcm_frames_to_bytes);
+MAKE_TYPEDEF(snd_pcm_get_params);
+/* snd_pcm_hw_params_alloca is actually a macro */
+/* MAKE_TYPEDEF(snd_pcm_hw_params_alloca); */
+MAKE_TYPEDEF(snd_pcm_hw_params_sizeof);
+#define snd_pcm_hw_params_sizeof cubeb_snd_pcm_hw_params_sizeof
+MAKE_TYPEDEF(snd_pcm_hw_params_any);
+MAKE_TYPEDEF(snd_pcm_hw_params_get_channels_max);
+MAKE_TYPEDEF(snd_pcm_hw_params_get_rate);
+MAKE_TYPEDEF(snd_pcm_hw_params_set_rate_near);
+MAKE_TYPEDEF(snd_pcm_nonblock);
+MAKE_TYPEDEF(snd_pcm_open);
+MAKE_TYPEDEF(snd_pcm_open_lconf);
+MAKE_TYPEDEF(snd_pcm_pause);
+MAKE_TYPEDEF(snd_pcm_poll_descriptors);
+MAKE_TYPEDEF(snd_pcm_poll_descriptors_count);
+MAKE_TYPEDEF(snd_pcm_poll_descriptors_revents);
+MAKE_TYPEDEF(snd_pcm_readi);
+MAKE_TYPEDEF(snd_pcm_recover);
+MAKE_TYPEDEF(snd_pcm_set_params);
+MAKE_TYPEDEF(snd_pcm_start);
+MAKE_TYPEDEF(snd_pcm_state);
+MAKE_TYPEDEF(snd_pcm_writei);
+
+#undef MAKE_TYPEDEF
+#endif
+
/* 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),
@@ -65,6 +113,8 @@ struct cubeb {
workaround is not required. */
snd_config_t * local_config;
int is_pa;
+
+ void * libasound;
};
enum stream_state {
@@ -245,8 +295,8 @@ set_timeout(struct timeval * timeout, un
static void
stream_buffer_decrement(cubeb_stream * stm, long count)
{
- char * bufremains = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, count);
- memmove(stm->buffer, bufremains, snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes - count));
+ char * bufremains = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, count);
+ memmove(stm->buffer, bufremains, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes - count));
stm->bufframes -= count;
}
@@ -278,9 +328,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. */
- snd_pcm_poll_descriptors_revents(stm->pcm, stm->fds, stm->nfds, &revents);
+ WRAP(snd_pcm_poll_descriptors_revents)(stm->pcm, stm->fds, stm->nfds, &revents);
- avail = snd_pcm_avail_update(stm->pcm);
+ avail = WRAP(snd_pcm_avail_update)(stm->pcm);
/* Got null event? Bail and wait for another wakeup. */
if (avail == 0) {
@@ -303,7 +353,7 @@ alsa_process_stream(cubeb_stream * stm)
// TODO: should it be marked as DRAINING?
}
- got = snd_pcm_readi(stm->pcm, stm->buffer+stm->bufframes, avail);
+ got = WRAP(snd_pcm_readi)(stm->pcm, stm->buffer+stm->bufframes, avail);
if (got < 0) {
avail = got; // the error handler below will recover us
@@ -347,7 +397,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;
- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
+ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
/* Correct read size to the other stream available frames */
if (stm->other_stream && got > (snd_pcm_sframes_t) stm->other_stream->bufframes) {
@@ -374,8 +424,8 @@ alsa_process_stream(cubeb_stream * stm)
long drain_frames = avail - stm->bufframes;
double drain_time = (double) drain_frames / stm->params.rate;
- char * buftail = stm->buffer + snd_pcm_frames_to_bytes(stm->pcm, stm->bufframes);
- memset(buftail, 0, snd_pcm_frames_to_bytes(stm->pcm, drain_frames));
+ char * buftail = stm->buffer + WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->bufframes);
+ memset(buftail, 0, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, drain_frames));
stm->bufframes = avail;
/* Mark as draining, unless we're waiting for capture */
@@ -402,7 +452,7 @@ alsa_process_stream(cubeb_stream * stm)
}
}
- wrote = snd_pcm_writei(stm->pcm, stm->buffer, avail);
+ wrote = WRAP(snd_pcm_writei)(stm->pcm, stm->buffer, avail);
if (wrote < 0) {
avail = wrote; // the error handler below will recover us
} else {
@@ -415,13 +465,13 @@ alsa_process_stream(cubeb_stream * stm)
/* Got some error? Let's try to recover the stream. */
if (avail < 0) {
- avail = snd_pcm_recover(stm->pcm, avail, 0);
+ avail = WRAP(snd_pcm_recover)(stm->pcm, avail, 0);
/* Capture pcm must be started after initial setup/recover */
if (avail >= 0 &&
stm->stream_type == SND_PCM_STREAM_CAPTURE &&
- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
- avail = snd_pcm_start(stm->pcm);
+ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
+ avail = WRAP(snd_pcm_start)(stm->pcm);
}
}
@@ -537,26 +587,26 @@ get_slave_pcm_node(snd_config_t * lconf,
slave_def = NULL;
- r = snd_config_search(root_pcm, "slave", &slave_pcm);
+ r = WRAP(snd_config_search)(root_pcm, "slave", &slave_pcm);
if (r < 0) {
return NULL;
}
- r = snd_config_get_string(slave_pcm, &string);
+ r = WRAP(snd_config_get_string)(slave_pcm, &string);
if (r >= 0) {
- r = snd_config_search_definition(lconf, "pcm_slave", string, &slave_def);
+ r = WRAP(snd_config_search_definition)(lconf, "pcm_slave", string, &slave_def);
if (r < 0) {
return NULL;
}
}
do {
- r = snd_config_search(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
+ r = WRAP(snd_config_search)(slave_def ? slave_def : slave_pcm, "pcm", &pcm);
if (r < 0) {
break;
}
- r = snd_config_get_string(slave_def ? slave_def : slave_pcm, &string);
+ r = WRAP(snd_config_get_string)(slave_def ? slave_def : slave_pcm, &string);
if (r < 0) {
break;
}
@@ -565,7 +615,7 @@ get_slave_pcm_node(snd_config_t * lconf,
if (r < 0 || r > (int) sizeof(node_name)) {
break;
}
- r = snd_config_search(lconf, node_name, &pcm);
+ r = WRAP(snd_config_search)(lconf, node_name, &pcm);
if (r < 0) {
break;
}
@@ -574,7 +624,7 @@ get_slave_pcm_node(snd_config_t * lconf,
} while (0);
if (slave_def) {
- snd_config_delete(slave_def);
+ WRAP(snd_config_delete)(slave_def);
}
return NULL;
@@ -597,22 +647,22 @@ init_local_config_with_workaround(char c
lconf = NULL;
- if (snd_config == NULL) {
+ if (*WRAP(snd_config) == NULL) {
return NULL;
}
- r = snd_config_copy(&lconf, snd_config);
+ r = WRAP(snd_config_copy)(&lconf, *WRAP(snd_config));
if (r < 0) {
return NULL;
}
do {
- r = snd_config_search_definition(lconf, "pcm", pcm_name, &pcm_node);
+ r = WRAP(snd_config_search_definition)(lconf, "pcm", pcm_name, &pcm_node);
if (r < 0) {
break;
}
- r = snd_config_get_id(pcm_node, &string);
+ r = WRAP(snd_config_get_id)(pcm_node, &string);
if (r < 0) {
break;
}
@@ -621,7 +671,7 @@ init_local_config_with_workaround(char c
if (r < 0 || r > (int) sizeof(node_name)) {
break;
}
- r = snd_config_search(lconf, node_name, &pcm_node);
+ r = WRAP(snd_config_search)(lconf, node_name, &pcm_node);
if (r < 0) {
break;
}
@@ -632,12 +682,12 @@ init_local_config_with_workaround(char c
}
/* Fetch the PCM node's type, and bail out if it's not the PulseAudio plugin. */
- r = snd_config_search(pcm_node, "type", &node);
+ r = WRAP(snd_config_search)(pcm_node, "type", &node);
if (r < 0) {
break;
}
- r = snd_config_get_string(node, &string);
+ r = WRAP(snd_config_get_string)(node, &string);
if (r < 0) {
break;
}
@@ -648,18 +698,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. */
- r = snd_config_search(pcm_node, "handle_underrun", &node);
+ r = WRAP(snd_config_search)(pcm_node, "handle_underrun", &node);
if (r != -ENOENT) {
break;
}
/* Disable pcm_pulse's asynchronous underrun handling. */
- r = snd_config_imake_integer(&node, "handle_underrun", 0);
+ r = WRAP(snd_config_imake_integer)(&node, "handle_underrun", 0);
if (r < 0) {
break;
}
- r = snd_config_add(pcm_node, node);
+ r = WRAP(snd_config_add)(pcm_node, node);
if (r < 0) {
break;
}
@@ -667,7 +717,7 @@ init_local_config_with_workaround(char c
return lconf;
} while (0);
- snd_config_delete(lconf);
+ WRAP(snd_config_delete)(lconf);
return NULL;
}
@@ -679,9 +729,9 @@ alsa_locked_pcm_open(snd_pcm_t ** pcm, c
pthread_mutex_lock(&cubeb_alsa_mutex);
if (local_config) {
- r = snd_pcm_open_lconf(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
+ r = WRAP(snd_pcm_open_lconf)(pcm, pcm_name, stream, SND_PCM_NONBLOCK, local_config);
} else {
- r = snd_pcm_open(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
+ r = WRAP(snd_pcm_open)(pcm, pcm_name, stream, SND_PCM_NONBLOCK);
}
pthread_mutex_unlock(&cubeb_alsa_mutex);
@@ -694,7 +744,7 @@ alsa_locked_pcm_close(snd_pcm_t * pcm)
int r;
pthread_mutex_lock(&cubeb_alsa_mutex);
- r = snd_pcm_close(pcm);
+ r = WRAP(snd_pcm_close)(pcm);
pthread_mutex_unlock(&cubeb_alsa_mutex);
return r;
@@ -757,12 +807,65 @@ alsa_init(cubeb ** context, char const *
pthread_attr_t attr;
snd_pcm_t * dummy;
+ void * libasound = NULL;
+
+#ifndef DISABLE_LIBASOUND_DLOPEN
+ libasound = dlopen("libasound.so", RTLD_LAZY);
+ if (!libasound) {
+ return CUBEB_ERROR;
+ }
+
+#define LOAD(x) do { \
+ cubeb_##x = dlsym(libasound, #x); \
+ if (!cubeb_##x) { \
+ dlclose(libasound); \
+ return CUBEB_ERROR; \
+ } \
+ } while(0)
+
+ LOAD(snd_config);
+ LOAD(snd_config_add);
+ LOAD(snd_config_copy);
+ LOAD(snd_config_delete);
+ LOAD(snd_config_get_id);
+ LOAD(snd_config_get_string);
+ LOAD(snd_config_imake_integer);
+ LOAD(snd_config_search);
+ LOAD(snd_config_search_definition);
+ LOAD(snd_lib_error_set_handler);
+ LOAD(snd_pcm_avail_update);
+ LOAD(snd_pcm_close);
+ LOAD(snd_pcm_delay);
+ LOAD(snd_pcm_drain);
+ LOAD(snd_pcm_frames_to_bytes);
+ LOAD(snd_pcm_get_params);
+ /* snd_pcm_hw_params_alloca is actually a macro */
+ /* LOAD(snd_pcm_hw_params_alloca); */
+ LOAD(snd_pcm_hw_params_sizeof);
+ LOAD(snd_pcm_hw_params_any);
+ LOAD(snd_pcm_hw_params_get_channels_max);
+ LOAD(snd_pcm_hw_params_get_rate);
+ LOAD(snd_pcm_hw_params_set_rate_near);
+ LOAD(snd_pcm_nonblock);
+ LOAD(snd_pcm_open);
+ LOAD(snd_pcm_open_lconf);
+ LOAD(snd_pcm_pause);
+ LOAD(snd_pcm_poll_descriptors);
+ LOAD(snd_pcm_poll_descriptors_count);
+ LOAD(snd_pcm_poll_descriptors_revents);
+ LOAD(snd_pcm_recover);
+ LOAD(snd_pcm_set_params);
+ LOAD(snd_pcm_state);
+ LOAD(snd_pcm_writei);
+
+#undef LOAD
+#endif
assert(context);
*context = NULL;
pthread_mutex_lock(&cubeb_alsa_mutex);
if (!cubeb_alsa_error_handler_set) {
- snd_lib_error_set_handler(silent_error_handler);
+ WRAP(snd_lib_error_set_handler)(silent_error_handler);
cubeb_alsa_error_handler_set = 1;
}
pthread_mutex_unlock(&cubeb_alsa_mutex);
@@ -770,6 +873,8 @@ alsa_init(cubeb ** context, char const *
ctx = calloc(1, sizeof(*ctx));
assert(ctx);
+ ctx->libasound = libasound;
+
ctx->ops = &alsa_ops;
r = pthread_mutex_init(&ctx->mutex, NULL);
@@ -819,7 +924,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);
- snd_config_delete(ctx->local_config);
+ WRAP(snd_config_delete)(ctx->local_config);
pthread_mutex_unlock(&cubeb_alsa_mutex);
ctx->local_config = NULL;
} else if (r >= 0) {
@@ -859,9 +964,13 @@ alsa_destroy(cubeb * ctx)
pthread_mutex_destroy(&ctx->mutex);
free(ctx->fds);
+ if (ctx->libasound) {
+ dlclose(ctx->libasound);
+ }
+
if (ctx->local_config) {
pthread_mutex_lock(&cubeb_alsa_mutex);
- snd_config_delete(ctx->local_config);
+ WRAP(snd_config_delete)(ctx->local_config);
pthread_mutex_unlock(&cubeb_alsa_mutex);
}
@@ -948,7 +1057,7 @@ alsa_stream_init_single(cubeb * ctx, cub
return CUBEB_ERROR;
}
- r = snd_pcm_nonblock(stm->pcm, 1);
+ r = WRAP(snd_pcm_nonblock)(stm->pcm, 1);
assert(r == 0);
latency_us = latency_frames * 1e6 / stm->params.rate;
@@ -961,7 +1070,7 @@ alsa_stream_init_single(cubeb * ctx, cub
latency_us = latency_us < min_latency ? min_latency: latency_us;
}
- r = snd_pcm_set_params(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
+ r = WRAP(snd_pcm_set_params)(stm->pcm, format, SND_PCM_ACCESS_RW_INTERLEAVED,
stm->params.channels, stm->params.rate, 1,
latency_us);
if (r < 0) {
@@ -969,20 +1078,20 @@ alsa_stream_init_single(cubeb * ctx, cub
return CUBEB_ERROR_INVALID_FORMAT;
}
- r = snd_pcm_get_params(stm->pcm, &stm->buffer_size, &period_size);
+ r = WRAP(snd_pcm_get_params)(stm->pcm, &stm->buffer_size, &period_size);
assert(r == 0);
/* Double internal buffer size to have enough space when waiting for the other side of duplex connection */
stm->buffer_size *= 2;
- stm->buffer = calloc(1, snd_pcm_frames_to_bytes(stm->pcm, stm->buffer_size));
+ stm->buffer = calloc(1, WRAP(snd_pcm_frames_to_bytes)(stm->pcm, stm->buffer_size));
assert(stm->buffer);
- stm->nfds = snd_pcm_poll_descriptors_count(stm->pcm);
+ stm->nfds = WRAP(snd_pcm_poll_descriptors_count)(stm->pcm);
assert(stm->nfds > 0);
stm->saved_fds = calloc(stm->nfds, sizeof(struct pollfd));
assert(stm->saved_fds);
- r = snd_pcm_poll_descriptors(stm->pcm, stm->saved_fds, stm->nfds);
+ r = WRAP(snd_pcm_poll_descriptors)(stm->pcm, stm->saved_fds, stm->nfds);
assert((nfds_t) r == stm->nfds);
if (alsa_register_stream(ctx, stm) != 0) {
@@ -1054,7 +1163,7 @@ alsa_stream_destroy(cubeb_stream * stm)
pthread_mutex_lock(&stm->mutex);
if (stm->pcm) {
if (stm->state == DRAINING) {
- snd_pcm_drain(stm->pcm);
+ WRAP(snd_pcm_drain)(stm->pcm);
}
alsa_locked_pcm_close(stm->pcm);
stm->pcm = NULL;
@@ -1100,12 +1209,12 @@ alsa_get_max_channel_count(cubeb * ctx,
assert(stm);
- r = snd_pcm_hw_params_any(stm->pcm, hw_params);
+ r = WRAP(snd_pcm_hw_params_any)(stm->pcm, hw_params);
if (r < 0) {
return CUBEB_ERROR;
}
- r = snd_pcm_hw_params_get_channels_max(hw_params, max_channels);
+ r = WRAP(snd_pcm_hw_params_get_channels_max)(hw_params, max_channels);
if (r < 0) {
return CUBEB_ERROR;
}
@@ -1126,34 +1235,34 @@ alsa_get_preferred_sample_rate(cubeb * c
/* get a pcm, disabling resampling, so we get a rate the
* hardware/dmix/pulse/etc. supports. */
- r = snd_pcm_open(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
+ r = WRAP(snd_pcm_open)(&pcm, CUBEB_ALSA_PCM_NAME, SND_PCM_STREAM_PLAYBACK, SND_PCM_NO_AUTO_RESAMPLE);
if (r < 0) {
return CUBEB_ERROR;
}
- r = snd_pcm_hw_params_any(pcm, hw_params);
+ r = WRAP(snd_pcm_hw_params_any)(pcm, hw_params);
if (r < 0) {
- snd_pcm_close(pcm);
+ WRAP(snd_pcm_close)(pcm);
return CUBEB_ERROR;
}
- r = snd_pcm_hw_params_get_rate(hw_params, rate, &dir);
+ r = WRAP(snd_pcm_hw_params_get_rate)(hw_params, rate, &dir);
if (r >= 0) {
/* There is a default rate: use it. */
- snd_pcm_close(pcm);
+ WRAP(snd_pcm_close)(pcm);
return CUBEB_OK;
}
/* Use a common rate, alsa may adjust it based on hw/etc. capabilities. */
*rate = 44100;
- r = snd_pcm_hw_params_set_rate_near(pcm, hw_params, rate, NULL);
+ r = WRAP(snd_pcm_hw_params_set_rate_near)(pcm, hw_params, rate, NULL);
if (r < 0) {
- snd_pcm_close(pcm);
+ WRAP(snd_pcm_close)(pcm);
return CUBEB_ERROR;
}
- snd_pcm_close(pcm);
+ WRAP(snd_pcm_close)(pcm);
return CUBEB_OK;
}
@@ -1186,10 +1295,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 &&
- snd_pcm_state(stm->pcm) == SND_PCM_STATE_PREPARED) {
- snd_pcm_start(stm->pcm);
+ WRAP(snd_pcm_state)(stm->pcm) == SND_PCM_STATE_PREPARED) {
+ WRAP(snd_pcm_start)(stm->pcm);
}
- snd_pcm_pause(stm->pcm, 0);
+ WRAP(snd_pcm_pause)(stm->pcm, 0);
gettimeofday(&stm->last_activity, NULL);
pthread_mutex_unlock(&stm->mutex);
@@ -1229,7 +1338,7 @@ alsa_stream_stop(cubeb_stream * stm)
pthread_mutex_unlock(&ctx->mutex);
pthread_mutex_lock(&stm->mutex);
- snd_pcm_pause(stm->pcm, 1);
+ WRAP(snd_pcm_pause)(stm->pcm, 1);
pthread_mutex_unlock(&stm->mutex);
return CUBEB_OK;
@@ -1245,8 +1354,8 @@ alsa_stream_get_position(cubeb_stream *
pthread_mutex_lock(&stm->mutex);
delay = -1;
- if (snd_pcm_state(stm->pcm) != SND_PCM_STATE_RUNNING ||
- snd_pcm_delay(stm->pcm, &delay) != 0) {
+ if (WRAP(snd_pcm_state)(stm->pcm) != SND_PCM_STATE_RUNNING ||
+ WRAP(snd_pcm_delay)(stm->pcm, &delay) != 0) {
*position = stm->last_position;
pthread_mutex_unlock(&stm->mutex);
return CUBEB_OK;
@@ -1271,7 +1380,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. */
- if (snd_pcm_delay(stm->pcm, &delay)) {
+ if (WRAP(snd_pcm_delay)(stm->pcm, &delay)) {
return CUBEB_ERROR;
}

View file

@ -1,461 +0,0 @@
$NetBSD: patch-media_libcubeb_src_cubeb__oss.c,v 1.13 2019/05/27 14:19:26 tsutsui Exp $
* Restore OSS audio support code
* fix wrong latency values in stream_init (PR pkg/54206)
--- media/libcubeb/src/cubeb_oss.c.orig 2019-05-24 13:05:19.117086384 +0000
+++ media/libcubeb/src/cubeb_oss.c
@@ -0,0 +1,453 @@
+/*
+ * Copyright © 2014 Mozilla Foundation
+ *
+ * This program is made available under an ISC-style license. See the
+ * accompanying file LICENSE for details.
+ */
+#if defined(HAVE_SYS_SOUNDCARD_H)
+#include <sys/soundcard.h>
+#else
+#include <soundcard.h>
+#endif
+#include <unistd.h>
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <assert.h>
+
+#include "cubeb/cubeb.h"
+#include "cubeb-internal.h"
+
+#ifndef CUBEB_OSS_DEFAULT_OUTPUT
+#define CUBEB_OSS_DEFAULT_OUTPUT "/dev/dsp"
+#endif
+
+#define OSS_BUFFER_SIZE 1024
+
+struct cubeb {
+ struct cubeb_ops const * ops;
+};
+
+struct cubeb_stream {
+ /* Note: Must match cubeb_stream layout in cubeb.c. */
+ cubeb * context;
+ void * user_ptr;
+ /**/
+
+ cubeb_data_callback data_callback;
+ cubeb_state_callback state_callback;
+ float volume;
+ float panning;
+
+ pthread_mutex_t state_mutex;
+ pthread_cond_t state_cond;
+
+ int running;
+ int stopped;
+ int floating;
+
+ /* These two vars are needed to support old versions of OSS */
+ unsigned int position_bytes;
+ unsigned int last_position_bytes;
+
+ uint64_t written_frags; /* The number of fragments written to /dev/dsp */
+ uint64_t missed_frags; /* fragments output with stopped stream */
+
+ cubeb_stream_params params;
+ int fd;
+ pthread_t th;
+};
+
+static struct cubeb_ops const oss_ops;
+
+int oss_init(cubeb ** context, char const * context_name)
+{
+ cubeb* ctx = (cubeb*)malloc(sizeof(cubeb));
+ ctx->ops = &oss_ops;
+ *context = ctx;
+ return CUBEB_OK;
+}
+
+static void oss_destroy(cubeb *ctx)
+{
+ free(ctx);
+}
+
+static char const * oss_get_backend_id(cubeb * context)
+{
+ static char oss_name[] = "oss";
+ return oss_name;
+}
+
+static int oss_get_max_channel_count(cubeb * ctx, uint32_t * max_channels)
+{
+ *max_channels = 2; /* Let's support only stereo for now */
+ return CUBEB_OK;
+}
+
+static int oss_get_min_latency(cubeb * context, cubeb_stream_params params,
+ uint32_t * latency_frames)
+{
+ (void)context;
+ /* 40ms is a big enough number to work ok */
+ *latency_frames = 40 * params.rate / 1000;
+ return CUBEB_OK;
+}
+
+static int oss_get_preferred_sample_rate(cubeb *context, uint32_t * rate)
+{
+ /* 48000 seems a prefered choice for most audio devices
+ * and a good choice for OSS */
+ *rate = 48000;
+ return CUBEB_OK;
+}
+
+static void run_state_callback(cubeb_stream *stream, cubeb_state state)
+{
+ if (stream->state_callback) {
+ stream->state_callback(stream, stream->user_ptr, state);
+ }
+}
+
+static long run_data_callback(cubeb_stream *stream, void *buffer, long nframes)
+{
+ long got = 0;
+ pthread_mutex_lock(&stream->state_mutex);
+ if (stream->data_callback && stream->running && !stream->stopped) {
+ pthread_mutex_unlock(&stream->state_mutex);
+ got = stream->data_callback(stream, stream->user_ptr, NULL, buffer, nframes);
+ } else {
+ pthread_mutex_unlock(&stream->state_mutex);
+ }
+ return got;
+}
+
+static void apply_volume_int(int16_t* buffer, unsigned int n,
+ float volume, float panning)
+{
+ float left = volume;
+ float right = volume;
+ unsigned int i;
+ int pan[2];
+ if (panning<0) {
+ right *= (1+panning);
+ } else {
+ left *= (1-panning);
+ }
+ pan[0] = 128.0*left;
+ pan[1] = 128.0*right;
+ for(i=0; i<n; i++){
+ buffer[i] = ((int)buffer[i])*pan[i%2]/128;
+ }
+}
+
+static void apply_volume_float(float* buffer, unsigned int n,
+ float volume, float panning)
+{
+ float left = volume;
+ float right = volume;
+ unsigned int i;
+ float pan[2];
+ if (panning<0) {
+ right *= (1+panning);
+ } else {
+ left *= (1-panning);
+ }
+ pan[0] = left;
+ pan[1] = right;
+ for(i=0; i<n; i++){
+ buffer[i] = buffer[i]*pan[i%2];
+ }
+}
+
+
+static void *writer(void *stm)
+{
+ cubeb_stream* stream = (cubeb_stream*)stm;
+ int16_t buffer[OSS_BUFFER_SIZE];
+ float f_buffer[OSS_BUFFER_SIZE];
+ int got;
+ unsigned long i;
+ while (stream->running) {
+ pthread_mutex_lock(&stream->state_mutex);
+ if (stream->stopped) {
+ pthread_mutex_unlock(&stream->state_mutex);
+ run_state_callback(stream, CUBEB_STATE_STOPPED);
+ pthread_mutex_lock(&stream->state_mutex);
+ while (stream->stopped) {
+ pthread_cond_wait(&stream->state_cond, &stream->state_mutex);
+ }
+ pthread_mutex_unlock(&stream->state_mutex);
+ run_state_callback(stream, CUBEB_STATE_STARTED);
+ continue;
+ }
+ pthread_mutex_unlock(&stream->state_mutex);
+ if (stream->floating) {
+ got = run_data_callback(stream, f_buffer,
+ OSS_BUFFER_SIZE/stream->params.channels);
+ apply_volume_float(f_buffer, got*stream->params.channels,
+ stream->volume, stream->panning);
+ for (i=0; i<((unsigned long)got)*stream->params.channels; i++) {
+ /* Clipping is prefered to overflow */
+ if(f_buffer[i]>=1.0){
+ f_buffer[i]=1.0;
+ }
+ if(f_buffer[i]<=-1.0){
+ f_buffer[i]=-1.0;
+ }
+ /* One might think that multipling by 32767.0 is logical but results in clipping */
+ buffer[i] = f_buffer[i]*32767.0;
+ }
+ } else {
+ got = run_data_callback(stream, buffer,
+ OSS_BUFFER_SIZE/stream->params.channels);
+ apply_volume_int(buffer, got*stream->params.channels,
+ stream->volume, stream->panning);
+ }
+ if (got<0) {
+ run_state_callback(stream, CUBEB_STATE_ERROR);
+ break;
+ }
+ if (!got) {
+ run_state_callback(stream, CUBEB_STATE_DRAINED);
+ }
+ if (got) {
+ size_t i = 0;
+ size_t s = got*stream->params.channels*sizeof(int16_t);
+ while (i < s) {
+ ssize_t n = write(stream->fd, ((char*)buffer) + i, s - i);
+ if (n<=0) {
+ run_state_callback(stream, CUBEB_STATE_ERROR);
+ break;
+ }
+ i+=n;
+ }
+ stream->written_frags+=got;
+ }
+ }
+ return NULL;
+}
+
+static void oss_try_set_latency(cubeb_stream* stream, unsigned int latency_frames)
+{
+ unsigned int latency_bytes, n_frag;
+ int frag;
+ /* fragment size of 1024 is a good choice with good chances to be accepted */
+ unsigned int frag_log=10; /* 2^frag_log = fragment size */
+ latency_bytes =
+ latency_frames*stream->params.channels*sizeof(uint16_t);
+ n_frag = latency_bytes>>frag_log;
+ frag = (n_frag<<16) | frag_log;
+ /* Even if this fails we wish to continue, not checking for errors */
+ ioctl(stream->fd, SNDCTL_DSP_SETFRAGMENT, &frag);
+}
+
+static int oss_stream_init(cubeb * context, cubeb_stream ** stm,
+ char const * stream_name,
+ cubeb_devid input_device,
+ cubeb_stream_params * input_stream_params,
+ cubeb_devid output_device,
+ cubeb_stream_params * output_stream_params,
+ unsigned int latency_frames,
+ cubeb_data_callback data_callback,
+ cubeb_state_callback state_callback, void * user_ptr)
+{
+ cubeb_stream* stream = (cubeb_stream*)malloc(sizeof(cubeb_stream));
+ stream->context = context;
+ stream->data_callback = data_callback;
+ stream->state_callback = state_callback;
+ stream->user_ptr = user_ptr;
+
+ assert(!input_stream_params && "not supported.");
+ if (input_device || output_device) {
+ /* Device selection not yet implemented. */
+ return CUBEB_ERROR_DEVICE_UNAVAILABLE;
+ }
+
+ if ((input_stream_params && input_stream_params->prefs & CUBEB_STREAM_PREF_LOOPBACK) ||
+ (output_stream_params && output_stream_params->prefs & CUBEB_STREAM_PREF_LOOPBACK)) {
+ return CUBEB_ERROR_NOT_SUPPORTED;
+ }
+
+ if ((stream->fd = open(CUBEB_OSS_DEFAULT_OUTPUT, O_WRONLY)) == -1) {
+ free(stream);
+ return CUBEB_ERROR;
+ }
+#define SET(what, to) do { unsigned int i = to; \
+ int j = ioctl(stream->fd, what, &i); \
+ if (j == -1 || i != to) { \
+ close(stream->fd); \
+ free(stream); \
+ return CUBEB_ERROR_INVALID_FORMAT; } } while (0)
+
+ stream->params = *output_stream_params;
+ stream->volume = 1.0;
+ stream->panning = 0.0;
+
+ oss_try_set_latency(stream, latency_frames);
+
+ stream->floating = 0;
+ SET(SNDCTL_DSP_CHANNELS, stream->params.channels);
+ SET(SNDCTL_DSP_SPEED, stream->params.rate);
+ switch (stream->params.format) {
+ case CUBEB_SAMPLE_S16LE:
+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_LE);
+ break;
+ case CUBEB_SAMPLE_S16BE:
+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_BE);
+ break;
+ case CUBEB_SAMPLE_FLOAT32LE:
+ SET(SNDCTL_DSP_SETFMT, AFMT_S16_NE);
+ stream->floating = 1;
+ break;
+ default:
+ close(stream->fd);
+ free(stream);
+ return CUBEB_ERROR;
+ }
+
+
+ pthread_mutex_init(&stream->state_mutex, NULL);
+ pthread_cond_init(&stream->state_cond, NULL);
+
+ stream->running = 1;
+ stream->stopped = 1;
+ stream->position_bytes = 0;
+ stream->last_position_bytes = 0;
+ stream->written_frags = 0;
+ stream->missed_frags = 0;
+
+ pthread_create(&stream->th, NULL, writer, (void*)stream);
+
+ *stm = stream;
+
+ return CUBEB_OK;
+}
+
+static void oss_stream_destroy(cubeb_stream * stream)
+{
+ pthread_mutex_lock(&stream->state_mutex);
+
+ stream->running = 0;
+ stream->stopped = 0;
+ pthread_cond_signal(&stream->state_cond);
+
+ pthread_mutex_unlock(&stream->state_mutex);
+
+ pthread_join(stream->th, NULL);
+
+ pthread_mutex_destroy(&stream->state_mutex);
+ pthread_cond_destroy(&stream->state_cond);
+ close(stream->fd);
+ free(stream);
+}
+
+static int oss_stream_get_latency(cubeb_stream * stream, uint32_t * latency)
+{
+ if (ioctl(stream->fd, SNDCTL_DSP_GETODELAY, latency)==-1) {
+ return CUBEB_ERROR;
+ }
+ /* Convert latency from bytes to frames */
+ *latency /= stream->params.channels*sizeof(int16_t);
+ return CUBEB_OK;
+}
+
+
+static int oss_stream_current_optr(cubeb_stream * stream, uint64_t * position)
+{
+ count_info ci;
+ /* Unfortunately, this ioctl is only available in OSS 4.x */
+#ifdef SNDCTL_DSP_CURRENT_OPTR
+ oss_count_t count;
+ if (ioctl(stream->fd, SNDCTL_DSP_CURRENT_OPTR, &count) != -1) {
+ *position = count.samples;// + count.fifo_samples;
+ return CUBEB_OK;
+ }
+#endif
+ /* Fall back to this ioctl in case the previous one fails */
+ if (ioctl(stream->fd, SNDCTL_DSP_GETOPTR, &ci) == -1) {
+ return CUBEB_ERROR;
+ }
+ /* ci.bytes is only 32 bit and will start to wrap after arithmetic overflow */
+ stream->position_bytes += ci.bytes - stream->last_position_bytes;
+ stream->last_position_bytes = ci.bytes;
+ *position = stream->position_bytes/stream->params.channels/sizeof(int16_t);
+ return CUBEB_OK;
+}
+
+static int oss_stream_get_position(cubeb_stream * stream, uint64_t * position)
+{
+ if ( oss_stream_current_optr(stream, position) == CUBEB_OK ){
+ *position -= stream->missed_frags;
+ return CUBEB_OK;
+ }
+ /* If no correct method to get position works we resort to this */
+ *position = stream->written_frags;
+ return CUBEB_OK;
+}
+
+
+static int oss_stream_start(cubeb_stream * stream)
+{
+ pthread_mutex_lock(&stream->state_mutex);
+ if (stream->stopped) {
+ uint64_t ptr;
+ oss_stream_current_optr(stream, &ptr);
+ stream->missed_frags = ptr - stream->written_frags;
+ stream->stopped = 0;
+ pthread_cond_signal(&stream->state_cond);
+ }
+ pthread_mutex_unlock(&stream->state_mutex);
+ return CUBEB_OK;
+}
+
+static int oss_stream_stop(cubeb_stream * stream)
+{
+ pthread_mutex_lock(&stream->state_mutex);
+ stream->stopped = 1;
+ pthread_mutex_unlock(&stream->state_mutex);
+ return CUBEB_OK;
+}
+
+int oss_stream_set_panning(cubeb_stream * stream, float panning)
+{
+ if (stream->params.channels == 2) {
+ stream->panning=panning;
+ }
+ return CUBEB_OK;
+}
+
+int oss_stream_set_volume(cubeb_stream * stream, float volume)
+{
+ stream->volume=volume;
+ return CUBEB_OK;
+}
+
+static struct cubeb_ops const oss_ops = {
+ .init = oss_init,
+ .get_backend_id = oss_get_backend_id,
+ .get_max_channel_count = oss_get_max_channel_count,
+ .get_min_latency = oss_get_min_latency,
+ .get_preferred_sample_rate = oss_get_preferred_sample_rate,
+ .enumerate_devices = NULL,
+ .device_collection_destroy = NULL,
+ .destroy = oss_destroy,
+ .stream_init = oss_stream_init,
+ .stream_destroy = oss_stream_destroy,
+ .stream_start = oss_stream_start,
+ .stream_stop = oss_stream_stop,
+ .stream_reset_default_device = NULL,
+ .stream_get_position = oss_stream_get_position,
+ .stream_get_latency = oss_stream_get_latency,
+ .stream_set_volume = oss_stream_set_volume,
+ .stream_set_panning = oss_stream_set_panning,
+ .stream_get_current_device = NULL,
+ .stream_device_destroy = NULL,
+ .stream_register_device_changed_callback = NULL,
+ .register_device_collection_changed = NULL
+};

View file

@ -1,164 +0,0 @@
From 9696bc1795c75b1b527e2b70d9baf3ced9e3c154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Mon, 23 Sep 2019 17:54:37 +0200
Subject: [PATCH] ir: Make Ord and PartialOrd implementations agree.
See https://github.com/rust-lang/rust/issues/64710.
Bogus implementations were introduced in 230545e7c, d3e39dc62, and 379bb1663.
--- third_party/rust/bindgen/src/ir/analysis/has_vtable.rs.orig 2019-10-30 17:36:44 UTC
+++ third_party/rust/bindgen/src/ir/analysis/has_vtable.rs
@@ -9,37 +9,22 @@ use std::ops;
use {HashMap, Entry};
/// The result of the `HasVtableAnalysis` for an individual item.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
pub enum HasVtableResult {
- /// The item has a vtable, but the actual vtable pointer is in a base
- /// member.
- BaseHasVtable,
+ /// The item does not have a vtable pointer.
+ No,
/// The item has a vtable and the actual vtable pointer is within this item.
SelfHasVtable,
- /// The item does not have a vtable pointer.
- No
+ /// The item has a vtable, but the actual vtable pointer is in a base
+ /// member.
+ BaseHasVtable,
}
impl Default for HasVtableResult {
fn default() -> Self {
HasVtableResult::No
- }
-}
-
-impl cmp::PartialOrd for HasVtableResult {
- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
- use self::HasVtableResult::*;
-
- match (*self, *rhs) {
- (x, y) if x == y => Some(cmp::Ordering::Equal),
- (BaseHasVtable, _) => Some(cmp::Ordering::Greater),
- (_, BaseHasVtable) => Some(cmp::Ordering::Less),
- (SelfHasVtable, _) => Some(cmp::Ordering::Greater),
- (_, SelfHasVtable) => Some(cmp::Ordering::Less),
- _ => unreachable!(),
- }
}
}
--- third_party/rust/bindgen/src/ir/analysis/sizedness.rs.orig 2019-10-30 17:36:21 UTC
+++ third_party/rust/bindgen/src/ir/analysis/sizedness.rs
@@ -22,13 +22,14 @@ use {HashMap, Entry};
///
/// We initially assume that all types are `ZeroSized` and then update our
/// understanding as we learn more about each type.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, Ord)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
pub enum SizednessResult {
- /// Has some size that is known to be greater than zero. That doesn't mean
- /// it has a static size, but it is not zero sized for sure. In other words,
- /// it might contain an incomplete array or some other dynamically sized
- /// type.
- NonZeroSized,
+ /// The type is zero-sized.
+ ///
+ /// This means that if it is a C++ type, and is not being used as a base
+ /// member, then we must add an `_address` byte to enforce the
+ /// unique-address-per-distinct-object-instance rule.
+ ZeroSized,
/// Whether this type is zero-sized or not depends on whether a type
/// parameter is zero-sized or not.
@@ -52,32 +53,16 @@ pub enum SizednessResult {
/// https://github.com/rust-lang/rust-bindgen/issues/586
DependsOnTypeParam,
- /// The type is zero-sized.
- ///
- /// This means that if it is a C++ type, and is not being used as a base
- /// member, then we must add an `_address` byte to enforce the
- /// unique-address-per-distinct-object-instance rule.
- ZeroSized,
+ /// Has some size that is known to be greater than zero. That doesn't mean
+ /// it has a static size, but it is not zero sized for sure. In other words,
+ /// it might contain an incomplete array or some other dynamically sized
+ /// type.
+ NonZeroSized,
}
impl Default for SizednessResult {
fn default() -> Self {
SizednessResult::ZeroSized
- }
-}
-
-impl cmp::PartialOrd for SizednessResult {
- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
- use self::SizednessResult::*;
-
- match (*self, *rhs) {
- (x, y) if x == y => Some(cmp::Ordering::Equal),
- (NonZeroSized, _) => Some(cmp::Ordering::Greater),
- (_, NonZeroSized) => Some(cmp::Ordering::Less),
- (DependsOnTypeParam, _) => Some(cmp::Ordering::Greater),
- (_, DependsOnTypeParam) => Some(cmp::Ordering::Less),
- _ => unreachable!(),
- }
}
}
--- third_party/rust/bindgen/src/ir/derive.rs.orig 2019-10-30 17:36:44 UTC
+++ third_party/rust/bindgen/src/ir/derive.rs
@@ -92,10 +92,10 @@ pub trait CanDeriveOrd {
///
/// Initially we assume that we can derive trait for all types and then
/// update our understanding as we learn more about each type.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Ord)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
pub enum CanDerive {
- /// No, we cannot.
- No,
+ /// Yes, we can derive automatically.
+ Yes,
/// The only thing that stops us from automatically deriving is that
/// array with more than maximum number of elements is used.
@@ -103,29 +103,13 @@ pub enum CanDerive {
/// This means we probably can "manually" implement such trait.
Manually,
- /// Yes, we can derive automatically.
- Yes,
+ /// No, we cannot.
+ No,
}
impl Default for CanDerive {
fn default() -> CanDerive {
CanDerive::Yes
- }
-}
-
-impl cmp::PartialOrd for CanDerive {
- fn partial_cmp(&self, rhs: &Self) -> Option<cmp::Ordering> {
- use self::CanDerive::*;
-
- let ordering = match (*self, *rhs) {
- (x, y) if x == y => cmp::Ordering::Equal,
- (No, _) => cmp::Ordering::Greater,
- (_, No) => cmp::Ordering::Less,
- (Manually, _) => cmp::Ordering::Greater,
- (_, Manually) => cmp::Ordering::Less,
- _ => unreachable!()
- };
- Some(ordering)
}
}

View file

@ -1,17 +0,0 @@
$NetBSD: patch-toolkit_library_moz.build,v 1.18 2018/11/04 04:46:57 ryoon Exp $
* Restore OSS support
--- toolkit/library/moz.build.orig 2018-10-18 20:06:16.000000000 +0000
+++ toolkit/library/moz.build
@@ -232,8 +232,8 @@ if CONFIG['MOZ_SYSTEM_LIBVPX']:
if not CONFIG['MOZ_TREE_PIXMAN']:
OS_LIBS += CONFIG['MOZ_PIXMAN_LIBS']
-if CONFIG['MOZ_ALSA']:
- OS_LIBS += CONFIG['MOZ_ALSA_LIBS']
+if CONFIG['MOZ_OSS']:
+ OS_LIBS += CONFIG['MOZ_OSS_LIBS']
if CONFIG['HAVE_CLOCK_MONOTONIC']:
OS_LIBS += CONFIG['REALTIME_LIBS']