Delete WebContentsAdapterClient::dpiScale()

It's always 1.

Change-Id: I1c3d5bc3080da90379f03b6d0819c5656334751e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

10 files changed, 36 insertions, 72 deletions

diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index ac7357f0e..0217bed59 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -188,14 +188,13 @@ static inline bool isCommonTextEditShortcut(const QKeyEvent *ke)
 static uint32_t s_eventId = 0;
 class MotionEventQt : public ui::MotionEvent {
 public:
-    MotionEventQt(const QList<QTouchEvent::TouchPoint> &touchPoints, const base::TimeTicks &eventTime, Action action, const Qt::KeyboardModifiers modifiers, float dpiScale, int index = -1)
+    MotionEventQt(const QList<QTouchEvent::TouchPoint> &touchPoints, const base::TimeTicks &eventTime, Action action, const Qt::KeyboardModifiers modifiers, int index = -1)
         : touchPoints(touchPoints)
         , eventTime(eventTime)
         , action(action)
         , eventId(++s_eventId)
         , flags(flagsFromModifiers(modifiers))
         , index(index)
-        , dpiScale(dpiScale)
     {
         // ACTION_DOWN and ACTION_UP must be accesssed through pointer_index 0
         Q_ASSERT((action != Action::DOWN && action != Action::UP) || index == 0);
@@ -206,8 +205,8 @@ public:
     int GetActionIndex() const override { return index; }
     size_t GetPointerCount() const override { return touchPoints.size(); }
     int GetPointerId(size_t pointer_index) const override { return touchPoints.at(pointer_index).id(); }
-    float GetX(size_t pointer_index) const override { return touchPoints.at(pointer_index).pos().x() / dpiScale; }
-    float GetY(size_t pointer_index) const override { return touchPoints.at(pointer_index).pos().y() / dpiScale; }
+    float GetX(size_t pointer_index) const override { return touchPoints.at(pointer_index).pos().x(); }
+    float GetY(size_t pointer_index) const override { return touchPoints.at(pointer_index).pos().y(); }
     float GetRawX(size_t pointer_index) const override { return touchPoints.at(pointer_index).screenPos().x(); }
     float GetRawY(size_t pointer_index) const override { return touchPoints.at(pointer_index).screenPos().y(); }
     float GetTouchMajor(size_t pointer_index) const override
@@ -247,7 +246,6 @@ private:
     const uint32_t eventId;
     int flags;
     int index;
-    float dpiScale;
 };
 
 RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost *widget)
@@ -434,9 +432,8 @@ bool RenderWidgetHostViewQt::IsShowing()
 gfx::Rect RenderWidgetHostViewQt::GetViewBounds() const
 {
     QRectF p = m_delegate->contentsRect();
-    float s = dpiScale();
-    gfx::Point p1(floor(p.x() / s), floor(p.y() / s));
-    gfx::Point p2(ceil(p.right() /s), ceil(p.bottom() / s));
+    gfx::Point p1(floor(p.x()), floor(p.y()));
+    gfx::Point p2(ceil(p.right()), ceil(p.bottom()));
     return gfx::BoundingRect(p1, p2);
 }
 
@@ -681,11 +678,6 @@ void RenderWidgetHostViewQt::SubmitCompositorFrame(const viz::LocalSurfaceId &lo
     if (frame_token)
         OnFrameTokenChangedForView(frame_token);
 
-    // Support experimental.viewport.devicePixelRatio, see GetScreenInfo implementation below.
-    float dpiScale = this->dpiScale();
-    if (dpiScale != 0 && dpiScale != 1)
-        frame.metadata.device_scale_factor /= dpiScale;
-
     m_compositor->submitFrame(
         std::move(frame),
         base::BindOnce(&RenderWidgetHostViewQtDelegate::update, base::Unretained(m_delegate.get())));
@@ -714,9 +706,6 @@ void RenderWidgetHostViewQt::GetScreenInfo(content::ScreenInfo *results) const
     if (!window)
         return;
     GetScreenInfoFromNativeWindow(window, results);
-
-    // Support experimental.viewport.devicePixelRatio
-    results->device_scale_factor *= dpiScale();
 }
 
 gfx::Rect RenderWidgetHostViewQt::GetBoundsInRootWindow()
@@ -1182,11 +1171,6 @@ QList<QTouchEvent::TouchPoint> RenderWidgetHostViewQt::mapTouchPointIds(const QL
     return outputPoints;
 }
 
