commit 5bd9a0bf3a6bf81c3706df595387f9fc497bbd72
author Dan Sinclair <dsinclair@chromium.org> Tue Nov 07 21:36:10 2017 +0000
committer Chromium commit bot <commit-bot@chromium.org> Tue Nov 07 21:36:10 2017 +0000
tree 311fe279349b878a943a5d21bab4ea7cd45460e9
parent d4a4b038d694681b2eaadef9ad6c5e316c67f2e1

Rename CXFA_ToolTip to CXFA_ToolTipData

This CL renames CXFA_ToolTip to CXFA_ToolTipData to signify it is part
of the data hierarchy.

Change-Id: I841ce0ee5841b652e03041f21bc220d9edc7564a
Reviewed-on: https://pdfium-review.googlesource.com/18016
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 06abf6e..6df5f9c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1877,8 +1877,8 @@
       "xfa/fxfa/parser/cxfa_thisproxy.h",
       "xfa/fxfa/parser/cxfa_timezoneprovider.cpp",
       "xfa/fxfa/parser/cxfa_timezoneprovider.h",
-      "xfa/fxfa/parser/cxfa_tooltip.cpp",
-      "xfa/fxfa/parser/cxfa_tooltip.h",
+      "xfa/fxfa/parser/cxfa_tooltipdata.cpp",
+      "xfa/fxfa/parser/cxfa_tooltipdata.h",
       "xfa/fxfa/parser/cxfa_traversestrategy_contentareacontainerlayoutitem.h",
       "xfa/fxfa/parser/cxfa_traversestrategy_contentlayoutitem.h",
       "xfa/fxfa/parser/cxfa_traversestrategy_layoutitem.h",

xfa/fxfa/cxfa_ffwidget.cpp

diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp
index baa9aaf..708c666 100644
--- a/xfa/fxfa/cxfa_ffwidget.cpp
+++ b/xfa/fxfa/cxfa_ffwidget.cpp
@@ -974,9 +974,9 @@
 bool CXFA_FFWidget::GetToolTip(WideString& wsToolTip) {
   CXFA_AssistData assist = m_pDataAcc->GetAssistData();
   if (assist) {
-    CXFA_ToolTip toolTip = assist.GetToolTip();
-    if (toolTip)
-      return toolTip.GetTip(wsToolTip);
+    CXFA_ToolTipData toolTipData = assist.GetToolTipData();
+    if (toolTipData)
+      return toolTipData.GetTip(wsToolTip);
   }
   return GetCaptionText(wsToolTip);
 }

xfa/fxfa/parser/cxfa_assistdata.cpp

diff --git a/xfa/fxfa/parser/cxfa_assistdata.cpp b/xfa/fxfa/parser/cxfa_assistdata.cpp
index e480d0b..051661f 100644
--- a/xfa/fxfa/parser/cxfa_assistdata.cpp
+++ b/xfa/fxfa/parser/cxfa_assistdata.cpp
@@ -10,6 +10,6 @@
 
 CXFA_AssistData::CXFA_AssistData(CXFA_Node* pNode) : CXFA_Data(pNode) {}
 
-CXFA_ToolTip CXFA_AssistData::GetToolTip() {
-  return CXFA_ToolTip(m_pNode->GetChild(0, XFA_Element::ToolTip, false));
+CXFA_ToolTipData CXFA_AssistData::GetToolTipData() {
+  return CXFA_ToolTipData(m_pNode->GetChild(0, XFA_Element::ToolTip, false));
 }

xfa/fxfa/parser/cxfa_assistdata.h

diff --git a/xfa/fxfa/parser/cxfa_assistdata.h b/xfa/fxfa/parser/cxfa_assistdata.h
index f77ffc4..8b37473 100644
--- a/xfa/fxfa/parser/cxfa_assistdata.h
+++ b/xfa/fxfa/parser/cxfa_assistdata.h
@@ -8,7 +8,7 @@
 #define XFA_FXFA_PARSER_CXFA_ASSISTDATA_H_
 
 #include "xfa/fxfa/parser/cxfa_data.h"
-#include "xfa/fxfa/parser/cxfa_tooltip.h"
+#include "xfa/fxfa/parser/cxfa_tooltipdata.h"
 
 class CXFA_Node;
 
@@ -16,7 +16,7 @@
  public:
   explicit CXFA_AssistData(CXFA_Node* pNode);
 
-  CXFA_ToolTip GetToolTip();
+  CXFA_ToolTipData GetToolTipData();
 };
 
 #endif  // XFA_FXFA_PARSER_CXFA_ASSISTDATA_H_

xfa/fxfa/parser/cxfa_tooltipdata.cpp

diff --git a/xfa/fxfa/parser/cxfa_tooltip.cpp b/xfa/fxfa/parser/cxfa_tooltipdata.cpp
similarity index 66%
rename from xfa/fxfa/parser/cxfa_tooltip.cpp
rename to xfa/fxfa/parser/cxfa_tooltipdata.cpp
index 7e56c66..6e2ceb5 100644
--- a/xfa/fxfa/parser/cxfa_tooltip.cpp
+++ b/xfa/fxfa/parser/cxfa_tooltipdata.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxfa/parser/cxfa_tooltip.h"
+#include "xfa/fxfa/parser/cxfa_tooltipdata.h"
 
 #include "xfa/fxfa/parser/cxfa_node.h"
 
-CXFA_ToolTip::CXFA_ToolTip(CXFA_Node* pNode) : CXFA_Data(pNode) {}
+CXFA_ToolTipData::CXFA_ToolTipData(CXFA_Node* pNode) : CXFA_Data(pNode) {}
 
-bool CXFA_ToolTip::GetTip(WideString& wsTip) {
+bool CXFA_ToolTipData::GetTip(WideString& wsTip) {
   return m_pNode->JSNode()->TryContent(wsTip, false, true);
 }

xfa/fxfa/parser/cxfa_tooltipdata.h

diff --git a/xfa/fxfa/parser/cxfa_tooltip.h b/xfa/fxfa/parser/cxfa_tooltipdata.h
similarity index 62%
rename from xfa/fxfa/parser/cxfa_tooltip.h
rename to xfa/fxfa/parser/cxfa_tooltipdata.h
index cc4bc31..447bf81 100644
--- a/xfa/fxfa/parser/cxfa_tooltip.h
+++ b/xfa/fxfa/parser/cxfa_tooltipdata.h
@@ -4,19 +4,19 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXFA_PARSER_CXFA_TOOLTIP_H_
-#define XFA_FXFA_PARSER_CXFA_TOOLTIP_H_
+#ifndef XFA_FXFA_PARSER_CXFA_TOOLTIPDATA_H_
+#define XFA_FXFA_PARSER_CXFA_TOOLTIPDATA_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "xfa/fxfa/parser/cxfa_data.h"
 
 class CXFA_Node;
 
-class CXFA_ToolTip : public CXFA_Data {
+class CXFA_ToolTipData : public CXFA_Data {
  public:
-  explicit CXFA_ToolTip(CXFA_Node* pNode);
+  explicit CXFA_ToolTipData(CXFA_Node* pNode);
 
   bool GetTip(WideString& wsTip);
 };
 
-#endif  // XFA_FXFA_PARSER_CXFA_TOOLTIP_H_
+#endif  // XFA_FXFA_PARSER_CXFA_TOOLTIPDATA_H_