OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2012 Samsung Electronics | 2 * Copyright (C) 2012 Samsung Electronics |
3 * | 3 * |
4 * This library is free software; you can redistribute it and/or | 4 * This library is free software; you can redistribute it and/or |
5 * modify it under the terms of the GNU Library General Public | 5 * modify it under the terms of the GNU Library General Public |
6 * License as published by the Free Software Foundation; either | 6 * License as published by the Free Software Foundation; either |
7 * version 2 of the License, or (at your option) any later version. | 7 * version 2 of the License, or (at your option) any later version. |
8 * | 8 * |
9 * This library is distributed in the hope that it will be useful, | 9 * This library is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
78 | 78 |
79 if (!m_pattern.size()) | 79 if (!m_pattern.size()) |
80 return true; | 80 return true; |
81 | 81 |
82 if (m_pattern.size() == 1 && !m_pattern[0]) { | 82 if (m_pattern.size() == 1 && !m_pattern[0]) { |
83 m_pattern.clear(); | 83 m_pattern.clear(); |
84 return true; | 84 return true; |
85 } | 85 } |
86 | 86 |
87 m_timerStart.startOneShot(0); | 87 m_timerStart.startOneShot(0); |
88 m_isVibrating = true; | |
tkent
2013/08/28 03:58:07
It seems m_isVibrating is equivalent to m_timerSta
kihong
2013/08/28 05:25:25
It's not exactly same because if there are some co
| |
88 return true; | 89 return true; |
89 } | 90 } |
90 | 91 |
91 void NavigatorVibration::cancelVibration() | 92 void NavigatorVibration::cancelVibration() |
92 { | 93 { |
93 m_pattern.clear(); | 94 m_pattern.clear(); |
94 if (m_isVibrating) { | 95 if (m_isVibrating) { |
95 WebKit::Platform::current()->cancelVibration(); | 96 WebKit::Platform::current()->cancelVibration(); |
96 m_isVibrating = false; | 97 m_isVibrating = false; |
97 m_timerStop.stop(); | 98 m_timerStop.stop(); |
tkent
2013/08/28 03:58:07
We had better stop m_timerStart too though timerSt
| |
98 } | 99 } |
99 } | 100 } |
100 | 101 |
101 void NavigatorVibration::timerStartFired(Timer<NavigatorVibration>* timer) | 102 void NavigatorVibration::timerStartFired(Timer<NavigatorVibration>* timer) |
102 { | 103 { |
103 ASSERT_UNUSED(timer, timer == &m_timerStart); | 104 ASSERT_UNUSED(timer, timer == &m_timerStart); |
104 | 105 |
105 if (m_pattern.size()) { | 106 if (m_pattern.size()) { |
106 m_isVibrating = true; | 107 m_isVibrating = true; |
107 WebKit::Platform::current()->vibrate(m_pattern[0]); | 108 WebKit::Platform::current()->vibrate(m_pattern[0]); |
108 m_timerStop.startOneShot(m_pattern[0] / 1000.0); | 109 m_timerStop.startOneShot(m_pattern[0] / 1000.0); |
109 m_pattern.remove(0); | 110 m_pattern.remove(0); |
110 } | 111 } |
111 } | 112 } |
112 | 113 |
113 void NavigatorVibration::timerStopFired(Timer<NavigatorVibration>* timer) | 114 void NavigatorVibration::timerStopFired(Timer<NavigatorVibration>* timer) |
114 { | 115 { |
115 ASSERT_UNUSED(timer, timer == &m_timerStop); | 116 ASSERT_UNUSED(timer, timer == &m_timerStop); |
116 | 117 |
117 m_isVibrating = false; | 118 if (m_pattern.isEmpty()) |
119 m_isVibrating = false; | |
118 | 120 |
119 if (m_pattern.size()) { | 121 if (m_pattern.size()) { |
120 m_timerStart.startOneShot(m_pattern[0] / 1000.0); | 122 m_timerStart.startOneShot(m_pattern[0] / 1000.0); |
121 m_pattern.remove(0); | 123 m_pattern.remove(0); |
122 } | 124 } |
123 } | 125 } |
124 | 126 |
125 void NavigatorVibration::pageVisibilityChanged() | 127 void NavigatorVibration::pageVisibilityChanged() |
126 { | 128 { |
127 if (page()->visibilityState() != PageVisibilityStateVisible) | 129 if (page()->visibilityState() != PageVisibilityStateVisible) |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
163 } | 165 } |
164 return navigatorVibration; | 166 return navigatorVibration; |
165 } | 167 } |
166 | 168 |
167 const char* NavigatorVibration::supplementName() | 169 const char* NavigatorVibration::supplementName() |
168 { | 170 { |
169 return "NavigatorVibration"; | 171 return "NavigatorVibration"; |
170 } | 172 } |
171 | 173 |
172 } // namespace WebCore | 174 } // namespace WebCore |
OLD | NEW |