Use FrameView rather than FrameViewBase for WebInputEventConversion

third_party/WebKit/Source/web/WebInputEventConversion.cpp

 /*
  * Copyright (C) 2009 Google Inc. 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 24 matching lines @@
 #include "core/events/GestureEvent.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
 #include "core/events/TouchEvent.h"
 #include "core/events/WheelEvent.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/VisualViewport.h"
 #include "core/layout/api/LayoutItem.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
-#include "platform/FrameViewBase.h"
 #include "platform/KeyboardCodes.h"
 #include "public/platform/Platform.h"
 
 namespace blink {
 
 namespace {
-float FrameScale(const FrameViewBase* frame_view_base) {
+float FrameScale(const FrameView* frame_view) {
   float scale = 1;
-  if (frame_view_base) {
-    FrameView* root_view = ToFrameView(frame_view_base->Root());
+  if (frame_view) {
+    FrameView* root_view = ToFrameView(frame_view->Root());
     if (root_view)
       scale = root_view->InputEventsScaleFactor();
   }
   return scale;
 }
 
-FloatPoint FrameTranslation(const FrameViewBase* frame_view_base) {
+FloatPoint FrameTranslation(const FrameView* frame_view) {
   float scale = 1;
   FloatSize offset;
   IntPoint visual_viewport;
   FloatSize overscroll_offset;
-  if (frame_view_base) {
-    FrameView* root_view = ToFrameView(frame_view_base->Root());
+  if (frame_view) {
+    FrameView* root_view = ToFrameView(frame_view->Root());
     if (root_view) {
       scale = root_view->InputEventsScaleFactor();
       offset = FloatSize(root_view->InputEventsOffsetForEmulation());
       visual_viewport = FlooredIntPoint(
           root_view->GetPage()->GetVisualViewport().VisibleRect().Location());
       overscroll_offset =
           root_view->GetPage()->GetChromeClient().ElasticOverscroll();
     }
   }
   return FloatPoint(
       -offset.Width() / scale + visual_viewport.X() + overscroll_offset.Width(),
       -offset.Height() / scale + visual_viewport.Y() +
           overscroll_offset.Height());
 }
 
 FloatPoint ConvertAbsoluteLocationForLayoutObjectFloat(
     const DoublePoint& location,
     const LayoutItem layout_item) {
   return layout_item.AbsoluteToLocal(FloatPoint(location), kUseTransforms);
 }
 
 IntPoint ConvertAbsoluteLocationForLayoutObjectInt(
     const DoublePoint& location,
     const LayoutItem layout_item) {
   return RoundedIntPoint(
       ConvertAbsoluteLocationForLayoutObjectFloat(location, layout_item));
 }
 
-// FIXME: Change |FrameViewBase| to const FrameViewBase& after RemoteFrames get
+// FIXME: Change |FrameView| to const FrameView& after RemoteFrames get

[dcheng, 2017/04/11 00:27:55]

+kenrb, is there some cleanup here?

 // RemoteFrameViews.
 void UpdateWebMouseEventFromCoreMouseEvent(const MouseEvent& event,
-                                           const FrameViewBase* frame_view_base,
+                                           const FrameView* plugin_parent,

[dcheng, 2017/04/11 00:27:55]

FWIW, I find this slightly confusing: there's nothing about this method that
seems particularly plugin specific. Maybe we need to add some more comments
somewhere or fix some names.

[haraken, 2017/04/11 01:07:24]

Yeah, this method itself is not doing anything plugin-specific. The method is
used only by plugin though.

                                            const LayoutItem layout_item,
                                            WebMouseEvent& web_event) {
   web_event.SetTimeStampSeconds(event.PlatformTimeStamp().InSeconds());
   web_event.SetModifiers(event.GetModifiers());
 
-  FrameView* view =
-      frame_view_base ? ToFrameView(frame_view_base->Parent()) : 0;
-  // TODO(bokan): If view == nullptr, pointInRootFrame will really be
+  // TODO(bokan): If plugin_parent == nullptr, pointInRootFrame will really be
   // pointInRootContent.
   IntPoint point_in_root_frame(event.AbsoluteLocation().X(),
                                event.AbsoluteLocation().Y());
-  if (view)
-    point_in_root_frame = view->ContentsToRootFrame(point_in_root_frame);
+  if (plugin_parent) {
+    point_in_root_frame =
+        plugin_parent->ContentsToRootFrame(point_in_root_frame);
+  }
   web_event.SetPositionInScreen(event.screenX(), event.screenY());
   IntPoint local_point = ConvertAbsoluteLocationForLayoutObjectInt(
       event.AbsoluteLocation(), layout_item);
   web_event.SetPositionInWidget(local_point.X(), local_point.Y());
 }
 
 unsigned ToWebInputEventModifierFrom(WebMouseEvent::Button button) {
   if (button == WebMouseEvent::Button::kNoButton)
     return 0;
 
   unsigned web_mouse_button_to_platform_modifier[] = {
       WebInputEvent::kLeftButtonDown, WebInputEvent::kMiddleButtonDown,
       WebInputEvent::kRightButtonDown, WebInputEvent::kBackButtonDown,
       WebInputEvent::kForwardButtonDown};
 
   return web_mouse_button_to_platform_modifier[static_cast<int>(button)];
 }
 
 }  // namespace
 
-WebMouseEvent TransformWebMouseEvent(FrameViewBase* frame_view_base,
+WebMouseEvent TransformWebMouseEvent(FrameView* frame_view,
                                      const WebMouseEvent& event) {
   WebMouseEvent result = event;
 
   // TODO(dtapuska): Remove this translation. In the past blink has
   // converted leaves into moves and not known about leaves. It should
   // be educated about them. crbug.com/686196
   if (event.GetType() == WebInputEvent::kMouseEnter ||
       event.GetType() == WebInputEvent::kMouseLeave) {
     result.SetType(WebInputEvent::kMouseMove);
   }
 
   // TODO(dtapuska): Perhaps the event should be constructed correctly?
   // crbug.com/686200
   if (event.GetType() == WebInputEvent::kMouseUp) {
     result.SetModifiers(event.GetModifiers() &
                         ~ToWebInputEventModifierFrom(event.button));
   }
-  result.SetFrameScale(FrameScale(frame_view_base));
-  result.SetFrameTranslate(FrameTranslation(frame_view_base));
+  result.SetFrameScale(FrameScale(frame_view));
+  result.SetFrameTranslate(FrameTranslation(frame_view));
   return result;
 }
 
 WebMouseWheelEvent TransformWebMouseWheelEvent(
-    FrameViewBase* frame_view_base,
+    FrameView* frame_view,
     const WebMouseWheelEvent& event) {
   WebMouseWheelEvent result = event;
-  result.SetFrameScale(FrameScale(frame_view_base));
-  result.SetFrameTranslate(FrameTranslation(frame_view_base));
+  result.SetFrameScale(FrameScale(frame_view));
+  result.SetFrameTranslate(FrameTranslation(frame_view));
   return result;
 }
 
-WebGestureEvent TransformWebGestureEvent(FrameViewBase* frame_view_base,
+WebGestureEvent TransformWebGestureEvent(FrameView* frame_view,
                                          const WebGestureEvent& event) {
   WebGestureEvent result = event;
-  result.SetFrameScale(FrameScale(frame_view_base));
-  result.SetFrameTranslate(FrameTranslation(frame_view_base));
+  result.SetFrameScale(FrameScale(frame_view));
+  result.SetFrameTranslate(FrameTranslation(frame_view));
   return result;
 }
 
 WebTouchEvent TransformWebTouchEvent(float frame_scale,
                                      FloatPoint frame_translate,
                                      const WebTouchEvent& event) {
   // frameScale is default initialized in debug builds to be 0.
   DCHECK_EQ(0, event.FrameScale());
   DCHECK_EQ(0, event.FrameTranslate().x);
   DCHECK_EQ(0, event.FrameTranslate().y);
   WebTouchEvent result = event;
   result.SetFrameScale(frame_scale);
   result.SetFrameTranslate(frame_translate);
   return result;
 }
 
-WebTouchEvent TransformWebTouchEvent(FrameViewBase* frame_view_base,
+WebTouchEvent TransformWebTouchEvent(FrameView* frame_view,
                                      const WebTouchEvent& event) {
-  return TransformWebTouchEvent(FrameScale(frame_view_base),
-                                FrameTranslation(frame_view_base), event);
+  return TransformWebTouchEvent(FrameScale(frame_view),
+                                FrameTranslation(frame_view), event);
 }
 
-WebMouseEventBuilder::WebMouseEventBuilder(const FrameViewBase* frame_view_base,
+WebMouseEventBuilder::WebMouseEventBuilder(const FrameView* plugin_parent,
                                            const LayoutItem layout_item,
                                            const MouseEvent& event) {
   if (event.NativeEvent()) {
     *static_cast<WebMouseEvent*>(this) =
         event.NativeEvent()->FlattenTransform();
     WebFloatPoint absolute_root_frame_location = PositionInRootFrame();
     IntPoint local_point = RoundedIntPoint(layout_item.AbsoluteToLocal(
         absolute_root_frame_location, kUseTransforms));
     SetPositionInWidget(local_point.X(), local_point.Y());
     return;
@@ skipping 13 matching lines @@
     type_ = WebInputEvent::kMouseDown;
   else if (event.type() == EventTypeNames::mouseup)
     type_ = WebInputEvent::kMouseUp;
   else if (event.type() == EventTypeNames::contextmenu)
     type_ = WebInputEvent::kContextMenu;
   else
     return;  // Skip all other mouse events.
 
   time_stamp_seconds_ = event.PlatformTimeStamp().InSeconds();
   modifiers_ = event.GetModifiers();
-  UpdateWebMouseEventFromCoreMouseEvent(event, frame_view_base, layout_item,
+  UpdateWebMouseEventFromCoreMouseEvent(event, plugin_parent, layout_item,
                                         *this);
 
   switch (event.button()) {
     case short(WebPointerProperties::Button::kLeft):
       button = WebMouseEvent::Button::kLeft;
       break;
     case short(WebPointerProperties::Button::kMiddle):
       button = WebMouseEvent::Button::kMiddle;
       break;
     case short(WebPointerProperties::Button::kRight):
@@ skipping 29 matching lines @@
   }
   movement_x = event.movementX();
   movement_y = event.movementY();
   click_count = event.detail();
 
   pointer_type = WebPointerProperties::PointerType::kMouse;
 }
 
 // Generate a synthetic WebMouseEvent given a TouchEvent (eg. for emulating a
 // mouse with touch input for plugins that don't support touch input).
-WebMouseEventBuilder::WebMouseEventBuilder(const FrameViewBase* frame_view_base,
+WebMouseEventBuilder::WebMouseEventBuilder(const FrameView* plugin_parent,
                                            const LayoutItem layout_item,
                                            const TouchEvent& event) {
   if (!event.touches())
     return;
   if (event.touches()->length() != 1) {
     if (event.touches()->length() || event.type() != EventTypeNames::touchend ||
         !event.changedTouches() || event.changedTouches()->length() != 1)
       return;
   }
 
@@ skipping 12 matching lines @@
   else
     return;
 
   time_stamp_seconds_ = event.PlatformTimeStamp().InSeconds();
   modifiers_ = event.GetModifiers();
   frame_scale_ = 1;
   frame_translate_ = WebFloatPoint();
 
   // The mouse event co-ordinates should be generated from the co-ordinates of
   // the touch point.
-  FrameView* view = ToFrameView(frame_view_base->Parent());
-  // FIXME: if view == nullptr, pointInRootFrame will really be
+  // FIXME: if plugin_parent == nullptr, pointInRootFrame will really be
   // pointInRootContent.
   IntPoint point_in_root_frame = RoundedIntPoint(touch->AbsoluteLocation());
-  if (view)
-    point_in_root_frame = view->ContentsToRootFrame(point_in_root_frame);
+  if (plugin_parent) {
+    point_in_root_frame =
+        plugin_parent->ContentsToRootFrame(point_in_root_frame);
+  }
   IntPoint screen_point = RoundedIntPoint(touch->ScreenLocation());
   SetPositionInScreen(screen_point.X(), screen_point.Y());
 
   button = WebMouseEvent::Button::kLeft;
   modifiers_ |= WebInputEvent::kLeftButtonDown;
   click_count = (type_ == kMouseDown || type_ == kMouseUp);
 
   IntPoint local_point = ConvertAbsoluteLocationForLayoutObjectInt(
       DoublePoint(touch->AbsoluteLocation()), layout_item);
   SetPositionInWidget(local_point.X(), local_point.Y());
@@ skipping 20 matching lines @@
     type_ = WebInputEvent::kChar;
   else
     return;  // Skip all other keyboard events.
 
   modifiers_ = event.GetModifiers();
   time_stamp_seconds_ = event.PlatformTimeStamp().InSeconds();
   windows_key_code = event.keyCode();
 }
 
 Vector<WebMouseEvent> TransformWebMouseEventVector(
-    FrameViewBase* frame_view_base,
+    FrameView* frame_view,
     const std::vector<const WebInputEvent*>& coalesced_events) {
   Vector<WebMouseEvent> result;
   for (const auto& event : coalesced_events) {
     DCHECK(WebInputEvent::IsMouseEventType(event->GetType()));
     result.push_back(TransformWebMouseEvent(
-        frame_view_base, static_cast<const WebMouseEvent&>(*event)));
+        frame_view, static_cast<const WebMouseEvent&>(*event)));
   }
   return result;
 }
 
 Vector<WebTouchEvent> TransformWebTouchEventVector(
-    FrameViewBase* frame_view_base,
+    FrameView* frame_view,
     const std::vector<const WebInputEvent*>& coalesced_events) {
-  float scale = FrameScale(frame_view_base);
-  FloatPoint translation = FrameTranslation(frame_view_base);
+  float scale = FrameScale(frame_view);
+  FloatPoint translation = FrameTranslation(frame_view);
   Vector<WebTouchEvent> result;
   for (const auto& event : coalesced_events) {
     DCHECK(WebInputEvent::IsTouchEventType(event->GetType()));
     result.push_back(TransformWebTouchEvent(
         scale, translation, static_cast<const WebTouchEvent&>(*event)));
   }
   return result;
 }
 
 }  // namespace blink