From cb92dc762d5c35232af9f6051b04e9716247d4ae Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 7 Sep 2016 09:02:48 -0700 Subject: Cleanup page when unloading in embedder tests When unloading a page in the embedder tests we need to cleanup the internal page map so if we load the page a second time we don't get a previously unloaded page. Review-Url: https://codereview.chromium.org/2322523002 --- testing/embedder_test.cpp | 8 ++++++++ testing/embedder_test.h | 1 + 2 files changed, 9 insertions(+) diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp index e10e2a81e8..1ce0f36a45 100644 --- a/testing/embedder_test.cpp +++ b/testing/embedder_test.cpp @@ -255,6 +255,7 @@ FPDF_PAGE EmbedderTest::LoadPage(int page_number) { FORM_DoPageAAction(page, form_handle_, FPDFPAGE_AACTION_OPEN); // Cache the page. page_map_[page_number] = page; + page_reverse_map_[page] = page_number; return page; } @@ -274,6 +275,13 @@ void EmbedderTest::UnloadPage(FPDF_PAGE page) { FORM_DoPageAAction(page, form_handle_, FPDFPAGE_AACTION_CLOSE); FORM_OnBeforeClosePage(page, form_handle_); FPDF_ClosePage(page); + + auto it = page_reverse_map_.find(page); + if (it == page_reverse_map_.end()) + return; + + page_map_.erase(it->second); + page_reverse_map_.erase(it); } FPDF_PAGE EmbedderTest::Delegate::GetPage(FPDF_FORMFILLINFO* info, diff --git a/testing/embedder_test.h b/testing/embedder_test.h index 153ca6e5f3..dc4ca0dc08 100644 --- a/testing/embedder_test.h +++ b/testing/embedder_test.h @@ -124,6 +124,7 @@ class EmbedderTest : public ::testing::Test, size_t file_length_; std::unique_ptr file_contents_; std::map page_map_; + std::map page_reverse_map_; private: static void UnsupportedHandlerTrampoline(UNSUPPORT_INFO*, int type); -- cgit v1.2.3