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

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

Issue 2223213002: Refactor fx_ge part 3 (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Created 4 years, 4 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"
8
9 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_ 7 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
dsinclair 2016/08/09 14:14:35 fx_system.h
npm 2016/08/09 16:26:12 Done.
10 #include <windows.h> 8 #include <windows.h>
11 #include <algorithm> 9 #include <algorithm>
12 10
13 namespace Gdiplus { 11 namespace Gdiplus {
14 using std::min; 12 using std::min;
15 using std::max; 13 using std::max;
16 } // namespace Gdiplus 14 } // namespace Gdiplus
17 15
18 #include <gdiplus.h> 16 #include <gdiplus.h>
19 17
20 #include "core/fxge/include/cfx_gemodule.h" 18 #include "core/fxge/include/cfx_gemodule.h"
19 #include "core/fxge/include/cfx_graphstatedata.h"
21 #include "core/fxge/include/cfx_pathdata.h" 20 #include "core/fxge/include/cfx_pathdata.h"
22 #include "core/fxge/win32/cfx_windowsdib.h" 21 #include "core/fxge/win32/cfx_windowsdib.h"
23 #include "core/fxge/win32/win32_int.h" 22 #include "core/fxge/win32/win32_int.h"
24 23
25 using namespace Gdiplus; // NOLINT 24 using namespace Gdiplus; // NOLINT
26 using namespace Gdiplus::DllExports; // NOLINT 25 using namespace Gdiplus::DllExports; // NOLINT
27 26
28 #define GdiFillType2Gdip(fill_type) \ 27 #define GdiFillType2Gdip(fill_type) \
29 (fill_type == ALTERNATE ? FillModeAlternate : FillModeWinding) 28 (fill_type == ALTERNATE ? FillModeAlternate : FillModeWinding)
30 29
(...skipping 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after
1517 dest_pitch); 1516 dest_pitch);
1518 } 1517 }
1519 } 1518 }
1520 CFX_DIBitmap* pDIBitmap = _FX_WindowsDIB_LoadFromBuf( 1519 CFX_DIBitmap* pDIBitmap = _FX_WindowsDIB_LoadFromBuf(
1521 pInfo->pbmi, pData, pInfo->pbmi->bmiHeader.biBitCount == 32); 1520 pInfo->pbmi, pData, pInfo->pbmi->bmiHeader.biBitCount == 32);
1522 FX_Free(pData); 1521 FX_Free(pData);
1523 FreeDIBitmap(pInfo); 1522 FreeDIBitmap(pInfo);
1524 return pDIBitmap; 1523 return pDIBitmap;
1525 } 1524 }
1526 #endif 1525 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698