Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1648)

Unified Diff: Source/modules/device_orientation/DeviceMotionController.cpp

Issue 315023006: Revert of Generalize and refactor DeviceSensorEvent* architecture to support multi-event type targets. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/device_orientation/DeviceMotionController.cpp
diff --git a/Source/modules/device_orientation/DeviceMotionController.cpp b/Source/modules/device_orientation/DeviceMotionController.cpp
index ed76d86d4db46910b7334b8c8500fbf526fb9a93..02498d07240ac6daa7bd41d6b0409517ad44a915 100644
--- a/Source/modules/device_orientation/DeviceMotionController.cpp
+++ b/Source/modules/device_orientation/DeviceMotionController.cpp
@@ -1,12 +1,35 @@
-// Copyright 2014 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.
+/*
+ * Copyright 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2012 Samsung Electronics. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
#include "config.h"
#include "modules/device_orientation/DeviceMotionController.h"
#include "core/dom/Document.h"
-#include "modules/EventModules.h"
+#include "core/frame/DOMWindow.h"
+#include "core/page/Page.h"
#include "modules/device_orientation/DeviceMotionData.h"
#include "modules/device_orientation/DeviceMotionDispatcher.h"
#include "modules/device_orientation/DeviceMotionEvent.h"
@@ -14,13 +37,20 @@
namespace WebCore {
DeviceMotionController::DeviceMotionController(Document& document)
- : DeviceSingleWindowEventController(document)
+ : DeviceSensorEventController(document.page())
+ , DOMWindowLifecycleObserver(document.domWindow())
+ , m_document(document)
{
}
DeviceMotionController::~DeviceMotionController()
{
stopUpdating();
+}
+
+void DeviceMotionController::didChangeDeviceMotion(DeviceMotionData* deviceMotionData)
+{
+ dispatchDeviceEvent(DeviceMotionEvent::create(EventTypeNames::devicemotion, deviceMotionData));
}
const char* DeviceMotionController::supplementName()
@@ -43,30 +73,56 @@
return DeviceMotionDispatcher::instance().latestDeviceMotionData();
}
+PassRefPtrWillBeRawPtr<Event> DeviceMotionController::getLastEvent()
+{
+ return DeviceMotionEvent::create(EventTypeNames::devicemotion, DeviceMotionDispatcher::instance().latestDeviceMotionData());
+}
+
void DeviceMotionController::registerWithDispatcher()
{
- DeviceMotionDispatcher::instance().addController(this);
+ DeviceMotionDispatcher::instance().addDeviceMotionController(this);
}
void DeviceMotionController::unregisterWithDispatcher()
{
- DeviceMotionDispatcher::instance().removeController(this);
+ DeviceMotionDispatcher::instance().removeDeviceMotionController(this);
}
-PassRefPtrWillBeRawPtr<Event> DeviceMotionController::lastEvent() const
-{
- return DeviceMotionEvent::create(EventTypeNames::devicemotion, DeviceMotionDispatcher::instance().latestDeviceMotionData());
-}
-
-bool DeviceMotionController::isNullEvent(Event* event) const
+bool DeviceMotionController::isNullEvent(Event* event)
{
DeviceMotionEvent* motionEvent = toDeviceMotionEvent(event);
return !motionEvent->deviceMotionData()->canProvideEventData();
}
-const AtomicString& DeviceMotionController::eventTypeName() const
+Document* DeviceMotionController::document()
{
- return EventTypeNames::devicemotion;
+ return &m_document;
+}
+
+void DeviceMotionController::didAddEventListener(DOMWindow* window, const AtomicString& eventType)
+{
+ if (eventType != EventTypeNames::devicemotion)
+ return;
+
+ if (page() && page()->visibilityState() == PageVisibilityStateVisible)
+ startUpdating();
+
+ m_hasEventListener = true;
+}
+
+void DeviceMotionController::didRemoveEventListener(DOMWindow* window, const AtomicString& eventType)
+{
+ if (eventType != EventTypeNames::devicemotion || window->hasEventListeners(EventTypeNames::devicemotion))
+ return;
+
+ stopUpdating();
+ m_hasEventListener = false;
+}
+
+void DeviceMotionController::didRemoveAllEventListeners(DOMWindow*)
+{
+ stopUpdating();
+ m_hasEventListener = false;
}
} // namespace WebCore
« no previous file with comments | « Source/modules/device_orientation/DeviceMotionController.h ('k') | Source/modules/device_orientation/DeviceMotionDispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698