diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-10-16 14:18:50 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-10-16 14:18:50 -0700 |
commit | 24e733ef26280268ac6ede6d73fac7475aedd1a9 (patch) | |
tree | b067396d52855d4e7a63d040fd99029f76ac6b94 /core/src/fxge/win32/fx_win32_dwrite.cpp | |
parent | db0be96179f0cd5f1787564cbccf86320a4d54ae (diff) | |
download | pdfium-24e733ef26280268ac6ede6d73fac7475aedd1a9.tar.xz |
fxcrt convergence - XFA side.
Take extern tables portion only of fx_bidi change.
Take itoa fixes and corresponding unit test.
Merge typo in skia font mgr.
Kill some null checks after new.
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1409223002 .
Diffstat (limited to 'core/src/fxge/win32/fx_win32_dwrite.cpp')
-rw-r--r-- | core/src/fxge/win32/fx_win32_dwrite.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/core/src/fxge/win32/fx_win32_dwrite.cpp b/core/src/fxge/win32/fx_win32_dwrite.cpp index 845eb14576..5a3c16c2af 100644 --- a/core/src/fxge/win32/fx_win32_dwrite.cpp +++ b/core/src/fxge/win32/fx_win32_dwrite.cpp @@ -64,7 +64,6 @@ class CDwFontFileLoader final : public IDWriteFontFileLoader { static IDWriteFontFileLoader* GetLoader() { if (instance_ == NULL) { instance_ = new CDwFontFileLoader(); - return instance_; } return instance_; } @@ -191,9 +190,6 @@ FX_BOOL CDWriteExt::DwCreateRenderingTarget(CFX_DIBitmap* pBitmap, } *(CDwGdiTextRenderer**)renderTarget = new CDwGdiTextRenderer(pBitmap, pBitmapRenderTarget, pRenderingParams); - if (*(CDwGdiTextRenderer**)renderTarget == NULL) { - goto failed; - } SafeRelease(&pGdiInterop); SafeRelease(&pBitmapRenderTarget); SafeRelease(&pRenderingParams); |