Merge to XFA: Cleanup: Remove some dead code in CPWL_Note.

fpdfsdk/src/pdfwindow/PWL_Note.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 "fpdfsdk/include/pdfwindow/PDFWindow.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Button.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Caret.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
@@ skipping 1041 matching lines @@
                      IPWL_NoteHandler* pNoteHandler)
     : m_pAuthor(NULL),
       m_pIcon(NULL),
       m_pCloseBox(NULL),
       m_pLBBox(NULL),
       m_pRBBox(NULL),
       m_pContentsBar(NULL),
       m_pOptions(NULL),
       m_pNoteNotify(pNoteNotify),
       m_bResizing(FALSE),
-      m_rcCaption(0, 0, 0, 0),
-      m_bEnalbleNotify(TRUE),
-      m_pPopupNote(pPopupNote) {}
+      m_bEnableNotify(TRUE) {}
 
 CPWL_Note::~CPWL_Note() {}
 
 IPWL_NoteItem* CPWL_Note::Reply() {
   return CreateNoteItem();
 }
 
 void CPWL_Note::EnableNotify(FX_BOOL bEnabled) {
-  m_bEnalbleNotify = bEnabled;
+  m_bEnableNotify = bEnabled;
 }
 
 void CPWL_Note::RePosChildWnd() {
   RePosNoteChildren();
   m_pContents->OnNotify(this, PNM_NOTERESET, 0, 0);
   ResetScrollBar();
   m_pContents->OnNotify(this, PNM_NOTERESET, 0, 0);
   OnNotify(this, PNM_NOTEEDITCHANGED, 0, 0);
   if (const CPWL_Wnd* pWnd = GetFocused()) {
     if (pWnd->GetClassName() == "CPWL_Edit") {
@@ skipping 143 matching lines @@
     rcContents.bottom += 14.0f;
     rcContents.Normalize();
     m_pContents->Move(rcContents, FALSE, FALSE);
     m_pContents->SetVisible(CPWL_Utils::ContainsRect(rcClient, rcContents));
 
     CPDF_Rect rcContentsBar = rcContents;
     rcContentsBar.right = rcClient.right - 3.0f;
     rcContentsBar.left = rcContentsBar.right - PWL_SCROLLBAR_WIDTH;
     rcContentsBar.Normalize();
     m_pContentsBar->Move(rcContentsBar, TRUE, FALSE);
-
-    m_rcCaption = rcClient;
-    m_rcCaption.bottom = rcContents.top;
   }
 
   m_bResizing = FALSE;
 }
 
-// TODO(thestig): Make this return an enum.
-// 0-normal / 1-caption / 2-leftbottom corner / 3-rightbottom corner / 4-close /
-// 5-options
-int32_t CPWL_Note::NoteHitTest(const CPDF_Point& point) const {
-  GetClientRect();
-
-  if (m_pSubject->WndHitTest(m_pSubject->ParentToChild(point)))
-    return 1;
-  if (m_pDateTime->WndHitTest(m_pDateTime->ParentToChild(point)))
-    return 1;
-  if (m_pAuthor->WndHitTest(m_pAuthor->ParentToChild(point)))
-    return 1;
-  if (m_pIcon->WndHitTest(m_pIcon->ParentToChild(point)))
-    return 1;
-
-  if (m_pContents->WndHitTest(m_pContents->ParentToChild(point)))
-    return 0;
-  if (m_pContentsBar->WndHitTest(m_pContentsBar->ParentToChild(point)))
-    return 0;
-
-  if (m_pCloseBox->WndHitTest(m_pCloseBox->ParentToChild(point)))
-    return 4;
-  if (m_pLBBox->WndHitTest(m_pLBBox->ParentToChild(point)))
-    return 2;
-  if (m_pRBBox->WndHitTest(m_pRBBox->ParentToChild(point)))
-    return 3;
-  if (m_pOptions->WndHitTest(m_pOptions->ParentToChild(point)))
-    return 5;
-
-  return 1;
-}
-
 void CPWL_Note::CreateChildWnd(const PWL_CREATEPARAM& cp) {
   CPWL_NoteItem::CreateChildWnd(cp);
 
   CPWL_Color sTextColor;
 
   if (CPWL_Utils::IsBlackOrWhite(GetBackgroundColor()))
     sTextColor = PWL_DEFAULT_WHITECOLOR;
   else
     sTextColor = PWL_DEFAULT_BLACKCOLOR;
 
@@ skipping 257 matching lines @@
 
 FX_BOOL CPWL_Note::OnRButtonUp(const CPDF_Point& point, FX_DWORD nFlag) {
   return CPWL_Wnd::OnRButtonUp(point, nFlag);
 }
 
 const CPWL_Note* CPWL_Note::GetNote() const {
   return this;
 }
 
 IPWL_NoteNotify* CPWL_Note::GetNoteNotify() const {
-  if (m_bEnalbleNotify)
-    return m_pNoteNotify;
-
-  return NULL;
+  return m_bEnableNotify ? m_pNoteNotify : nullptr;
 }
 
 void CPWL_Note::SetIconType(int32_t nType) {
   if (m_pIcon)
     m_pIcon->SetIconType(nType);
 }
 
 void CPWL_Note::EnableModify(FX_BOOL bEnabled) {
   m_pContents->EnableModify(bEnabled);
 }
 
 void CPWL_Note::EnableRead(FX_BOOL bEnabled) {
   m_pContents->EnableRead(bEnabled);
 }
 
 CFX_WideString CPWL_Note::GetReplyString() const {
   return m_sReplyString;
 }
 
 void CPWL_Note::SetReplyString(const CFX_WideString& string) {
   m_sReplyString = string;
 }