wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1038218. Convert some of gfxAlphaBlur's nsAutoPtr's to UniquePtrs. r=bas

Browse Source 
--HG--
extra : rebase_source : e0b5db8c5ab28664f4733969bf42cb4585cb22f8
This commit is contained in:
Jeff Muizelaar 2014-07-21 11:06:11 -04:00
parent 988ca4c7f3
commit 3262ad9459
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gfx/thebes/gfxBlur.cpp
View File

@ -9,6 +9,7 @@
#include "mozilla/gfx/Blur.h"
#include "mozilla/gfx/2D.h"
#include "mozilla/UniquePtr.h"
#include "nsExpirationTracker.h"
#include "nsClassHashtable.h"
@ -16,14 +17,12 @@ using namespace mozilla;
using namespace mozilla::gfx;
gfxAlphaBoxBlur::gfxAlphaBoxBlur()
: mBlur(nullptr)
{
}
gfxAlphaBoxBlur::~gfxAlphaBoxBlur()
{
mContext = nullptr;
delete mBlur;
}
gfxContext*
@ -37,22 +36,22 @@ gfxAlphaBoxBlur::Init(const gfxRect& aRect,
Float(aRect.width), Float(aRect.height));
IntSize spreadRadius(aSpreadRadius.width, aSpreadRadius.height);
IntSize blurRadius(aBlurRadius.width, aBlurRadius.height);
nsAutoPtr<mozilla::gfx::Rect> dirtyRect;
UniquePtr<Rect> dirtyRect;
if (aDirtyRect) {
dirtyRect = new mozilla::gfx::Rect(Float(aDirtyRect->x),
Float(aDirtyRect->y),
Float(aDirtyRect->width),
Float(aDirtyRect->height));
dirtyRect = MakeUnique<Rect>(Float(aDirtyRect->x),
Float(aDirtyRect->y),
Float(aDirtyRect->width),
Float(aDirtyRect->height));
}
nsAutoPtr<mozilla::gfx::Rect> skipRect;
UniquePtr<Rect> skipRect;
if (aSkipRect) {
skipRect = new mozilla::gfx::Rect(Float(aSkipRect->x),
Float(aSkipRect->y),
Float(aSkipRect->width),
Float(aSkipRect->height));
skipRect = MakeUnique<Rect>(Float(aSkipRect->x),
Float(aSkipRect->y),
Float(aSkipRect->width),
Float(aSkipRect->height));
}
mBlur = new AlphaBoxBlur(rect, spreadRadius, blurRadius, dirtyRect, skipRect);
mBlur = MakeUnique<AlphaBoxBlur>(rect, spreadRadius, blurRadius, dirtyRect.get(), skipRect.get());
int32_t blurDataSize = mBlur->GetSurfaceAllocationSize();
if (blurDataSize <= 0)
return nullptr;

3
gfx/thebes/gfxBlur.h
View File

@ -11,6 +11,7 @@
#include "nsAutoPtr.h"
#include "gfxPoint.h"
#include "mozilla/RefPtr.h"
#include "mozilla/UniquePtr.h"
class gfxContext;
struct gfxRect;
@ -149,7 +150,7 @@ protected:
/**
* The object that actually does the blurring for us.
*/
mozilla::gfx::AlphaBoxBlur *mBlur;
mozilla::UniquePtr<mozilla::gfx::AlphaBoxBlur> mBlur;
};
#endif /* GFX_BLUR_H */