corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1287691 (Part 4) - Leave notifying decoding progress for each frame to DecodingTask. r=edwin

Browse Source
This commit is contained in:
Seth Fowler
2016-07-18 23:53:20 -07:00
parent 69348dbead
commit 1f573d3fd9
3 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
image/Decoder.cpp
View File

@@ -447,12 +447,6 @@ Decoder::PostFrameStop(Opacity aFrameOpacity
mInvalidRect.UnionRect(mInvalidRect, mInvalidRect.UnionRect(mInvalidRect,
gfx::IntRect(gfx::IntPoint(0, 0), GetSize())); gfx::IntRect(gfx::IntPoint(0, 0), GetSize()));
} }
// If we are going to keep decoding we should notify now about the first frame being done.
if (mImage && mFrameCount == 1 && HasAnimation()) {
MOZ_ASSERT(HasProgress());
IDecodingTask::NotifyProgress(WrapNotNull(this));
}
} }
void void

4
image/IDecodingTask.cpp
View File

@@ -19,8 +19,8 @@ namespace image {
// Helpers for sending notifications to the image associated with a decoder. // Helpers for sending notifications to the image associated with a decoder.
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/* static */ void static void
IDecodingTask::NotifyProgress(NotNull<Decoder*> aDecoder) NotifyProgress(NotNull<Decoder*> aDecoder)
{ {
MOZ_ASSERT(aDecoder->HasProgress() && !aDecoder->IsMetadataDecode()); MOZ_ASSERT(aDecoder->HasProgress() && !aDecoder->IsMetadataDecode());

5
image/IDecodingTask.h
View File

@@ -50,11 +50,6 @@ public:
/// @return a non-null weak pointer to the Decoder associated with this task. /// @return a non-null weak pointer to the Decoder associated with this task.
virtual NotNull<Decoder*> GetDecoder() const = 0; virtual NotNull<Decoder*> GetDecoder() const = 0;
// Notify the Image associated with a Decoder of its progress, sending a
// runnable to the main thread if necessary.
// XXX(seth): This is a hack that will be removed soon.
static void NotifyProgress(NotNull<Decoder*> aDecoder);
protected: protected:
virtual ~IDecodingTask() { } virtual ~IDecodingTask() { }
}; };