Pass objects instead of strings for undo/redo records.

xfa/fwl/basewidget/fwl_editimp.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/basewidget/fwl_editimp.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 130 matching lines @@
 }
 FX_BOOL IFWL_Edit::Cut(CFX_WideString& wsCut) {
   return static_cast<CFWL_EditImp*>(GetImpl())->Cut(wsCut);
 }
 FX_BOOL IFWL_Edit::Paste(const CFX_WideString& wsPaste) {
   return static_cast<CFWL_EditImp*>(GetImpl())->Paste(wsPaste);
 }
 FX_BOOL IFWL_Edit::Delete() {
   return static_cast<CFWL_EditImp*>(GetImpl())->Delete();
 }
-FX_BOOL IFWL_Edit::Redo(const CFX_ByteStringC& bsRecord) {
-  return static_cast<CFWL_EditImp*>(GetImpl())->Redo(bsRecord);
+FX_BOOL IFWL_Edit::Redo(const IFDE_TxtEdtDoRecord* pRecord) {
+  return static_cast<CFWL_EditImp*>(GetImpl())->Redo(pRecord);
 }
-FX_BOOL IFWL_Edit::Undo(const CFX_ByteStringC& bsRecord) {
-  return static_cast<CFWL_EditImp*>(GetImpl())->Undo(bsRecord);
+FX_BOOL IFWL_Edit::Undo(const IFDE_TxtEdtDoRecord* pRecord) {
+  return static_cast<CFWL_EditImp*>(GetImpl())->Undo(pRecord);
 }
 FX_BOOL IFWL_Edit::Undo() {
   return static_cast<CFWL_EditImp*>(GetImpl())->Undo();
 }
 FX_BOOL IFWL_Edit::Redo() {
   return static_cast<CFWL_EditImp*>(GetImpl())->Redo();
 }
 FX_BOOL IFWL_Edit::CanUndo() {
   return static_cast<CFWL_EditImp*>(GetImpl())->CanUndo();
 }
@@ skipping 576 matching lines @@
     return FALSE;
 
   int32_t nCount = m_pEdtEngine->CountSelRanges();
   if (nCount < 1)
     return FALSE;
 
   m_pEdtEngine->Delete(0);
   return TRUE;
 }
 
-FX_BOOL CFWL_EditImp::Redo(const CFX_ByteStringC& bsRecord) {
+FX_BOOL CFWL_EditImp::Redo(const IFDE_TxtEdtDoRecord* pRecord) {
   if (!m_pEdtEngine)
     return FALSE;
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_NoRedoUndo)
     return TRUE;
-  return m_pEdtEngine->Redo(bsRecord);
+  return m_pEdtEngine->Redo(pRecord);
 }
 
-FX_BOOL CFWL_EditImp::Undo(const CFX_ByteStringC& bsRecord) {
+FX_BOOL CFWL_EditImp::Undo(const IFDE_TxtEdtDoRecord* pRecord) {
   if (!m_pEdtEngine)
     return FALSE;
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_NoRedoUndo)
     return TRUE;
-  return m_pEdtEngine->Undo(bsRecord);
+  return m_pEdtEngine->Undo(pRecord);
 }
 
 FX_BOOL CFWL_EditImp::Undo() {
   if (!CanUndo())
     return FALSE;
-
-  CFX_ByteString bsRecord = m_RecordArr[m_iCurRecord--];
-  return Undo(bsRecord.AsStringC());
+  return Undo(m_DoRecords[m_iCurRecord--].get());
 }
 
 FX_BOOL CFWL_EditImp::Redo() {
   if (!CanRedo())
     return FALSE;
-
-  CFX_ByteString bsRecord = m_RecordArr[++m_iCurRecord];
-  return Redo(bsRecord.AsStringC());
+  return Redo(m_DoRecords[++m_iCurRecord].get());
 }
 
 FX_BOOL CFWL_EditImp::CanUndo() {
   return m_iCurRecord >= 0;
 }
 
 FX_BOOL CFWL_EditImp::CanRedo() {
-  return m_iCurRecord < m_RecordArr.GetSize() - 1;
+  return m_iCurRecord < m_DoRecords.size() - 1;

[Lei Zhang, 2016/05/19 23:46:48]

When I tried to roll DEPS, this failed on the Chromium Windows trybots with:

FAILED: obj/third_party/pdfium/xfa/fwl_editimp.obj 
ninja -t msvc -e environment.x86 -- E:\b\build\slave\cache\cipd\goma/gomacc.exe
"E:\b\depot_tools\win_toolchain\vs_files\95ddda401ec5678f15eeed01d2bee08fcbc5ee97\VC\bin\amd64_x86/cl.exe"
/nologo /showIncludes /FC @obj/third_party/pdfium/xfa/fwl_editimp.obj.rsp /c
../../third_party/pdfium/xfa/fwl/basewidget/fwl_editimp.cpp
/Foobj/third_party/pdfium/xfa/fwl_editimp.obj
/Fd"obj/third_party/pdfium/xfa_cc.pdb"
e:\b\build\slave\win_gn\build\src\third_party\pdfium\xfa\fwl\basewidget\fwl_editimp.cpp(782):
error C2220: warning treated as error - no 'object' file generated
e:\b\build\slave\win_gn\build\src\third_party\pdfium\xfa\fwl\basewidget\fwl_editimp.cpp(782):
warning C4018: '<': signed/unsigned mismatch

https://build.chromium.org/p/tryserver.chromium.win/builders/win8_chromium_ng...

 }
 
 FWL_Error CFWL_EditImp::SetTabWidth(FX_FLOAT fTabWidth, FX_BOOL bEquidistant) {
   if (!m_pEdtEngine)
     return FWL_Error::Indefinite;
 
   FDE_TXTEDTPARAMS* pParams = m_pEdtEngine->GetEditParams();
   pParams->fTabWidth = fTabWidth;
   pParams->bTabEquidistant = bEquidistant;
   return FWL_Error::Succeeded;
@@ skipping 124 matching lines @@
                                     int32_t nPurpose) {
   CFDE_TxtEdtEngine* pEdtEngine = m_pEdtEngine;
   IFDE_TxtEdtPage* pPage = pEdtEngine->GetPage(nPageIndex);
   if (!pPage)
     return FALSE;
   pPage->UnloadPage(nullptr);
   return TRUE;
 }
 
 void CFWL_EditImp::On_AddDoRecord(CFDE_TxtEdtEngine* pEdit,
-                                  const CFX_ByteStringC& bsDoRecord) {
-  AddDoRecord(bsDoRecord);
+                                  IFDE_TxtEdtDoRecord* pRecord) {
+  AddDoRecord(pRecord);
 }
 
 FX_BOOL CFWL_EditImp::On_Validate(CFDE_TxtEdtEngine* pEdit,
                                   CFX_WideString& wsText) {
   IFWL_Widget* pDst = GetOuter();
   if (!pDst) {
     pDst = m_pInterface;
   }
   CFWL_EvtEdtValidate event;
   event.pDstWidget = pDst;
@@ skipping 515 matching lines @@
          (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine);
 }
 FX_BOOL CFWL_EditImp::IsContentHeightOverflow() {
   if (!m_pEdtEngine)
     return FALSE;
   IFDE_TxtEdtPage* pPage = m_pEdtEngine->GetPage(0);
   if (!pPage)
     return FALSE;
   return pPage->GetContentsBox().height > m_rtEngine.height + 1.0f;
 }
-int32_t CFWL_EditImp::AddDoRecord(const CFX_ByteStringC& bsDoRecord) {
-  int32_t nCount = m_RecordArr.GetSize();
+int32_t CFWL_EditImp::AddDoRecord(IFDE_TxtEdtDoRecord* pRecord) {
+  int32_t nCount = m_DoRecords.size();
   if (m_iCurRecord == nCount - 1) {
     if (nCount == m_iMaxRecord) {
-      m_RecordArr.RemoveAt(0);
+      m_DoRecords.pop_front();
       m_iCurRecord--;
     }
   } else {
-    for (int32_t i = nCount - 1; i > m_iCurRecord; i--) {
-      m_RecordArr.RemoveAt(i);
-    }
+    m_DoRecords.erase(m_DoRecords.begin() + m_iCurRecord + 1,

[Tom Sepez, 2016/05/17 21:24:38]

Maybe m_iCurRecord should itself be an iterator.

[dsinclair, 2016/05/18 13:09:06]

Filed pdfium:494 to track.

+                      m_DoRecords.end());
   }
-  m_RecordArr.Add(CFX_ByteString(bsDoRecord));
-  return m_iCurRecord = m_RecordArr.GetSize() - 1;
+
+  m_DoRecords.push_back(std::unique_ptr<IFDE_TxtEdtDoRecord>(pRecord));
+  m_iCurRecord = m_DoRecords.size() - 1;
+  return m_iCurRecord;
 }
 void CFWL_EditImp::Layout() {
   GetClientRect(m_rtClient);
   m_rtEngine = m_rtClient;
   FX_FLOAT* pfWidth = static_cast<FX_FLOAT*>(
       GetThemeCapacity(CFWL_WidgetCapacity::ScrollBarWidth));
   if (!pfWidth)
     return;
   FX_FLOAT fWidth = *pfWidth;
   if (!m_pOuter) {
@@ skipping 234 matching lines @@
       m_pCaret.reset(IFWL_Caret::Create(prop, m_pInterface));
       m_pCaret->Initialize();
       m_pCaret->SetParent(m_pInterface);
       m_pCaret->SetStates(m_pProperties->m_dwStates);
     }
   } else if ((m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_InnerCaret) ==
              0) {
     m_pCaret.reset();
   }
 }
+
 void CFWL_EditImp::ClearRecord() {
   m_iCurRecord = -1;
-  m_RecordArr.RemoveAll();
+  m_DoRecords.clear();
 }
+
 void CFWL_EditImp::ProcessInsertError(int32_t iError) {
   switch (iError) {
     case -2: {
       CFWL_EvtEdtTextFull textFullEvent;
       textFullEvent.m_pSrcTarget = m_pInterface;
       DispatchEvent(&textFullEvent);
       break;
     }
     default: {}
   }
@@ skipping 437 matching lines @@
     }
     CFX_RectF rect;
     m_pOwner->GetWidgetRect(rect);
     CFX_RectF rtInvalidate;
     rtInvalidate.Set(0, 0, rect.width + 2, rect.height + 2);
     m_pOwner->Repaint(&rtInvalidate);
   }
   return TRUE;
 }
 void CFWL_EditImpDelegate::DoCursor(CFWL_MsgMouse* pMsg) {}