Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / pdf / out_of_process_instance.cc

diff --git a/src/pdf/out_of_process_instance.cc b/src/pdf/out_of_process_instance.cc
index a385bb3..bfbcb93 100644 (file)
--- a/src/pdf/out_of_process_instance.cc
+++ b/src/pdf/out_of_process_instance.cc
@@ -127,6 +127,8 @@ const char kJSEmailBody[] = "body";
 // Rotation (Page -> Plugin)
 const char kJSRotateClockwiseType[] = "rotateClockwise";
 const char kJSRotateCounterclockwiseType[] = "rotateCounterclockwise";
+// Select all text in the document (Page -> Plugin)
+const char kJSSelectAllType[] = "selectAll";
 
 const int kFindResultCooldownMs = 100;
 
@@ -350,14 +352,14 @@ void OutOfProcessInstance::HandleMessage(const pp::Var& message) {
   std::string type = dict.Get(kType).AsString();
 
   if (type == kJSViewportType &&
-      dict.Get(pp::Var(kJSXOffset)).is_int() &&
-      dict.Get(pp::Var(kJSYOffset)).is_int() &&
+      dict.Get(pp::Var(kJSXOffset)).is_number() &&
+      dict.Get(pp::Var(kJSYOffset)).is_number() &&
       dict.Get(pp::Var(kJSZoom)).is_number()) {
     received_viewport_message_ = true;
     stop_scrolling_ = false;
     double zoom = dict.Get(pp::Var(kJSZoom)).AsDouble();
-    pp::Point scroll_offset(dict.Get(pp::Var(kJSXOffset)).AsInt(),
-                            dict.Get(pp::Var(kJSYOffset)).AsInt());
+    pp::FloatPoint scroll_offset(dict.Get(pp::Var(kJSXOffset)).AsDouble(),
+                                 dict.Get(pp::Var(kJSYOffset)).AsDouble());
 
     // Bound the input parameters.
     zoom = std::max(kMinZoom, zoom);
@@ -381,6 +383,8 @@ void OutOfProcessInstance::HandleMessage(const pp::Var& message) {
     RotateClockwise();
   } else if (type == kJSRotateCounterclockwiseType) {
     RotateCounterclockwise();
+  } else if (type == kJSSelectAllType) {
+    engine_->SelectAll();
   } else if (type == kJSResetPrintPreviewModeType &&
              dict.Get(pp::Var(kJSPrintPreviewUrl)).is_string() &&
              dict.Get(pp::Var(kJSPrintPreviewGrayscale)).is_bool() &&
@@ -488,16 +492,6 @@ bool OutOfProcessInstance::HandleInputEvent(
   // TODO(raymes): Implement this scroll behavior in JS:
   // When click+dragging, scroll the document correctly.
 
-  if (event.GetType() == PP_INPUTEVENT_TYPE_KEYDOWN &&
-      event.GetModifiers() & kDefaultKeyModifier) {
-    pp::KeyboardInputEvent keyboard_event(event);
-    switch (keyboard_event.GetKeyCode()) {
-      case 'A':
-        engine_->SelectAll();
-        return true;
-    }
-  }
-
   // Return true for unhandled clicks so the plugin takes focus.
   return (event.GetType() == PP_INPUTEVENT_TYPE_MOUSEDOWN);
 }
@@ -536,10 +530,12 @@ void OutOfProcessInstance::DidChangeView(const pp::View& view) {
   }
 
   if (!stop_scrolling_) {
-    pp::Point scroll_offset(
-        BoundScrollOffsetToDocument(view.GetScrollOffset()));
-    engine_->ScrolledToXPosition(scroll_offset.x() * device_scale_);
-    engine_->ScrolledToYPosition(scroll_offset.y() * device_scale_);
+    pp::Point scroll_offset(view.GetScrollOffset());
+    pp::FloatPoint scroll_offset_float(scroll_offset.x(),
+                                       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_);
   }
 }
 
@@ -910,6 +906,7 @@ void OutOfProcessInstance::NotifyNumberOfFindResultsChanged(int total,
 
 void OutOfProcessInstance::NotifySelectedFindResultChanged(
     int current_find_index) {
+  DCHECK_GE(current_find_index, 0);
   SelectedFindResultChanged(current_find_index);
 }
 
@@ -1363,13 +1360,13 @@ void OutOfProcessInstance::UserMetricsRecordAction(
   pp::PDF::UserMetricsRecordAction(this, pp::Var(action));
 }
 
-pp::Point OutOfProcessInstance::BoundScrollOffsetToDocument(
-    const pp::Point& scroll_offset) {
-  int max_x = document_size_.width() * zoom_ - plugin_dip_size_.width();
-  int x = std::max(std::min(scroll_offset.x(), max_x), 0);
-  int max_y = document_size_.height() * zoom_ - plugin_dip_size_.height();
-  int y = std::max(std::min(scroll_offset.y(), max_y), 0);
-  return pp::Point(x, y);
+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 max_y = document_size_.height() * zoom_ - plugin_dip_size_.height();
+  float y = std::max(std::min(scroll_offset.y(), max_y), 0.0f);
+  return pp::FloatPoint(x, y);
 }
 
 }  // namespace chrome_pdf