diff options
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 1 | ||||
| -rw-r--r-- | src/core/render_widget_host_view_qt_delegate_client.cpp | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 61fae5dca..a35ab1b2d 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -411,7 +411,6 @@ void RenderWidgetHostViewQt::UpdateBackgroundColor() m_rootLayer->SetColor(color); m_uiCompositor->SetBackgroundColor(color); - content::RenderViewHost *rvh = content::RenderViewHost::From(host()); if (color == SK_ColorTRANSPARENT) host()->owner_delegate()->SetBackgroundOpaque(false); } diff --git a/src/core/render_widget_host_view_qt_delegate_client.cpp b/src/core/render_widget_host_view_qt_delegate_client.cpp index 305f4c1e9..eb0a0ff12 100644 --- a/src/core/render_widget_host_view_qt_delegate_client.cpp +++ b/src/core/render_widget_host_view_qt_delegate_client.cpp @@ -688,7 +688,7 @@ void RenderWidgetHostViewQtDelegateClient::handleTouchEvent(QTouchEvent *event) // touch event content like number of points for different states int lastPressIndex = -1; - while ((lastPressIndex + 1) < touchPoints.size() && touchPoints[lastPressIndex + 1].second.state() == Qt::TouchPointPressed) + while ((lastPressIndex + 1) < touchPoints.size() && touchPoints[lastPressIndex + 1].second.state() == QEventPoint::Pressed) ++lastPressIndex; switch (event->type()) { @@ -700,7 +700,7 @@ void RenderWidgetHostViewQtDelegateClient::handleTouchEvent(QTouchEvent *event) case QEvent::TouchUpdate: for (; lastPressIndex >= 0; --lastPressIndex) { - Q_ASSERT(touchPoints[lastPressIndex].second.state() == Qt::TouchPointPressed); + Q_ASSERT(touchPoints[lastPressIndex].second.state() == QEventPoint::Pressed); MotionEventQt me(touchPoints.mid(lastPressIndex), eventTimestamp, ui::MotionEvent::Action::POINTER_DOWN, event->modifiers(), 0); m_rwhv->processMotionEvent(me); } @@ -711,7 +711,7 @@ void RenderWidgetHostViewQtDelegateClient::handleTouchEvent(QTouchEvent *event) Q_FALLTHROUGH(); case QEvent::TouchEnd: - while (!touchPoints.isEmpty() && touchPoints.back().second.state() == Qt::TouchPointReleased) { + while (!touchPoints.isEmpty() && touchPoints.back().second.state() == QEventPoint::Released) { auto action = touchPoints.size() > 1 ? ui::MotionEvent::Action::POINTER_UP : ui::MotionEvent::Action::UP; int index = action == ui::MotionEvent::Action::POINTER_UP ? touchPoints.size() - 1 : -1; m_rwhv->processMotionEvent(MotionEventQt(touchPoints, eventTimestamp, action, event->modifiers(), index)); |