| Index: Source/modules/device_orientation/DeviceOrientationController.cpp
|
| diff --git a/Source/modules/device_orientation/DeviceOrientationController.cpp b/Source/modules/device_orientation/DeviceOrientationController.cpp
|
| index 23b943df73f3280fc2a91e5793c9d8a2f5935896..0afc4df7e0f21598dd5b3d3b6090cb14156576b2 100644
|
| --- a/Source/modules/device_orientation/DeviceOrientationController.cpp
|
| +++ b/Source/modules/device_orientation/DeviceOrientationController.cpp
|
| @@ -1,25 +1,29 @@
|
| /*
|
| - * Copyright 2010 Apple Inc. All rights reserved.
|
| - * Copyright (C) 2012 Samsung Electronics. All rights reserved.
|
| + * Copyright (C) 2013 Google Inc. 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.
|
| + * modification, are permitted provided that the following conditions are
|
| + * met:
|
| *
|
| - * 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
|
| + * * 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.
|
| + * * Neither the name of Google Inc. nor the names of its
|
| + * contributors may be used to endorse or promote products derived from
|
| + * this software without specific prior written permission.
|
| + *
|
| + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| + * "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.
|
| */
|
| @@ -28,8 +32,7 @@
|
| #include "modules/device_orientation/DeviceOrientationController.h"
|
|
|
| #include "core/dom/Document.h"
|
| -#include "core/frame/DOMWindow.h"
|
| -#include "core/page/Page.h"
|
| +#include "modules/EventModules.h"
|
| #include "modules/device_orientation/DeviceOrientationData.h"
|
| #include "modules/device_orientation/DeviceOrientationDispatcher.h"
|
| #include "modules/device_orientation/DeviceOrientationEvent.h"
|
| @@ -37,9 +40,7 @@
|
| namespace WebCore {
|
|
|
| DeviceOrientationController::DeviceOrientationController(Document& document)
|
| - : DeviceSensorEventController(document.page())
|
| - , DOMWindowLifecycleObserver(document.domWindow())
|
| - , m_document(document)
|
| + : DeviceSingleWindowEventController(document)
|
| {
|
| }
|
|
|
| @@ -48,11 +49,11 @@ DeviceOrientationController::~DeviceOrientationController()
|
| stopUpdating();
|
| }
|
|
|
| -void DeviceOrientationController::didChangeDeviceOrientation(DeviceOrientationData* deviceOrientationData)
|
| +void DeviceOrientationController::didUpdateData()
|
| {
|
| if (m_overrideOrientationData)
|
| return;
|
| - dispatchDeviceEvent(DeviceOrientationEvent::create(EventTypeNames::deviceorientation, deviceOrientationData));
|
| + dispatchDeviceEvent(DeviceOrientationEvent::create(EventTypeNames::deviceorientation, lastData()));
|
| }
|
|
|
| const char* DeviceOrientationController::supplementName()
|
| @@ -75,24 +76,24 @@ DeviceOrientationData* DeviceOrientationController::lastData()
|
| return m_overrideOrientationData ? m_overrideOrientationData.get() : DeviceOrientationDispatcher::instance().latestDeviceOrientationData();
|
| }
|
|
|
| -bool DeviceOrientationController::hasLastData()
|
| +bool DeviceOrientationController::isInvokeInitialUpdate()
|
| {
|
| return lastData();
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<Event> DeviceOrientationController::getLastEvent()
|
| +void DeviceOrientationController::registerWithDispatcher()
|
| {
|
| - return DeviceOrientationEvent::create(EventTypeNames::deviceorientation, lastData());
|
| + DeviceOrientationDispatcher::instance().addController(this);
|
| }
|
|
|
| -void DeviceOrientationController::registerWithDispatcher()
|
| +void DeviceOrientationController::unregisterWithDispatcher()
|
| {
|
| - DeviceOrientationDispatcher::instance().addDeviceOrientationController(this);
|
| + DeviceOrientationDispatcher::instance().removeController(this);
|
| }
|
|
|
| -void DeviceOrientationController::unregisterWithDispatcher()
|
| +PassRefPtrWillBeRawPtr<Event> DeviceOrientationController::getLastEvent()
|
| {
|
| - DeviceOrientationDispatcher::instance().removeDeviceOrientationController(this);
|
| + return DeviceOrientationEvent::create(EventTypeNames::deviceorientation, lastData());
|
| }
|
|
|
| bool DeviceOrientationController::isNullEvent(Event* event)
|
| @@ -101,41 +102,15 @@ bool DeviceOrientationController::isNullEvent(Event* event)
|
| return !orientationEvent->orientation()->canProvideEventData();
|
| }
|
|
|
| -Document* DeviceOrientationController::document()
|
| -{
|
| - return &m_document;
|
| -}
|
| -
|
| -void DeviceOrientationController::didAddEventListener(DOMWindow* window, const AtomicString& eventType)
|
| +const AtomicString& DeviceOrientationController::getEventTypeName()
|
| {
|
| - if (eventType != EventTypeNames::deviceorientation)
|
| - return;
|
| -
|
| - if (page() && page()->visibilityState() == PageVisibilityStateVisible)
|
| - startUpdating();
|
| -
|
| - m_hasEventListener = true;
|
| -}
|
| -
|
| -void DeviceOrientationController::didRemoveEventListener(DOMWindow* window, const AtomicString& eventType)
|
| -{
|
| - if (eventType != EventTypeNames::deviceorientation || window->hasEventListeners(EventTypeNames::deviceorientation))
|
| - return;
|
| -
|
| - stopUpdating();
|
| - m_hasEventListener = false;
|
| -}
|
| -
|
| -void DeviceOrientationController::didRemoveAllEventListeners(DOMWindow* window)
|
| -{
|
| - stopUpdating();
|
| - m_hasEventListener = false;
|
| + return EventTypeNames::deviceorientation;
|
| }
|
|
|
| void DeviceOrientationController::setOverride(DeviceOrientationData* deviceOrientationData)
|
| {
|
| m_overrideOrientationData.clear();
|
| - didChangeDeviceOrientation(deviceOrientationData);
|
| + didUpdateData();
|
| m_overrideOrientationData = deviceOrientationData;
|
| }
|
|
|
| @@ -144,9 +119,8 @@ void DeviceOrientationController::clearOverride()
|
| if (!m_overrideOrientationData)
|
| return;
|
| m_overrideOrientationData.clear();
|
| - DeviceOrientationData* orientation = lastData();
|
| - if (orientation)
|
| - didChangeDeviceOrientation(orientation);
|
| + if (lastData())
|
| + didUpdateData();
|
| }
|
|
|
| void DeviceOrientationController::trace(Visitor* visitor)
|
|
|