diff options
Diffstat (limited to 'www/firefox/patches/patch-content_media_gmp_GMPChild.cpp')
| -rw-r--r-- | www/firefox/patches/patch-content_media_gmp_GMPChild.cpp | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/www/firefox/patches/patch-content_media_gmp_GMPChild.cpp b/www/firefox/patches/patch-content_media_gmp_GMPChild.cpp index a5487fb1f72..2391ee0d598 100644 --- a/www/firefox/patches/patch-content_media_gmp_GMPChild.cpp +++ b/www/firefox/patches/patch-content_media_gmp_GMPChild.cpp @@ -1,13 +1,13 @@ -$NetBSD: patch-content_media_gmp_GMPChild.cpp,v 1.1 2014/10/15 13:43:32 ryoon Exp $ +$NetBSD: patch-content_media_gmp_GMPChild.cpp,v 1.2 2015/01/16 22:42:09 ryoon Exp $ ---- content/media/gmp/GMPChild.cpp.orig 2014-10-11 09:06:20.000000000 +0000 +--- content/media/gmp/GMPChild.cpp.orig 2015-01-09 04:38:19.000000000 +0000 +++ content/media/gmp/GMPChild.cpp -@@ -66,19 +66,11 @@ GetPluginFile(const std::string& aPlugin +@@ -91,21 +91,14 @@ GetFileBase(const std::string& aPluginPa } #endif - nsCOMPtr<nsIFile> parent; -- rv = aLibFile->GetParent(getter_AddRefs(parent)); +- rv = aFileBase->GetParent(getter_AddRefs(parent)); - if (NS_FAILED(rv)) { - return false; - } @@ -16,12 +16,15 @@ $NetBSD: patch-content_media_gmp_GMPChild.cpp,v 1.1 2014/10/15 13:43:32 ryoon Ex - rv = parent->GetLeafName(parentLeafName); - if (NS_FAILED(rv)) { + nsAutoString leafName; -+ if (NS_FAILED(aLibFile->GetLeafName(leafName))) { ++ if (NS_FAILED(aFileBase->GetLeafName(leafName))) { return false; } -- -- nsAutoString baseName(Substring(parentLeafName, 4, parentLeafName.Length() - 1)); -+ nsAutoString baseName(Substring(leafName, 4, leafName.Length() - 1)); - #if defined(XP_MACOSX) - nsAutoString binaryName = NS_LITERAL_STRING("lib") + baseName + NS_LITERAL_STRING(".dylib"); +- aBaseName = Substring(parentLeafName, ++ aBaseName = Substring(leafName, + 4, +- parentLeafName.Length() - 1); ++ leafName.Length() - 1); + return true; + } + |