зеркало из https://github.com/mozilla/pjs.git
Bug 673417. imglib: remove more PRBools. r=joe
--HG-- extra : rebase_source : cb8f4dfc1048b5e5af72d5544294a70624cdf35e
This commit is contained in:
Родитель
8149ddd14c
Коммит
7b5280eb93
|
@ -158,7 +158,7 @@ protected:
|
|||
* Extended by child classes, if they have additional
|
||||
* conditions for being able to animate
|
||||
*/
|
||||
virtual PRBool ShouldAnimate() {
|
||||
virtual bool ShouldAnimate() {
|
||||
return mAnimationConsumers > 0 && mAnimationMode != kDontAnimMode;
|
||||
}
|
||||
};
|
||||
|
|
|
@ -2116,7 +2116,7 @@ RasterImage::Discard(bool force)
|
|||
}
|
||||
|
||||
// Helper method to determine if we can discard an image
|
||||
PRBool
|
||||
bool
|
||||
RasterImage::CanDiscard() {
|
||||
return (DiscardingEnabled() && // Globally enabled...
|
||||
mDiscardable && // ...Enabled at creation time...
|
||||
|
@ -2125,7 +2125,7 @@ RasterImage::CanDiscard() {
|
|||
mDecoded); // ...and have something to discard.
|
||||
}
|
||||
|
||||
PRBool
|
||||
bool
|
||||
RasterImage::CanForciblyDiscard() {
|
||||
return mDiscardable && // ...Enabled at creation time...
|
||||
mHasSourceData; // ...have the source data...
|
||||
|
@ -2133,14 +2133,14 @@ RasterImage::CanForciblyDiscard() {
|
|||
|
||||
// Helper method to tell us whether the clock is currently running for
|
||||
// discarding this image. Mainly for assertions.
|
||||
PRBool
|
||||
bool
|
||||
RasterImage::DiscardingActive() {
|
||||
return !!(mDiscardTrackerNode.prev || mDiscardTrackerNode.next);
|
||||
}
|
||||
|
||||
// Helper method to determine if we're storing the source data in a buffer
|
||||
// or just writing it directly to the decoder
|
||||
PRBool
|
||||
bool
|
||||
RasterImage::StoringSourceData() {
|
||||
return (mDecodeOnDraw || mDiscardable);
|
||||
}
|
||||
|
@ -2817,7 +2817,7 @@ RasterImage::WriteToRasterImage(nsIInputStream* /* unused */,
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
PRBool
|
||||
bool
|
||||
RasterImage::ShouldAnimate()
|
||||
{
|
||||
return Image::ShouldAnimate() && mFrames.Length() >= 2 &&
|
||||
|
|
|
@ -545,13 +545,13 @@ private: // data
|
|||
|
||||
// Helpers
|
||||
void DoError();
|
||||
PRBool CanDiscard();
|
||||
PRBool CanForciblyDiscard();
|
||||
PRBool DiscardingActive();
|
||||
PRBool StoringSourceData();
|
||||
bool CanDiscard();
|
||||
bool CanForciblyDiscard();
|
||||
bool DiscardingActive();
|
||||
bool StoringSourceData();
|
||||
|
||||
protected:
|
||||
PRBool ShouldAnimate();
|
||||
bool ShouldAnimate();
|
||||
};
|
||||
|
||||
// XXXdholbert These helper classes should move to be inside the
|
||||
|
|
|
@ -301,7 +301,7 @@ VectorImage::StopAnimation()
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
PRBool
|
||||
bool
|
||||
VectorImage::ShouldAnimate()
|
||||
{
|
||||
return Image::ShouldAnimate() && mIsFullyLoaded && mHaveAnimations;
|
||||
|
|
|
@ -99,7 +99,7 @@ public:
|
|||
protected:
|
||||
virtual nsresult StartAnimation();
|
||||
virtual nsresult StopAnimation();
|
||||
virtual PRBool ShouldAnimate();
|
||||
virtual bool ShouldAnimate();
|
||||
|
||||
private:
|
||||
nsWeakPtr mObserver; //! imgIDecoderObserver
|
||||
|
|
Загрузка…
Ссылка в новой задаче