diff options
author | thestig <thestig@chromium.org> | 2016-01-04 15:06:27 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-04 23:08:10 +0000 |
commit | e2cb8a125d8079f85c16290ee761460cf54b9ec4 (patch) | |
tree | 0bdd76f3422a09df79cbafd89394c929994275ab /pdf/pdfium | |
parent | 9b27e004cd48237103de4e5f0592749e095aa6f9 (diff) | |
download | chromium_src-e2cb8a125d8079f85c16290ee761460cf54b9ec4.zip chromium_src-e2cb8a125d8079f85c16290ee761460cf54b9ec4.tar.gz chromium_src-e2cb8a125d8079f85c16290ee761460cf54b9ec4.tar.bz2 |
Remove some dead PDF code.
Review URL: https://codereview.chromium.org/1552833003
Cr-Commit-Position: refs/heads/master@{#367398}
Diffstat (limited to 'pdf/pdfium')
-rw-r--r-- | pdf/pdfium/pdfium_engine.cc | 41 | ||||
-rw-r--r-- | pdf/pdfium/pdfium_engine.h | 7 |
2 files changed, 3 insertions, 45 deletions
diff --git a/pdf/pdfium/pdfium_engine.cc b/pdf/pdfium/pdfium_engine.cc index f9e47f5..4151bb2 100644 --- a/pdf/pdfium/pdfium_engine.cc +++ b/pdf/pdfium/pdfium_engine.cc @@ -534,7 +534,6 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Client* client) fpdf_availability_(NULL), next_timer_id_(0), last_page_mouse_down_(-1), - first_visible_page_(-1), most_visible_page_(-1), called_do_document_action_(false), render_grayscale_(false), @@ -2272,10 +2271,6 @@ std::string PDFiumEngine::GetLinkAtPosition(const pp::Point& point) { return url; } -bool PDFiumEngine::IsSelecting() { - return selecting_; -} - bool PDFiumEngine::HasPermission(DocumentPermission permission) const { // PDF 1.7 spec, section 3.5.2 says: "If the revision number is 2 or greater, // the operations to which user access can be controlled are as follows: ..." @@ -2345,11 +2340,6 @@ int PDFiumEngine::GetNamedDestinationPage(const std::string& destination) { return dest ? FPDFDest_GetPageIndex(doc_, dest) : -1; } -int PDFiumEngine::GetFirstVisiblePage() { - CalculateVisiblePages(); - return first_visible_page_; -} - int PDFiumEngine::GetMostVisiblePage() { CalculateVisiblePages(); return most_visible_page_; @@ -2366,26 +2356,6 @@ pp::Rect PDFiumEngine::GetPageContentsRect(int index) { return GetScreenRect(pages_[index]->rect()); } -void PDFiumEngine::PaintThumbnail(pp::ImageData* image_data, int index) { - FPDF_BITMAP bitmap = FPDFBitmap_CreateEx( - image_data->size().width(), image_data->size().height(), - FPDFBitmap_BGRx, image_data->data(), image_data->stride()); - - if (pages_[index]->available()) { - FPDFBitmap_FillRect(bitmap, 0, 0, image_data->size().width(), - image_data->size().height(), 0xFFFFFFFF); - - FPDF_RenderPageBitmap( - bitmap, pages_[index]->GetPage(), 0, 0, image_data->size().width(), - image_data->size().height(), 0, GetRenderingFlags()); - } else { - FPDFBitmap_FillRect(bitmap, 0, 0, image_data->size().width(), - image_data->size().height(), kPendingPageColor); - } - - FPDFBitmap_Destroy(bitmap); -} - void PDFiumEngine::SetGrayscale(bool grayscale) { render_grayscale_ = grayscale; } @@ -2714,15 +2684,10 @@ void PDFiumEngine::CalculateVisiblePages() { // screen coordinates. form_highlights_.clear(); - if (visible_pages_.size() == 0) - first_visible_page_ = -1; - else - first_visible_page_ = visible_pages_.front(); - - int most_visible_page = first_visible_page_; + int most_visible_page = visible_pages_.empty() ? 0 : visible_pages_.front(); + DCHECK_GE(most_visible_page, 0); // Check if the next page is more visible than the first one. - if (most_visible_page != -1 && - pages_.size() > 0 && + if (!pages_.empty() && most_visible_page < static_cast<int>(pages_.size()) - 1) { pp::Rect rc_first = visible_rect.Intersect(GetPageScreenRect(most_visible_page)); diff --git a/pdf/pdfium/pdfium_engine.h b/pdf/pdfium/pdfium_engine.h index 88a2575..e0b8af5 100644 --- a/pdf/pdfium/pdfium_engine.h +++ b/pdf/pdfium/pdfium_engine.h @@ -77,19 +77,16 @@ class PDFiumEngine : public PDFEngine, void RotateCounterclockwise() override; std::string GetSelectedText() override; std::string GetLinkAtPosition(const pp::Point& point) override; - bool IsSelecting() override; bool HasPermission(DocumentPermission permission) const override; void SelectAll() override; int GetNumberOfPages() override; pp::VarArray GetBookmarks() override; int GetNamedDestinationPage(const std::string& destination) override; - int GetFirstVisiblePage() override; int GetMostVisiblePage() override; pp::Rect GetPageRect(int index) override; pp::Rect GetPageContentsRect(int index) override; pp::Rect GetPageScreenRect(int page_index) const override; int GetVerticalScrollbarYPosition() override { return position_.y(); } - void PaintThumbnail(pp::ImageData* image_data, int index) override; void SetGrayscale(bool grayscale) override; void OnCallback(int id) override; std::string GetPageAsJSON(int index) override; @@ -670,10 +667,6 @@ class PDFiumEngine : public PDFEngine, // Holds the page index of the last page that the mouse clicked on. int last_page_mouse_down_; - // Holds the page index of the first visible page; refreshed by calling - // CalculateVisiblePages() - int first_visible_page_; - // Holds the page index of the most visible page; refreshed by calling // CalculateVisiblePages() int most_visible_page_; |