commit 7346266252904103d3645ed5b4b778bf977170b5
author Lei Zhang <thestig@chromium.org> Wed Jul 03 01:27:36 2024 +0000
committer Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jul 03 01:27:36 2024 +0000
tree 98704be6f41701da6b7eaaac24e09d695eb9f211
parent ac123575c3b4b3408c281b0e0e42d51d1bfb44f8

Remove UNSAFE_TODO() in fxge/apple/fx_quartz_device.cpp

Switch to FixedSizeDataVector and Zip(). Also use Google-style variable
names throughout the file.

Bug: 42271176
Change-Id: I9e4e50e1dcf2edfe4a5504f9ff3e920dc0cabcf1
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/121411
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@google.com>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

core/fxge/apple/fx_quartz_device.cpp

diff --git a/core/fxge/apple/fx_quartz_device.cpp b/core/fxge/apple/fx_quartz_device.cpp
index c1dc537..a0757c2 100644
--- a/core/fxge/apple/fx_quartz_device.cpp
+++ b/core/fxge/apple/fx_quartz_device.cpp
@@ -8,8 +8,10 @@
 
 #include <CoreGraphics/CoreGraphics.h>
 
-#include "core/fxcrt/compiler_specific.h"
+#include "core/fxcrt/fixed_size_data_vector.h"
 #include "core/fxcrt/fx_extension.h"
+#include "core/fxcrt/fx_memory_wrappers.h"
+#include "core/fxcrt/zip.h"
 #include "core/fxge/cfx_graphstatedata.h"
 #include "core/fxge/cfx_path.h"
 #include "core/fxge/cfx_renderdevice.h"
@@ -19,6 +21,8 @@
 #error Expected CGFLOAT_IS_DOUBLE to be defined by CoreGraphics headers
 #endif
 
+FX_DATA_PARTITION_EXCEPTION(CGPoint);
+
 void* CQuartz2D::CreateGraphics(const RetainPtr<CFX_DIBitmap>& pBitmap) {
   if (!pBitmap)
     return nullptr;
@@ -44,19 +48,20 @@
     CGContextRelease((CGContextRef)graphics);
 }
 
-void* CQuartz2D::CreateFont(pdfium::span<const uint8_t> pFontData) {
-  CGDataProviderRef pDataProvider = CGDataProviderCreateWithData(
-      nullptr, pFontData.data(), pFontData.size(), nullptr);
-  if (!pDataProvider)
+void* CQuartz2D::CreateFont(pdfium::span<const uint8_t> font_data) {
+  CGDataProviderRef data_provider = CGDataProviderCreateWithData(
+      nullptr, font_data.data(), font_data.size(), nullptr);
+  if (!data_provider) {
     return nullptr;
+  }
 
-  CGFontRef pCGFont = CGFontCreateWithDataProvider(pDataProvider);
-  CGDataProviderRelease(pDataProvider);
-  return pCGFont;
+  CGFontRef cg_font = CGFontCreateWithDataProvider(data_provider);
+  CGDataProviderRelease(data_provider);
+  return cg_font;
 }
 
-void CQuartz2D::DestroyFont(void* pFont) {
-  CGFontRelease((CGFontRef)pFont);
+void CQuartz2D::DestroyFont(void* font) {
+  CGFontRelease((CGFontRef)font);
 }
 
 void CQuartz2D::SetGraphicsTextMatrix(void* graphics,
@@ -72,16 +77,16 @@
 
 bool CQuartz2D::DrawGraphicsString(void* graphics,
                                    void* font,
-                                   float fontSize,
-                                   pdfium::span<uint16_t> glyphIndices,
-                                   pdfium::span<CGPoint> glyphPositions,
+                                   float font_size,
+                                   pdfium::span<uint16_t> glyph_indices,
+                                   pdfium::span<CGPoint> glyph_positions,
                                    FX_ARGB argb) {
   if (!graphics)
     return false;
 
   CGContextRef context = (CGContextRef)graphics;
   CGContextSetFont(context, (CGFontRef)font);
-  CGContextSetFontSize(context, fontSize);
+  CGContextSetFontSize(context, font_size);
 
   int32_t a;
   int32_t r;
@@ -91,22 +96,20 @@
   CGContextSetRGBFillColor(context, r / 255.f, g / 255.f, b / 255.f, a / 255.f);
   CGContextSaveGState(context);
 #if CGFLOAT_IS_DOUBLE
-  CGPoint* glyphPositionsCG = new CGPoint[glyphPositions.size()];
-  UNSAFE_TODO({
-    for (size_t index = 0; index < glyphPositions.size(); ++index) {
-      glyphPositionsCG[index].x = glyphPositions[index].x;
-      glyphPositionsCG[index].y = glyphPositions[index].y;
-    }
-  });
+  auto glyph_positions_cg =
+      FixedSizeDataVector<CGPoint>::Uninit(glyph_positions.size());
+  for (auto [input, output] :
+       fxcrt::Zip(glyph_positions, glyph_positions_cg.span())) {
+    output.x = input.x;
+    output.y = input.y;
+  }
+  const CGPoint* glyph_positions_cg_ptr = glyph_positions_cg.span().data();
 #else
-  CGPoint* glyphPositionsCG = glyphPositions.data();
+  const CGPoint* glyph_positions_cg_ptr = glyph_positions.data();
 #endif
   CGContextShowGlyphsAtPositions(
-      context, reinterpret_cast<CGGlyph*>(glyphIndices.data()),
-      glyphPositionsCG, glyphPositions.size());
-#if CGFLOAT_IS_DOUBLE
-  delete[] glyphPositionsCG;
-#endif
+      context, reinterpret_cast<CGGlyph*>(glyph_indices.data()),
+      glyph_positions_cg_ptr, glyph_positions.size());
   CGContextRestoreGState(context);
   return true;
 }

core/fxge/apple/fx_quartz_device.h

diff --git a/core/fxge/apple/fx_quartz_device.h b/core/fxge/apple/fx_quartz_device.h
index 14b6d58..1f92a8d 100644
--- a/core/fxge/apple/fx_quartz_device.h
+++ b/core/fxge/apple/fx_quartz_device.h
@@ -22,14 +22,14 @@
   void* CreateGraphics(const RetainPtr<CFX_DIBitmap>& bitmap);
   void DestroyGraphics(void* graphics);
 
-  void* CreateFont(pdfium::span<const uint8_t> pFontData);
-  void DestroyFont(void* pFont);
+  void* CreateFont(pdfium::span<const uint8_t> font_data);
+  void DestroyFont(void* font);
   void SetGraphicsTextMatrix(void* graphics, const CFX_Matrix& matrix);
   bool DrawGraphicsString(void* graphics,
                           void* font,
-                          float fontSize,
-                          pdfium::span<uint16_t> glyphIndices,
-                          pdfium::span<CGPoint> glyphPositions,
+                          float font_size,
+                          pdfium::span<uint16_t> glyph_indices,
+                          pdfium::span<CGPoint> glyph_positions,
                           FX_ARGB argb);
 };