Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1068)

Unified Diff: pdf/pdfium/pdfium_engine.cc

Issue 2924343005: Add functionality for copying text within form text fields and form combobox text fields (Closed)
Patch Set: Add braces around multi-line conditional Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pdf/pdfium/pdfium_engine.h ('k') | pdf/pdfium/pdfium_page.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pdf/pdfium/pdfium_engine.cc
diff --git a/pdf/pdfium/pdfium_engine.cc b/pdf/pdfium/pdfium_engine.cc
index 28e80d07ef888662aa6eff8681f948d0b3282407..3c70313c58350ae4f70ca4090858b8bd4b0be7cc 100644
--- a/pdf/pdfium/pdfium_engine.cc
+++ b/pdf/pdfium/pdfium_engine.cc
@@ -1627,7 +1627,30 @@ void PDFiumEngine::FitContentsToPrintableAreaIfRequired(
void PDFiumEngine::SaveSelectedFormForPrint() {
FORM_ForceToKillFocus(form_);
- client_->FormTextFieldFocusChange(false);
+ SetInFormTextArea(false);
+}
+
+void PDFiumEngine::SetFormSelectedText(FPDF_FORMHANDLE form_handle,
+ FPDF_PAGE page) {
+ unsigned long form_sel_text_len =
+ FORM_GetSelectedText(form_handle, page, nullptr, 0);
+
+ // Check to see if there is selected text in the form. When
+ // |form_sel_text_len| is 2, that represents a wide string with just a
+ // NUL-terminator.
+ if (form_sel_text_len <= 2)
+ return;
+
+ base::string16 selected_form_text16;
+ PDFiumAPIStringBufferSizeInBytesAdapter<base::string16> string_adapter(
+ &selected_form_text16, form_sel_text_len, false);
+ string_adapter.Close(FORM_GetSelectedText(
+ form_handle, page, string_adapter.GetData(), form_sel_text_len));
+
+ std::string selected_form_text = base::UTF16ToUTF8(selected_form_text16);
+ if (!selected_form_text.empty()) {
+ pp::PDF::SetSelectedText(GetPluginInstance(), selected_form_text.c_str());
+ }
}
void PDFiumEngine::PrintEnd() {
@@ -1724,18 +1747,21 @@ bool PDFiumEngine::OnMouseDown(const pp::MouseInputEvent& event) {
FORM_OnLButtonDown(form_, pages_[page_index]->GetPage(), 0, page_x, page_y);
if (form_type > FPDF_FORMFIELD_UNKNOWN) { // returns -1 sometimes...
- mouse_down_state_.Set(PDFiumPage::NONSELECTABLE_AREA, target);
+ mouse_down_state_.Set(PDFiumPage::FormTypeToArea(form_type), target);
+
bool is_valid_control = (form_type == FPDF_FORMFIELD_TEXTFIELD ||
form_type == FPDF_FORMFIELD_COMBOBOX);
+
+// TODO(bug_62400): figure out selection and copying
+// for XFA fields
#if defined(PDF_ENABLE_XFA)
is_valid_control |= (form_type == FPDF_FORMFIELD_XFA);
#endif
- client_->FormTextFieldFocusChange(is_valid_control);
+ SetInFormTextArea(is_valid_control);
return true; // Return now before we get into the selection code.
}
}
-
- client_->FormTextFieldFocusChange(false);
+ SetInFormTextArea(false);
if (area != PDFiumPage::TEXT_AREA)
return true; // Return true so WebKit doesn't do its own highlighting.
@@ -1810,12 +1836,12 @@ bool PDFiumEngine::OnMouseUp(const pp::MouseInputEvent& event) {
middle_button, alt_key, ctrl_key, meta_key, shift_key);
client_->NavigateTo(target.url, disposition);
- client_->FormTextFieldFocusChange(false);
+ SetInFormTextArea(false);
return true;
}
if (area == PDFiumPage::DOCLINK_AREA) {
client_->ScrollToPage(target.page);
- client_->FormTextFieldFocusChange(false);
+ SetInFormTextArea(false);
return true;
}
}
@@ -1831,6 +1857,9 @@ bool PDFiumEngine::OnMouseUp(const pp::MouseInputEvent& event) {
FORM_OnLButtonUp(form_, pages_[page_index]->GetPage(), 0, page_x, page_y);
}
+ if (area == PDFiumPage::FORM_TEXT_AREA)
+ SetFormSelectedText(form_, pages_[last_page_mouse_down_]->GetPage());
+
if (!selecting_)
return false;
@@ -1862,6 +1891,7 @@ bool PDFiumEngine::OnMouseMove(const pp::MouseInputEvent& event) {
cursor = PP_CURSORTYPE_HAND;
break;
case PDFiumPage::NONSELECTABLE_AREA:
+ case PDFiumPage::FORM_TEXT_AREA:
default:
switch (form_type) {
case FPDF_FORMFIELD_PUSHBUTTON:
@@ -1988,6 +2018,14 @@ bool PDFiumEngine::OnKeyDown(const pp::KeyboardInputEvent& event) {
OnChar(synthesized);
}
+ // If form selected text is empty and key pressed within form text area,
+ // plugin text selection should be cleared.
+ if (in_form_text_area_ &&
+ FORM_GetSelectedText(form_, pages_[last_page_mouse_down_]->GetPage(),
+ nullptr, 0) <= 2) {
+ pp::PDF::SetSelectedText(GetPluginInstance(), "");
+ }
+
return rv;
}
@@ -1995,6 +2033,11 @@ bool PDFiumEngine::OnKeyUp(const pp::KeyboardInputEvent& event) {
if (last_page_mouse_down_ == -1)
return false;
+ if (in_form_text_area_) {
+ if (event.GetKeyCode() == ui::VKEY_SHIFT)
+ SetFormSelectedText(form_, pages_[last_page_mouse_down_]->GetPage());
+ }
+
return !!FORM_OnKeyUp(form_, pages_[last_page_mouse_down_]->GetPage(),
event.GetKeyCode(), event.GetModifiers());
}
@@ -3556,6 +3599,11 @@ void PDFiumEngine::SetSelecting(bool selecting) {
client_->IsSelectingChanged(selecting);
}
+void PDFiumEngine::SetInFormTextArea(bool in_form_text_area) {
+ client_->FormTextFieldFocusChange(in_form_text_area);
+ in_form_text_area_ = in_form_text_area;
+}
+
void PDFiumEngine::ScheduleTouchTimer(const pp::TouchInputEvent& evt) {
touch_timers_[++next_touch_timer_id_] = evt;
client_->ScheduleTouchTimerCallback(next_touch_timer_id_,
« no previous file with comments | « pdf/pdfium/pdfium_engine.h ('k') | pdf/pdfium/pdfium_page.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698