diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2015-07-16 06:05:59 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2015-07-16 06:05:59 +0000 |
| commit | ef0a0c91f153782cd38b84d14147dfa8cef8337f (patch) | |
| tree | caa550e9c6de6d456de3b7c58dd8a734b5352b71 /www/firefox/files/patch-system-openh264 | |
| parent | Revert 392050 (diff) | |
- Update NSS and ca_root_nss to 3.19.2
- Update Firefox and gmp-api to 39.0
- Update Firefox ESR and libxul to 38.1.0
Changes: https://developer.mozilla.org/docs/Mozilla/Projects/NSS/NSS_3.19.2_release_notes
Changes: https://www.mozilla.org/firefox/39.0/releasenotes/
Changes: https://www.mozilla.org/firefox/38.1.0/releasenotes/
MFH: 2015Q3
Security: https://vuxml.freebsd.org/freebsd/44d9daee-940c-4179-86bb-6e3ffd617869.html
Notes
Notes:
svn path=/head/; revision=392273
Diffstat (limited to 'www/firefox/files/patch-system-openh264')
| -rw-r--r-- | www/firefox/files/patch-system-openh264 | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/www/firefox/files/patch-system-openh264 b/www/firefox/files/patch-system-openh264 index e694b28f436e..9bf447c54abe 100644 --- a/www/firefox/files/patch-system-openh264 +++ b/www/firefox/files/patch-system-openh264 @@ -34,7 +34,7 @@ diff --git dom/media/gmp/GMPParent.cpp dom/media/gmp/GMPParent.cpp index aa60acf..90878ca 100644 --- dom/media/gmp/GMPParent.cpp +++ dom/media/gmp/GMPParent.cpp -@@ -90,23 +90,16 @@ +@@ -93,22 +93,15 @@ mService = aService; mDirectory = aPluginDir; @@ -42,19 +42,18 @@ index aa60acf..90878ca 100644 - // where <gmp-plugin-id> should be gmp-gmpopenh264 - nsCOMPtr<nsIFile> parent; - nsresult rv = aPluginDir->GetParent(getter_AddRefs(parent)); -- if (NS_FAILED(rv)) { -- return rv; -- } -- nsAutoString parentLeafName; -- rv = parent->GetLeafName(parentLeafName); + nsAutoString leafname; + nsresult rv = aPluginDir->GetLeafName(leafname); if (NS_FAILED(rv)) { return rv; } - LOGD(("%s::%s: %p for %s", __CLASS__, __FUNCTION__, this, -- NS_LossyConvertUTF16toASCII(parentLeafName).get())); -+ NS_LossyConvertUTF16toASCII(leafname).get())); +- nsAutoString parentLeafName; +- rv = parent->GetLeafName(parentLeafName); +- if (NS_FAILED(rv)) { +- return rv; +- } +- LOGD("%s: for %s", __FUNCTION__, NS_LossyConvertUTF16toASCII(parentLeafName).get()); ++ LOGD("%s: for %s", __FUNCTION__, NS_LossyConvertUTF16toASCII(leafname).get()); - MOZ_ASSERT(parentLeafName.Length() > 4); - mName = Substring(parentLeafName, 4); @@ -125,7 +124,7 @@ index 1f3a0b1..93517be 100644 if (this._plugin.isEME) { Preferences.observe(GMPPrefs.KEY_EME_ENABLED, this.onPrefEMEGlobalEnabledChanged, this); -@@ -120,17 +119,14 @@ +@@ -134,17 +133,14 @@ optionsType: AddonManager.OPTIONS_TYPE_INLINE, get optionsURL() { return this._plugin.optionsURL; }, @@ -143,9 +142,9 @@ index 1f3a0b1..93517be 100644 return this._gmpPath; }, - - get id() { return this._plugin.id; }, - get type() { return "plugin"; }, - get isGMPlugin() { return true; }, + get missingKey() { + return this._plugin.missingKey; + }, @@ -141,8 +137,13 @@ get description() { return this._plugin.description; }, get fullDescription() { return this._plugin.fullDescription; }, |