1116737 - Merge FrameBlender into FrameAnimator

Status: RESOLVED FIXED

Description

[Seth Fowler [:seth] [:s2h]]

After bug 1116716, FrameBlender just isn't doing very much by itself anymore - it stores a couple of compositing frames, but other than that it's mostly a set of utility methods for FrameAnimator to call. In future bugs we're going to want to do refactorings that cut across both the code in FrameAnimator and the code that's currently in FrameBlender. I think it makes sense at this point to merge FrameBlender into FrameAnimator, which will provide a good foundation for those future refactorings.

Comment 1

[Seth Fowler [:seth] [:s2h]]

Attachment: Merge FrameBlender into FrameAnimator

Here's the patch. It's purely refactoring. Basically, the member variables and code from FrameBlender gets moved into FrameAnimator, with the exception of the enumerations, which turn out to make more sense living in imgFrame's header file. Then all the code that references those things gets updated.

Comment 2

[Seth Fowler [:seth] [:s2h]]

Try job here:

https://tbpl.mozilla.org/?tree=Try&rev=d18c17a28fe1

Comment 3

[Seth Fowler [:seth] [:s2h]]

Thanks for the review!

The failures in the try job above are all from previous patches in the patch stack, and they've now been fixed. The one exception was a failure to build on Windows because the TRANSPARENT identifier is used. =\ To work around that I renamed TRANSPARENT to SOME_TRANSPARENCY, and building on Windows is now successful, as this try job shows:

https://tbpl.mozilla.org/?tree=Try&rev=aa5ade79fd8b

Pushed:

https://hg.mozilla.org/integration/mozilla-inbound/rev/689797cc26c4

Comment 4

[Seth Fowler [:seth] [:s2h]]

Attachment: Merge FrameBlender into FrameAnimator

Here's the final version of the patch that got pushed.

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/689797cc26c4