Add functionality for copying text within form text fields and form combobox text fields

pdf/pdfium/pdfium_page.cc

 // Copyright (c) 2010 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_page.h"
 
 #include <math.h>
 #include <stddef.h>
 
 #include <algorithm>
@@ skipping 246 matching lines @@
 
   // If there is a control and link at the same point, figure out their z-order
   // to determine which is on top.
   if (link && control > FPDF_FORMFIELD_UNKNOWN) {
     int control_z_order = FPDFPage_FormFieldZOrderAtPoint(
         engine_->form(), GetPage(), new_x, new_y);
     int link_z_order = FPDFLink_GetLinkZOrderAtPoint(GetPage(), new_x, new_y);
     DCHECK_NE(control_z_order, link_z_order);
     if (control_z_order > link_z_order) {
       *form_type = control;
+
+      if (*form_type == FPDF_FORMFIELD_TEXTFIELD)

[Lei Zhang, 2017/06/17 02:21:18]

We now have 3 (or more?) places that are trying to decide between
(FORM_TEXT_AREA, FORM_COMBOBOX_TEXT_AREA, NONSELECTABLE_AREA). Can we write a
helper function?

[drgage, 2017/06/19 21:53:52]

Do you still think this will be necessary after removing the
FORM_COMBOBOX_TEXT_AREA value? In pdfium_engine.cc where this decision is made,
I've gone back to using the ternary operator.

[Lei Zhang, 2017/06/20 00:26:24]

Given the pdfium_engine.cc code in question forgot to check for the combobox
type, probably yes.

[drgage, 2017/06/20 23:14:27]

Done.

+        return PDFiumPage::FORM_TEXT_AREA;
+
+      if (*form_type == FPDF_FORMFIELD_COMBOBOX)
+        return PDFiumPage::FORM_COMBOBOX_TEXT_AREA;
+
       return PDFiumPage::NONSELECTABLE_AREA;
     }
 
     // We don't handle all possible link types of the PDF. For example,
     // launch actions, cross-document links, etc.
     // In that case, GetLinkTarget() will return NONSELECTABLE_AREA
     // and we should proceed with area detection.
     PDFiumPage::Area area = GetLinkTarget(link, target);
     if (area != PDFiumPage::NONSELECTABLE_AREA)
       return area;
   } else if (link) {
     // We don't handle all possible link types of the PDF. For example,
     // launch actions, cross-document links, etc.
     // See identical block above.
     PDFiumPage::Area area = GetLinkTarget(link, target);
     if (area != PDFiumPage::NONSELECTABLE_AREA)
       return area;
   } else if (control > FPDF_FORMFIELD_UNKNOWN) {
     *form_type = control;
+
+    if (*form_type == FPDF_FORMFIELD_TEXTFIELD)
+      return PDFiumPage::FORM_TEXT_AREA;
+
+    if (*form_type == FPDF_FORMFIELD_COMBOBOX)
+      return PDFiumPage::FORM_COMBOBOX_TEXT_AREA;
+
     return PDFiumPage::NONSELECTABLE_AREA;
   }
 
   if (rv < 0)
     return NONSELECTABLE_AREA;
 
   return GetLink(*char_index, target) != -1 ? WEBLINK_AREA : TEXT_AREA;
 }
 
 base::char16 PDFiumPage::GetCharAtIndex(int index) {
@@ skipping 226 matching lines @@
   page_->loading_count_--;
 }
 
 PDFiumPage::Link::Link() = default;
 
 PDFiumPage::Link::Link(const Link& that) = default;
 
 PDFiumPage::Link::~Link() = default;
 
 }  // namespace chrome_pdf