Refactor PDFiumEngine::SelectionChangeInvalidator.

pdf/pdfium/pdfium_engine.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "pdf/pdfium/pdfium_engine.h"
 
 #include <math.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 3248 matching lines @@
       //  This is our highlight color.
       pixel[0] = static_cast<uint8_t>(pixel[0] * (kHighlightColorB / 255.0));
       pixel[1] = static_cast<uint8_t>(pixel[1] * (kHighlightColorG / 255.0));
       pixel[2] = static_cast<uint8_t>(pixel[2] * (kHighlightColorR / 255.0));
     }
   }
 }
 
 PDFiumEngine::SelectionChangeInvalidator::SelectionChangeInvalidator(
     PDFiumEngine* engine)
-    : engine_(engine) {
-  previous_origin_ = engine_->GetVisibleRect().point();
-  GetVisibleSelectionsScreenRects(&old_selections_);
-}
+    : engine_(engine),
+      previous_origin_(engine_->GetVisibleRect().point()),
+      old_selections_(GetVisibleSelections()) {}
 
 PDFiumEngine::SelectionChangeInvalidator::~SelectionChangeInvalidator() {
   // Offset the old selections if the document scrolled since we recorded them.
   pp::Point offset = previous_origin_ - engine_->GetVisibleRect().point();
   for (auto& old_selection : old_selections_)
     old_selection.Offset(offset);
 
-  std::vector<pp::Rect> new_selections;
-  GetVisibleSelectionsScreenRects(&new_selections);
+  std::vector<pp::Rect> new_selections = GetVisibleSelections();
   for (auto& new_selection : new_selections) {
     for (auto& old_selection : old_selections_) {
       if (!old_selection.IsEmpty() && new_selection == old_selection) {
         // Rectangle was selected before and after, so no need to invalidate it.
         // Mark the rectangles by setting them to empty.
         new_selection = old_selection = pp::Rect();
         break;
       }
     }
   }
 
   bool selection_changed = false;
   for (const auto& old_selection : old_selections_) {
     if (!old_selection.IsEmpty()) {
       engine_->client_->Invalidate(old_selection);
       selection_changed = true;
     }
   }
   for (const auto& new_selection : new_selections) {
     if (!new_selection.IsEmpty()) {
       engine_->client_->Invalidate(new_selection);
       selection_changed = true;
     }
   }
   if (selection_changed)
     engine_->OnSelectionChanged();
 }
 
-void PDFiumEngine::SelectionChangeInvalidator::GetVisibleSelectionsScreenRects(
-    std::vector<pp::Rect>* rects) {
-  pp::Rect visible_rect = engine_->GetVisibleRect();
+std::vector<pp::Rect>
+PDFiumEngine::SelectionChangeInvalidator::GetVisibleSelections() const {
+  std::vector<pp::Rect> rects;
+  pp::Point visible_point = engine_->GetVisibleRect().point();
   for (auto& range : engine_->selection_) {
-    int page_index = range.page_index();
-    if (!engine_->IsPageVisible(page_index))
-      continue;  // This selection is on a page that's not currently visible.
+    // Exclude selections on pages that's not currently visible.
+    if (!engine_->IsPageVisible(range.page_index()))
+      continue;
 
-    std::vector<pp::Rect> selection_rects =
-        range.GetScreenRects(visible_rect.point(), engine_->current_zoom_,
-                             engine_->current_rotation_);
-    rects->insert(rects->end(), selection_rects.begin(), selection_rects.end());
+    std::vector<pp::Rect> selection_rects = range.GetScreenRects(
+        visible_point, engine_->current_zoom_, engine_->current_rotation_);
+    rects.insert(rects.end(), selection_rects.begin(), selection_rects.end());
   }
+  return rects;
 }
 
 PDFiumEngine::MouseDownState::MouseDownState(
     const PDFiumPage::Area& area,
     const PDFiumPage::LinkTarget& target)
     : area_(area), target_(target) {}
 
 PDFiumEngine::MouseDownState::~MouseDownState() {}
 
 void PDFiumEngine::MouseDownState::Set(const PDFiumPage::Area& area,
@@ skipping 859 matching lines @@
   FPDF_DOCUMENT doc =
       FPDF_LoadMemDocument(pdf_buffer, pdf_buffer_size, nullptr);
   if (!doc)
     return false;
   bool success = FPDF_GetPageSizeByIndex(doc, page_number, width, height) != 0;
   FPDF_CloseDocument(doc);
   return success;
 }
 
 }  // namespace chrome_pdf