From b9c3e2712f75363372622282023143b86b72f2df Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 14 Aug 2018 18:22:06 +0000 Subject: Remove more default arg = nullptr cases. Bring in line with standards. Remove argument entirely for mac code that is always nullptr. Change-Id: I0710bdbd51fc0bc2e1d428ef44976be39a631147 Reviewed-on: https://pdfium-review.googlesource.com/40091 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fxge/apple/apple_int.h | 3 +-- core/fxge/apple/fx_apple_platform.cpp | 6 +++--- core/fxge/apple/fx_quartz_device.cpp | 12 +++--------- 3 files changed, 7 insertions(+), 14 deletions(-) (limited to 'core/fxge/apple') diff --git a/core/fxge/apple/apple_int.h b/core/fxge/apple/apple_int.h index d57989180d..e84387a3c8 100644 --- a/core/fxge/apple/apple_int.h +++ b/core/fxge/apple/apple_int.h @@ -31,8 +31,7 @@ class CQuartz2D { uint16_t* glyphIndices, CGPoint* glyphPositions, int32_t chars, - FX_ARGB argb, - CFX_Matrix* matrix = nullptr); + FX_ARGB argb); void saveGraphicsState(void* graphics); void restoreGraphicsState(void* graphics); }; diff --git a/core/fxge/apple/fx_apple_platform.cpp b/core/fxge/apple/fx_apple_platform.cpp index 3c1e4d7766..cafe44730c 100644 --- a/core/fxge/apple/fx_apple_platform.cpp +++ b/core/fxge/apple/fx_apple_platform.cpp @@ -76,9 +76,9 @@ bool CGDrawGlyphRun(CGContextRef pContext, new_matrix.d = -new_matrix.d; } quartz2d.setGraphicsTextMatrix(pContext, &new_matrix); - return quartz2d.drawGraphicsString( - pContext, pFont->GetPlatformFont(), font_size, glyph_indices.data(), - glyph_positions.data(), nChars, argb, nullptr); + return quartz2d.drawGraphicsString(pContext, pFont->GetPlatformFont(), + font_size, glyph_indices.data(), + glyph_positions.data(), nChars, argb); } } // namespace diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp index 709f201f8a..62b9b9e618 100644 --- a/core/fxge/apple/fx_quartz_device.cpp +++ b/core/fxge/apple/fx_quartz_device.cpp @@ -79,20 +79,14 @@ bool CQuartz2D::drawGraphicsString(void* graphics, uint16_t* glyphIndices, CGPoint* glyphPositions, int32_t charsCount, - FX_ARGB argb, - CFX_Matrix* matrix) { + FX_ARGB argb) { if (!graphics) return false; + CGContextRef context = (CGContextRef)graphics; CGContextSetFont(context, (CGFontRef)font); CGContextSetFontSize(context, fontSize); - if (matrix) { - CGAffineTransform m = CGContextGetTextMatrix(context); - m = CGAffineTransformConcat( - m, CGAffineTransformMake(matrix->a, matrix->b, matrix->c, matrix->d, - matrix->e, matrix->f)); - CGContextSetTextMatrix(context, m); - } + int32_t a; int32_t r; int32_t g; -- cgit v1.2.3