diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-30 12:48:17 +0200 |
commit | 881da28418d380042aa95a97f0cbd42560a64f7c (patch) | |
tree | a794dff3274695e99c651902dde93d934ea7a5af /Source/WebKit2/UIProcess/WebVibrationProvider.cpp | |
parent | 7e104c57a70fdf551bb3d22a5d637cdcbc69dbea (diff) | |
parent | 0fcedcd17cc00d3dd44c718b3cb36c1033319671 (diff) | |
download | qtwebkit-881da28418d380042aa95a97f0cbd42560a64f7c.tar.gz |
Merge 'wip/next' into dev
Change-Id: Iff9ee5e23bb326c4371ec8ed81d56f2f05d680e9
Diffstat (limited to 'Source/WebKit2/UIProcess/WebVibrationProvider.cpp')
-rw-r--r-- | Source/WebKit2/UIProcess/WebVibrationProvider.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit2/UIProcess/WebVibrationProvider.cpp b/Source/WebKit2/UIProcess/WebVibrationProvider.cpp index a12f5973b..72f31b2b5 100644 --- a/Source/WebKit2/UIProcess/WebVibrationProvider.cpp +++ b/Source/WebKit2/UIProcess/WebVibrationProvider.cpp @@ -38,7 +38,7 @@ void WebVibrationProvider::vibrate(WebVibrationProxy* vibration, uint32_t vibrat if (!m_client.vibrate) return; - m_client.vibrate(toAPI(vibration), vibrationTime, m_client.clientInfo); + m_client.vibrate(toAPI(vibration), vibrationTime, m_client.base.clientInfo); } void WebVibrationProvider::cancelVibration(WebVibrationProxy* vibration) @@ -46,7 +46,7 @@ void WebVibrationProvider::cancelVibration(WebVibrationProxy* vibration) if (!m_client.cancelVibration) return; - m_client.cancelVibration(toAPI(vibration), m_client.clientInfo); + m_client.cancelVibration(toAPI(vibration), m_client.base.clientInfo); } } // namespace WebKit |