Remove PlatformTouchEvent/Point and use WebTouchEvent/Point instead

third_party/WebKit/Source/web/WebInputEventConversion.h

 /*
  * 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef WebInputEventConversion_h
 #define WebInputEventConversion_h
 
 #include "platform/PlatformMouseEvent.h"
-#include "platform/PlatformTouchEvent.h"
 #include "platform/scroll/ScrollTypes.h"
 #include "public/platform/WebInputEvent.h"
 #include "public/platform/WebKeyboardEvent.h"
 #include "public/platform/WebMouseWheelEvent.h"
 #include "public/platform/WebTouchEvent.h"
 #include "web/WebExport.h"
 #include "wtf/Compiler.h"
 #include <vector>
 
 namespace blink {
@@ skipping 10 matching lines @@
 
 // These classes are used to convert from WebInputEvent subclasses to
 // corresponding WebCore events.
 
 class WEB_EXPORT PlatformMouseEventBuilder
     : NON_EXPORTED_BASE(public PlatformMouseEvent) {
  public:
   PlatformMouseEventBuilder(Widget*, const WebMouseEvent&);
 };
 
-// Converts a WebTouchPoint to a PlatformTouchPoint.
-class WEB_EXPORT PlatformTouchPointBuilder
-    : NON_EXPORTED_BASE(public PlatformTouchPoint) {
- public:
-  PlatformTouchPointBuilder(Widget*, const WebTouchPoint&);
-};
-
-// Converts a WebTouchEvent to a PlatformTouchEvent.
-class WEB_EXPORT PlatformTouchEventBuilder
-    : NON_EXPORTED_BASE(public PlatformTouchEvent) {
- public:
-  PlatformTouchEventBuilder(Widget*, const WebTouchEvent&);
-};
-
 class WEB_EXPORT WebMouseEventBuilder
     : NON_EXPORTED_BASE(public WebMouseEvent) {
  public:
   // Converts a MouseEvent to a corresponding WebMouseEvent.
   // NOTE: This is only implemented for mousemove, mouseover, mouseout,
   // mousedown and mouseup. If the event mapping fails, the event type will
   // be set to Undefined.
   WebMouseEventBuilder(const Widget*, const LayoutItem, const MouseEvent&);
   WebMouseEventBuilder(const Widget*, const LayoutItem, const TouchEvent&);
 };
 
 // Converts a KeyboardEvent to a corresponding WebKeyboardEvent.
 // NOTE: For KeyboardEvent, this is only implemented for keydown,
 // keyup, and keypress. If the event mapping fails, the event type will be set
 // to Undefined.
 class WEB_EXPORT WebKeyboardEventBuilder
     : NON_EXPORTED_BASE(public WebKeyboardEvent) {
  public:
   WebKeyboardEventBuilder(const KeyboardEvent&);
 };
 
 // Converts a TouchEvent to a corresponding WebTouchEvent.
 // NOTE: WebTouchEvents have a cap on the number of WebTouchPoints. Any points
 // exceeding that cap will be dropped.
 class WEB_EXPORT WebTouchEventBuilder
     : NON_EXPORTED_BASE(public WebTouchEvent) {
  public:
   WebTouchEventBuilder(const LayoutItem, const TouchEvent&);

[bokan, 2017/01/25 15:19:48]

You removed the implementation, presumably this class is unneeded now?

[dtapuska, 2017/01/25 17:59:17]

yup not needed anymore. The native event is stored on the DOM event so we don't
need to reconstitute an event from a DOM Event.

 };
 
 // Return a new transformed WebGestureEvent by applying the Widget's scale
 // and translation.
 WEB_EXPORT WebGestureEvent TransformWebGestureEvent(Widget*,
                                                     const WebGestureEvent&);
 WEB_EXPORT WebMouseWheelEvent
 TransformWebMouseWheelEvent(Widget*, const WebMouseWheelEvent&);
 
+WEB_EXPORT WebTouchEvent TransformWebTouchEvent(Widget*, const WebTouchEvent&);
+
 Vector<PlatformMouseEvent> WEB_EXPORT
 createPlatformMouseEventVector(Widget*,
                                const std::vector<const WebInputEvent*>&);
-Vector<PlatformTouchEvent> WEB_EXPORT
-createPlatformTouchEventVector(Widget*,
-                               const std::vector<const WebInputEvent*>&);
+Vector<WebTouchEvent> WEB_EXPORT
+TransformWebTouchEventVector(Widget*, const std::vector<const WebInputEvent*>&);
 
 }  // namespace blink
 
 #endif