current/SOURCES/firefox-32.0-1f10a8067853-undefined_reference.patch


# HG changeset patch
# User Simon Wilper <sxw@cpan.org>
# Date 1400002680 -43200
# Node ID 1f10a80678532ff186f314bb98050fd81f22a7fe
# Parent  a54ace627db8f12a9b2c5d3b60a675576887c445
Bug 999496 - Move AudioData::SizeOfIncludingThis to MediaData.cpp.  r=kinetik

diff --git a/content/media/MediaData.cpp b/content/media/MediaData.cpp
--- a/content/media/MediaData.cpp
+++ b/content/media/MediaData.cpp
@@ -33,16 +33,26 @@ AudioData::EnsureAudioBuffer()
   AudioDataValue* data = static_cast<AudioDataValue*>(mAudioBuffer->Data());
   for (uint32_t i = 0; i < mFrames; ++i) {
     for (uint32_t j = 0; j < mChannels; ++j) {
       data[j*mFrames + i] = mAudioData[i*mChannels + j];
     }
   }
 }
 
+size_t
+AudioData::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
+{
+  size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData);
+  if (mAudioBuffer) {
+    size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf);
+  }
+  return size;
+}
+
 static bool
 ValidatePlane(const VideoData::YCbCrBuffer::Plane& aPlane)
 {
   return aPlane.mWidth <= PlanarYCbCrImage::MAX_DIMENSION &&
          aPlane.mHeight <= PlanarYCbCrImage::MAX_DIMENSION &&
          aPlane.mWidth * aPlane.mHeight < MAX_VIDEO_WIDTH * MAX_VIDEO_HEIGHT &&
          aPlane.mStride > 0;
 }
diff --git a/content/media/MediaData.h b/content/media/MediaData.h
--- a/content/media/MediaData.h
+++ b/content/media/MediaData.h
@@ -75,23 +75,17 @@ public:
     MOZ_COUNT_CTOR(AudioData);
   }
 
   ~AudioData()
   {
     MOZ_COUNT_DTOR(AudioData);
   }
 
-  size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const {
-    size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData);
-    if (mAudioBuffer) {
-      size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf);
-    }
-    return size;
-  }
+  size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
 
   // If mAudioBuffer is null, creates it from mAudioData.
   void EnsureAudioBuffer();
 
   const uint32_t mFrames;
   const uint32_t mChannels;
   // At least one of mAudioBuffer/mAudioData must be non-null.
   // mChannels channels, each with mFrames frames

1
2	# HG changeset patch
3	# User Simon Wilper <sxw@cpan.org>
4	# Date 1400002680 -43200
5	# Node ID 1f10a80678532ff186f314bb98050fd81f22a7fe
6	# Parent a54ace627db8f12a9b2c5d3b60a675576887c445
7	Bug 999496 - Move AudioData::SizeOfIncludingThis to MediaData.cpp. r=kinetik
8
9	diff --git a/content/media/MediaData.cpp b/content/media/MediaData.cpp
10	--- a/content/media/MediaData.cpp
11	+++ b/content/media/MediaData.cpp
12	@@ -33,16 +33,26 @@ AudioData::EnsureAudioBuffer()
13	AudioDataValue* data = static_cast<AudioDataValue*>(mAudioBuffer->Data());
14	for (uint32_t i = 0; i < mFrames; ++i) {
15	for (uint32_t j = 0; j < mChannels; ++j) {
16	data[jmFrames + i] = mAudioData[imChannels + j];
17	}
18	}
19	}
20
21	+size_t
22	+AudioData::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const
23	+{
24	+ size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData);
25	+ if (mAudioBuffer) {
26	+ size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf);
27	+ }
28	+ return size;
29	+}
30	+
31	static bool
32	ValidatePlane(const VideoData::YCbCrBuffer::Plane& aPlane)
33	{
34	return aPlane.mWidth <= PlanarYCbCrImage::MAX_DIMENSION &&
35	aPlane.mHeight <= PlanarYCbCrImage::MAX_DIMENSION &&
36	aPlane.mWidth * aPlane.mHeight < MAX_VIDEO_WIDTH * MAX_VIDEO_HEIGHT &&
37	aPlane.mStride > 0;
38	}
39	diff --git a/content/media/MediaData.h b/content/media/MediaData.h
40	--- a/content/media/MediaData.h
41	+++ b/content/media/MediaData.h
42	@@ -75,23 +75,17 @@ public:
43	MOZ_COUNT_CTOR(AudioData);
44	}
45
46	~AudioData()
47	{
48	MOZ_COUNT_DTOR(AudioData);
49	}
50
51	- size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const {
52	- size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData);
53	- if (mAudioBuffer) {
54	- size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf);
55	- }
56	- return size;
57	- }
58	+ size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const;
59
60	// If mAudioBuffer is null, creates it from mAudioData.
61	void EnsureAudioBuffer();
62
63	const uint32_t mFrames;
64	const uint32_t mChannels;
65	// At least one of mAudioBuffer/mAudioData must be non-null.
66	// mChannels channels, each with mFrames frames
67