Extract simpler classes for observing context lifecycle and observe Page lifecycle inNavigatorVibra…

Source/modules/vibration/NavigatorVibration.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/NavigatorVibration.h"
 
 #include "core/page/Frame.h"
+#include "core/page/Navigator.h"
 #include "core/page/Page.h"
+#include "core/page/PageVisibilityState.h"
 #include "public/platform/Platform.h"
 
 namespace WebCore {
 
 // Maximum duration of a vibration is 10 seconds.
 const unsigned kVibrationDurationMax = 10000;
 
 // Maximum number of entries in a vibration pattern.
 const unsigned kVibrationPatternLengthMax = 99;
 
-NavigatorVibration::NavigatorVibration()
-    : m_timerStart(this, &NavigatorVibration::timerStartFired)
+NavigatorVibration::NavigatorVibration(Page* page)
+    : PageLifecycleObserver(page)
+    , m_page(page)
+    , m_timerStart(this, &NavigatorVibration::timerStartFired)
     , m_timerStop(this, &NavigatorVibration::timerStopFired)
     , m_isVibrating(false)
 {
 }
 
 NavigatorVibration::~NavigatorVibration()
 {
     if (m_isVibrating)
         cancelVibration();
 }
@@ skipping 43 matching lines @@
 void NavigatorVibration::cancelVibration()
 {
     m_pattern.clear();
     if (m_isVibrating) {
         WebKit::Platform::current()->cancelVibration();
         m_isVibrating = false;
         m_timerStop.stop();
     }
 }
 
-void NavigatorVibration::suspendVibration()
-{
-    if (!m_isVibrating)
-        return;
-
-    m_pattern.insert(0, m_timerStop.nextFireInterval());
-    m_timerStop.stop();
-    cancelVibration();
-}
-
-void NavigatorVibration::resumeVibration()
-{
-    ASSERT(!m_timerStart.isActive());
-
-    m_timerStart.startOneShot(0);
-}
-
 void NavigatorVibration::timerStartFired(Timer<NavigatorVibration>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_timerStart);
 
     if (m_pattern.size()) {
         m_isVibrating = true;
         WebKit::Platform::current()->vibrate(m_pattern[0]);
         m_timerStop.startOneShot(m_pattern[0] / 1000.0);
         m_pattern.remove(0);
     }
 }
 
 void NavigatorVibration::timerStopFired(Timer<NavigatorVibration>* timer)
 {
     ASSERT_UNUSED(timer, timer == &m_timerStop);
 
     m_isVibrating = false;
 
     if (m_pattern.size()) {
         m_timerStart.startOneShot(m_pattern[0] / 1000.0);
         m_pattern.remove(0);
     }
 }
 
+void NavigatorVibration::pageVisibilityChanged()
+{
+    if (m_page->visibilityState() != PageVisibilityStateVisible)
+        cancelVibration();
+}
+
 bool NavigatorVibration::vibrate(Navigator* navigator, unsigned time)
 {
     VibrationPattern pattern;
     pattern.append(time);
     return NavigatorVibration::vibrate(navigator, pattern);
 }
 
 bool NavigatorVibration::vibrate(Navigator* navigator, const VibrationPattern& pattern)
 {
-    if (!navigator->frame()->page())
+    Page* page = navigator->frame()->page();
+    if (!page)
         return false;
 
-    if (navigator->frame()->page()->visibilityState() != PageVisibilityStateVisible)
+    if (page->visibilityState() != PageVisibilityStateVisible)
         return false;
 
-    return NavigatorVibration::from(navigator)->vibrate(pattern);
+    return NavigatorVibration::from(page)->vibrate(pattern);
 }
 
-NavigatorVibration* NavigatorVibration::from(Navigator* navigator)
+NavigatorVibration* NavigatorVibration::from(Page* page)
 {
-    NavigatorVibration* navigatorVibration = static_cast<NavigatorVibration*>(Supplement<Navigator>::from(navigator, supplementName()));
+    NavigatorVibration* navigatorVibration = static_cast<NavigatorVibration*>(Supplement<Page>::from(page, supplementName()));
     if (!navigatorVibration) {
-        navigatorVibration = new NavigatorVibration();
-        Supplement<Navigator>::provideTo(navigator, supplementName(), adoptPtr(navigatorVibration));
+        navigatorVibration = new NavigatorVibration(page);
+        Supplement<Page>::provideTo(page, supplementName(), adoptPtr(navigatorVibration));
     }
     return navigatorVibration;
 }
 
 const char* NavigatorVibration::supplementName()
 {
     return "NavigatorVibration";
 }
 
 } // namespace WebCore