Replace a few more std::unique_ptr.reset() with WrapUnique assignments.

And fix a typo.

TBR=tsepez@chromium.org

Review-Url: https://codereview.chromium.org/2382443004

3 files changed, 15 insertions, 15 deletions

diff --git a/core/fxge/dib/fx_dib_engine.cpp b/core/fxge/dib/fx_dib_engine.cpp
index 7ba031e8aa..e8401d7663 100644
--- a/core/fxge/dib/fx_dib_engine.cpp
+++ b/core/fxge/dib/fx_dib_engine.cpp
@@ -930,9 +930,9 @@ FX_BOOL CFX_ImageStretcher::Continue(IFX_Pause* pPause) {
 }
 
 FX_BOOL CFX_ImageStretcher::StartStretch() {
-  m_pStretchEngine.reset(new CStretchEngine(m_pDest, m_DestFormat, m_DestWidth,
-                                            m_DestHeight, m_ClipRect, m_pSource,
-                                            m_Flags));
+  m_pStretchEngine = WrapUnique(
+      new CStretchEngine(m_pDest, m_DestFormat, m_DestWidth, m_DestHeight,
+                         m_ClipRect, m_pSource, m_Flags));
   m_pStretchEngine->StartStretchHorz();
   if (SourceSizeWithinLimit(m_pSource->GetWidth(), m_pSource->GetHeight())) {
     m_pStretchEngine->Continue(nullptr);
diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp
index 16106fec7f..9575e6aac4 100644
--- a/core/fxge/dib/fx_dib_main.cpp
+++ b/core/fxge/dib/fx_dib_main.cpp
@@ -1461,7 +1461,7 @@ CFX_DIBitmap* CFX_DIBSource::FlipImage(FX_BOOL bXFlip, FX_BOOL bYFlip) const {
 
 CFX_DIBExtractor::CFX_DIBExtractor(const CFX_DIBSource* pSrc) {
   if (pSrc->GetBuffer()) {
-    m_pBitmap.reset(new CFX_DIBitmap);
+    m_pBitmap = WrapUnique(new CFX_DIBitmap);
     if (!m_pBitmap->Create(pSrc->GetWidth(), pSrc->GetHeight(),
                            pSrc->GetFormat(), pSrc->GetBuffer())) {
       m_pBitmap.reset();
@@ -1567,9 +1567,9 @@ FX_BOOL CFX_ImageRenderer::Start(CFX_DIBitmap* pDevice,
       m_Composer.Compose(pDevice, pClipRgn, bitmap_alpha, mask_color, m_ClipBox,
                          TRUE, m_Matrix.c > 0, m_Matrix.b < 0, m_bRgbByteOrder,
                          alpha_flag, pIccTransform, m_BlendType);
-      m_Stretcher.reset(new CFX_ImageStretcher(&m_Composer, pSource,
-                                               dest_height, dest_width,
-                                               bitmap_clip, dib_flags));
+      m_Stretcher = WrapUnique(new CFX_ImageStretcher(&m_Composer, pSource,
+                                                      dest_height, dest_width,
+                                                      bitmap_clip, dib_flags));
       if (!m_Stretcher->Start())
         return FALSE;
 
@@ -1600,7 +1600,7 @@ FX_BOOL CFX_ImageRenderer::Start(CFX_DIBitmap* pDevice,
                      FALSE, FALSE, FALSE, m_bRgbByteOrder, alpha_flag,
                      pIccTransform, m_BlendType);
   m_Status = 1;
-  m_Stretcher.reset(new CFX_ImageStretcher(
+  m_Stretcher = WrapUnique(new CFX_ImageStretcher(
       &m_Composer, pSource, dest_width, dest_height, bitmap_clip, dib_flags));
   return m_Stretcher->Start();
 }
@@ -1680,7 +1680,7 @@ FX_BOOL CFX_BitmapStorer::SetInfo(int width,
                                   int height,
                                   FXDIB_Format src_format,
                                   uint32_t* pSrcPalette) {
-  m_pBitmap.reset(new CFX_DIBitmap);
+  m_pBitmap = WrapUnique(new CFX_DIBitmap);
   if (!m_pBitmap->Create(width, height, src_format)) {
     m_pBitmap.reset();
     return FALSE;
diff --git a/core/fxge/dib/fx_dib_transform.cpp b/core/fxge/dib/fx_dib_transform.cpp
index 73b02be210..27dbb82fab 100644
--- a/core/fxge/dib/fx_dib_transform.cpp
+++ b/core/fxge/dib/fx_dib_transform.cpp
@@ -363,8 +363,8 @@ FX_BOOL CFX_ImageTransformer::Start() {
     result_clip.Offset(-result_rect.left, -result_rect.top);
     result_clip = FXDIB_SwapClipBox(result_clip, dest_width, dest_height,
                                     m_pMatrix->c > 0, m_pMatrix->b < 0);
-    m_Stretcher.reset(new CFX_ImageStretcher(&m_Storer, m_pSrc, dest_height,
-                                             dest_width, result_clip, m_Flags));
+    m_Stretcher = WrapUnique(new CFX_ImageStretcher(
+        &m_Storer, m_pSrc, dest_height, dest_width, result_clip, m_Flags));
     m_Stretcher->Start();
     m_Status = 1;
     return TRUE;
@@ -376,7 +376,7 @@ FX_BOOL CFX_ImageTransformer::Start() {
     int dest_height = m_pMatrix->d > 0 ? (int)-FXSYS_ceil(m_pMatrix->d)
                                        : (int)-FXSYS_floor(m_pMatrix->d);
     result_clip.Offset(-result_rect.left, -result_rect.top);
-    m_Stretcher.reset(new CFX_ImageStretcher(
+    m_Stretcher = WrapUnique(new CFX_ImageStretcher(
         &m_Storer, m_pSrc, dest_width, dest_height, result_clip, m_Flags));
     m_Stretcher->Start();
     m_Status = 2;
@@ -395,9 +395,9 @@ FX_BOOL CFX_ImageTransformer::Start() {
   clip_rect_f.Transform(&m_dest2stretch);
   m_StretchClip = clip_rect_f.GetOuterRect();
   m_StretchClip.Intersect(0, 0, stretch_width, stretch_height);
-  m_Stretcher.reset(new CFX_ImageStretcher(&m_Storer, m_pSrc, stretch_width,
-                                           stretch_height, m_StretchClip,
-                                           m_Flags));
+  m_Stretcher = WrapUnique(new CFX_ImageStretcher(&m_Storer, m_pSrc,
+                                                  stretch_width, stretch_height,
+                                                  m_StretchClip, m_Flags));
   m_Stretcher->Start();
   m_Status = 3;
   return TRUE;