commit 9444c286748466f07f5100cb7217ac7b243223f3
author Tom Sepez <tsepez@chromium.org> Fri Apr 03 21:27:58 2020 +0000
committer Chromium commit bot <commit-bot@chromium.org> Fri Apr 03 21:27:58 2020 +0000
tree 380a21345f45f8e88b1b12a2828e75701229c132
parent 863a7546e299cd466154eb7b5f397c6a1df12cdb

Store uint8_t vector data in data partition in fxge/

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

core/fxge/cfx_fontmapper.cpp

diff --git a/core/fxge/cfx_fontmapper.cpp b/core/fxge/cfx_fontmapper.cpp
index 024594f..e40e083 100644
--- a/core/fxge/cfx_fontmapper.cpp
+++ b/core/fxge/cfx_fontmapper.cpp
@@ -306,7 +306,7 @@
   if (!size)
     return ByteString();
 
-  std::vector<uint8_t> buffer(size);
+  std::vector<uint8_t, FxAllocAllocator<uint8_t>> buffer(size);
   uint32_t bytes_read = m_pFontInfo->GetFontData(hFont, kTableNAME, buffer);
   return bytes_read == size ? GetNameFromTT(buffer, 6) : ByteString();
 }

core/fxge/dib/cfx_bitmapcomposer.h

diff --git a/core/fxge/dib/cfx_bitmapcomposer.h b/core/fxge/dib/cfx_bitmapcomposer.h
index 74a7efa..8d0202d 100644
--- a/core/fxge/dib/cfx_bitmapcomposer.h
+++ b/core/fxge/dib/cfx_bitmapcomposer.h
@@ -72,10 +72,10 @@
   bool m_bFlipY;
   bool m_bRgbByteOrder = false;
   BlendMode m_BlendType = BlendMode::kNormal;
-  std::vector<uint8_t> m_pScanlineV;
-  std::vector<uint8_t> m_pClipScanV;
-  std::vector<uint8_t> m_pAddClipScan;
-  std::vector<uint8_t> m_pScanlineAlphaV;
+  std::vector<uint8_t, FxAllocAllocator<uint8_t>> m_pScanlineV;
+  std::vector<uint8_t, FxAllocAllocator<uint8_t>> m_pClipScanV;
+  std::vector<uint8_t, FxAllocAllocator<uint8_t>> m_pAddClipScan;
+  std::vector<uint8_t, FxAllocAllocator<uint8_t>> m_pScanlineAlphaV;
 };
 
 #endif  // CORE_FXGE_DIB_CFX_BITMAPCOMPOSER_H_

core/fxge/dib/cstretchengine.h

diff --git a/core/fxge/dib/cstretchengine.h b/core/fxge/dib/cstretchengine.h
index 1792963..9575157 100644
--- a/core/fxge/dib/cstretchengine.h
+++ b/core/fxge/dib/cstretchengine.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "core/fxcrt/fx_coordinates.h"
+#include "core/fxcrt/fx_memory_wrappers.h"
 #include "core/fxcrt/retain_ptr.h"
 #include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/fx_dib.h"
@@ -61,7 +62,7 @@
     int m_DestMin = 0;
     int m_ItemSize = 0;
     size_t m_dwWeightTablesSize = 0;
-    std::vector<uint8_t> m_WeightTables;
+    std::vector<uint8_t, FxAllocAllocator<uint8_t>> m_WeightTables;
   };
 
   enum class State : uint8_t { kInitial, kHorizontal, kVertical };
@@ -89,10 +90,10 @@
   const int m_DestWidth;
   const int m_DestHeight;
   const FX_RECT m_DestClip;
-  std::vector<uint8_t> m_DestScanline;
-  std::vector<uint8_t> m_DestMaskScanline;
-  std::vector<uint8_t> m_InterBuf;
-  std::vector<uint8_t> m_ExtraAlphaBuf;
+  std::vector<uint8_t, FxAllocAllocator<uint8_t>> m_DestScanline;
+  std::vector<uint8_t, FxAllocAllocator<uint8_t>> m_DestMaskScanline;
+  std::vector<uint8_t, FxAllocAllocator<uint8_t>> m_InterBuf;
+  std::vector<uint8_t, FxAllocAllocator<uint8_t>> m_ExtraAlphaBuf;
   FX_RECT m_SrcClip;
   int m_InterPitch;
   int m_ExtraMaskPitch;