Index: Source/modules/device_orientation/DeviceMotionController.cpp |
diff --git a/Source/modules/device_orientation/DeviceMotionController.cpp b/Source/modules/device_orientation/DeviceMotionController.cpp |
index 02498d07240ac6daa7bd41d6b0409517ad44a915..ed76d86d4db46910b7334b8c8500fbf526fb9a93 100644 |
--- a/Source/modules/device_orientation/DeviceMotionController.cpp |
+++ b/Source/modules/device_orientation/DeviceMotionController.cpp |
@@ -1,35 +1,12 @@ |
-/* |
- * 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. |
- */ |
+// 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. |
#include "config.h" |
#include "modules/device_orientation/DeviceMotionController.h" |
#include "core/dom/Document.h" |
-#include "core/frame/DOMWindow.h" |
-#include "core/page/Page.h" |
+#include "modules/EventModules.h" |
#include "modules/device_orientation/DeviceMotionData.h" |
#include "modules/device_orientation/DeviceMotionDispatcher.h" |
#include "modules/device_orientation/DeviceMotionEvent.h" |
@@ -37,9 +14,7 @@ |
namespace WebCore { |
DeviceMotionController::DeviceMotionController(Document& document) |
- : DeviceSensorEventController(document.page()) |
- , DOMWindowLifecycleObserver(document.domWindow()) |
- , m_document(document) |
+ : DeviceSingleWindowEventController(document) |
{ |
} |
@@ -48,11 +23,6 @@ DeviceMotionController::~DeviceMotionController() |
stopUpdating(); |
} |
-void DeviceMotionController::didChangeDeviceMotion(DeviceMotionData* deviceMotionData) |
-{ |
- dispatchDeviceEvent(DeviceMotionEvent::create(EventTypeNames::devicemotion, deviceMotionData)); |
-} |
- |
const char* DeviceMotionController::supplementName() |
{ |
return "DeviceMotionController"; |
@@ -73,56 +43,30 @@ bool DeviceMotionController::hasLastData() |
return DeviceMotionDispatcher::instance().latestDeviceMotionData(); |
} |
-PassRefPtrWillBeRawPtr<Event> DeviceMotionController::getLastEvent() |
-{ |
- return DeviceMotionEvent::create(EventTypeNames::devicemotion, DeviceMotionDispatcher::instance().latestDeviceMotionData()); |
-} |
- |
void DeviceMotionController::registerWithDispatcher() |
{ |
- DeviceMotionDispatcher::instance().addDeviceMotionController(this); |
+ DeviceMotionDispatcher::instance().addController(this); |
} |
void DeviceMotionController::unregisterWithDispatcher() |
{ |
- DeviceMotionDispatcher::instance().removeDeviceMotionController(this); |
-} |
- |
-bool DeviceMotionController::isNullEvent(Event* event) |
-{ |
- DeviceMotionEvent* motionEvent = toDeviceMotionEvent(event); |
- return !motionEvent->deviceMotionData()->canProvideEventData(); |
+ DeviceMotionDispatcher::instance().removeController(this); |
} |
-Document* DeviceMotionController::document() |
+PassRefPtrWillBeRawPtr<Event> DeviceMotionController::lastEvent() const |
{ |
- 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; |
+ return DeviceMotionEvent::create(EventTypeNames::devicemotion, DeviceMotionDispatcher::instance().latestDeviceMotionData()); |
} |
-void DeviceMotionController::didRemoveEventListener(DOMWindow* window, const AtomicString& eventType) |
+bool DeviceMotionController::isNullEvent(Event* event) const |
{ |
- if (eventType != EventTypeNames::devicemotion || window->hasEventListeners(EventTypeNames::devicemotion)) |
- return; |
- |
- stopUpdating(); |
- m_hasEventListener = false; |
+ DeviceMotionEvent* motionEvent = toDeviceMotionEvent(event); |
+ return !motionEvent->deviceMotionData()->canProvideEventData(); |
} |
-void DeviceMotionController::didRemoveAllEventListeners(DOMWindow*) |
+const AtomicString& DeviceMotionController::eventTypeName() const |
{ |
- stopUpdating(); |
- m_hasEventListener = false; |
+ return EventTypeNames::devicemotion; |
} |
} // namespace WebCore |