[Sensors] The sensor state changes from "active" to "activated"

third_party/WebKit/Source/modules/sensor/Sensor.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/sensor/Sensor.h"
 
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/inspector/ConsoleMessage.h"
@@ skipping 81 matching lines @@
 
   stopListening();
 }
 
 static String ToString(Sensor::SensorState state) {
   switch (state) {
     case Sensor::SensorState::Idle:
       return "idle";
     case Sensor::SensorState::Activating:
       return "activating";
-    case Sensor::SensorState::Active:
-      return "active";
+    case Sensor::SensorState::Activated:
+      return "activated";
     case Sensor::SensorState::Errored:
       return "errored";
     default:
       NOTREACHED();
   }
   return "idle";
 }
 
 // Getters
 String Sensor::state() const {
   return ToString(m_state);
 }
 
 SensorReading* Sensor::reading() const {
-  if (m_state != Sensor::SensorState::Active)
+  if (m_state != Sensor::SensorState::Activated)
     return nullptr;
   DCHECK(m_sensorProxy);
   return m_sensorProxy->sensorReading();
 }
 
 DEFINE_TRACE(Sensor) {
   visitor->trace(m_sensorProxy);
   ActiveScriptWrappable::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
   EventTargetWithInlineData::trace(visitor);
@@ skipping 34 matching lines @@
   auto provider = SensorProviderProxy::from(document->frame());
   m_sensorProxy = provider->getSensorProxy(m_type);
 
   if (!m_sensorProxy) {
     m_sensorProxy = provider->createSensorProxy(m_type, document->page(),
                                                 createSensorReadingFactory());
   }
 }
 
 void Sensor::contextDestroyed() {
-  if (m_state == Sensor::SensorState::Active ||
+  if (m_state == Sensor::SensorState::Activated ||
       m_state == Sensor::SensorState::Activating)
     stopListening();
 }
 
 void Sensor::onSensorInitialized() {
   if (m_state != Sensor::SensorState::Activating)
     return;
 
   startListening();
 }
 
 void Sensor::onSensorReadingChanged() {
-  if (m_state == Sensor::SensorState::Active) {
+  if (m_state == Sensor::SensorState::Activated) {
     DCHECK(m_sensorUpdateNotifier);
     m_sensorUpdateNotifier->onSensorReadingChanged();
   }
 }
 
 void Sensor::onSensorError(ExceptionCode code,
                            const String& sanitizedMessage,
                            const String& unsanitizedMessage) {
   reportError(code, sanitizedMessage, unsanitizedMessage);
   if (m_sensorUpdateNotifier)
@@ skipping 11 matching lines @@
     return;
   }
 
   DCHECK(m_configuration);
   DCHECK(m_sensorProxy);
   auto updateCallback =
       WTF::bind(&Sensor::onSensorUpdateNotification, wrapWeakPersistent(this));
   DCHECK_GT(m_configuration->frequency, 0);
   m_sensorUpdateNotifier = SensorUpdateNotificationStrategy::create(
       m_configuration->frequency, std::move(updateCallback));
-  updateState(Sensor::SensorState::Active);
+  updateState(Sensor::SensorState::Activated);
 }
 
 void Sensor::startListening() {
   DCHECK(m_sensorProxy);
   updateState(Sensor::SensorState::Activating);
 
   m_sensorProxy->addObserver(this);
   if (!m_sensorProxy->isInitialized()) {
     m_sensorProxy->initialize();
     return;
@@ skipping 20 matching lines @@
     m_sensorUpdateNotifier->cancelPendingNotifications();
 
   if (m_sensorProxy->isInitialized()) {
     DCHECK(m_configuration);
     m_sensorProxy->removeConfiguration(m_configuration->Clone());
   }
   m_sensorProxy->removeObserver(this);
 }
 
 void Sensor::onSensorUpdateNotification() {
-  if (m_state != Sensor::SensorState::Active)
+  if (m_state != Sensor::SensorState::Activated)
     return;
 
   DCHECK(m_sensorProxy);
   DCHECK(m_sensorProxy->isInitialized());
   DCHECK(m_sensorProxy->sensorReading());
 
   if (getExecutionContext() &&
       m_sensorProxy->sensorReading()->isReadingUpdated(m_storedData)) {
     getExecutionContext()->postTask(
         BLINK_FROM_HERE,
         createSameThreadTask(&Sensor::notifySensorReadingChanged,
                              wrapWeakPersistent(this)));
   }
 
   m_storedData = m_sensorProxy->sensorReading()->data();
 }
 
 void Sensor::updateState(Sensor::SensorState newState) {
   if (newState == m_state)
     return;
 
-  if (newState == SensorState::Active && getExecutionContext()) {
+  if (newState == SensorState::Activated && getExecutionContext()) {
     DCHECK_EQ(SensorState::Activating, m_state);
     getExecutionContext()->postTask(
         BLINK_FROM_HERE, createSameThreadTask(&Sensor::notifyOnActivate,
                                               wrapWeakPersistent(this)));
   }
 
   m_state = newState;
 }
 
 void Sensor::reportError(ExceptionCode code,
@@ skipping 22 matching lines @@
 void Sensor::notifyOnActivate() {
   dispatchEvent(Event::create(EventTypeNames::activate));
 }
 
 void Sensor::notifyError(DOMException* error) {
   dispatchEvent(
       SensorErrorEvent::create(EventTypeNames::error, std::move(error)));
 }
 
 }  // namespace blink