Refcount all CFX_DIBSources (and subclasses) all the time.

There are currently several ownership models for these objects,
including ad-hoc logic for sharing and deletion, and the
now-redundant CFX_DIBitmapRef externally-counted handle to the DIBs.

Replace them all with the internal refcount scheme.

Change-Id: I2db399dfc19219eda384f94cc989353b78ce2872
Reviewed-on: https://pdfium-review.googlesource.com/3166
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp
index 555b58643d..dcea777089 100644
--- a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp
+++ b/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp
@@ -167,13 +167,14 @@ uint8_t* CBC_OnedEAN13Writer::Encode(const CFX_ByteString& contents,
   return result;
 }
 
-void CBC_OnedEAN13Writer::ShowChars(const CFX_WideStringC& contents,
-                                    CFX_DIBitmap* pOutBitmap,
-                                    CFX_RenderDevice* device,
-                                    const CFX_Matrix* matrix,
-                                    int32_t barWidth,
-                                    int32_t multiple,
-                                    int32_t& e) {
+void CBC_OnedEAN13Writer::ShowChars(
+    const CFX_WideStringC& contents,
+    const CFX_RetainPtr<CFX_DIBitmap>& pOutBitmap,
+    CFX_RenderDevice* device,
+    const CFX_Matrix* matrix,
+    int32_t barWidth,
+    int32_t multiple,
+    int32_t& e) {
   if (!device && !pOutBitmap) {
     e = BCExceptionIllegalArgument;
     return;
@@ -278,7 +279,6 @@ void CBC_OnedEAN13Writer::ShowChars(const CFX_WideStringC& contents,
 
   CalcTextInfo(tempStr, pCharPos, m_pFont, (float)strWidth, iFontSize, blank);
   if (pOutBitmap) {
-    delete ge.GetBitmap();
     ge.Create(strWidth, iTextHeight, FXDIB_Argb, nullptr);
     ge.GetBitmap()->Clear(m_backgroundColor);
     ge.DrawNormalText(iLen, pCharPos, m_pFont, static_cast<float>(iFontSize),