diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-16 09:13:02 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-16 09:13:02 -0700 |
| commit | 3f754d483e257f0d373be28a64b58620b4e0953f (patch) | |
| tree | 51dbd10bcfc25572ab5a6a70eba2eab0f6bf3131 /core/src/fxge/skia | |
| parent | 026623249c78ba305c874cc093a035ef5a4cd1b4 (diff) | |
| download | pdfium-3f754d483e257f0d373be28a64b58620b4e0953f.tar.xz | |
Remove checks in fxge/{apple,win32,skia,dib} now that FX_NEW cant return 0
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1062863006
Diffstat (limited to 'core/src/fxge/skia')
| -rw-r--r-- | core/src/fxge/skia/fx_skia_device.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/core/src/fxge/skia/fx_skia_device.cpp b/core/src/fxge/skia/fx_skia_device.cpp index 6c329eee4e..cc4059dd1d 100644 --- a/core/src/fxge/skia/fx_skia_device.cpp +++ b/core/src/fxge/skia/fx_skia_device.cpp @@ -237,7 +237,7 @@ static void SkRasterizeStroke(SkPaint& spaint, SkPath* dstPathData, SkPath& path CFX_SkiaDeviceDriver::CFX_SkiaDeviceDriver(CFX_DIBitmap* pBitmap, int dither_bits, FX_BOOL bRgbByteOrder, CFX_DIBitmap* pOriDevice, FX_BOOL bGroupKnockout) { - m_pAggDriver = FX_NEW CFX_AggDeviceDriver(pBitmap, dither_bits, bRgbByteOrder, pOriDevice, bGroupKnockout); + m_pAggDriver = new CFX_AggDeviceDriver(pBitmap, dither_bits, bRgbByteOrder, pOriDevice, bGroupKnockout); } CFX_SkiaDeviceDriver::~CFX_SkiaDeviceDriver() { @@ -300,7 +300,7 @@ FX_BOOL CFX_SkiaDeviceDriver::SetClip_PathFill(const CFX_PathData* pPathData, // ) { if (m_pAggDriver->m_pClipRgn == NULL) - m_pAggDriver->m_pClipRgn = FX_NEW CFX_ClipRgn(GetDeviceCaps(FXDC_PIXEL_WIDTH), GetDeviceCaps(FXDC_PIXEL_HEIGHT)); + m_pAggDriver->m_pClipRgn = new CFX_ClipRgn(GetDeviceCaps(FXDC_PIXEL_WIDTH), GetDeviceCaps(FXDC_PIXEL_HEIGHT)); if (pPathData->GetPointCount() == 5 || pPathData->GetPointCount() == 4) { CFX_FloatRect rectf; @@ -332,7 +332,7 @@ FX_BOOL CFX_SkiaDeviceDriver::SetClip_PathStroke(const CFX_PathData* pPathData, ) { if (m_pAggDriver->m_pClipRgn == NULL) - m_pAggDriver->m_pClipRgn = FX_NEW CFX_ClipRgn(GetDeviceCaps(FXDC_PIXEL_WIDTH), GetDeviceCaps(FXDC_PIXEL_HEIGHT)); + m_pAggDriver->m_pClipRgn = new CFX_ClipRgn(GetDeviceCaps(FXDC_PIXEL_WIDTH), GetDeviceCaps(FXDC_PIXEL_HEIGHT)); // build path data CSkia_PathData path_data; @@ -505,7 +505,7 @@ FX_BOOL CFX_SkiaDevice::Attach(CFX_DIBitmap* pBitmap, int dither_bits, FX_BOOL b if (pBitmap == NULL) return FALSE; SetBitmap(pBitmap); - CFX_SkiaDeviceDriver* pDriver = FX_NEW CFX_SkiaDeviceDriver(pBitmap, dither_bits, bRgbByteOrder, pOriDevice, bGroupKnockout); + CFX_SkiaDeviceDriver* pDriver = new CFX_SkiaDeviceDriver(pBitmap, dither_bits, bRgbByteOrder, pOriDevice, bGroupKnockout); SetDeviceDriver(pDriver); return TRUE; } @@ -513,13 +513,13 @@ FX_BOOL CFX_SkiaDevice::Attach(CFX_DIBitmap* pBitmap, int dither_bits, FX_BOOL b FX_BOOL CFX_SkiaDevice::Create(int width, int height, FXDIB_Format format, int dither_bits, CFX_DIBitmap* pOriDevice) { m_bOwnedBitmap = TRUE; - CFX_DIBitmap* pBitmap = FX_NEW CFX_DIBitmap; + CFX_DIBitmap* pBitmap = new CFX_DIBitmap; if (!pBitmap->Create(width, height, format)) { delete pBitmap; return FALSE; } SetBitmap(pBitmap); - CFX_SkiaDeviceDriver* pDriver = FX_NEW CFX_SkiaDeviceDriver(pBitmap, dither_bits, FALSE, pOriDevice, FALSE); + CFX_SkiaDeviceDriver* pDriver = new CFX_SkiaDeviceDriver(pBitmap, dither_bits, FALSE, pOriDevice, FALSE); SetDeviceDriver(pDriver); return TRUE; } @@ -528,4 +528,4 @@ CFX_SkiaDevice::~CFX_SkiaDevice() if (m_bOwnedBitmap && GetBitmap()) delete GetBitmap(); } -#endif
\ No newline at end of file +#endif |