From 64376be4aac4710848b36b823fd98aae75095336 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 31 Mar 2016 20:03:24 -0700 Subject: Move the fpdfsdk/include/javascript folder This CL splits the IJavaScript.h file into the two inner classes and puts them in the fpdfsdk/javascript folder. Review URL: https://codereview.chromium.org/1847583004 --- fpdfsdk/include/fsdk_mgr.h | 2 +- fpdfsdk/include/fxedit/fxet_edit.h | 13 --- fpdfsdk/include/javascript/DEPS | 3 - fpdfsdk/include/javascript/IJavaScript.h | 166 ------------------------------- 4 files changed, 1 insertion(+), 183 deletions(-) delete mode 100644 fpdfsdk/include/javascript/DEPS delete mode 100644 fpdfsdk/include/javascript/IJavaScript.h (limited to 'fpdfsdk/include') diff --git a/fpdfsdk/include/fsdk_mgr.h b/fpdfsdk/include/fsdk_mgr.h index 3b8c951e0e..4bc5a7f916 100644 --- a/fpdfsdk/include/fsdk_mgr.h +++ b/fpdfsdk/include/fsdk_mgr.h @@ -19,7 +19,6 @@ #include "fpdfsdk/include/fsdk_common.h" #include "fpdfsdk/include/fsdk_define.h" #include "fpdfsdk/include/fx_systemhandler.h" -#include "javascript/IJavaScript.h" #include "public/fpdf_formfill.h" #include "public/fpdf_fwlevent.h" @@ -30,6 +29,7 @@ class CPDFSDK_InterForm; class CPDFSDK_PageView; class CPDFSDK_Widget; class IFX_SystemHandler; +class IJS_Runtime; // NOTE: |bsUTF16LE| must outlive the use of the result. Care must be taken // since modifying the result would impact |bsUTF16LE|. diff --git a/fpdfsdk/include/fxedit/fxet_edit.h b/fpdfsdk/include/fxedit/fxet_edit.h index 6f174a81d1..d3383ac2cd 100644 --- a/fpdfsdk/include/fxedit/fxet_edit.h +++ b/fpdfsdk/include/fxedit/fxet_edit.h @@ -21,8 +21,6 @@ class CFX_Edit_Provider; #define FX_EDIT_IsFloatSmaller(fa, fb) \ (fa < fb && !FX_EDIT_IsFloatEqual(fa, fb)) -/* ------------------------- CFX_Edit_Refresh ---------------------------- */ - enum REFRESH_PLAN_E { RP_ANALYSE, RP_NOANALYSE, RP_OPTIONAL }; enum EDIT_PROPS_E { @@ -165,8 +163,6 @@ class CFX_Edit_Refresh { CFX_Edit_RectArray m_RefreshRects; }; -/* ------------------------- CFX_Edit_Select ---------------------------- */ - class CFX_Edit_Select { public: CFX_Edit_Select() {} @@ -206,8 +202,6 @@ class CFX_Edit_Select { CPVT_WordPlace BeginPos, EndPos; }; -/* ------------------------- CFX_Edit_Undo ---------------------------- */ - class CFX_Edit_Undo { public: explicit CFX_Edit_Undo(int32_t nBufsize); @@ -280,9 +274,6 @@ class CFX_Edit_GroupUndoItem : public IFX_Edit_UndoItem { CFX_ArrayTemplate m_Items; }; -/* ------------------------- CFX_Edit_UndoItem derived classes - * ---------------------------- */ - class CFXEU_InsertWord : public CFX_Edit_UndoItem { public: CFXEU_InsertWord(CFX_Edit* pEdit, @@ -507,8 +498,6 @@ class CFXEU_SetWordProps : public CFX_Edit_UndoItem { CPVT_WordProps m_NewWordProps; }; -/* ------------------------- CFX_Edit ---------------------------- */ - class CFX_Edit : public IFX_Edit { friend class CFX_Edit_Iterator; friend class CFXEU_InsertWord; @@ -764,8 +753,6 @@ class CFX_Edit : public IFX_Edit { CFX_Edit_GroupUndoItem* m_pGroupUndoItem; }; -/* ------------------------- CFX_Edit_Iterator ---------------------------- */ - class CFX_Edit_Iterator : public IFX_Edit_Iterator { public: CFX_Edit_Iterator(CFX_Edit* pEdit, IPDF_VariableText_Iterator* pVTIterator); diff --git a/fpdfsdk/include/javascript/DEPS b/fpdfsdk/include/javascript/DEPS deleted file mode 100644 index 2846bdc69c..0000000000 --- a/fpdfsdk/include/javascript/DEPS +++ /dev/null @@ -1,3 +0,0 @@ -include_rules = [ - '+xfa/fxjse/include' -] diff --git a/fpdfsdk/include/javascript/IJavaScript.h b/fpdfsdk/include/javascript/IJavaScript.h deleted file mode 100644 index 8aab367983..0000000000 --- a/fpdfsdk/include/javascript/IJavaScript.h +++ /dev/null @@ -1,166 +0,0 @@ -// 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 - -#ifndef FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_ -#define FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_ - -#include "core/fxcrt/include/fx_string.h" -#include "core/fxcrt/include/fx_system.h" - -#ifdef PDF_ENABLE_XFA -#include "xfa/fxjse/include/fxjse.h" -#endif // PDF_ENABLE_XFA - -class CPDFDoc_Environment; -class CPDFSDK_Annot; -class CPDFSDK_Document; -class CPDF_Bookmark; -class CPDF_FormField; - -// Records the details of an event and triggers JS execution for it. -class IJS_Context { - public: - virtual FX_BOOL RunScript(const CFX_WideString& script, - CFX_WideString* info) = 0; - - virtual void OnApp_Init() = 0; - - virtual void OnDoc_Open(CPDFSDK_Document* pDoc, - const CFX_WideString& strTargetName) = 0; - virtual void OnDoc_WillPrint(CPDFSDK_Document* pDoc) = 0; - virtual void OnDoc_DidPrint(CPDFSDK_Document* pDoc) = 0; - virtual void OnDoc_WillSave(CPDFSDK_Document* pDoc) = 0; - virtual void OnDoc_DidSave(CPDFSDK_Document* pDoc) = 0; - virtual void OnDoc_WillClose(CPDFSDK_Document* pDoc) = 0; - - virtual void OnPage_Open(CPDFSDK_Document* pTarget) = 0; - virtual void OnPage_Close(CPDFSDK_Document* pTarget) = 0; - virtual void OnPage_InView(CPDFSDK_Document* pTarget) = 0; - virtual void OnPage_OutView(CPDFSDK_Document* pTarget) = 0; - - virtual void OnField_MouseDown(FX_BOOL bModifier, - FX_BOOL bShift, - CPDF_FormField* pTarget) = 0; - virtual void OnField_MouseEnter(FX_BOOL bModifier, - FX_BOOL bShift, - CPDF_FormField* pTarget) = 0; - virtual void OnField_MouseExit(FX_BOOL bModifier, - FX_BOOL bShift, - CPDF_FormField* pTarget) = 0; - virtual void OnField_MouseUp(FX_BOOL bModifier, - FX_BOOL bShift, - CPDF_FormField* pTarget) = 0; - virtual void OnField_Focus(FX_BOOL bModifier, - FX_BOOL bShift, - CPDF_FormField* pTarget, - const CFX_WideString& Value) = 0; - virtual void OnField_Blur(FX_BOOL bModifier, - FX_BOOL bShift, - CPDF_FormField* pTarget, - const CFX_WideString& Value) = 0; - - virtual void OnField_Calculate(CPDF_FormField* pSource, - CPDF_FormField* pTarget, - CFX_WideString& Value, - FX_BOOL& bRc) = 0; - virtual void OnField_Format(CPDF_FormField* pTarget, - CFX_WideString& Value, - FX_BOOL bWillCommit) = 0; - virtual void OnField_Keystroke(CFX_WideString& strChange, - const CFX_WideString& strChangeEx, - FX_BOOL KeyDown, - FX_BOOL bModifier, - int& nSelEnd, - int& nSelStart, - FX_BOOL bShift, - CPDF_FormField* pTarget, - CFX_WideString& Value, - FX_BOOL bWillCommit, - FX_BOOL bFieldFull, - FX_BOOL& bRc) = 0; - virtual void OnField_Validate(CFX_WideString& strChange, - const CFX_WideString& strChangeEx, - FX_BOOL bKeyDown, - FX_BOOL bModifier, - FX_BOOL bShift, - CPDF_FormField* pTarget, - CFX_WideString& Value, - FX_BOOL& bRc) = 0; - - virtual void OnScreen_Focus(FX_BOOL bModifier, - FX_BOOL bShift, - CPDFSDK_Annot* pScreen) = 0; - virtual void OnScreen_Blur(FX_BOOL bModifier, - FX_BOOL bShift, - CPDFSDK_Annot* pScreen) = 0; - virtual void OnScreen_Open(FX_BOOL bModifier, - FX_BOOL bShift, - CPDFSDK_Annot* pScreen) = 0; - virtual void OnScreen_Close(FX_BOOL bModifier, - FX_BOOL bShift, - CPDFSDK_Annot* pScreen) = 0; - virtual void OnScreen_MouseDown(FX_BOOL bModifier, - FX_BOOL bShift, - CPDFSDK_Annot* pScreen) = 0; - virtual void OnScreen_MouseUp(FX_BOOL bModifier, - FX_BOOL bShift, - CPDFSDK_Annot* pScreen) = 0; - virtual void OnScreen_MouseEnter(FX_BOOL bModifier, - FX_BOOL bShift, - CPDFSDK_Annot* pScreen) = 0; - virtual void OnScreen_MouseExit(FX_BOOL bModifier, - FX_BOOL bShift, - CPDFSDK_Annot* pScreen) = 0; - virtual void OnScreen_InView(FX_BOOL bModifier, - FX_BOOL bShift, - CPDFSDK_Annot* pScreen) = 0; - virtual void OnScreen_OutView(FX_BOOL bModifier, - FX_BOOL bShift, - CPDFSDK_Annot* pScreen) = 0; - - virtual void OnBookmark_MouseUp(CPDF_Bookmark* pBookMark) = 0; - virtual void OnLink_MouseUp(CPDFSDK_Document* pTarget) = 0; - - virtual void OnMenu_Exec(CPDFSDK_Document* pTarget, - const CFX_WideString&) = 0; - virtual void OnBatchExec(CPDFSDK_Document* pTarget) = 0; - virtual void OnConsole_Exec() = 0; - virtual void OnExternal_Exec() = 0; - - virtual void EnableMessageBox(FX_BOOL bEnable) = 0; - - protected: - virtual ~IJS_Context() {} -}; - -// Owns the FJXS objects needed to actually execute JS. -class IJS_Runtime { - public: - static void Initialize(unsigned int slot, void* isolate); - static IJS_Runtime* Create(CPDFDoc_Environment* pEnv); - virtual ~IJS_Runtime() {} - - virtual IJS_Context* NewContext() = 0; - virtual void ReleaseContext(IJS_Context* pContext) = 0; - virtual IJS_Context* GetCurrentContext() = 0; - virtual void SetReaderDocument(CPDFSDK_Document* pReaderDoc) = 0; - virtual CPDFSDK_Document* GetReaderDocument() = 0; - virtual int Execute(IJS_Context* cc, - const wchar_t* script, - CFX_WideString* info) = 0; - -#ifdef PDF_ENABLE_XFA - virtual FX_BOOL GetHValueByName(const CFX_ByteStringC& utf8Name, - FXJSE_HVALUE hValue) = 0; - virtual FX_BOOL SetHValueByName(const CFX_ByteStringC& utf8Name, - FXJSE_HVALUE hValue) = 0; -#endif // PDF_ENABLE_XFA - - protected: - IJS_Runtime() {} -}; - -#endif // FPDFSDK_INCLUDE_JAVASCRIPT_IJAVASCRIPT_H_ -- cgit v1.2.3