From 618cb1f3e561b5d2a1dea9ec4653804f0da7267c Mon Sep 17 00:00:00 2001 From: tonikitoo Date: Thu, 18 Aug 2016 20:10:17 -0700 Subject: Add initial Document::getAnnot support CL implements the first step in order to support Annotations manipulation in PDFium: Document::getAnnot. The method takes two arguments, an integer (page number) and a string (annotation name). When called, it iterates over the annotations on the given page number, searching for the one whose name matches the string in the second parameter. If found, then an Annot instance (see Annot.cpp/g added by this CL), is bound to a Javascript object and returned. With the use cases described in bug [1] as an initial test case, CL adds support to the following Annotation object properties: - hidden - name - type Idea is to keep evolving the implementation with more methods and properties in follow up CLs. [1] https://bugs.chromium.org/p/pdfium/issues/detail?id=492 BUG=pdfium:492 Review-Url: https://codereview.chromium.org/2260663002 --- fpdfsdk/javascript/Annot.cpp | 89 ++++++++++++++++++++++++++++++++++++++ fpdfsdk/javascript/Annot.h | 39 +++++++++++++++++ fpdfsdk/javascript/Document.cpp | 46 ++++++++++++++++++++ fpdfsdk/javascript/cjs_runtime.cpp | 4 +- 4 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 fpdfsdk/javascript/Annot.cpp create mode 100644 fpdfsdk/javascript/Annot.h (limited to 'fpdfsdk/javascript') diff --git a/fpdfsdk/javascript/Annot.cpp b/fpdfsdk/javascript/Annot.cpp new file mode 100644 index 0000000000..df123274d5 --- /dev/null +++ b/fpdfsdk/javascript/Annot.cpp @@ -0,0 +1,89 @@ +// 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" +#include "fpdfsdk/javascript/JS_Value.h" +#include "fpdfsdk/javascript/cjs_context.h" + +BEGIN_JS_STATIC_CONST(CJS_Annot) +END_JS_STATIC_CONST() + +BEGIN_JS_STATIC_PROP(CJS_Annot) +JS_STATIC_PROP_ENTRY(hidden) +JS_STATIC_PROP_ENTRY(name) +JS_STATIC_PROP_ENTRY(type) +END_JS_STATIC_PROP() + +BEGIN_JS_STATIC_METHOD(CJS_Annot) +END_JS_STATIC_METHOD() + +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 (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 (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(cc); + sError = JSGetStringFromID(pContext, IDS_STRING_JSREADONLY); + return FALSE; + } + + vp << m_BAAnnot->GetType(); + return TRUE; +} + +void Annot::SetSDKAnnot(CPDFSDK_BAAnnot* annot) { + m_BAAnnot = annot; +} diff --git a/fpdfsdk/javascript/Annot.h b/fpdfsdk/javascript/Annot.h new file mode 100644 index 0000000000..b3ea292aed --- /dev/null +++ b/fpdfsdk/javascript/Annot.h @@ -0,0 +1,39 @@ +// 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 + +#ifndef FPDFSDK_JAVASCRIPT_ANNOT_H_ +#define FPDFSDK_JAVASCRIPT_ANNOT_H_ + +#include "fpdfsdk/include/cpdfsdk_baannot.h" +#include "fpdfsdk/javascript/JS_Define.h" + +class Annot : public CJS_EmbedObj { + public: + explicit Annot(CJS_Object* pJSObject); + ~Annot() override; + + FX_BOOL hidden(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + FX_BOOL name(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + FX_BOOL type(IJS_Context* cc, CJS_PropValue& vp, CFX_WideString& sError); + + void SetSDKAnnot(CPDFSDK_BAAnnot* annot); + + private: + CPDFSDK_BAAnnot* m_BAAnnot = nullptr; +}; + +class CJS_Annot : public CJS_Object { + public: + explicit CJS_Annot(v8::Local pObject) : CJS_Object(pObject) {} + ~CJS_Annot() override {} + + DECLARE_JS_CLASS(); + JS_STATIC_PROP(hidden, Annot); + JS_STATIC_PROP(name, Annot); + JS_STATIC_PROP(type, Annot); +}; + +#endif // FPDFSDK_JAVASCRIPT_ANNOT_H_ diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp index e38f61d5fc..8fb07b085b 100644 --- a/fpdfsdk/javascript/Document.cpp +++ b/fpdfsdk/javascript/Document.cpp @@ -15,9 +15,11 @@ #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h" #include "core/fpdfdoc/include/cpdf_interform.h" #include "core/fpdfdoc/include/cpdf_nametree.h" +#include "fpdfsdk/include/cpdfsdk_annotiterator.h" #include "fpdfsdk/include/cpdfsdk_interform.h" #include "fpdfsdk/include/cpdfsdk_widget.h" #include "fpdfsdk/include/fsdk_mgr.h" +#include "fpdfsdk/javascript/Annot.h" #include "fpdfsdk/javascript/Field.h" #include "fpdfsdk/javascript/Icon.h" #include "fpdfsdk/javascript/JS_Define.h" @@ -1029,6 +1031,50 @@ FX_BOOL Document::getAnnot(IJS_Context* cc, const std::vector& params, CJS_Value& vRet, CFX_WideString& sError) { + CJS_Context* pContext = static_cast(cc); + if (params.size() != 2) { + sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR); + return FALSE; + } + + CJS_Runtime* pRuntime = pContext->GetJSRuntime(); + int nPageNo = params[0].ToInt(pRuntime); + CFX_WideString swAnnotName = params[1].ToCFXWideString(pRuntime); + + CPDFSDK_PageView* pPageView = m_pDocument->GetPageView(nPageNo); + if (!pPageView) + return FALSE; + + CPDFSDK_AnnotIterator annotIterator(pPageView, false); + CPDFSDK_BAAnnot* pSDKBAAnnot = nullptr; + while (CPDFSDK_Annot* pSDKAnnotCur = annotIterator.Next()) { + CPDFSDK_BAAnnot* pBAAnnot = static_cast(pSDKAnnotCur); + if (pBAAnnot && pBAAnnot->GetAnnotName() == swAnnotName) { + pSDKBAAnnot = pBAAnnot; + break; + } + } + + if (!pSDKBAAnnot) + return FALSE; + + v8::Local pObj = + pRuntime->NewFxDynamicObj(CJS_Annot::g_nObjDefnID); + if (pObj.IsEmpty()) + return FALSE; + + CJS_Annot* pJS_Annot = + static_cast(pRuntime->GetObjectPrivate(pObj)); + if (!pJS_Annot) + return FALSE; + + Annot* pAnnot = static_cast(pJS_Annot->GetEmbedObject()); + if (!pAnnot) + return FALSE; + + pAnnot->SetSDKAnnot(pSDKBAAnnot); + + vRet = CJS_Value(pRuntime, pJS_Annot); return TRUE; } diff --git a/fpdfsdk/javascript/cjs_runtime.cpp b/fpdfsdk/javascript/cjs_runtime.cpp index 7ea9b158a5..b12a3f5eeb 100644 --- a/fpdfsdk/javascript/cjs_runtime.cpp +++ b/fpdfsdk/javascript/cjs_runtime.cpp @@ -9,6 +9,7 @@ #include #include "fpdfsdk/include/fsdk_mgr.h" +#include "fpdfsdk/javascript/Annot.h" #include "fpdfsdk/javascript/Consts.h" #include "fpdfsdk/javascript/Document.h" #include "fpdfsdk/javascript/Field.h" @@ -175,9 +176,10 @@ void CJS_Runtime::DefineJSObjects() { CJS_GlobalConsts::DefineJSObjects(this); CJS_GlobalArrays::DefineJSObjects(this); - // ObjDefIDs 21 - 22. + // ObjDefIDs 21 - 23. CJS_TimerObj::DefineJSObjects(this, FXJSOBJTYPE_DYNAMIC); CJS_PrintParamsObj::DefineJSObjects(this, FXJSOBJTYPE_DYNAMIC); + CJS_Annot::DefineJSObjects(this, FXJSOBJTYPE_DYNAMIC); } IJS_Context* CJS_Runtime::NewContext() { -- cgit v1.2.3