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

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

Issue 1171733003: Remove typdefs for pointer types in fx_system.h (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Manual fixes. Created 5 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/include/fxge/fx_ge.h ('k') | core/include/reflow/fpdf_layout.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_INCLUDE_FXGE_FX_GE_WIN32_H_ 7 #ifndef CORE_INCLUDE_FXGE_FX_GE_WIN32_H_
8 #define CORE_INCLUDE_FXGE_FX_GE_WIN32_H_ 8 #define CORE_INCLUDE_FXGE_FX_GE_WIN32_H_
9 9
10 #ifdef _WIN32 10 #ifdef _WIN32
11 #ifndef _WINDOWS_ 11 #ifndef _WINDOWS_
12 #include <windows.h> 12 #include <windows.h>
13 #endif 13 #endif
14 #define WINDIB_OPEN_MEMORY 0x1 14 #define WINDIB_OPEN_MEMORY 0x1
15 #define WINDIB_OPEN_PATHNAME 0x2 15 #define WINDIB_OPEN_PATHNAME 0x2
16 typedef struct WINDIB_Open_Args_ { 16 typedef struct WINDIB_Open_Args_ {
17 17
18 int flags; 18 int flags;
19 19
20 const uint8_t* memory_base; 20 const uint8_t* memory_base;
21 21
22 size_t memory_size; 22 size_t memory_size;
23 23
24 FX_LPCWSTR path_name; 24 const FX_WCHAR* path_name;
25 } WINDIB_Open_Args_; 25 } WINDIB_Open_Args_;
26 class CFX_WindowsDIB : public CFX_DIBitmap 26 class CFX_WindowsDIB : public CFX_DIBitmap
27 { 27 {
28 public: 28 public:
29 29
30 static CFX_ByteString GetBitmapInfo(const CFX_DIBitmap* pBitmap); 30 static CFX_ByteString GetBitmapInfo(const CFX_DIBitmap* pBitmap);
31 31
32 static CFX_DIBitmap* LoadFromBuf(BITMAPINFO* pbmi, void* pData); 32 static CFX_DIBitmap* LoadFromBuf(BITMAPINFO* pbmi, void* pData);
33 33
34 static HBITMAP GetDDBitmap(const CFX_DIBitmap* pBitmap, HDC hDC ); 34 static HBITMAP GetDDBitmap(const CFX_DIBitmap* pBitmap, HDC hDC );
35 35
36 static CFX_DIBitmap* LoadFromDDB(HDC hDC, HBITMAP hBitmap, FX_DWORD* pPalett e = NULL, FX_DWORD size = 256); 36 static CFX_DIBitmap* LoadFromDDB(HDC hDC, HBITMAP hBitmap, FX_DWORD* pPalett e = NULL, FX_DWORD size = 256);
37 37
38 static CFX_DIBitmap* LoadFromFile(FX_LPCWSTR filename); 38 static CFX_DIBitmap* LoadFromFile(const FX_WCHAR* filename);
39 39
40 static CFX_DIBitmap* LoadFromFile(FX_LPCSTR filename) 40 static CFX_DIBitmap* LoadFromFile(const FX_CHAR* filename)
41 { 41 {
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
47 CFX_WindowsDIB(HDC hDC, int width, int height); 47 CFX_WindowsDIB(HDC hDC, int width, int height);
48 48
49 ~CFX_WindowsDIB(); 49 ~CFX_WindowsDIB();
50 50
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 HBITMAP m_hBitmap; 99 HBITMAP m_hBitmap;
100 100
101 HBITMAP m_hOldBitmap; 101 HBITMAP m_hOldBitmap;
102 102
103 HDC m_hDC; 103 HDC m_hDC;
104 }; 104 };
105 #endif 105 #endif
106 106
107 #endif // CORE_INCLUDE_FXGE_FX_GE_WIN32_H_ 107 #endif // CORE_INCLUDE_FXGE_FX_GE_WIN32_H_
OLDNEW
« no previous file with comments | « core/include/fxge/fx_ge.h ('k') | core/include/reflow/fpdf_layout.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698