Add observer for BAAnnots from Javascript

fpdfsdk/javascript/Annot.cpp

 // Copyright 2016 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/javascript/Annot.h"
 
 #include "fpdfsdk/javascript/JS_Define.h"
 #include "fpdfsdk/javascript/JS_Object.h"
@@ skipping 14 matching lines @@
 
 IMPLEMENT_JS_CLASS(CJS_Annot, Annot)
 
 Annot::Annot(CJS_Object* pJSObject) : CJS_EmbedObj(pJSObject) {}
 
 Annot::~Annot() {}
 
 FX_BOOL Annot::hidden(IJS_Context* cc,
                       CJS_PropValue& vp,
                       CFX_WideString& sError) {
+  if (!m_BAAnnot)
+    return FALSE;
+
   if (vp.IsGetting()) {
     CPDF_Annot* pPDFAnnot = m_BAAnnot->GetPDFAnnot();
     vp << CPDF_Annot::IsAnnotationHidden(pPDFAnnot->GetAnnotDict());
     return TRUE;
   }
 
   bool bHidden;
   vp >> bHidden;
 
   uint32_t flags = m_BAAnnot->GetFlags();
   if (bHidden) {
     flags |= ANNOTFLAG_HIDDEN;
     flags |= ANNOTFLAG_INVISIBLE;
     flags |= ANNOTFLAG_NOVIEW;
     flags &= ~ANNOTFLAG_PRINT;
   } else {
     flags &= ~ANNOTFLAG_HIDDEN;
     flags &= ~ANNOTFLAG_INVISIBLE;
     flags &= ~ANNOTFLAG_NOVIEW;
     flags |= ANNOTFLAG_PRINT;
   }
   m_BAAnnot->SetFlags(flags);
   return TRUE;
 }
 
 FX_BOOL Annot::name(IJS_Context* cc,
                     CJS_PropValue& vp,
                     CFX_WideString& sError) {
+  if (!m_BAAnnot)
+    return FALSE;
+
   if (vp.IsGetting()) {
     vp << m_BAAnnot->GetAnnotName();
     return TRUE;
   }
 
   CFX_WideString annotName;
   vp >> annotName;
   m_BAAnnot->SetAnnotName(annotName);
   return TRUE;
 }
 
 FX_BOOL Annot::type(IJS_Context* cc,
                     CJS_PropValue& vp,
                     CFX_WideString& sError) {
   if (vp.IsSetting()) {
     CJS_Context* pContext = static_cast<CJS_Context*>(cc);
     sError = JSGetStringFromID(pContext, IDS_STRING_JSREADONLY);
     return FALSE;
   }
 
+  if (!m_BAAnnot)
+    return FALSE;
+
   vp << CPDF_Annot::AnnotSubtypeToString(m_BAAnnot->GetAnnotSubtype());
   return TRUE;
 }
 
-void Annot::SetSDKAnnot(CPDFSDK_BAAnnot* annot) {
-  m_BAAnnot = annot;
+void Annot::SetSDKAnnot(CPDFSDK_BAAnnot* baannot) {
+  m_BAAnnot = baannot;

[Tom Sepez, 2016/09/01 18:04:24]

m_BAAnnot can't be a widget?

[dsinclair, 2016/09/01 18:11:58]

I don't think so as the Widget inherits from BAAnnot and overrides stuff.
(Things like IsAppearanceValid are overridden in Widget)

[Tom Sepez, 2016/09/01 18:12:06]

I mean, what if we repalce m_BAAnont with a CPDFSDK_Annot and downcast?

+  m_pObserver.reset(new CPDFSDK_BAAnnot::Observer(&m_BAAnnot));
 }