Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2138)

Unified Diff: Source/modules/vibration/NavigatorVibration.cpp

Issue 18478003: Vibration cannot be canceled during pattern vibration. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Patch for Relanding Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/vibration/NavigatorVibration.cpp
diff --git a/Source/modules/vibration/NavigatorVibration.cpp b/Source/modules/vibration/NavigatorVibration.cpp
index 9c34b341e6107e1a6f4a95aa3607d999bb59d7d5..65815153e9ef50b64c30af1e319a9ef16e081690 100644
--- a/Source/modules/vibration/NavigatorVibration.cpp
+++ b/Source/modules/vibration/NavigatorVibration.cpp
@@ -85,6 +85,7 @@ bool NavigatorVibration::vibrate(const VibrationPattern& pattern)
}
m_timerStart.startOneShot(0);
+ m_isVibrating = true;
return true;
}
@@ -114,7 +115,8 @@ void NavigatorVibration::timerStopFired(Timer<NavigatorVibration>* timer)
{
ASSERT_UNUSED(timer, timer == &m_timerStop);
- m_isVibrating = false;
+ if (m_pattern.isEmpty())
+ m_isVibrating = false;
if (m_pattern.size()) {
m_timerStart.startOneShot(m_pattern[0] / 1000.0);
« no previous file with comments | « Source/modules/vibration/NavigatorVibration.h ('k') | Source/modules/vibration/testing/InternalsVibration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698