projects / framework / web / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 07a6152)
[CherryPick] Vibration cannot be canceled during pattern vibration.
authorJiyeon Kim <jiyeon0402.kim@samsung.com>
Thu, 27 Jun 2013 06:19:46 +0000 (15:19 +0900)
committerGerrit Code Review <gerrit@gerrit.vlan144.tizendev.org>
Mon, 1 Jul 2013 01:31:17 +0000 (01:31 +0000)
[Title] [CherryPick] Vibration cannot be canceled during pattern vibration.
[Issue] N/A
[Problem] Vibration cannot be canceled during pattern vibration
[Cause] If resting time which are even numbers of pattern m_isVibraing is false, therefore if cancel is called it is returned.
In addition, m_timerStart need to stop in the cancelVibration() with m_timerStop.stop().
If cancelVibration is called right after m_timerStart is fired, timerStartFired function can be called even if vibration is already canceled because of timing issue of timer.
[Solution] Cherry picked
[Cherry-Picker] Jiyeon Kim

https://bugs.webkit.org/show_bug.cgi?id=117822

Change-Id: If6c3332bf7b4867abb47b5f295cbf16458edfda2

LayoutTests/vibration/cancelVibration-during-pattern-vibrating-expected.txt [new file with mode: 0644] patch | blob
LayoutTests/vibration/cancelVibration-during-pattern-vibrating.html [new file with mode: 0644] patch | blob
Source/WebCore/Modules/vibration/Vibration.cpp patch | blob | history
Source/WebCore/Modules/vibration/Vibration.h patch | blob | history

diff --git a/LayoutTests/vibration/cancelVibration-during-pattern-vibrating-expected.txt b/LayoutTests/vibration/cancelVibration-during-pattern-vibrating-expected.txt
new file mode 100644 (file)
index 0000000..c4cbfc2
--- /dev/null
+++ b/LayoutTests/vibration/cancelVibration-during-pattern-vibrating-expected.txt
@@ -0,0 +1,16 @@
+Tests the cancelVibration during pattern vibration is working.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS internals.isVibrating() is false
+PASS internals.isVibrating() is true
+PASS internals.isVibrating() is false
+PASS internals.isVibrating() is true
+PASS internals.isVibrating() is false
+PASS internals.isVibrating() is true
+PASS internals.isVibrating() is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/vibration/cancelVibration-during-pattern-vibrating.html b/LayoutTests/vibration/cancelVibration-during-pattern-vibrating.html
new file mode 100644 (file)
index 0000000..bdacc3d
--- /dev/null
+++ b/LayoutTests/vibration/cancelVibration-during-pattern-vibrating.html
@@ -0,0 +1,37 @@
+<html>
+<head>
+<script src="../fast/js/resources/js-test-pre.js"></script>
+</head>
+<body>
+<script>
+description('Tests the cancelVibration during pattern vibration is working.');
+
+var count = 0;
+var cancelingTime = 80;
+
+if (window.testRunner) {
+    function vibrate() {
+        navigator.vibrate([100, 100, 100, 100, 100]);
+        shouldBeTrue('internals.isVibrating()');
+        cancelVibration(cancelingTime + count * 100);
+    }
+
+    function cancelVibration(time) {
+        setTimeout(function() {
+            navigator.vibrate(0);
+            shouldBeFalse('internals.isVibrating()');
+            if (count++ == 2)
+                finishJSTest();
+            vibrate();
+        }, time);
+    }
+
+    shouldBeFalse('internals.isVibrating()');
+    vibrate();
+    window.jsTestIsAsync = true;
+} else
+    debug('This test can not be run without the TestRunner');
+</script>
+<script src="../fast/js/resources/js-test-post.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/Source/WebCore/Modules/vibration/Vibration.cpp b/Source/WebCore/Modules/vibration/Vibration.cpp
index 0733914..0baefc7 100644 (file)
--- a/Source/WebCore/Modules/vibration/Vibration.cpp
+++ b/Source/WebCore/Modules/vibration/Vibration.cpp
@@ -52,6 +52,7 @@ void Vibration::vibrate(const unsigned long& time)
     }
     m_pattern.append(time);
     m_timerStart.startOneShot(0);
+    m_isVibrating = true;
 }
 
 void Vibration::vibrate(const VibrationPattern& pattern)
@@ -76,11 +77,9 @@ void Vibration::vibrate(const VibrationPattern& pattern)
 
 void Vibration::cancelVibration()
 {
-    if (m_isVibrating) {
-        m_vibrationClient->cancelVibration();
-        m_isVibrating = false;
-        m_timerStop.stop();
-    }
+    m_pattern.clear();
+    if (m_isVibrating)
+        stopVibration();
 }
 
 void Vibration::suspendVibration()
@@ -89,13 +88,21 @@ void Vibration::suspendVibration()
         return;
 
     m_pattern.insert(0, m_timerStop.nextFireInterval());
-    m_timerStop.stop();
-    cancelVibration();
+    stopVibration();
 }
 
 void Vibration::resumeVibration()
 {
     m_timerStart.startOneShot(0);
+    m_isVibrating = true;
+}
+
+void Vibration::stopVibration()
+{
+    m_timerStart.stop();
+    m_timerStop.stop();
+    m_vibrationClient->cancelVibration();
+    m_isVibrating = false;
 }
 
 void Vibration::timerStartFired(Timer<Vibration>* timer)
@@ -119,9 +126,11 @@ void Vibration::timerStopFired(Timer<Vibration>* timer)
     m_timerStop.stop();
     m_isVibrating = false;
 
-    if (m_pattern.size()) {
+    if (!m_pattern.isEmpty()) {
         m_timerStart.startOneShot(m_pattern[0] / 1000.0);
         m_pattern.remove(0);
+        if (m_pattern.isEmpty())
+            m_isVibrating = false;
     }
 }
 
diff --git a/Source/WebCore/Modules/vibration/Vibration.h b/Source/WebCore/Modules/vibration/Vibration.h
index 361586b..57f00d1 100644 (file)
--- a/Source/WebCore/Modules/vibration/Vibration.h
+++ b/Source/WebCore/Modules/vibration/Vibration.h
@@ -55,7 +55,11 @@ public:
     static Vibration* from(Page* page) { return static_cast<Vibration*>(Supplement<Page>::from(page, supplementName())); }
     static bool isActive(Page*);
 
+    bool isVibrating() { return m_isVibrating; }
+
 private:
+    void stopVibration();
+
     VibrationClient* m_vibrationClient;
     Timer<Vibration> m_timerStart;
     Timer<Vibration> m_timerStop;
Domain: Web Framework / Uncategorized;