summaryrefslogtreecommitdiff
path: root/core/src/fxge/win32/fx_win32_dwrite.cpp
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-04-16 09:13:02 -0700
committerTom Sepez <tsepez@chromium.org>2015-04-16 09:13:02 -0700
commit3f754d483e257f0d373be28a64b58620b4e0953f (patch)
tree51dbd10bcfc25572ab5a6a70eba2eab0f6bf3131 /core/src/fxge/win32/fx_win32_dwrite.cpp
parent026623249c78ba305c874cc093a035ef5a4cd1b4 (diff)
downloadpdfium-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/win32/fx_win32_dwrite.cpp')
-rw-r--r--core/src/fxge/win32/fx_win32_dwrite.cpp13
1 files changed, 3 insertions, 10 deletions
diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp
index 1ad4f8c457..7a17c4ad09 100644
--- a/core/src/fxge/win32/fx_win32_dwrite.cpp
+++ b/core/src/fxge/win32/fx_win32_dwrite.cpp
@@ -57,8 +57,7 @@ public:
static IDWriteFontFileLoader* GetLoader()
{
if (instance_ == NULL) {
- instance_ = FX_NEW CDwFontFileLoader();
- return instance_;
+ instance_ = new CDwFontFileLoader();
}
return instance_;
}
@@ -209,10 +208,7 @@ FX_BOOL CDWriteExt::DwCreateRenderingTarget(CFX_DIBitmap* pBitmap, void** render
if (FAILED(hr)) {
goto failed;
}
- *(CDwGdiTextRenderer**)renderTarget = FX_NEW CDwGdiTextRenderer(pBitmap, pBitmapRenderTarget, pRenderingParams);
- if (*(CDwGdiTextRenderer**)renderTarget == NULL) {
- goto failed;
- }
+ *(CDwGdiTextRenderer**)renderTarget = new CDwGdiTextRenderer(pBitmap, pBitmapRenderTarget, pRenderingParams);
SafeRelease(&pGdiInterop);
SafeRelease(&pBitmapRenderTarget);
SafeRelease(&pRenderingParams);
@@ -372,10 +368,7 @@ HRESULT STDMETHODCALLTYPE CDwFontFileLoader::CreateStreamFromKey(
)
{
*fontFileStream = NULL;
- CDwFontFileStream* stream = FX_NEW CDwFontFileStream(fontFileReferenceKey, fontFileReferenceKeySize);
- if (stream == NULL) {
- return E_OUTOFMEMORY;
- }
+ CDwFontFileStream* stream = new CDwFontFileStream(fontFileReferenceKey, fontFileReferenceKeySize);
if (!stream->IsInitialized()) {
delete stream;
return E_FAIL;