Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(503)

Side by Side Diff: core/src/fxge/win32/fx_win32_dwrite.cpp

Issue 1529553003: Merge to XFA: Get rid of most instance of 'foo != NULL' (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "core/include/fxge/fx_ge.h" 7 #include "core/include/fxge/fx_ge.h"
8 8
9 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ 9 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
10 #include <dwrite.h> 10 #include <dwrite.h>
11 11
12 #include "core/include/fxge/fx_ge_win32.h" 12 #include "core/include/fxge/fx_ge_win32.h"
13 #include "dwrite_int.h" 13 #include "dwrite_int.h"
14 14
15 typedef HRESULT(__stdcall* FuncType_DWriteCreateFactory)( 15 typedef HRESULT(__stdcall* FuncType_DWriteCreateFactory)(
16 __in DWRITE_FACTORY_TYPE, 16 __in DWRITE_FACTORY_TYPE,
17 __in REFIID, 17 __in REFIID,
18 __out IUnknown**); 18 __out IUnknown**);
19 template <typename InterfaceType> 19 template <typename InterfaceType>
20 inline void SafeRelease(InterfaceType** currentObject) { 20 inline void SafeRelease(InterfaceType** currentObject) {
21 if (*currentObject != NULL) { 21 if (*currentObject) {
22 (*currentObject)->Release(); 22 (*currentObject)->Release();
23 *currentObject = NULL; 23 *currentObject = NULL;
24 } 24 }
25 } 25 }
26 template <typename InterfaceType> 26 template <typename InterfaceType>
27 inline InterfaceType* SafeAcquire(InterfaceType* newObject) { 27 inline InterfaceType* SafeAcquire(InterfaceType* newObject) {
28 if (newObject != NULL) { 28 if (newObject) {
29 newObject->AddRef(); 29 newObject->AddRef();
30 } 30 }
31 return newObject; 31 return newObject;
32 } 32 }
33 class CDwFontFileStream final : public IDWriteFontFileStream { 33 class CDwFontFileStream final : public IDWriteFontFileStream {
34 public: 34 public:
35 explicit CDwFontFileStream(void const* fontFileReferenceKey, 35 explicit CDwFontFileStream(void const* fontFileReferenceKey,
36 UINT32 fontFileReferenceKeySize); 36 UINT32 fontFileReferenceKeySize);
37 virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, 37 virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid,
38 void** ppvObject); 38 void** ppvObject);
(...skipping 362 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 textColor); 401 textColor);
402 if (FAILED(hr)) { 402 if (FAILED(hr)) {
403 return hr; 403 return hr;
404 } 404 }
405 pBitmap_->CompositeBitmap(text_bbox.left, text_bbox.top, text_bbox.Width(), 405 pBitmap_->CompositeBitmap(text_bbox.left, text_bbox.top, text_bbox.Width(),
406 text_bbox.Height(), &dib, text_bbox.left, 406 text_bbox.Height(), &dib, text_bbox.left,
407 text_bbox.top, FXDIB_BLEND_NORMAL, pClipRgn); 407 text_bbox.top, FXDIB_BLEND_NORMAL, pClipRgn);
408 return hr; 408 return hr;
409 } 409 }
410 #endif 410 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698