From b38a900497ab85c5badd5f1cd1f8c00d0c6f580d Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 30 Jan 2015 14:31:58 -0800 Subject: Track formhandles in EmbedderTest class itself This removes some duplicated code from each individual test. R=thestig@chromium.org Review URL: https://codereview.chromium.org/885403002 --- testing/embedder_test.h | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'testing/embedder_test.h') diff --git a/testing/embedder_test.h b/testing/embedder_test.h index 3eb3be606f..072dce3bc3 100644 --- a/testing/embedder_test.h +++ b/testing/embedder_test.h @@ -22,6 +22,7 @@ class EmbedderTest : public ::testing::Test { public: EmbedderTest() : document_(nullptr), + form_handle_(nullptr), avail_(nullptr), loader_(nullptr), file_length_(0), @@ -37,36 +38,32 @@ class EmbedderTest : public ::testing::Test { void TearDown() override; FPDF_DOCUMENT document() { return document_; } + FPDF_FORMHANDLE form_handle() { return form_handle_; } - // Open the document specified by |filename|, or return false on failure. + // Open the document specified by |filename|, and create its form fill + // environment, or return false on failure. virtual bool OpenDocument(const std::string& filename); - // Create and return a handle to the form fill module for use with the - // FORM_ family of functions from fpdfformfill.h, or return NULL on failure. - virtual FPDF_FORMHANDLE SetFormFillEnvironment(); - - // Release the resources obtained from SetFormFillEnvironment(). - virtual void ClearFormFillEnvironment(FPDF_FORMHANDLE form); - // Perform JavaScript actions that are to run at document open time. - virtual void DoOpenActions(FPDF_FORMHANDLE form); + virtual void DoOpenActions(); // Determine the page numbers present in the document. virtual int GetFirstPageNum(); virtual int GetPageCount(); // Load a specific page of the open document. - virtual FPDF_PAGE LoadPage(int page_number, FPDF_FORMHANDLE form); + virtual FPDF_PAGE LoadPage(int page_number); // Convert a loaded page into a bitmap. - virtual FPDF_BITMAP RenderPage(FPDF_PAGE page, FPDF_FORMHANDLE form); + virtual FPDF_BITMAP RenderPage(FPDF_PAGE page); // Relese the resources obtained from LoadPage(). Further use of |page| // is prohibited after this call is made. - virtual void UnloadPage(FPDF_PAGE page, FPDF_FORMHANDLE form); + virtual void UnloadPage(FPDF_PAGE page); protected: FPDF_DOCUMENT document_; + FPDF_FORMHANDLE form_handle_; FPDF_AVAIL avail_; FX_DOWNLOADHINTS hints_; FPDF_FILEACCESS file_access_; -- cgit v1.2.3