Remove CJS_PropValue

This CL removes the CJS_PropValue class and uses CJS_Value directly. The
various Set methods have been moved to CJS_Value and the runtime provided as
needed.

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

1 files changed, 12 insertions, 16 deletions

diff --git a/fpdfsdk/javascript/Annot.cpp b/fpdfsdk/javascript/Annot.cpp
index 0fb83e051b..867cfc49bf 100644
--- a/fpdfsdk/javascript/Annot.cpp
+++ b/fpdfsdk/javascript/Annot.cpp
@@ -36,7 +36,7 @@ Annot::Annot(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) {}
 Annot::~Annot() {}
 
 bool Annot::get_hidden(CJS_Runtime* pRuntime,
-                       CJS_PropValue* vp,
+                       CJS_Value* vp,
                        WideString* sError) {
   if (!m_pAnnot) {
     *sError = JSGetStringFromID(IDS_STRING_JSBADOBJECT);
@@ -44,14 +44,14 @@ bool Annot::get_hidden(CJS_Runtime* pRuntime,
   }
 
   CPDF_Annot* pPDFAnnot = ToBAAnnot(m_pAnnot.Get())->GetPDFAnnot();
-  vp->Set(CPDF_Annot::IsAnnotationHidden(pPDFAnnot->GetAnnotDict()));
+  vp->Set(pRuntime, CPDF_Annot::IsAnnotationHidden(pPDFAnnot->GetAnnotDict()));
   return true;
 }
 
 bool Annot::set_hidden(CJS_Runtime* pRuntime,
-                       const CJS_PropValue& vp,
+                       const CJS_Value& vp,
                        WideString* sError) {
-  bool bHidden = vp.ToBool();  // May invalidate m_pAnnot.
+  bool bHidden = vp.ToBool(pRuntime);  // May invalidate m_pAnnot.
   if (!m_pAnnot) {
     *sError = JSGetStringFromID(IDS_STRING_JSBADOBJECT);
     return false;
@@ -74,22 +74,20 @@ bool Annot::set_hidden(CJS_Runtime* pRuntime,
   return true;
 }
 
-bool Annot::get_name(CJS_Runtime* pRuntime,
-                     CJS_PropValue* vp,
-                     WideString* sError) {
+bool Annot::get_name(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError) {
   if (!m_pAnnot) {
     *sError = JSGetStringFromID(IDS_STRING_JSBADOBJECT);
     return false;
   }
 
-  vp->Set(ToBAAnnot(m_pAnnot.Get())->GetAnnotName());
+  vp->Set(pRuntime, ToBAAnnot(m_pAnnot.Get())->GetAnnotName());
   return true;
 }
 
 bool Annot::set_name(CJS_Runtime* pRuntime,
-                     const CJS_PropValue& vp,
+                     const CJS_Value& vp,
                      WideString* sError) {
-  WideString annotName = vp.ToWideString();  // May invalidate m_pAnnot.
+  WideString annotName = vp.ToWideString(pRuntime);  // May invalidate m_pAnnot.
   if (!m_pAnnot) {
     *sError = JSGetStringFromID(IDS_STRING_JSBADOBJECT);
     return false;
@@ -99,21 +97,19 @@ bool Annot::set_name(CJS_Runtime* pRuntime,
   return true;
 }
 
-bool Annot::get_type(CJS_Runtime* pRuntime,
-                     CJS_PropValue* vp,
-                     WideString* sError) {
+bool Annot::get_type(CJS_Runtime* pRuntime, CJS_Value* vp, WideString* sError) {
   if (!m_pAnnot) {
     *sError = JSGetStringFromID(IDS_STRING_JSBADOBJECT);
     return false;
   }
 
-  vp->Set(CPDF_Annot::AnnotSubtypeToString(
-      ToBAAnnot(m_pAnnot.Get())->GetAnnotSubtype()));
+  vp->Set(pRuntime, CPDF_Annot::AnnotSubtypeToString(
+                        ToBAAnnot(m_pAnnot.Get())->GetAnnotSubtype()));
   return true;
 }
 
 bool Annot::set_type(CJS_Runtime* pRuntime,
-                     const CJS_PropValue& vp,
+                     const CJS_Value& vp,
                      WideString* sError) {
   *sError = JSGetStringFromID(IDS_STRING_JSREADONLY);
   return false;