diff --git a/gfx/layers/YCbCrImageDataSerializer.cpp b/gfx/layers/YCbCrImageDataSerializer.cpp index 74ce60fe97e3..a8978674dfa5 100644 --- a/gfx/layers/YCbCrImageDataSerializer.cpp +++ b/gfx/layers/YCbCrImageDataSerializer.cpp @@ -132,13 +132,6 @@ YCbCrImageDataSerializer::ComputeMinBufferSize(const LayerIntSize& aYSize, + MOZ_ALIGN_WORD(sizeof(YCbCrBufferInfo)); } -size_t -YCbCrImageDataSerializer::ComputeMinBufferSize(const gfxIntSize& aYSize, - const gfxIntSize& aCbCrSize) -{ - return ComputeMinBufferSize(LayerIntSize(aYSize.width, aYSize.height), - LayerIntSize(aCbCrSize.width, aCbCrSize.height)); -} // Offset in bytes static size_t ComputeOffset(uint32_t aSize) { @@ -171,16 +164,6 @@ YCbCrImageDataSerializer::InitializeBufferInfo(const LayerIntSize& aYSize, info->mStereoMode = aStereoMode; } -void -YCbCrImageDataSerializer::InitializeBufferInfo(const gfxIntSize& aYSize, - const gfxIntSize& aCbCrSize, - StereoMode aStereoMode) -{ - InitializeBufferInfo(LayerIntSize(aYSize.width, aYSize.height), - LayerIntSize(aCbCrSize.width, aCbCrSize.height), - aStereoMode); -} - static void CopyLineWithSkip(const uint8_t* src, uint8_t* dst, uint32_t len, uint32_t skip) { for (uint32_t i = 0; i < len; ++i) { *dst = *src; diff --git a/gfx/layers/YCbCrImageDataSerializer.h b/gfx/layers/YCbCrImageDataSerializer.h index 7bd33e0a4a79..6c8ab0c35a79 100644 --- a/gfx/layers/YCbCrImageDataSerializer.h +++ b/gfx/layers/YCbCrImageDataSerializer.h @@ -106,8 +106,6 @@ public: */ static size_t ComputeMinBufferSize(const LayerIntSize& aYSize, const LayerIntSize& aCbCrSize); - static size_t ComputeMinBufferSize(const gfxIntSize& aYSize, - const gfxIntSize& aCbCrSize); static size_t ComputeMinBufferSize(uint32_t aSize); /** @@ -118,9 +116,6 @@ public: void InitializeBufferInfo(const LayerIntSize& aYSize, const LayerIntSize& aCbCrSize, StereoMode aStereoMode); - void InitializeBufferInfo(const gfxIntSize& aYSize, - const gfxIntSize& aCbCrSize, - StereoMode aStereoMode); bool CopyData(const uint8_t* aYData, const uint8_t* aCbData, const uint8_t* aCrData,