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

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

Issue 2163103002: Use smart pointers for graphics device classes (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: fix all platforms Created 4 years, 5 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/agg/fx_agg_driver.cpp ('k') | core/fxge/dib/fx_dib_main.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 "core/fxcrt/include/fx_ext.h" 7 #include "core/fxcrt/include/fx_ext.h"
8 8
9 #ifndef _SKIA_SUPPORT_ 9 #ifndef _SKIA_SUPPORT_
10 #include "core/fxge/agg/fx_agg_driver.h" 10 #include "core/fxge/agg/fx_agg_driver.h"
11 #endif 11 #endif
12 12
13 #include "core/fxcrt/include/fx_memory.h"
13 #include "core/fxge/dib/dib_int.h" 14 #include "core/fxge/dib/dib_int.h"
14 #include "core/fxge/ge/fx_text_int.h" 15 #include "core/fxge/ge/fx_text_int.h"
15 #include "core/fxge/include/fx_freetype.h" 16 #include "core/fxge/include/fx_freetype.h"
16 #include "core/fxge/include/fx_ge.h" 17 #include "core/fxge/include/fx_ge.h"
17 18
18 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ 19 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
19 #include "core/fxge/apple/apple_int.h" 20 #include "core/fxge/apple/apple_int.h"
20 #include "core/fxge/include/fx_ge_apple.h" 21 #include "core/fxge/include/fx_ge_apple.h"
21 #ifndef CGFLOAT_IS_DOUBLE 22 #ifndef CGFLOAT_IS_DOUBLE
22 #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers 23 #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers
(...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after
1011 } 1012 }
1012 CGContextRef CFX_QuartzDevice::GetContext() { 1013 CGContextRef CFX_QuartzDevice::GetContext() {
1013 return m_pContext; 1014 return m_pContext;
1014 } 1015 }
1015 FX_BOOL CFX_QuartzDevice::Attach(CGContextRef context, int32_t nDeviceClass) { 1016 FX_BOOL CFX_QuartzDevice::Attach(CGContextRef context, int32_t nDeviceClass) {
1016 if (m_pContext) { 1017 if (m_pContext) {
1017 CGContextRelease(m_pContext); 1018 CGContextRelease(m_pContext);
1018 } 1019 }
1019 m_pContext = context; 1020 m_pContext = context;
1020 CGContextRetain(m_pContext); 1021 CGContextRetain(m_pContext);
1021 IFX_RenderDeviceDriver* pDriver = 1022 SetDeviceDriver(
1022 new CFX_QuartzDeviceDriver(m_pContext, nDeviceClass); 1023 WrapUnique(new CFX_QuartzDeviceDriver(m_pContext, nDeviceClass)));
1023 SetDeviceDriver(pDriver);
1024 return TRUE; 1024 return TRUE;
1025 } 1025 }
1026
1026 FX_BOOL CFX_QuartzDevice::Attach(CFX_DIBitmap* pBitmap) { 1027 FX_BOOL CFX_QuartzDevice::Attach(CFX_DIBitmap* pBitmap) {
1027 SetBitmap(pBitmap); 1028 SetBitmap(pBitmap);
1028 m_pContext = createContextWithBitmap(pBitmap); 1029 m_pContext = createContextWithBitmap(pBitmap);
1029 if (!m_pContext) 1030 if (!m_pContext)
1030 return FALSE; 1031 return FALSE;
1031 1032
1032 IFX_RenderDeviceDriver* pDriver = 1033 SetDeviceDriver(
1033 new CFX_QuartzDeviceDriver(m_pContext, FXDC_DISPLAY); 1034 WrapUnique(new CFX_QuartzDeviceDriver(m_pContext, FXDC_DISPLAY)));
1034 SetDeviceDriver(pDriver);
1035 return TRUE; 1035 return TRUE;
1036 } 1036 }
1037
1037 FX_BOOL CFX_QuartzDevice::Create(int32_t width, 1038 FX_BOOL CFX_QuartzDevice::Create(int32_t width,
1038 int32_t height, 1039 int32_t height,
1039 FXDIB_Format format) { 1040 FXDIB_Format format) {
1040 if ((uint8_t)format < 32) { 1041 if ((uint8_t)format < 32) {
1041 return FALSE; 1042 return FALSE;
1042 } 1043 }
1043 CFX_DIBitmap* pBitmap = new CFX_DIBitmap; 1044 std::unique_ptr<CFX_DIBitmap> pBitmap(new CFX_DIBitmap);
1044 if (!pBitmap->Create(width, height, format)) { 1045 if (!pBitmap->Create(width, height, format))
1045 delete pBitmap;
1046 return FALSE; 1046 return FALSE;
1047 }
1048 m_bOwnedBitmap = TRUE; 1047 m_bOwnedBitmap = TRUE;
1049 return Attach(pBitmap); 1048 return Attach(pBitmap.release());
1050 } 1049 }
1051 #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ 1050 #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
OLDNEW
« no previous file with comments | « core/fxge/agg/fx_agg_driver.cpp ('k') | core/fxge/dib/fx_dib_main.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698