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

Side by Side Diff: core/fxge/include/fx_ge_win32.h

Issue 2032613003: Get rid of NULLs in core/ (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: Fix a bad merge 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
« no previous file with comments | « core/fxge/include/fx_ge.h ('k') | core/fxge/skia/fx_skia_device.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CORE_FXGE_INCLUDE_FX_GE_WIN32_H_ 7 #ifndef CORE_FXGE_INCLUDE_FX_GE_WIN32_H_
8 #define CORE_FXGE_INCLUDE_FX_GE_WIN32_H_ 8 #define CORE_FXGE_INCLUDE_FX_GE_WIN32_H_
9 9
10 #ifdef _WIN32 10 #ifdef _WIN32
(...skipping 15 matching lines...) Expand all
26 class CFX_WindowsDIB : public CFX_DIBitmap { 26 class CFX_WindowsDIB : public CFX_DIBitmap {
27 public: 27 public:
28 static CFX_ByteString GetBitmapInfo(const CFX_DIBitmap* pBitmap); 28 static CFX_ByteString GetBitmapInfo(const CFX_DIBitmap* pBitmap);
29 29
30 static CFX_DIBitmap* LoadFromBuf(BITMAPINFO* pbmi, void* pData); 30 static CFX_DIBitmap* LoadFromBuf(BITMAPINFO* pbmi, void* pData);
31 31
32 static HBITMAP GetDDBitmap(const CFX_DIBitmap* pBitmap, HDC hDC); 32 static HBITMAP GetDDBitmap(const CFX_DIBitmap* pBitmap, HDC hDC);
33 33
34 static CFX_DIBitmap* LoadFromDDB(HDC hDC, 34 static CFX_DIBitmap* LoadFromDDB(HDC hDC,
35 HBITMAP hBitmap, 35 HBITMAP hBitmap,
36 uint32_t* pPalette = NULL, 36 uint32_t* pPalette = nullptr,
37 uint32_t size = 256); 37 uint32_t size = 256);
38 38
39 static CFX_DIBitmap* LoadFromFile(const FX_WCHAR* filename); 39 static CFX_DIBitmap* LoadFromFile(const FX_WCHAR* filename);
40 40
41 static CFX_DIBitmap* LoadFromFile(const FX_CHAR* filename) { 41 static CFX_DIBitmap* LoadFromFile(const FX_CHAR* filename) {
42 return LoadFromFile(CFX_WideString::FromLocal(filename).c_str()); 42 return LoadFromFile(CFX_WideString::FromLocal(filename).c_str());
43 } 43 }
44 44
45 static CFX_DIBitmap* LoadDIBitmap(WINDIB_Open_Args_ args); 45 static CFX_DIBitmap* LoadDIBitmap(WINDIB_Open_Args_ args);
46 46
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 protected: 84 protected:
85 HBITMAP m_hBitmap; 85 HBITMAP m_hBitmap;
86 86
87 HBITMAP m_hOldBitmap; 87 HBITMAP m_hOldBitmap;
88 88
89 HDC m_hDC; 89 HDC m_hDC;
90 }; 90 };
91 #endif 91 #endif
92 92
93 #endif // CORE_FXGE_INCLUDE_FX_GE_WIN32_H_ 93 #endif // CORE_FXGE_INCLUDE_FX_GE_WIN32_H_
OLDNEW
« no previous file with comments | « core/fxge/include/fx_ge.h ('k') | core/fxge/skia/fx_skia_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698