-float RenderWidgetHostViewQt::dpiScale() const
-{
-    return m_adapterClient ? m_adapterClient->dpiScale() : 1.0;
-}
-
 bool RenderWidgetHostViewQt::IsPopup() const
 {
     return widget_type_ == content::WidgetType::kPopup;
@@ -1414,7 +1398,7 @@ void RenderWidgetHostViewQt::handleWheelEvent(QWheelEvent *ev)
 {
     if (!m_wheelAckPending) {
         Q_ASSERT(m_pendingWheelEvents.isEmpty());
-        blink::WebMouseWheelEvent webEvent = WebEventFactory::toWebWheelEvent(ev, dpiScale());
+        blink::WebMouseWheelEvent webEvent = WebEventFactory::toWebWheelEvent(ev);
         m_wheelAckPending = (webEvent.phase != blink::WebMouseWheelEvent::kPhaseEnded);
         m_mouseWheelPhaseHandler.AddPhaseIfNeededAndScheduleEndEvent(webEvent, false);
         host()->ForwardWheelEvent(webEvent);
@@ -1422,10 +1406,10 @@ void RenderWidgetHostViewQt::handleWheelEvent(QWheelEvent *ev)
     }
     if (!m_pendingWheelEvents.isEmpty()) {
         // Try to combine with this wheel event with the last pending one.
-        if (WebEventFactory::coalesceWebWheelEvent(m_pendingWheelEvents.last(), ev, dpiScale()))
+        if (WebEventFactory::coalesceWebWheelEvent(m_pendingWheelEvents.last(), ev))
             return;
     }
-    m_pendingWheelEvents.append(WebEventFactory::toWebWheelEvent(ev, dpiScale()));
+    m_pendingWheelEvents.append(WebEventFactory::toWebWheelEvent(ev));
 }
 
 void RenderWidgetHostViewQt::WheelEventAck(const blink::WebMouseWheelEvent &event, content::InputEventAckState /*ack_result*/)
@@ -1460,9 +1444,7 @@ void RenderWidgetHostViewQt::handleGestureEvent(QNativeGestureEvent *ev)
     const Qt::NativeGestureType type = ev->gestureType();
     // These are the only supported gestures by Chromium so far.
     if (type == Qt::ZoomNativeGesture || type == Qt::SmartZoomNativeGesture) {
-        host()->ForwardGestureEvent(WebEventFactory::toWebGestureEvent(
-                                        ev,
-                                        static_cast<double>(dpiScale())));
+        host()->ForwardGestureEvent(WebEventFactory::toWebGestureEvent(ev));
     }
 }
 #endif
@@ -1508,7 +1490,7 @@ void RenderWidgetHostViewQt::handleTouchEvent(QTouchEvent *ev)
             break;
         }
 
-        MotionEventQt motionEvent(touchPoints, eventTimestamp, action, ev->modifiers(), dpiScale(), 0);
+        MotionEventQt motionEvent(touchPoints, eventTimestamp, action, ev->modifiers(), 0);
         if (m_touchSelectionController->WillHandleTouchEvent(motionEvent)) {
             ev->accept();
             return;
@@ -1539,8 +1521,7 @@ void RenderWidgetHostViewQt::handleTouchEvent(QTouchEvent *ev)
         if (touchPoints.isEmpty())
             touchPoints = m_previousTouchPoints;
         clearPreviousTouchMotionState();
-        MotionEventQt cancelEvent(touchPoints, eventTimestamp, ui::MotionEvent::Action::CANCEL,
-                                  ev->modifiers(), dpiScale());
+        MotionEventQt cancelEvent(touchPoints, eventTimestamp, ui::MotionEvent::Action::CANCEL, ev->modifiers());
         processMotionEvent(cancelEvent);
         return;
     }
@@ -1593,8 +1574,7 @@ void RenderWidgetHostViewQt::handleTouchEvent(QTouchEvent *ev)
             continue;
         }
 
-        MotionEventQt motionEvent(touchPoints, eventTimestamp, action, ev->modifiers(), dpiScale(),
-                                  i);
+        MotionEventQt motionEvent(touchPoints, eventTimestamp, action, ev->modifiers(), i);
         processMotionEvent(motionEvent);
     }
 }
