From edf78018f280a1bdb1437b1b6698a2c635a35844 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Tue, 26 Feb 2013 12:02:20 +0100 Subject: [PATCH] Bug 844905 - Change MediaResource::GetContentType return type to nsCString. r=cpearce --- content/media/BufferMediaResource.h | 2 +- content/media/MediaResource.h | 4 ++-- content/media/wmf/WMFByteStream.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/media/BufferMediaResource.h b/content/media/BufferMediaResource.h index 9b5cc17ce00e..d6eec0b259ac 100644 --- a/content/media/BufferMediaResource.h +++ b/content/media/BufferMediaResource.h @@ -136,7 +136,7 @@ public: bool IsTransportSeekable() MOZ_OVERRIDE { return true; } - virtual const nsACString& GetContentType() const MOZ_OVERRIDE + virtual const nsCString& GetContentType() const MOZ_OVERRIDE { return mContentType; } diff --git a/content/media/MediaResource.h b/content/media/MediaResource.h index df3230769dd2..618ee6e1311d 100644 --- a/content/media/MediaResource.h +++ b/content/media/MediaResource.h @@ -371,7 +371,7 @@ public: // Returns the content type of the resource. This is copied from the // nsIChannel when the MediaResource is created. Safe to call from // any thread. - virtual const nsACString& GetContentType() const = 0; + virtual const nsCString& GetContentType() const = 0; }; class BaseMediaResource : public MediaResource { @@ -398,7 +398,7 @@ protected: MOZ_COUNT_DTOR(BaseMediaResource); } - virtual const nsACString& GetContentType() const MOZ_OVERRIDE + virtual const nsCString& GetContentType() const MOZ_OVERRIDE { return mContentType; } diff --git a/content/media/wmf/WMFByteStream.cpp b/content/media/wmf/WMFByteStream.cpp index bd1281a1be33..3b712e15beae 100644 --- a/content/media/wmf/WMFByteStream.cpp +++ b/content/media/wmf/WMFByteStream.cpp @@ -162,7 +162,7 @@ WMFByteStream::Init() contentTypeUTF16.get()); NS_ENSURE_TRUE(SUCCEEDED(hr), NS_ERROR_FAILURE); - LOG("WMFByteStream has Content-Type=%s", mResource->GetContentType()); + LOG("WMFByteStream has Content-Type=%s", mResource->GetContentType().get()); } return NS_OK; }