diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index 754501b178e..0aee107a6c8 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -51,7 +51,7 @@ pref("extensions.blocklist.interval", 86400); // blocking them. pref("extensions.blocklist.level", 2); pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/"); -pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/"); +pref("extensions.blocklist.detailsURL", "https://www.mozilla.org/%LOCALE%/blocklist/"); pref("extensions.blocklist.itemURL", "https://addons.mozilla.org/%LOCALE%/%APP%/blocked/%blockID%"); pref("extensions.update.autoUpdateDefault", true); @@ -753,7 +753,7 @@ pref("browser.safebrowsing.reportPhishURL", "http://%LOCALE%.phish-report.mozill pref("browser.safebrowsing.reportMalwareURL", "http://%LOCALE%.malware-report.mozilla.com/?hl=%LOCALE%"); pref("browser.safebrowsing.reportMalwareErrorURL", "http://%LOCALE%.malware-error.mozilla.com/?hl=%LOCALE%"); -pref("browser.safebrowsing.warning.infoURL", "http://www.mozilla.com/%LOCALE%/firefox/phishing-protection/"); +pref("browser.safebrowsing.warning.infoURL", "https://www.mozilla.org/%LOCALE%/firefox/phishing-protection/"); pref("browser.safebrowsing.malware.reportURL", "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?client=%NAME%&hl=%LOCALE%&site="); #ifdef MOZILLA_OFFICIAL diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index 848d940298e..3d88664dddc 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -117,7 +117,7 @@ - + &trademarkInfo.part1; diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc index 042d06901eb..ecb3b8d5324 100644 --- a/browser/base/content/browser-appmenu.inc +++ b/browser/base/content/browser-appmenu.inc @@ -369,7 +369,7 @@ onclick="checkForMiddleClick(this, event);"/> #ifdef MOZ_SERVICES_HEALTHREPORT - + diff --git a/browser/locales/en-US/chrome/browser/aboutRobots.dtd b/browser/locales/en-US/chrome/browser/aboutRobots.dtd index f417428c84a..139603d8d3b 100644 --- a/browser/locales/en-US/chrome/browser/aboutRobots.dtd +++ b/browser/locales/en-US/chrome/browser/aboutRobots.dtd @@ -3,9 +3,7 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> diff --git a/browser/locales/en-US/profile/bookmarks.inc b/browser/locales/en-US/profile/bookmarks.inc index f91f15ef765..d2a701e52b9 100644 --- a/browser/locales/en-US/profile/bookmarks.inc +++ b/browser/locales/en-US/profile/bookmarks.inc @@ -14,7 +14,7 @@ #define bookmarks_toolbarfolder_description Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar # LOCALIZATION NOTE (getting_started): -# link title for http://en-US.www.mozilla.com/en-US/firefox/central/ +# link title for https://www.mozilla.org/en-US/firefox/central/ #define getting_started Getting Started # LOCALIZATION NOTE (firefox_heading): @@ -22,19 +22,19 @@ #define firefox_heading Mozilla Firefox # LOCALIZATION NOTE (firefox_help): -# link title for http://en-US.www.mozilla.com/en-US/firefox/help/ +# link title for https://www.mozilla.org/en-US/firefox/help/ #define firefox_help Help and Tutorials # LOCALIZATION NOTE (firefox_customize): -# link title for http://en-US.www.mozilla.com/en-US/firefox/customize/ +# link title for https://www.mozilla.org/en-US/firefox/customize/ #define firefox_customize Customize Firefox # LOCALIZATION NOTE (firefox_community): -# link title for http://en-US.www.mozilla.com/en-US/firefox/community/ +# link title for https://www.mozilla.org/en-US/contribute/ #define firefox_community Get Involved # LOCALIZATION NOTE (firefox_about): -# link title for http://en-US.www.mozilla.com/en-US/about/ +# link title for https://www.mozilla.org/en-US/about/ #define firefox_about About Us #unfilter emptyLines diff --git a/browser/locales/generic/extract-bookmarks.py b/browser/locales/generic/extract-bookmarks.py index cc8a954ef53..7bf711fff12 100644 --- a/browser/locales/generic/extract-bookmarks.py +++ b/browser/locales/generic/extract-bookmarks.py @@ -32,7 +32,7 @@ template = '''#filter emptyLines #define bookmarks_toolbarfolder_description %s # LOCALIZATION NOTE (getting_started): -# link title for http://www.mozilla.com/en-US/firefox/central/ +# link title for https://www.mozilla.org/en-US/firefox/central/ #define getting_started %s # LOCALIZATION NOTE (firefox_heading): @@ -40,19 +40,19 @@ template = '''#filter emptyLines #define firefox_heading %s # LOCALIZATION NOTE (firefox_help): -# link title for http://www.mozilla.com/en-US/firefox/help/ +# link title for https://www.mozilla.org/en-US/firefox/help/ #define firefox_help %s # LOCALIZATION NOTE (firefox_customize): -# link title for http://www.mozilla.com/en-US/firefox/customize/ +# link title for https://www.mozilla.org/en-US/firefox/customize/ #define firefox_customize %s # LOCALIZATION NOTE (firefox_community): -# link title for http://www.mozilla.com/en-US/firefox/community/ +# link title for https://www.mozilla.org/en-US/contribute/ #define firefox_community %s # LOCALIZATION NOTE (firefox_about): -# link title for http://www.mozilla.com/en-US/about/ +# link title for https://www.mozilla.org/en-US/about/ #define firefox_about %s #unfilter emptyLines''' diff --git a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in index b9a5ba865d5..e925c1ef235 100644 --- a/browser/locales/generic/profile/bookmarks.html.in +++ b/browser/locales/generic/profile/bookmarks.html.in @@ -15,13 +15,13 @@

