Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 04:58:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1332160 - use nsCString internally whenever possible. r=gerald

Browse Source 
MozReview-Commit-ID: 1DUaJWfbL88

--HG--
extra : rebase_source : f4a02736b0385e4be6258a185822f7855d0b0189
extra : intermediate-source : 1faaf4254a2e1ce2c096a8650b66d07c84c7fdbe
extra : source : c23fc2cea382627af8ff20ae3edea926eaa6d51a
This commit is contained in:
JW Wang 2017-01-18 16:51:31 +08:00
parent fec54be7a5
commit 992114f5fd
14 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/html/HTMLMediaElement.cpp
View File

@ -1447,7 +1447,9 @@ void
HTMLMediaElement::GetMozDebugReaderData(nsAString& aString)
{
if (mDecoder && !mSrcStream) {
mDecoder->GetMozDebugReaderData(aString);
nsAutoCString result;
mDecoder->GetMozDebugReaderData(result);
aString = NS_ConvertUTF8toUTF16(result);
}
}

4
dom/media/MediaDecoder.cpp
View File

@ -1738,10 +1738,10 @@ MediaDecoder::DumpDebugInfo()
mInfo ? mInfo->HasAudio() : 0, mInfo ? mInfo->HasVideo() : 0,
PlayStateStr(), GetStateMachine());
nsString str;
nsAutoCString str;
GetMozDebugReaderData(str);
if (!str.IsEmpty()) {
DUMP_LOG("reader data:\n%s", NS_ConvertUTF16toUTF8(str).get());
DUMP_LOG("reader data:\n%s", str.get());
}
if (GetStateMachine()) {

2
dom/media/MediaDecoder.h
View File

@ -473,7 +473,7 @@ private:
// Returns a string describing the state of the media player internal
// data. Used for debugging purposes.
virtual void GetMozDebugReaderData(nsAString& aString) {}
virtual void GetMozDebugReaderData(nsACString& aString) {}
virtual void DumpDebugInfo();

4
dom/media/MediaFormatReader.cpp
View File

@ -2652,7 +2652,7 @@ MediaFormatReader::GetImageContainer()
}
void
MediaFormatReader::GetMozDebugReaderData(nsAString& aString)
MediaFormatReader::GetMozDebugReaderData(nsACString& aString)
{
nsAutoCString result;
const char* audioName = "unavailable";
@ -2712,7 +2712,7 @@ MediaFormatReader::GetMozDebugReaderData(nsAString& aString)
mVideo.mWaitingForData, mVideo.mWaitingForKey,
mVideo.mLastStreamSourceID);
}
aString += NS_ConvertUTF8toUTF16(result);
aString += result;
}
void

2
dom/media/MediaFormatReader.h
View File

@ -76,7 +76,7 @@ public:
// Returns a string describing the state of the decoder data.
// Used for debugging purposes.
void GetMozDebugReaderData(nsAString& aString);
void GetMozDebugReaderData(nsACString& aString);
void SetVideoBlankDecode(bool aIsBlankDecode) override;

2
dom/media/fmp4/MP4Decoder.cpp
View File

@ -282,7 +282,7 @@ MP4Decoder::IsVideoAccelerated(layers::KnowsCompositor* aKnowsCompositor, nsIGlo
}
void
MP4Decoder::GetMozDebugReaderData(nsAString& aString)
MP4Decoder::GetMozDebugReaderData(nsACString& aString)
{
if (mReader) {
mReader->GetMozDebugReaderData(aString);

2
dom/media/fmp4/MP4Decoder.h
View File

@ -52,7 +52,7 @@ public:
static already_AddRefed<dom::Promise>
IsVideoAccelerated(layers::KnowsCompositor* aKnowsCompositor, nsIGlobalObject* aParent);
void GetMozDebugReaderData(nsAString& aString) override;
void GetMozDebugReaderData(nsACString& aString) override;
private:
RefPtr<MediaFormatReader> mReader;

4
dom/media/mediasource/MediaSource.cpp
View File

@ -557,7 +557,9 @@ MediaSource::DurationChange(double aNewDuration, ErrorResult& aRv)
void
MediaSource::GetMozDebugReaderData(nsAString& aString)
{
mDecoder->GetMozDebugReaderData(aString);
nsAutoCString result;
mDecoder->GetMozDebugReaderData(result);
aString = NS_ConvertUTF8toUTF16(result);
}
nsPIDOMWindowInner*

2
dom/media/mediasource/MediaSourceDecoder.cpp
View File

@ -249,7 +249,7 @@ MediaSourceDecoder::SetMediaSourceDuration(double aDuration)
}
void
MediaSourceDecoder::GetMozDebugReaderData(nsAString& aString)
MediaSourceDecoder::GetMozDebugReaderData(nsACString& aString)
{
if (mReader && mDemuxer) {
mReader->GetMozDebugReaderData(aString);

2
dom/media/mediasource/MediaSourceDecoder.h
View File

@ -65,7 +65,7 @@ public:
// Returns a string describing the state of the MediaSource internal
// buffered data. Used for debugging purposes.
void GetMozDebugReaderData(nsAString& aString) override;
void GetMozDebugReaderData(nsACString& aString) override;
void AddSizeOfResources(ResourceSizes* aSizes) override;

4
dom/media/mediasource/MediaSourceDemuxer.cpp
View File

@ -246,7 +246,7 @@ MediaSourceDemuxer::~MediaSourceDemuxer()
}
void
MediaSourceDemuxer::GetMozDebugReaderData(nsAString& aString)
MediaSourceDemuxer::GetMozDebugReaderData(nsACString& aString)
{
MonitorAutoLock mon(mMonitor);
nsAutoCString result;
@ -279,7 +279,7 @@ MediaSourceDemuxer::GetMozDebugReaderData(nsAString& aString)
result += nsPrintfCString("\t\tBuffered: ranges=%s\n",
DumpTimeRanges(mVideoTrack->SafeBuffered(TrackInfo::kVideoTrack)).get());
}
aString += NS_ConvertUTF8toUTF16(result);
aString += result;
}
MediaSourceTrackDemuxer::MediaSourceTrackDemuxer(MediaSourceDemuxer* aParent,

2
dom/media/mediasource/MediaSourceDemuxer.h
View File

@ -52,7 +52,7 @@ public:
// Returns a string describing the state of the MediaSource internal
// buffered data. Used for debugging purposes.
void GetMozDebugReaderData(nsAString& aString);
void GetMozDebugReaderData(nsACString& aString);
void AddSizeOfResources(MediaSourceDecoder::ResourceSizes* aSizes);

2
dom/media/webm/WebMDecoder.cpp
View File

@ -58,7 +58,7 @@ WebMDecoder::IsSupportedType(const MediaContainerType& aContainerType)
}
void
WebMDecoder::GetMozDebugReaderData(nsAString& aString)
WebMDecoder::GetMozDebugReaderData(nsACString& aString)
{
if (mReader) {
mReader->GetMozDebugReaderData(aString);

2
dom/media/webm/WebMDecoder.h
View File

@ -30,7 +30,7 @@ public:
// If provided, codecs are checked for support.
static bool IsSupportedType(const MediaContainerType& aContainerType);
void GetMozDebugReaderData(nsAString& aString) override;
void GetMozDebugReaderData(nsACString& aString) override;
private:
RefPtr<MediaFormatReader> mReader;