From 22bf7a5f796155ee3d1a4ea32e237a6d2034996d Mon Sep 17 00:00:00 2001
From: Diana Gage <drgage@google.com>
Date: Fri, 21 Jul 2017 11:33:18 -0700
Subject: Change Clear() to ClearSelection().

This CL renames Clear() in CPWL_EditCtrl, CPWL_ComboBox, and CFX_Edit
to ClearSelection(), as this function's behavior is clearing text selection.

Change-Id: Ia32f5347abc1960d7219684942df6a3fede9936c
Reviewed-on: https://pdfium-review.googlesource.com/8611
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Diana Gage <drgage@google.com>
---
 fpdfsdk/fxedit/fxet_edit.cpp | 5 +++--
 fpdfsdk/fxedit/fxet_edit.h   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'fpdfsdk/fxedit')

diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp
index d00b4d6a61..96868d03c1 100644
--- a/fpdfsdk/fxedit/fxet_edit.cpp
+++ b/fpdfsdk/fxedit/fxet_edit.cpp
@@ -884,7 +884,7 @@ bool CFX_Edit::Delete() {
   return Delete(true, true);
 }
 
-bool CFX_Edit::Clear() {
+bool CFX_Edit::ClearSelection() {
   return Clear(true, true);
 }
 
@@ -1736,9 +1736,10 @@ bool CFX_Edit::Clear(bool bAddUndo, bool bPaint) {
     return false;
 
   CPVT_WordRange range = m_SelState.ConvertToWordRange();
-  if (bAddUndo && m_bEnableUndo)
+  if (bAddUndo && m_bEnableUndo) {
     AddEditUndoItem(
         pdfium::MakeUnique<CFXEU_Clear>(this, range, GetSelectedText()));
+  }
 
   SelectNone();
   SetCaret(m_pVT->DeleteWords(range));
diff --git a/fpdfsdk/fxedit/fxet_edit.h b/fpdfsdk/fxedit/fxet_edit.h
index fb64e0a401..bb5246226d 100644
--- a/fpdfsdk/fxedit/fxet_edit.h
+++ b/fpdfsdk/fxedit/fxet_edit.h
@@ -343,7 +343,7 @@ class CFX_Edit {
   bool InsertReturn();
   bool Backspace();
   bool Delete();
-  bool Clear();
+  bool ClearSelection();
   bool InsertText(const CFX_WideString& sText, int32_t charset);
   bool Redo();
   bool Undo();
-- 
cgit v1.2.3