@bookmarks_toolbarfolder@

@bookmarks_toolbarfolder_description@

-

@getting_started@ +
@getting_started@

@firefox_heading@

-

@firefox_help@ -
@firefox_customize@ -
@firefox_community@ -
@firefox_about@ +
@firefox_help@ +
@firefox_customize@ +
@firefox_community@ +
@firefox_about@

diff --git a/browser/metro/base/content/pages/aboutRights.xhtml b/browser/metro/base/content/pages/aboutRights.xhtml index becab854e2d..df29ae7ea60 100644 --- a/browser/metro/base/content/pages/aboutRights.xhtml +++ b/browser/metro/base/content/pages/aboutRights.xhtml @@ -33,7 +33,7 @@ -->

  • &rights.intro-point2-a;&rights.intro-point2-b;&rights.intro-point2-c;
  • &rights.intro-point2.5;
    • -
  • &rights2.intro-point3a;&rights2.intro-point3b;&rights.intro-point3c;
    • +
  • &rights2.intro-point3a;&rights2.intro-point3b;&rights.intro-point3c;
  • &rights2.intro-point4a;&rights.intro-point4b;&rights.intro-point4c;
    • diff --git a/browser/metro/profile/metro.js b/browser/metro/profile/metro.js index 3b278bd59ce..381845c007c 100644 --- a/browser/metro/profile/metro.js +++ b/browser/metro/profile/metro.js @@ -188,7 +188,7 @@ pref("extensions.update.enabled", false); pref("extensions.blocklist.enabled", true); pref("extensions.blocklist.interval", 86400); pref("extensions.blocklist.url", "https://addons.mozilla.org/blocklist/3/%APP_ID%/%APP_VERSION%/%PRODUCT%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/%PING_COUNT%/%TOTAL_PING_COUNT%/%DAYS_SINCE_LAST_PING%/"); -pref("extensions.blocklist.detailsURL", "https://www.mozilla.com/%LOCALE%/blocklist/"); +pref("extensions.blocklist.detailsURL", "https://www.mozilla.org/%LOCALE%/blocklist/"); /* block popups by default, and notify the user about blocked popups */ pref("dom.disable_open_during_load", true); @@ -383,7 +383,7 @@ pref("breakpad.reportURL", "https://crash-stats.mozilla.com/report/index/"); // TODO: This is not the correct article for metro!!! pref("app.sync.tutorialURL", "https://support.mozilla.org/kb/sync-firefox-between-desktop-and-mobile"); pref("app.support.baseURL", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/"); -pref("app.privacyURL", "http://www.mozilla.com/legal/privacy/"); +pref("app.privacyURL", "https://www.mozilla.org/legal/privacy/"); pref("app.creditsURL", "http://www.mozilla.org/credits/"); pref("app.channelURL", "http://www.mozilla.org/%LOCALE%/firefox/channel/"); diff --git a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp index 26ba34a11aa..1c9b5c6c6d3 100644 --- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp +++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp @@ -827,6 +827,13 @@ void MediaPipelineTransmit::PipelineListener::ProcessVideoChunk( return; } + // We get passed duplicate frames every ~10ms even if there's no frame change! + int32_t serial = img->GetSerial(); + if (serial == last_img_) { + return; + } + last_img_ = serial; + ImageFormat format = img->GetFormat(); #ifdef MOZ_WIDGET_GONK if (format == GONK_IO_SURFACE) { diff --git a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h index 46376227fbc..52c3a312a90 100644 --- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h +++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.h @@ -321,8 +321,12 @@ class MediaPipelineTransmit : public MediaPipeline { class PipelineListener : public MediaStreamListener { public: PipelineListener(const RefPtr& conduit) - : conduit_(conduit), active_(false), samples_10ms_buffer_(nullptr), - buffer_current_(0), samplenum_10ms_(0){} + : conduit_(conduit), + active_(false), + last_img_(-1), + samples_10ms_buffer_(nullptr), + buffer_current_(0), + samplenum_10ms_(0) {} ~PipelineListener() { @@ -359,6 +363,8 @@ class MediaPipelineTransmit : public MediaPipeline { RefPtr conduit_; volatile bool active_; + int32_t last_img_; // serial number of last Image + // These vars handle breaking audio samples into exact 10ms chunks: // The buffer of 10ms audio samples that we will send once full // (can be carried over from one call to another). diff --git a/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp b/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp index df988602995..7a2d2f708bd 100644 --- a/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp +++ b/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp @@ -62,6 +62,10 @@ GetStreamFromInfo(T* info, bool& found) DOMMediaStream* MediaStreamList::IndexedGetter(uint32_t index, bool& found) { + if (!mPeerConnection->media()) { // PeerConnection closed + found = false; + return nullptr; + } if (mType == Local) { return GetStreamFromInfo(mPeerConnection->media()-> GetLocalStream(index), found); @@ -74,6 +78,9 @@ MediaStreamList::IndexedGetter(uint32_t index, bool& found) uint32_t MediaStreamList::Length() { + if (!mPeerConnection->media()) { // PeerConnection closed + return 0; + } return mType == Local ? mPeerConnection->media()->LocalStreamsLength() : mPeerConnection->media()->RemoteStreamsLength(); } diff --git a/media/webrtc/trunk/webrtc/modules/video_capture/windows/device_info_ds.cc b/media/webrtc/trunk/webrtc/modules/video_capture/windows/device_info_ds.cc index a0da89d79b8..fcf2eeba9f3 100644 --- a/media/webrtc/trunk/webrtc/modules/video_capture/windows/device_info_ds.cc +++ b/media/webrtc/trunk/webrtc/modules/video_capture/windows/device_info_ds.cc @@ -586,7 +586,7 @@ WebRtc_Word32 DeviceInfoDS::CreateCapabilityMap( if (hrVC == S_OK) { - LONGLONG *frameDurationList; + LONGLONG *frameDurationList = NULL; LONGLONG maxFPS; long listSize; SIZE size; diff --git a/toolkit/content/about.xhtml b/toolkit/content/about.xhtml index 13d70eb8695..5351181f38d 100644 --- a/toolkit/content/about.xhtml +++ b/toolkit/content/about.xhtml @@ -22,7 +22,7 @@
    - + &brandShortName;

    @@ -31,7 +31,7 @@
    • &about.credits.beforeLink;&about.credits.linkTitle;&about.credits.afterLink;
    • &about.license.beforeTheLink;&about.license.linkTitle;&about.license.afterTheLink;
      • -
    • &about.relnotes.beforeTheLink;&about.relnotes.linkTitle;&about.relnotes.afterTheLink;
      • +
    • &about.buildconfig.beforeTheLink;&about.buildconfig.linkTitle;&about.buildconfig.afterTheLink;