Bug 1275750 (Part 3) - Remove imgFrame::GetFormat(). r=edwin
authorSeth Fowler <mark.seth.fowler@gmail.com>
Thu, 26 May 2016 11:33:38 -0700
changeset 338257 945c510ffa9b4af93cb438331af18ac82f4db59c
parent 338256 7c4ec7324278eabb7a00fcd9c11191fd699feb40
child 338258 cca36be27a57c6d85c018261adf5ab20cbd42eeb
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersedwin
bugs1275750
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1275750 (Part 3) - Remove imgFrame::GetFormat(). r=edwin
image/imgFrame.cpp
image/imgFrame.h
--- a/image/imgFrame.cpp
+++ b/image/imgFrame.cpp
@@ -662,23 +662,16 @@ imgFrame::Finish(Opacity aFrameOpacity /
 }
 
 nsIntRect
 imgFrame::GetRect() const
 {
   return gfx::IntRect(mOffset, mSize);
 }
 
-SurfaceFormat
-imgFrame::GetFormat() const
-{
-  MonitorAutoLock lock(mMonitor);
-  return mFormat;
-}
-
 uint32_t
 imgFrame::GetImageBytesPerRow() const
 {
   mMonitor.AssertCurrentThreadOwns();
 
   if (mVBuf) {
     return mSize.width * BytesPerPixel(mFormat);
   }
--- a/image/imgFrame.h
+++ b/image/imgFrame.h
@@ -218,23 +218,16 @@ public:
   void GetImageData(uint8_t** aData, uint32_t* length) const;
   uint8_t* GetImageData() const;
 
   bool GetIsPaletted() const;
   void GetPaletteData(uint32_t** aPalette, uint32_t* length) const;
   uint32_t* GetPaletteData() const;
   uint8_t GetPaletteDepth() const { return mPaletteDepth; }
 
-  /**
-   * Get the SurfaceFormat for this imgFrame.
-   *
-   * This should only be used for assertions.
-   */
-  SurfaceFormat GetFormat() const;
-
   AnimationData GetAnimationData() const;
 
   bool GetCompositingFailed() const;
   void SetCompositingFailed(bool val);
 
   void SetOptimizable();
 
   Color SinglePixelColor() const;