From b1670b5cca9a59dfb612ef9eb891a70dd716bf9c Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 16 Feb 2017 17:01:00 -0800 Subject: Pass CJS_Runtime to JS callbacks. This is much more convenient, since only a fraction of them need an IJS_EventContext, which can be obtained from the CJS_Runtime. Make GetCurrentEventContext() specific to CJS_Runtime, and return the concrete type. This saves a lot of casting. Change-Id: If79a3bcbf44de513f3caace153099234cc313d47 Reviewed-on: https://pdfium-review.googlesource.com/2793 Commit-Queue: dsinclair Reviewed-by: dsinclair --- fpdfsdk/javascript/cjs_runtime.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'fpdfsdk/javascript/cjs_runtime.h') diff --git a/fpdfsdk/javascript/cjs_runtime.h b/fpdfsdk/javascript/cjs_runtime.h index 96b171b41e..039e24b63e 100644 --- a/fpdfsdk/javascript/cjs_runtime.h +++ b/fpdfsdk/javascript/cjs_runtime.h @@ -27,7 +27,6 @@ class CJS_Runtime : public IJS_Runtime, public: using FieldEvent = std::pair; - static CJS_Runtime* FromEventContext(const IJS_EventContext* cc); static CJS_Runtime* CurrentRuntimeFromIsolate(v8::Isolate* pIsolate); explicit CJS_Runtime(CPDFSDK_FormFillEnvironment* pFormFillEnv); @@ -36,11 +35,12 @@ class CJS_Runtime : public IJS_Runtime, // IJS_Runtime IJS_EventContext* NewEventContext() override; void ReleaseEventContext(IJS_EventContext* pContext) override; - IJS_EventContext* GetCurrentEventContext() override; CPDFSDK_FormFillEnvironment* GetFormFillEnv() const override; int ExecuteScript(const CFX_WideString& script, CFX_WideString* info) override; + CJS_EventContext* GetCurrentEventContext() const; + // Returns true if the event isn't already found in the set. bool AddEventToSet(const FieldEvent& event); void RemoveEventFromSet(const FieldEvent& event); -- cgit v1.2.3