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

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

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Git rid of comparisons against NULL Created 4 years, 6 months 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/fxge/include/fx_ge.h" 7 #include "core/fxge/include/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>
(...skipping 28 matching lines...) Expand all
39 virtual ULONG STDMETHODCALLTYPE AddRef(); 39 virtual ULONG STDMETHODCALLTYPE AddRef();
40 virtual ULONG STDMETHODCALLTYPE Release(); 40 virtual ULONG STDMETHODCALLTYPE Release();
41 virtual HRESULT STDMETHODCALLTYPE 41 virtual HRESULT STDMETHODCALLTYPE
42 ReadFileFragment(void const** fragmentStart, 42 ReadFileFragment(void const** fragmentStart,
43 UINT64 fileOffset, 43 UINT64 fileOffset,
44 UINT64 fragmentSize, 44 UINT64 fragmentSize,
45 OUT void** fragmentContext); 45 OUT void** fragmentContext);
46 virtual void STDMETHODCALLTYPE ReleaseFileFragment(void* fragmentContext); 46 virtual void STDMETHODCALLTYPE ReleaseFileFragment(void* fragmentContext);
47 virtual HRESULT STDMETHODCALLTYPE GetFileSize(OUT UINT64* fileSize); 47 virtual HRESULT STDMETHODCALLTYPE GetFileSize(OUT UINT64* fileSize);
48 virtual HRESULT STDMETHODCALLTYPE GetLastWriteTime(OUT UINT64* lastWriteTime); 48 virtual HRESULT STDMETHODCALLTYPE GetLastWriteTime(OUT UINT64* lastWriteTime);
49 bool IsInitialized() { return resourcePtr_ != NULL; } 49 bool IsInitialized() { return !!resourcePtr_; }
50 50
51 private: 51 private:
52 ULONG refCount_; 52 ULONG refCount_;
53 void const* resourcePtr_; 53 void const* resourcePtr_;
54 DWORD resourceSize_; 54 DWORD resourceSize_;
55 }; 55 };
56 class CDwFontFileLoader final : public IDWriteFontFileLoader { 56 class CDwFontFileLoader final : public IDWriteFontFileLoader {
57 public: 57 public:
58 virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid, 58 virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID iid,
59 void** ppvObject); 59 void** ppvObject);
60 virtual ULONG STDMETHODCALLTYPE AddRef(); 60 virtual ULONG STDMETHODCALLTYPE AddRef();
61 virtual ULONG STDMETHODCALLTYPE Release(); 61 virtual ULONG STDMETHODCALLTYPE Release();
62 virtual HRESULT STDMETHODCALLTYPE 62 virtual HRESULT STDMETHODCALLTYPE
63 CreateStreamFromKey(void const* fontFileReferenceKey, 63 CreateStreamFromKey(void const* fontFileReferenceKey,
64 UINT32 fontFileReferenceKeySize, 64 UINT32 fontFileReferenceKeySize,
65 OUT IDWriteFontFileStream** fontFileStream); 65 OUT IDWriteFontFileStream** fontFileStream);
66 66
67 static IDWriteFontFileLoader* GetLoader() { 67 static IDWriteFontFileLoader* GetLoader() {
68 if (!instance_) { 68 if (!instance_) {
69 instance_ = new CDwFontFileLoader(); 69 instance_ = new CDwFontFileLoader();
70 } 70 }
71 return instance_; 71 return instance_;
72 } 72 }
73 static bool IsLoaderInitialized() { return instance_ != NULL; } 73 static bool IsLoaderInitialized() { return !!instance_; }
74 74
75 private: 75 private:
76 CDwFontFileLoader(); 76 CDwFontFileLoader();
77 ULONG refCount_; 77 ULONG refCount_;
78 static IDWriteFontFileLoader* instance_; 78 static IDWriteFontFileLoader* instance_;
79 }; 79 };
80 class CDwFontContext { 80 class CDwFontContext {
81 public: 81 public:
82 CDwFontContext(IDWriteFactory* dwriteFactory); 82 CDwFontContext(IDWriteFactory* dwriteFactory);
83 ~CDwFontContext(); 83 ~CDwFontContext();
(...skipping 317 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