Fix frame coordinate translation issue with scroll views.

third_party/WebKit/Source/web/WebPluginContainerImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 692 matching lines @@
   PluginView::Trace(visitor);
 }
 
 void WebPluginContainerImpl::HandleMouseEvent(MouseEvent* event) {
   DCHECK(Parent()->IsFrameView());
 
   // We cache the parent FrameView here as the plugin widget could be deleted
   // in the call to HandleEvent. See http://b/issue?id=1362948
   FrameView* parent_view = ToFrameView(Parent());
 
+  // TODO(dtapuska): Move WebMouseEventBuilder into the anonymous namespace
+  // in this class.
   WebMouseEventBuilder transformed_event(
       ToFrameView(Parent()), LayoutItem(element_->GetLayoutObject()), *event);
   if (transformed_event.GetType() == WebInputEvent::kUndefined)
     return;
 
   if (event->type() == EventTypeNames::mousedown)
     FocusPlugin();
 
   WebCursorInfo cursor_info;
   if (web_plugin_ &&
@@ skipping 35 matching lines @@
   WebPoint drag_screen_location(event->screenX(), event->screenY());
   WebPoint drag_location(event->AbsoluteLocation().X() - Location().X(),
                          event->AbsoluteLocation().Y() - Location().Y());
 
   web_plugin_->HandleDragStatusUpdate(drag_status, drag_data,
                                       drag_operation_mask, drag_location,
                                       drag_screen_location);
 }
 
 void WebPluginContainerImpl::HandleWheelEvent(WheelEvent* event) {
   WebFloatPoint absolute_root_frame_location =

[bokan, 2017/04/12 17:28:44]

This (and below) should now be called absolute_location or content_location,
right?

[dtapuska, 2017/04/12 19:02:56]

Done.

       event->NativeEvent().PositionInRootFrame();
+
+  FrameView* view = ToFrameView(Parent());
+  // Translate the root frame position to content coordinates.
+  if (view) {
+    absolute_root_frame_location =
+        view->RootFrameToContents(absolute_root_frame_location);
+  }
+
   IntPoint local_point =
       RoundedIntPoint(element_->GetLayoutObject()->AbsoluteToLocal(
           absolute_root_frame_location, kUseTransforms));
   WebMouseWheelEvent translated_event = event->NativeEvent().FlattenTransform();
   translated_event.SetPositionInWidget(local_point.X(), local_point.Y());
 
   WebCursorInfo cursor_info;
   if (web_plugin_->HandleInputEvent(translated_event, cursor_info) !=
       WebInputEventResult::kNotHandled)
     event->SetDefaultHandled();
@@ skipping 43 matching lines @@
     case kTouchEventRequestTypeRaw: {
       if (!event->NativeEvent())
         return;
 
       if (event->type() == EventTypeNames::touchstart)
         FocusPlugin();
 
       WebTouchEvent transformed_event =
           event->NativeEvent()->FlattenTransform();
 
+      FrameView* view = ToFrameView(Parent());
+
       for (unsigned i = 0; i < transformed_event.touches_length; ++i) {
         WebFloatPoint absolute_root_frame_location =
             transformed_event.touches[i].position;
+
+        // Translate the root frame position to content coordinates.
+        if (view) {
+          absolute_root_frame_location =
+              view->RootFrameToContents(absolute_root_frame_location);
+        }
+
         IntPoint local_point =
             RoundedIntPoint(element_->GetLayoutObject()->AbsoluteToLocal(
                 absolute_root_frame_location, kUseTransforms));
         transformed_event.touches[i].position.x = local_point.X();
         transformed_event.touches[i].position.y = local_point.Y();
       }
 
       WebCursorInfo cursor_info;
       if (web_plugin_->HandleInputEvent(transformed_event, cursor_info) !=
           WebInputEventResult::kNotHandled)
@@ skipping 149 matching lines @@
     ComputeClipRectsForPlugin(element_, window_rect, clip_rect,
                               unobscured_rect);
   }
   GetPluginOcclusions(element_, this->Parent(), FrameRect(), cut_out_rects);
   // Convert to the plugin position.
   for (size_t i = 0; i < cut_out_rects.size(); i++)
     cut_out_rects[i].Move(-FrameRect().X(), -FrameRect().Y());
 }
 
 }  // namespace blink