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

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

Issue 2386273004: Add ptr_util.h from base until std::make_unique<> available (Closed)
Patch Set: 2016 Created 4 years, 2 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_engine.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/fx_ext.h" 7 #include "core/fxcrt/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/fx_memory.h" 13 #include "core/fxcrt/fx_memory.h"
14 #include "core/fxge/cfx_gemodule.h" 14 #include "core/fxge/cfx_gemodule.h"
15 #include "core/fxge/cfx_graphstatedata.h" 15 #include "core/fxge/cfx_graphstatedata.h"
16 #include "core/fxge/cfx_pathdata.h" 16 #include "core/fxge/cfx_pathdata.h"
17 #include "core/fxge/cfx_renderdevice.h" 17 #include "core/fxge/cfx_renderdevice.h"
18 #include "core/fxge/dib/dib_int.h" 18 #include "core/fxge/dib/dib_int.h"
19 #include "core/fxge/fx_freetype.h" 19 #include "core/fxge/fx_freetype.h"
20 #include "core/fxge/ge/fx_text_int.h" 20 #include "core/fxge/ge/fx_text_int.h"
21 #include "third_party/base/ptr_util.h"
21 22
22 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ 23 #if _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_
23 #include "core/fxge/apple/apple_int.h" 24 #include "core/fxge/apple/apple_int.h"
24 #include "core/fxge/apple/cfx_quartzdevice.h" 25 #include "core/fxge/apple/cfx_quartzdevice.h"
25 #ifndef CGFLOAT_IS_DOUBLE 26 #ifndef CGFLOAT_IS_DOUBLE
26 #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers 27 #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers
27 #endif 28 #endif
28 29
29 void* CQuartz2D::createGraphics(CFX_DIBitmap* pBitmap) { 30 void* CQuartz2D::createGraphics(CFX_DIBitmap* pBitmap) {
30 if (!pBitmap) { 31 if (!pBitmap) {
(...skipping 983 matching lines...) Expand 10 before | Expand all | Expand 10 after
1014 CGContextRef CFX_QuartzDevice::GetContext() { 1015 CGContextRef CFX_QuartzDevice::GetContext() {
1015 return m_pContext; 1016 return m_pContext;
1016 } 1017 }
1017 FX_BOOL CFX_QuartzDevice::Attach(CGContextRef context, int32_t nDeviceClass) { 1018 FX_BOOL CFX_QuartzDevice::Attach(CGContextRef context, int32_t nDeviceClass) {
1018 if (m_pContext) { 1019 if (m_pContext) {
1019 CGContextRelease(m_pContext); 1020 CGContextRelease(m_pContext);
1020 } 1021 }
1021 m_pContext = context; 1022 m_pContext = context;
1022 CGContextRetain(m_pContext); 1023 CGContextRetain(m_pContext);
1023 SetDeviceDriver( 1024 SetDeviceDriver(
1024 WrapUnique(new CFX_QuartzDeviceDriver(m_pContext, nDeviceClass))); 1025 pdfium::MakeUnique<CFX_QuartzDeviceDriver>(m_pContext, nDeviceClass));
1025 return TRUE; 1026 return TRUE;
1026 } 1027 }
1027 1028
1028 FX_BOOL CFX_QuartzDevice::Attach(CFX_DIBitmap* pBitmap) { 1029 FX_BOOL CFX_QuartzDevice::Attach(CFX_DIBitmap* pBitmap) {
1029 SetBitmap(pBitmap); 1030 SetBitmap(pBitmap);
1030 m_pContext = createContextWithBitmap(pBitmap); 1031 m_pContext = createContextWithBitmap(pBitmap);
1031 if (!m_pContext) 1032 if (!m_pContext)
1032 return FALSE; 1033 return FALSE;
1033 1034
1034 SetDeviceDriver( 1035 SetDeviceDriver(
1035 WrapUnique(new CFX_QuartzDeviceDriver(m_pContext, FXDC_DISPLAY))); 1036 pdfium::MakeUnique<CFX_QuartzDeviceDriver>(m_pContext, FXDC_DISPLAY));
1036 return TRUE; 1037 return TRUE;
1037 } 1038 }
1038 1039
1039 FX_BOOL CFX_QuartzDevice::Create(int32_t width, 1040 FX_BOOL CFX_QuartzDevice::Create(int32_t width,
1040 int32_t height, 1041 int32_t height,
1041 FXDIB_Format format) { 1042 FXDIB_Format format) {
1042 if ((uint8_t)format < 32) { 1043 if ((uint8_t)format < 32) {
1043 return FALSE; 1044 return FALSE;
1044 } 1045 }
1045 std::unique_ptr<CFX_DIBitmap> pBitmap(new CFX_DIBitmap); 1046 std::unique_ptr<CFX_DIBitmap> pBitmap(new CFX_DIBitmap);
1046 if (!pBitmap->Create(width, height, format)) 1047 if (!pBitmap->Create(width, height, format))
1047 return FALSE; 1048 return FALSE;
1048 m_bOwnedBitmap = TRUE; 1049 m_bOwnedBitmap = TRUE;
1049 return Attach(pBitmap.release()); 1050 return Attach(pBitmap.release());
1050 } 1051 }
1051 #endif // _FXM_PLATFORM_ == _FXM_PLATFORM_APPLE_ 1052 #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_engine.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698