Vibration API: use runtime flag, change from client to platform.

Source/modules/vibration/Vibration.cpp

 /*
  *  Copyright (C) 2012 Samsung Electronics
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  Library General Public License for more details.
  *
  *  You should have received a copy of the GNU Library General Public License
  *  along with this library; see the file COPYING.LIB.  If not, write to
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  */
 
 #include "config.h"
 #include "modules/vibration/Vibration.h"
 
-#if ENABLE(VIBRATION)
-
-#include "modules/vibration/VibrationClient.h"
+#include "public/platform/Platform.h"
 
 namespace WebCore {
 
-Vibration::Vibration(VibrationClient* client)
-    : m_vibrationClient(client)
-    , m_timerStart(this, &Vibration::timerStartFired)
+Vibration::Vibration()
+    : m_timerStart(this, &Vibration::timerStartFired)
     , m_timerStop(this, &Vibration::timerStopFired)
     , m_isVibrating(false)
 {
 }
 
 Vibration::~Vibration()
 {
-    m_vibrationClient->vibrationDestroyed();
+    if (m_isVibrating)
+        cancelVibration();
 }
 
-PassOwnPtr<Vibration> Vibration::create(VibrationClient* client)
+PassOwnPtr<Vibration> Vibration::create()

[Peter Beverloo, 2013/06/11 13:50:12]

This method isn't being used anymore, please remove it.

[Michael van Ouwerkerk, 2013/06/11 14:16:43]

Done.

 {
-    return adoptPtr(new Vibration(client));
+    return adoptPtr(new Vibration());
 }
 
 void Vibration::vibrate(const unsigned& time)
 {
     if (!time) {
         cancelVibration();
         return;
     }
     m_pattern.append(time);
     m_timerStart.startOneShot(0);
@@ skipping 16 matching lines @@
         m_timerStart.stop();
 
     m_pattern = pattern;
     m_timerStart.startOneShot(0);
 }
 
 void Vibration::cancelVibration()
 {
     m_pattern.clear();
     if (m_isVibrating) {
-        m_vibrationClient->cancelVibration();
+        WebKit::Platform::current()->cancelVibration();
         m_isVibrating = false;
         m_timerStop.stop();
     }
 }
 
 void Vibration::suspendVibration()
 {
     if (!m_isVibrating)
         return;
 
     m_pattern.insert(0, m_timerStop.nextFireInterval());
     m_timerStop.stop();
     cancelVibration();
 }
 
 void Vibration::resumeVibration()
 {
     m_timerStart.startOneShot(0);
 }
 
 void Vibration::timerStartFired(Timer<Vibration>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_timerStart);
 
     m_timerStart.stop();
 
     if (m_pattern.size()) {
         m_isVibrating = true;
-        m_vibrationClient->vibrate(m_pattern[0]);
+        WebKit::Platform::current()->vibrate(m_pattern[0]);
         m_timerStop.startOneShot(m_pattern[0] / 1000.0);
         m_pattern.remove(0);
     }
 }
 
 void Vibration::timerStopFired(Timer<Vibration>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_timerStop);
 
     m_timerStop.stop();
     m_isVibrating = false;
 
     if (m_pattern.size()) {
         m_timerStart.startOneShot(m_pattern[0] / 1000.0);
         m_pattern.remove(0);
     }
 }
 
 const char* Vibration::supplementName()
 {
     return "Vibration";
 }
 
+Vibration* Vibration::from(Page* page)
+{
+    if (!Supplement<Page>::from(page, supplementName()))
+        Supplement<Page>::provideTo(page, supplementName(), adoptPtr(new Vibration()));
+    return static_cast<Vibration*>(Supplement<Page>::from(page, supplementName()));
+}
+
 bool Vibration::isActive(Page* page)
 {
     return static_cast<bool>(Vibration::from(page));
 }
 
-void provideVibrationTo(Page* page, VibrationClient* client)
-{
-    Vibration::provideTo(page, Vibration::supplementName(), Vibration::create(client));
-}
-
 } // namespace WebCore
-
-#endif // ENABLE(VIBRATION)
-