From 50dfc4a7068e8e08105f7b9a3945136e7246e677 Mon Sep 17 00:00:00 2001
From: Tom Sepez <tsepez@chromium.org>
Date: Tue, 1 Mar 2016 11:34:03 -0800
Subject: Replace FX_LPCRECT typedef with underlying types

Helps with transparency. Also remove default args and
use override consistently in the affected methods.

R=dsinclair@chromium.org

Review URL: https://codereview.chromium.org/1751093002 .
---
 xfa/src/fwl/src/basewidget/fwl_editimp.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'xfa/src/fwl')

diff --git a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
index 4cbf92ba7b..74c7ef21fe 100644
--- a/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
+++ b/xfa/src/fwl/src/basewidget/fwl_editimp.cpp
@@ -866,7 +866,7 @@ FX_BOOL CFWL_EditImp::On_PageLoad(IFDE_TxtEdtEngine* pEdit,
   IFDE_TxtEdtPage* pPage = pEdtEngine->GetPage(nPageIndex);
   if (!pPage)
     return FALSE;
-  pPage->LoadPage();
+  pPage->LoadPage(nullptr, nullptr);
   return TRUE;
 }
 FX_BOOL CFWL_EditImp::On_PageUnload(IFDE_TxtEdtEngine* pEdit,
@@ -876,7 +876,7 @@ FX_BOOL CFWL_EditImp::On_PageUnload(IFDE_TxtEdtEngine* pEdit,
   IFDE_TxtEdtPage* pPage = pEdtEngine->GetPage(nPageIndex);
   if (!pPage)
     return FALSE;
-  pPage->UnloadPage();
+  pPage->UnloadPage(nullptr);
   return TRUE;
 }
 
@@ -1186,23 +1186,23 @@ void CFWL_EditImp::UpdateEditParams() {
   params.pEventSink = this;
   m_pEdtEngine->SetEditParams(params);
 }
+
 void CFWL_EditImp::UpdateEditLayout() {
-  if (m_pEdtEngine->GetTextLength() <= 0) {
-    m_pEdtEngine->SetTextByStream(NULL);
-  }
+  if (m_pEdtEngine->GetTextLength() <= 0)
+    m_pEdtEngine->SetTextByStream(nullptr);
+
   IFDE_TxtEdtPage* pPage = m_pEdtEngine->GetPage(0);
-  if (pPage) {
-    pPage->UnloadPage();
-    pPage = NULL;
-  }
+  if (pPage)
+    pPage->UnloadPage(nullptr);
+
   m_pEdtEngine->StartLayout();
-  m_pEdtEngine->DoLayout(NULL);
+  m_pEdtEngine->DoLayout(nullptr);
   m_pEdtEngine->EndLayout();
   pPage = m_pEdtEngine->GetPage(0);
-  if (pPage) {
-    pPage->LoadPage();
-  }
+  if (pPage)
+    pPage->LoadPage(nullptr, nullptr);
 }
+
 FX_BOOL CFWL_EditImp::UpdateOffset() {
   CFX_RectF rtCaret;
   m_pEdtEngine->GetCaretRect(rtCaret);
-- 
cgit v1.2.3