summaryrefslogtreecommitdiff
path: root/xfa/fde
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2017-05-16 15:40:23 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-05-16 23:11:57 +0000
commit365333552cf67b7c97c4093177e7ed7b43f540ab (patch)
tree44dfc8a496ff586def85d34e0a07893445b79cc7 /xfa/fde
parentdde95d8be9bc2817e34429fc38ee6d89d6d5ab75 (diff)
downloadpdfium-365333552cf67b7c97c4093177e7ed7b43f540ab.tar.xz
CFDE_RenderDevice::m_bOwnerDevice is always false
So remove it. But they probably wanted it to be true in one place, because it looks like a leak. So find a better way to own the object. Change-Id: I15937e29da5ce8b380f82cb20ee3ecc3f49b8ca3 Reviewed-on: https://pdfium-review.googlesource.com/5473 Commit-Queue: Tom Sepez <tsepez@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'xfa/fde')
-rw-r--r--xfa/fde/cfde_renderdevice.cpp10
-rw-r--r--xfa/fde/cfde_renderdevice.h3
-rw-r--r--xfa/fde/cfde_textout.cpp11
-rw-r--r--xfa/fde/cfde_textout.h2
4 files changed, 12 insertions, 14 deletions
diff --git a/xfa/fde/cfde_renderdevice.cpp b/xfa/fde/cfde_renderdevice.cpp
index 7fb5b0352e..9236dc7800 100644
--- a/xfa/fde/cfde_renderdevice.cpp
+++ b/xfa/fde/cfde_renderdevice.cpp
@@ -22,9 +22,8 @@
#include "xfa/fgas/font/cfgas_fontmgr.h"
#include "xfa/fgas/font/cfgas_gefont.h"
-CFDE_RenderDevice::CFDE_RenderDevice(CFX_RenderDevice* pDevice,
- bool bOwnerDevice)
- : m_pDevice(pDevice), m_bOwnerDevice(bOwnerDevice), m_iCharCount(0) {
+CFDE_RenderDevice::CFDE_RenderDevice(CFX_RenderDevice* pDevice)
+ : m_pDevice(pDevice), m_iCharCount(0) {
ASSERT(pDevice);
FX_RECT rt = m_pDevice->GetClipBox();
@@ -33,10 +32,7 @@ CFDE_RenderDevice::CFDE_RenderDevice(CFX_RenderDevice* pDevice,
static_cast<float>(rt.Height()));
}
-CFDE_RenderDevice::~CFDE_RenderDevice() {
- if (m_bOwnerDevice)
- delete m_pDevice;
-}
+CFDE_RenderDevice::~CFDE_RenderDevice() {}
int32_t CFDE_RenderDevice::GetWidth() const {
return m_pDevice->GetWidth();
diff --git a/xfa/fde/cfde_renderdevice.h b/xfa/fde/cfde_renderdevice.h
index f429ac1703..d9f4ce0d34 100644
--- a/xfa/fde/cfde_renderdevice.h
+++ b/xfa/fde/cfde_renderdevice.h
@@ -19,7 +19,7 @@ class CFX_GraphStateData;
class CFDE_RenderDevice {
public:
- CFDE_RenderDevice(CFX_RenderDevice* pDevice, bool bOwnerDevice);
+ explicit CFDE_RenderDevice(CFX_RenderDevice* pDevice);
~CFDE_RenderDevice();
int32_t GetWidth() const;
@@ -120,7 +120,6 @@ class CFDE_RenderDevice {
CFX_RenderDevice* const m_pDevice;
CFX_RectF m_rtClip;
- bool m_bOwnerDevice;
int32_t m_iCharCount;
};
diff --git a/xfa/fde/cfde_textout.cpp b/xfa/fde/cfde_textout.cpp
index b41ee1fbd8..6d5ab2a980 100644
--- a/xfa/fde/cfde_textout.cpp
+++ b/xfa/fde/cfde_textout.cpp
@@ -7,6 +7,7 @@
#include "xfa/fde/cfde_textout.h"
#include <algorithm>
+#include <utility>
#include "core/fxcrt/fx_coordinates.h"
#include "core/fxcrt/fx_system.h"
@@ -117,16 +118,16 @@ void CFDE_TextOut::SetLineSpace(float fLineSpace) {
void CFDE_TextOut::SetDIBitmap(const CFX_RetainPtr<CFX_DIBitmap>& pDIB) {
ASSERT(pDIB);
-
m_pRenderDevice.reset();
- CFX_DefaultRenderDevice* device = new CFX_DefaultRenderDevice;
- device->Attach(pDIB, false, nullptr, false);
- m_pRenderDevice = pdfium::MakeUnique<CFDE_RenderDevice>(device, false);
+ m_pDefaultRenderDevice = pdfium::MakeUnique<CFX_DefaultRenderDevice>();
+ m_pDefaultRenderDevice->Attach(pDIB, false, nullptr, false);
+ m_pRenderDevice =
+ pdfium::MakeUnique<CFDE_RenderDevice>(m_pDefaultRenderDevice.get());
}
void CFDE_TextOut::SetRenderDevice(CFX_RenderDevice* pDevice) {
ASSERT(pDevice);
- m_pRenderDevice = pdfium::MakeUnique<CFDE_RenderDevice>(pDevice, false);
+ m_pRenderDevice = pdfium::MakeUnique<CFDE_RenderDevice>(pDevice);
}
void CFDE_TextOut::SetClipRect(const CFX_Rect& rtClip) {
diff --git a/xfa/fde/cfde_textout.h b/xfa/fde/cfde_textout.h
index 360c3051e9..a52814041b 100644
--- a/xfa/fde/cfde_textout.h
+++ b/xfa/fde/cfde_textout.h
@@ -167,6 +167,8 @@ class CFDE_TextOut {
int32_t m_iCurPiece;
int32_t m_iTotalLines;
std::vector<FXTEXT_CHARPOS> m_CharPos;
+ // NOTE: m_pDefaultRenderDevice must outlive m_pRenderDevice.
+ std::unique_ptr<CFX_DefaultRenderDevice> m_pDefaultRenderDevice;
std::unique_ptr<CFDE_RenderDevice> m_pRenderDevice;
std::vector<int32_t> m_HotKeys;
std::vector<CFX_RectF> m_rectArray;