diff options
| author | Henrique Nakashima <hnakashima@chromium.org> | 2018-09-24 17:23:27 +0000 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2018-09-24 17:23:27 +0000 |
| commit | 97f4483de007c2ff248696f24d34634e0adbf894 (patch) | |
| tree | 7defaedcdad0f06b8a870164fd2bee9200b347ac /testing | |
| parent | f07e487a1a6d5c1588b1d1dfd5c25fa5b91f73ca (diff) | |
| download | pdfium-97f4483de007c2ff248696f24d34634e0adbf894.tar.xz | |
Revert "Make potentially dangerous Actions require a user click."
This reverts commit 9d784c291714b703b16185e69860a3797de85b6c.
Reason for revert: Roll into chromium is stuck, this is a potential
culprit.
Original change's description:
> Make potentially dangerous Actions require a user click.
>
> URI and SubmitForm actions are only handled if the event was
> ButtonUp or ButtonDown.
>
> Bug: 851821
> Change-Id: If6eb0ff44f6d62ac6df50b552c0bdc582885ab5d
> Reviewed-on: https://pdfium-review.googlesource.com/42731
> Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
> Reviewed-by: Tom Sepez <tsepez@chromium.org>
> Reviewed-by: Ryan Harrison <rharrison@chromium.org>
TBR=tsepez@chromium.org,hnakashima@chromium.org,rharrison@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 851821
Change-Id: I6f1bc0a02f65a24fbd49d53526b985f8a4ea0b4f
Reviewed-on: https://pdfium-review.googlesource.com/42990
Reviewed-by: Henrique Nakashima <hnakashima@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/embedder_test.cpp | 9 | ||||
| -rw-r--r-- | testing/embedder_test.h | 5 | ||||
| -rw-r--r-- | testing/resources/redirect.pdf | 22 |
3 files changed, 0 insertions, 36 deletions
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp index 43f077ca01..215009ceac 100644 --- a/testing/embedder_test.cpp +++ b/testing/embedder_test.cpp @@ -241,8 +241,6 @@ FPDF_FORMHANDLE EmbedderTest::SetupFormFillEnvironment( formfillinfo->FFI_SetTimer = SetTimerTrampoline; formfillinfo->FFI_KillTimer = KillTimerTrampoline; formfillinfo->FFI_GetPage = GetPageTrampoline; - formfillinfo->FFI_DoURIAction = DoURIActionTrampoline; - if (javascript_option == JavaScriptOption::kEnableJavaScript) formfillinfo->m_pJsPlatform = platform; @@ -480,13 +478,6 @@ FPDF_PAGE EmbedderTest::GetPageTrampoline(FPDF_FORMFILLINFO* info, } // static -void EmbedderTest::DoURIActionTrampoline(FPDF_FORMFILLINFO* info, - FPDF_BYTESTRING uri) { - EmbedderTest* test = static_cast<EmbedderTest*>(info); - return test->delegate_->DoURIAction(uri); -} - -// static std::string EmbedderTest::HashBitmap(FPDF_BITMAP bitmap) { uint8_t digest[16]; CRYPT_MD5Generate(static_cast<uint8_t*>(FPDFBitmap_GetBuffer(bitmap)), diff --git a/testing/embedder_test.h b/testing/embedder_test.h index a6a4cf51e4..64707631b5 100644 --- a/testing/embedder_test.h +++ b/testing/embedder_test.h @@ -62,9 +62,6 @@ class EmbedderTest : public ::testing::Test, virtual FPDF_PAGE GetPage(FPDF_FORMFILLINFO* info, FPDF_DOCUMENT document, int page_index); - - // Equivalent to FPDF_FORMFILLINFO::FFI_DoURIAction(). - virtual void DoURIAction(FPDF_BYTESTRING uri) {} }; EmbedderTest(); @@ -248,8 +245,6 @@ class EmbedderTest : public ::testing::Test, static FPDF_PAGE GetPageTrampoline(FPDF_FORMFILLINFO* info, FPDF_DOCUMENT document, int page_index); - static void DoURIActionTrampoline(FPDF_FORMFILLINFO* info, - FPDF_BYTESTRING uri); static int WriteBlockCallback(FPDF_FILEWRITE* pFileWrite, const void* data, unsigned long size); diff --git a/testing/resources/redirect.pdf b/testing/resources/redirect.pdf deleted file mode 100644 index 2dcc23b0be..0000000000 --- a/testing/resources/redirect.pdf +++ /dev/null @@ -1,22 +0,0 @@ -%PDF-1.7
-trailer
-<<
-/Root 1 0 R
->>
-1 0 obj
-<<
-/Type /Catalog
-/Pages 2 0 R
-/OpenAction 2 0 R
->>
-endobj
-
-2 0 obj
-<<
-/Type /Action
-/S /URI
-/URI (http://evilzone.org) // URL HERE
->>
-endobj
-
-%%EOF
\ No newline at end of file |