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

Side by Side Diff: core/src/fxge/apple/fx_quartz_device.cpp

Issue 1439223003: Merge to XFA: Remove relative includes. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@xfa
Patch Set: fix merge Created 5 years, 1 month 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/src/fxge/apple/fx_apple_platform.cpp ('k') | core/src/fxge/ge/fx_ge_fontmap.cpp » ('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 #include "../dib/dib_int.h"
8 #include "../ge/text_int.h"
9 #include "core/include/fxcrt/fx_ext.h" 7 #include "core/include/fxcrt/fx_ext.h"
10 #include "core/include/fxge/fx_freetype.h" 8 #include "core/include/fxge/fx_freetype.h"
11 #include "core/include/fxge/fx_ge.h" 9 #include "core/include/fxge/fx_ge.h"
12 #include "core/src/fxge/agg/include/fx_agg_driver.h" 10 #include "core/src/fxge/agg/include/fx_agg_driver.h"
11 #include "core/src/fxge/dib/dib_int.h"
12 #include "core/src/fxge/ge/text_int.h"
13 13
14 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ 14 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
15 #include "apple_int.h" 15 #include "apple_int.h"
16 #include "core/include/fxge/fx_ge_apple.h" 16 #include "core/include/fxge/fx_ge_apple.h"
17 #ifndef CGFLOAT_IS_DOUBLE 17 #ifndef CGFLOAT_IS_DOUBLE
18 #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers 18 #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers
19 #endif 19 #endif
20 20
21 void* CQuartz2D::createGraphics(CFX_DIBitmap* pBitmap) { 21 void* CQuartz2D::createGraphics(CFX_DIBitmap* pBitmap) {
22 if (!pBitmap) { 22 if (!pBitmap) {
(...skipping 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 } 1042 }
1043 CFX_DIBitmap* pBitmap = new CFX_DIBitmap; 1043 CFX_DIBitmap* pBitmap = new CFX_DIBitmap;
1044 if (!pBitmap->Create(width, height, format)) { 1044 if (!pBitmap->Create(width, height, format)) {
1045 delete pBitmap; 1045 delete pBitmap;
1046 return FALSE; 1046 return FALSE;
1047 } 1047 }
1048 m_bOwnedBitmap = TRUE; 1048 m_bOwnedBitmap = TRUE;
1049 return Attach(pBitmap); 1049 return Attach(pBitmap);
1050 } 1050 }
1051 #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ 1051 #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
OLDNEW
« no previous file with comments | « core/src/fxge/apple/fx_apple_platform.cpp ('k') | core/src/fxge/ge/fx_ge_fontmap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698