fxcrt convergence - XFA side.

core/src/fxge/win32/fx_win32_dwrite.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../include/fxge/fx_ge.h"
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include "../../../include/fxge/fx_ge_win32.h"
 #include "dwrite_int.h"
@@ skipping 46 matching lines @@
   virtual ULONG STDMETHODCALLTYPE AddRef();
   virtual ULONG STDMETHODCALLTYPE Release();
   virtual HRESULT STDMETHODCALLTYPE
   CreateStreamFromKey(void const* fontFileReferenceKey,
                       UINT32 fontFileReferenceKeySize,
                       OUT IDWriteFontFileStream** fontFileStream);
 
   static IDWriteFontFileLoader* GetLoader() {
     if (instance_ == NULL) {
       instance_ = new CDwFontFileLoader();
-      return instance_;
     }
     return instance_;
   }
   static bool IsLoaderInitialized() { return instance_ != NULL; }
 
  private:
   CDwFontFileLoader();
   ULONG refCount_;
   static IDWriteFontFileLoader* instance_;
 };
@@ skipping 106 matching lines @@
       DWRITE_RENDERING_MODE_DEFAULT, &pRenderingParams);
   if (FAILED(hr)) {
     goto failed;
   }
   hr = pBitmapRenderTarget->SetPixelsPerDip(1.0f);
   if (FAILED(hr)) {
     goto failed;
   }
   *(CDwGdiTextRenderer**)renderTarget =
       new CDwGdiTextRenderer(pBitmap, pBitmapRenderTarget, pRenderingParams);
-  if (*(CDwGdiTextRenderer**)renderTarget == NULL) {
-    goto failed;
-  }
   SafeRelease(&pGdiInterop);
   SafeRelease(&pBitmapRenderTarget);
   SafeRelease(&pRenderingParams);
   return TRUE;
 failed:
   SafeRelease(&pGdiInterop);
   SafeRelease(&pBitmapRenderTarget);
   SafeRelease(&pRenderingParams);
   return FALSE;
 }
@@ skipping 195 matching lines @@
                                     textColor);
   if (FAILED(hr)) {
     return hr;
   }
   pBitmap_->CompositeBitmap(text_bbox.left, text_bbox.top, text_bbox.Width(),
                             text_bbox.Height(), &dib, text_bbox.left,
                             text_bbox.top, FXDIB_BLEND_NORMAL, pClipRgn);
   return hr;
 }
 #endif