diff options
author | vitalybuka <vitalybuka@chromium.org> | 2015-08-04 16:19:02 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-04 23:20:47 +0000 |
commit | 0bb69c7f9ab18c6e79dd607ee6ab405231964dac (patch) | |
tree | 40b05aa3555cb0d35a95170992fdb7347d85c174 /pdf | |
parent | 2bcebfbff86ffc73ee01f58a67e15541ffa4a150 (diff) | |
download | chromium_src-0bb69c7f9ab18c6e79dd607ee6ab405231964dac.zip chromium_src-0bb69c7f9ab18c6e79dd607ee6ab405231964dac.tar.gz chromium_src-0bb69c7f9ab18c6e79dd607ee6ab405231964dac.tar.bz2 |
Revert of Add a scroll offset to PDF documents to account for the top material design toolbar. (patchset #7 id:120001 of https://codereview.chromium.org/1255403002/ )
Reason for revert:
This patch breaks print preview.
BUG=516829
Original issue's description:
> Add a scroll offset to PDF documents to account for the top material design toolbar.
>
> Previously the toolbar in the material design PDF UI would always cover the top
> of pages when it was first loaded or when a page was navigated to using the
> page selector. Now we ensure that a blank region is left at the very top of
> the document when it is first loaded. This is the region that the toolbar
> covers, so the document is not obscured at all. When pages are navigated to, we
> ensure that the top of the selected page is always underneath the toolbar
> so that it is not obscured. The one exception to this is when in fit-to-page
> mode which causes the page to be zoomed to cover the entire screen, ignoring
> the toolbar. This is so that users can take advantaging of filling all of the
> screen real-estate with a page when that is what they want.
>
> This is implemented by initially scrolling the document to a negative offset
> (which is equal to the toolbar height). All subsequent scrolls are relative
> to this initial scroll. A few small bugs that assumed there was no blank space
> above the first page have also been fixed.
>
> BUG=439114
>
> Committed: https://crrev.com/daad0f1f879b13c8b55797ae5ce106d382283047
> Cr-Commit-Position: refs/heads/master@{#341685}
TBR=sammc@chromium.org,tsergeant@chromium.org,raymes@chromium.org
BUG=439114
Review URL: https://codereview.chromium.org/1267553004
Cr-Commit-Position: refs/heads/master@{#341820}
Diffstat (limited to 'pdf')
-rw-r--r-- | pdf/out_of_process_instance.cc | 34 | ||||
-rw-r--r-- | pdf/out_of_process_instance.h | 4 | ||||
-rw-r--r-- | pdf/pdf_engine.h | 3 | ||||
-rw-r--r-- | pdf/pdfium/pdfium_engine.cc | 9 | ||||
-rw-r--r-- | pdf/pdfium/pdfium_engine.h | 5 |
5 files changed, 13 insertions, 42 deletions
diff --git a/pdf/out_of_process_instance.cc b/pdf/out_of_process_instance.cc index 0637845..df18f17 100644 --- a/pdf/out_of_process_instance.cc +++ b/pdf/out_of_process_instance.cc @@ -278,8 +278,7 @@ OutOfProcessInstance::OutOfProcessInstance(PP_Instance instance) received_viewport_message_(false), did_call_start_loading_(false), stop_scrolling_(false), - background_color_(kBackgroundColor), - top_toolbar_height_(0) { + background_color_(kBackgroundColor) { loader_factory_.Initialize(this); timer_factory_.Initialize(this); form_factory_.Initialize(this); @@ -356,8 +355,6 @@ bool OutOfProcessInstance::Init(uint32_t argc, headers = argv[i]; else if (strcmp(argn[i], "is-material") == 0) is_material = true; - else if (strcmp(argn[i], "top-toolbar-height") == 0) - base::StringToInt(argv[i], &top_toolbar_height_); } if (is_material) @@ -595,12 +592,8 @@ void OutOfProcessInstance::DidChangeView(const pp::View& view) { if (!stop_scrolling_) { pp::Point scroll_offset(view.GetScrollOffset()); - // Because view messages come from the DOM, the coordinates of the viewport - // are 0-based (i.e. they do not correspond to the viewport's coordinates in - // JS), so we need to subtract the toolbar height to convert them into - // viewport coordinates. pp::FloatPoint scroll_offset_float(scroll_offset.x(), - scroll_offset.y() - top_toolbar_height_); + scroll_offset.y()); scroll_offset_float = BoundScrollOffsetToDocument(scroll_offset_float); engine_->ScrolledToXPosition(scroll_offset_float.x() * device_scale_); engine_->ScrolledToYPosition(scroll_offset_float.y() * device_scale_); @@ -733,15 +726,6 @@ void OutOfProcessInstance::OnPaint( } } - // Ensure the region above the first page (if any) is filled; - int32_t first_page_ypos = engine_->GetPageScreenRect(0).y(); - if (rect.y() < first_page_ypos) { - pp::Rect region = rect.Intersect(pp::Rect( - pp::Point(), pp::Size(plugin_size_.width(), first_page_ypos))); - ready->push_back(PaintManager::ReadyRect(region, image_data_, false)); - FillRect(region, background_color_); - } - for (size_t j = 0; j < background_parts_.size(); ++j) { pp::Rect intersection = background_parts_[j].location.Intersect(rect); if (!intersection.IsEmpty()) { @@ -1153,7 +1137,8 @@ void OutOfProcessInstance::DocumentLoadComplete(int page_count) { pp::PDF::SetContentRestriction(this, content_restrictions); - uma_.HistogramCustomCounts("PDF.PageCount", page_count, 1, 1000000, 50); + uma_.HistogramCustomCounts("PDF.PageCount", page_count, + 1, 1000000, 50); } void OutOfProcessInstance::RotateClockwise() { @@ -1299,10 +1284,10 @@ void OutOfProcessInstance::OnGeometryChanged(double old_zoom, available_area_.Offset((available_area_.width() - doc_width) / 2, 0); available_area_.set_width(doc_width); } - int bottom_of_document = - GetDocumentPixelHeight() + (top_toolbar_height_ * device_scale_); - if (bottom_of_document < available_area_.height()) - available_area_.set_height(bottom_of_document); + int doc_height = GetDocumentPixelHeight(); + if (doc_height < available_area_.height()) { + available_area_.set_height(doc_height); + } CalculateBackgroundParts(); engine_->PageOffsetUpdated(available_area_.point()); @@ -1428,9 +1413,8 @@ pp::FloatPoint OutOfProcessInstance::BoundScrollOffsetToDocument( const pp::FloatPoint& scroll_offset) { float max_x = document_size_.width() * zoom_ - plugin_dip_size_.width(); float x = std::max(std::min(scroll_offset.x(), max_x), 0.0f); - float min_y = -top_toolbar_height_; float max_y = document_size_.height() * zoom_ - plugin_dip_size_.height(); - float y = std::max(std::min(scroll_offset.y(), max_y), min_y); + float y = std::max(std::min(scroll_offset.y(), max_y), 0.0f); return pp::FloatPoint(x, y); } diff --git a/pdf/out_of_process_instance.h b/pdf/out_of_process_instance.h index 1215f19..8a3de66 100644 --- a/pdf/out_of_process_instance.h +++ b/pdf/out_of_process_instance.h @@ -333,10 +333,6 @@ class OutOfProcessInstance : public pp::Instance, // The background color of the PDF viewer. uint32 background_color_; - // The blank space above the first page of the document reserved for the - // toolbar. - int top_toolbar_height_; - DISALLOW_COPY_AND_ASSIGN(OutOfProcessInstance); }; diff --git a/pdf/pdf_engine.h b/pdf/pdf_engine.h index 24c69b5..857db88 100644 --- a/pdf/pdf_engine.h +++ b/pdf/pdf_engine.h @@ -233,9 +233,6 @@ class PDFEngine { virtual pp::Rect GetPageRect(int index) = 0; // Gets the rectangle of the page excluding any additional areas. virtual pp::Rect GetPageContentsRect(int index) = 0; - // Returns a page's rect in screen coordinates, as well as its surrounding - // border areas and bottom separator. - virtual pp::Rect GetPageScreenRect(int page_index) const = 0; // Gets the offset of the vertical scrollbar from the top in document // coordinates. virtual int GetVerticalScrollbarYPosition() = 0; diff --git a/pdf/pdfium/pdfium_engine.cc b/pdf/pdfium/pdfium_engine.cc index fc36c1e..89fa7eb 100644 --- a/pdf/pdfium/pdfium_engine.cc +++ b/pdf/pdfium/pdfium_engine.cc @@ -1071,15 +1071,6 @@ void PDFiumEngine::Paint(const pp::Rect& rect, if (dirty_in_screen.IsEmpty()) continue; - // Compute the leftover dirty region. The first page may have blank space - // above it, in which case we also need to subtract that space from the - // dirty region. - if (i == 0) { - pp::Rect blank_space_in_screen = dirty_in_screen; - blank_space_in_screen.set_y(0); - blank_space_in_screen.set_height(dirty_in_screen.y()); - leftover = leftover.Subtract(blank_space_in_screen); - } leftover = leftover.Subtract(dirty_in_screen); if (pages_[index]->available()) { diff --git a/pdf/pdfium/pdfium_engine.h b/pdf/pdfium/pdfium_engine.h index c8ee6bd..ff45f45 100644 --- a/pdf/pdfium/pdfium_engine.h +++ b/pdf/pdfium/pdfium_engine.h @@ -84,7 +84,6 @@ class PDFiumEngine : public PDFEngine, virtual int GetMostVisiblePage(); virtual pp::Rect GetPageRect(int index); virtual pp::Rect GetPageContentsRect(int index); - virtual pp::Rect GetPageScreenRect(int page_index) const; virtual int GetVerticalScrollbarYPosition() { return position_.y(); } virtual void PaintThumbnail(pp::ImageData* image_data, int index); virtual void SetGrayscale(bool grayscale); @@ -374,6 +373,10 @@ class PDFiumEngine : public PDFEngine, // Returns the currently visible rectangle in document coordinates. pp::Rect GetVisibleRect() const; + // Returns a page's rect in screen coordinates, as well as its surrounding + // border areas and bottom separator. + pp::Rect GetPageScreenRect(int page_index) const; + // Given a rectangle in document coordinates, returns the rectange into screen // coordinates (i.e. 0,0 is top left corner of plugin area). If it's not // visible, an empty rectangle is returned. |