Right clicking outside of a selected area should deselect text and bring up the correct context men…

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 "base/json/json_writer.h"
 #include "base/logging.h"
@@ skipping 1587 matching lines @@
     if (progressive_paints_[i].page_index == page)
       return PDFiumPage::NONSELECTABLE_AREA;
   }
 
   *page_index = page;
   return pages_[page]->GetCharIndex(point, current_rotation_, char_index,
                                     target);
 }
 
 bool PDFiumEngine::OnMouseDown(const pp::MouseInputEvent& event) {
-  if (event.GetButton() != PP_INPUTEVENT_MOUSEBUTTON_LEFT)
+  if (event.GetButton() != PP_INPUTEVENT_MOUSEBUTTON_LEFT &&
+      event.GetButton() != PP_INPUTEVENT_MOUSEBUTTON_RIGHT) {
     return false;
+  }
+  if (event.GetButton() == PP_INPUTEVENT_MOUSEBUTTON_RIGHT) {
+    if (!selection_.size())
+      return false;
+    std::vector<pp::Rect> selection_rect_vector;
+    GetAllScreenRectsUnion(&selection_, GetVisibleRect().point(),
+                           &selection_rect_vector);
+    pp::Point point = event.GetPosition();
+    for (size_t i = 0; i < selection_rect_vector.size(); ++i) {
+      if (selection_rect_vector[i].Contains(point.x(), point.y()))
+        return false;
+    }
+    SelectionChangeInvalidator selection_invalidator(this);
+    selection_.clear();
+    return true;
+  }
 
   SelectionChangeInvalidator selection_invalidator(this);
   selection_.clear();
 
   int page_index = -1;
   int char_index = -1;
   PDFiumPage::LinkTarget target;
   PDFiumPage::Area area = GetCharIndex(event, &page_index,
                                        &char_index, &target);
   mouse_down_state_.Set(area, target);
@@ skipping 559 matching lines @@
   find_results_.clear();
   next_page_to_search_ = -1;
   last_page_to_search_ = -1;
   last_character_index_to_search_ = -1;
   current_find_index_.Invalidate();
   current_find_text_.clear();
   UpdateTickMarks();
   find_factory_.CancelAll();
 }
 
+void PDFiumEngine::GetAllScreenRectsUnion(std::vector<PDFiumRange>* rect_range,
+                                          const pp::Point& offset_point,
+                                          std::vector<pp::Rect>* rect_vector) {
+  for (std::vector<PDFiumRange>::iterator it = rect_range->begin();
+       it != rect_range->end(); ++it) {
+    pp::Rect rect;
+    std::vector<pp::Rect> rects =
+        it->GetScreenRects(offset_point, current_zoom_, current_rotation_);
+    for (size_t j = 0; j < rects.size(); ++j)
+      rect = rect.Union(rects[j]);
+    rect_vector->push_back(rect);
+  }
+}
+
 void PDFiumEngine::UpdateTickMarks() {
   std::vector<pp::Rect> tickmarks;
-  for (size_t i = 0; i < find_results_.size(); ++i) {
-    pp::Rect rect;
-    // Always use an origin of 0,0 since scroll positions don't affect tickmark.
-    std::vector<pp::Rect> rects = find_results_[i].GetScreenRects(
-      pp::Point(0, 0), current_zoom_, current_rotation_);
-    for (size_t j = 0; j < rects.size(); ++j)
-      rect = rect.Union(rects[j]);
-    tickmarks.push_back(rect);
-  }
-
+  GetAllScreenRectsUnion(&find_results_, pp::Point(0, 0), &tickmarks);
   client_->UpdateTickMarks(tickmarks);
 }
 
 void PDFiumEngine::ZoomUpdated(double new_zoom_level) {
   CancelPaints();
 
   current_zoom_ = new_zoom_level;
 
   CalculateVisiblePages();
   UpdateTickMarks();
@@ skipping 1678 matching lines @@
     double* height) {
   FPDF_DOCUMENT doc = FPDF_LoadMemDocument(pdf_buffer, pdf_buffer_size, NULL);
   if (!doc)
     return false;
   bool success = FPDF_GetPageSizeByIndex(doc, page_number, width, height) != 0;
   FPDF_CloseDocument(doc);
   return success;
 }
 
 }  // namespace chrome_pdf