@@ -1611,7 +1591,7 @@ void RenderWidgetHostViewQt::handlePointerEvent(T *event)
 {
     // Currently WebMouseEvent is a subclass of WebPointerProperties, so basically
     // tablet events are mouse events with extra properties.
-    blink::WebMouseEvent webEvent = WebEventFactory::toWebMouseEvent(event, dpiScale());
+    blink::WebMouseEvent webEvent = WebEventFactory::toWebMouseEvent(event);
     if ((webEvent.GetType() == blink::WebInputEvent::kMouseDown || webEvent.GetType() == blink::WebInputEvent::kMouseUp)
             && webEvent.button == blink::WebMouseEvent::Button::kNoButton) {
         // Blink can only handle the 3 main mouse-buttons and may assert when processing mouse-down for no button.
@@ -1657,7 +1637,7 @@ void RenderWidgetHostViewQt::handlePointerEvent(T *event)
 
 void RenderWidgetHostViewQt::handleHoverEvent(QHoverEvent *ev)
 {
-    host()->ForwardMouseEvent(WebEventFactory::toWebMouseEvent(ev, dpiScale()));
+    host()->ForwardMouseEvent(WebEventFactory::toWebMouseEvent(ev));
 }
 
 void RenderWidgetHostViewQt::handleFocusEvent(QFocusEvent *ev)
diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h
index b9efc996f..f7bd82f03 100644
--- a/src/core/render_widget_host_view_qt.h
+++ b/src/core/render_widget_host_view_qt.h
@@ -234,7 +234,6 @@ private:
     void processMotionEvent(const ui::MotionEvent &motionEvent);
     void clearPreviousTouchMotionState();
     QList<QTouchEvent::TouchPoint> mapTouchPointIds(const QList<QTouchEvent::TouchPoint> &inputPoints);
-    float dpiScale() const;
     void updateNeedsBeginFramesInternal();
 
     bool IsPopup() const;
diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
index 4a36e77f9..f4937f0d4 100644
--- a/src/core/web_contents_adapter_client.h
+++ b/src/core/web_contents_adapter_client.h
@@ -424,7 +424,6 @@ public:
     virtual void selectionChanged() = 0;
     virtual void recentlyAudibleChanged(bool recentlyAudible) = 0;
     virtual QRectF viewportRect() const = 0;
-    virtual qreal dpiScale() const = 0;
     virtual QColor backgroundColor() const = 0;
     virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
     virtual void loadCommitted() = 0;
diff --git a/src/core/web_contents_view_qt.cpp b/src/core/web_contents_view_qt.cpp
index 648e0fd8f..550a98a52 100644
--- a/src/core/web_contents_view_qt.cpp
+++ b/src/core/web_contents_view_qt.cpp
@@ -239,7 +239,7 @@ void WebContentsViewQt::StartDragging(const content::DropData &drop_data,
 
     QPixmap pixmap;
     QPoint hotspot;
-    pixmap = QPixmap::fromImage(toQImage(image.GetRepresentation(m_client->dpiScale())));
+    pixmap = QPixmap::fromImage(toQImage(image.GetRepresentation(1.0)));
     if (!pixmap.isNull()) {
         hotspot.setX(image_offset.x());
         hotspot.setY(image_offset.y());
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp
index 339a3ef0e..b97696030 100644
--- a/src/core/web_event_factory.cpp
+++ b/src/core/web_event_factory.cpp
@@ -1354,10 +1354,10 @@ static WebPointerProperties::PointerType pointerTypeForTabletEvent(const QTablet
 }
 #endif
 
-WebMouseEvent WebEventFactory::toWebMouseEvent(QMouseEvent *ev, double dpiScale)
+WebMouseEvent WebEventFactory::toWebMouseEvent(QMouseEvent *ev)
 {
     WebMouseEvent webKitEvent(webEventTypeForEvent(ev),
-                              WebFloatPoint(ev->x() / dpiScale, ev->y() / dpiScale),
+                              WebFloatPoint(ev->x(), ev->y()),
                               WebFloatPoint(ev->globalX(), ev->globalY()),
                               mouseButtonForEvent<QMouseEvent>(ev),
                               0,
@@ -1369,14 +1369,14 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QMouseEvent *ev, double dpiScale)
     return webKitEvent;
 }
 
-WebMouseEvent WebEventFactory::toWebMouseEvent(QHoverEvent *ev, double dpiScale)
+WebMouseEvent WebEventFactory::toWebMouseEvent(QHoverEvent *ev)
 {
     WebMouseEvent webKitEvent;
     webKitEvent.SetTimeStamp(base::TimeTicks::Now());
     webKitEvent.SetModifiers(modifiersForEvent(ev));
     webKitEvent.SetType(webEventTypeForEvent(ev));
 
-    webKitEvent.SetPositionInWidget(ev->pos().x() / dpiScale, ev->pos().y() / dpiScale);
+    webKitEvent.SetPositionInWidget(ev->pos().x(), ev->pos().y());
     webKitEvent.movement_x = ev->pos().x() - ev->oldPos().x();
     webKitEvent.movement_y = ev->pos().y() - ev->oldPos().y();
     webKitEvent.pointer_type = WebPointerProperties::PointerType::kMouse;
@@ -1385,10 +1385,10 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QHoverEvent *ev, double dpiScale)
 }
 
 #if QT_CONFIG(tabletevent)
-WebMouseEvent WebEventFactory::toWebMouseEvent(QTabletEvent *ev, double dpiScale)
+WebMouseEvent WebEventFactory::toWebMouseEvent(QTabletEvent *ev)
 {
     WebMouseEvent webKitEvent(webEventTypeForEvent(ev),
-                              WebFloatPoint(ev->x() / dpiScale, ev->y() / dpiScale),
+                              WebFloatPoint(ev->x(), ev->y()),
                               WebFloatPoint(ev->globalX(), ev->globalY()),
                               mouseButtonForEvent<QTabletEvent>(ev),
                               0,
@@ -1416,17 +1416,17 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QEvent *ev)
 }
 
 #ifndef QT_NO_GESTURES
-WebGestureEvent WebEventFactory::toWebGestureEvent(QNativeGestureEvent *ev, double dpiScale)
+WebGestureEvent WebEventFactory::toWebGestureEvent(QNativeGestureEvent *ev)
 {
     WebGestureEvent webKitEvent;
     webKitEvent.SetTimeStamp(base::TimeTicks::Now());
     webKitEvent.SetModifiers(modifiersForEvent(ev));
 
-    webKitEvent.SetPositionInWidget(WebFloatPoint(ev->localPos().x() / dpiScale,
-                                                  ev->localPos().y() / dpiScale));
+    webKitEvent.SetPositionInWidget(WebFloatPoint(ev->localPos().x(),
+                                                  ev->localPos().y()));
 
-    webKitEvent.SetPositionInScreen(WebFloatPoint(ev->screenPos().x() / dpiScale,
-                                                  ev->screenPos().y() / dpiScale));
+    webKitEvent.SetPositionInScreen(WebFloatPoint(ev->screenPos().x(),
+                                                  ev->screenPos().y()));
 
     webKitEvent.SetSourceDevice(blink::kWebGestureDeviceTouchpad);
 
@@ -1484,13 +1484,13 @@ blink::WebMouseWheelEvent::Phase toBlinkPhase(QWheelEvent *ev)
     return blink::WebMouseWheelEvent::kPhaseNone;
 }
 
-blink::WebMouseWheelEvent WebEventFactory::toWebWheelEvent(QWheelEvent *ev, double dpiScale)
+blink::WebMouseWheelEvent WebEventFactory::toWebWheelEvent(QWheelEvent *ev)
 {
     WebMouseWheelEvent webEvent;
     webEvent.SetType(webEventTypeForEvent(ev));
     webEvent.SetModifiers(modifiersForEvent(ev));
     webEvent.SetTimeStamp(base::TimeTicks::Now());
-    webEvent.SetPositionInWidget(ev->x() / dpiScale, ev->y() / dpiScale);
+    webEvent.SetPositionInWidget(ev->x(), ev->y());
     webEvent.SetPositionInScreen(ev->globalX(), ev->globalY());
 
     webEvent.wheel_ticks_x = static_cast<float>(ev->angleDelta().x()) / QWheelEvent::DefaultDeltasPerStep;
@@ -1506,7 +1506,7 @@ blink::WebMouseWheelEvent WebEventFactory::toWebWheelEvent(QWheelEvent *ev, doub
     return webEvent;
 }
 
-bool WebEventFactory::coalesceWebWheelEvent(blink::WebMouseWheelEvent &webEvent, QWheelEvent *ev, double dpiScale)
+bool WebEventFactory::coalesceWebWheelEvent(blink::WebMouseWheelEvent &webEvent, QWheelEvent *ev)
 {
     if (webEventTypeForEvent(ev) != webEvent.GetType())
         return false;
@@ -1520,7 +1520,7 @@ bool WebEventFactory::coalesceWebWheelEvent(blink::WebMouseWheelEvent &webEvent,
 #endif
 
     webEvent.SetTimeStamp(base::TimeTicks::Now());
-    webEvent.SetPositionInWidget(ev->x() / dpiScale, ev->y() / dpiScale);
+    webEvent.SetPositionInWidget(ev->x(), ev->y());
     webEvent.SetPositionInScreen(ev->globalX(), ev->globalY());
 
     webEvent.wheel_ticks_x += static_cast<float>(ev->angleDelta().x()) / QWheelEvent::DefaultDeltasPerStep;
diff --git a/src/core/web_event_factory.h b/src/core/web_event_factory.h
index 4b22de7d7..526202cfb 100644
--- a/src/core/web_event_factory.h
+++ b/src/core/web_event_factory.h
@@ -66,17 +66,17 @@ QT_END_NAMESPACE
 class WebEventFactory {
 
 public:
-    static blink::WebMouseEvent toWebMouseEvent(QMouseEvent*, double dpiScale);
-    static blink::WebMouseEvent toWebMouseEvent(QHoverEvent*, double dpiScale);
+    static blink::WebMouseEvent toWebMouseEvent(QMouseEvent *);
+    static blink::WebMouseEvent toWebMouseEvent(QHoverEvent *);
 #ifndef QT_NO_TABLETEVENT
-    static blink::WebMouseEvent toWebMouseEvent(QTabletEvent*, double dpiScale);
+    static blink::WebMouseEvent toWebMouseEvent(QTabletEvent *);
 #endif
     static blink::WebMouseEvent toWebMouseEvent(QEvent *);
 #ifndef QT_NO_GESTURES
-    static blink::WebGestureEvent toWebGestureEvent(QNativeGestureEvent *, double dpiScale);
+    static blink::WebGestureEvent toWebGestureEvent(QNativeGestureEvent *);
 #endif
-    static blink::WebMouseWheelEvent toWebWheelEvent(QWheelEvent*, double dpiScale);
-    static bool coalesceWebWheelEvent(blink::WebMouseWheelEvent &, QWheelEvent*, double dpiScale);
+    static blink::WebMouseWheelEvent toWebWheelEvent(QWheelEvent *);
+    static bool coalesceWebWheelEvent(blink::WebMouseWheelEvent &, QWheelEvent *);
     static content::NativeWebKeyboardEvent toWebKeyboardEvent(QKeyEvent*);
     static bool getEditCommand(QKeyEvent *event, std::string *editCommand);
 };
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
index 59431cadc..5e6a45924 100644
--- a/src/webengine/api/qquickwebengineview.cpp
+++ b/src/webengine/api/qquickwebengineview.cpp
@@ -128,7 +128,6 @@ QQuickWebEngineViewPrivate::QQuickWebEngineViewPrivate()
     , m_webChannel(0)
     , m_webChannelWorld(0)
     , m_isBeingAdopted(false)
-    , m_dpiScale(1.0)
     , m_backgroundColor(Qt::white)
     , m_zoomFactor(1.0)
     , m_ui2Enabled(false)
@@ -415,11 +414,6 @@ QRectF QQuickWebEngineViewPrivate::viewportRect() const
     return QRectF(q->x(), q->y(), q->width(), q->height());
 }
 
-qreal QQuickWebEngineViewPrivate::dpiScale() const
-{
-    return m_dpiScale;
-}
-
 QColor QQuickWebEngineViewPrivate::backgroundColor() const
 {
     return m_backgroundColor;
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
index 3c985cba1..4e8657651 100644
--- a/src/webengine/api/qquickwebengineview_p_p.h
+++ b/src/webengine/api/qquickwebengineview_p_p.h
@@ -109,7 +109,6 @@ public:
     void selectionChanged() override { }
     void recentlyAudibleChanged(bool recentlyAudible) override;
     QRectF viewportRect() const override;
-    qreal dpiScale() const override;
     QColor backgroundColor() const override;
     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
     void loadCommitted() override;
@@ -218,7 +217,6 @@ public:
 private:
     QScopedPointer<QtWebEngineCore::UIDelegatesManager> m_uIDelegatesManager;
     QList<QQuickWebEngineScript *> m_userScripts;
-    qreal m_dpiScale;
     QColor m_backgroundColor;
     qreal m_zoomFactor;
     bool m_ui2Enabled;
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 06a708672..3bc1a0b80 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -267,11 +267,6 @@ QRectF QWebEnginePagePrivate::viewportRect() const
     return view ? view->rect() : QRectF();
 }
 
-qreal QWebEnginePagePrivate::dpiScale() const
-{
-    return 1.0;
-}
-
 QColor QWebEnginePagePrivate::backgroundColor() const
 {
     return m_backgroundColor;
diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
index e60438d97..bf2f43f80 100644
--- a/src/webenginewidgets/api/qwebenginepage_p.h
+++ b/src/webenginewidgets/api/qwebenginepage_p.h
@@ -100,7 +100,6 @@ public:
     void selectionChanged() override;
     void recentlyAudibleChanged(bool recentlyAudible) override;
     QRectF viewportRect() const override;
-    qreal dpiScale() const override;
     QColor backgroundColor() const override;
     void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
     void loadCommitted() override { }