Generalize and refactor DeviceSensorEvent* architecture to support multi-event type targets.

Source/modules/device_orientation/DeviceOrientationController.h

Index: Source/modules/device_orientation/DeviceOrientationController.h
diff --git a/Source/modules/device_orientation/DeviceOrientationController.h b/Source/modules/device_orientation/DeviceOrientationController.h
index ed9ba629374a7ce3013787ddb6d93a6684703ca7..5bc3eb5421bfda00b9a0fb0951496df463ce4d1d 100644
--- a/Source/modules/device_orientation/DeviceOrientationController.h
+++ b/Source/modules/device_orientation/DeviceOrientationController.h
@@ -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.

[tkent, 2014/06/05 16:06:18]

Ditto.

[timvolodine, 2014/06/05 17:29:04]

Done.

  *
  * 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,15 +32,14 @@
 #define DeviceOrientationController_h
 
 #include "core/dom/DocumentSupplementable.h"
-#include "core/frame/DOMWindowLifecycleObserver.h"
-#include "core/frame/DeviceSensorEventController.h"
-#include "modules/EventModules.h"
+#include "core/frame/DeviceSingleWindowEventController.h"
 
 namespace WebCore {
 
 class DeviceOrientationData;
+class Event;
 
-class DeviceOrientationController FINAL : public NoBaseWillBeGarbageCollectedFinalized<DeviceOrientationController>, public DeviceSensorEventController, public DocumentSupplement, public DOMWindowLifecycleObserver {
+class DeviceOrientationController FINAL : public NoBaseWillBeGarbageCollectedFinalized<DeviceOrientationController>, public DeviceSingleWindowEventController, public DocumentSupplement {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(DeviceOrientationController);
 public:
     virtual ~DeviceOrientationController();
@@ -44,30 +47,30 @@ public:
     static const char* supplementName();
     static DeviceOrientationController& from(Document&);
 
-    void didChangeDeviceOrientation(DeviceOrientationData*);
+    // Inherited from DeviceSingleWindowEventController.
+    void didUpdateData() OVERRIDE;
+
     void setOverride(DeviceOrientationData*);
     void clearOverride();
 
-    // Inherited from DOMWindowLifecycleObserver
-    virtual void didAddEventListener(DOMWindow*, const AtomicString&) OVERRIDE;
-    virtual void didRemoveEventListener(DOMWindow*, const AtomicString&) OVERRIDE;
-    virtual void didRemoveAllEventListeners(DOMWindow*) OVERRIDE;
-
     virtual void trace(Visitor*) OVERRIDE;
 
 private:
     explicit DeviceOrientationController(Document&);
+
+    // Inherited from DeviceEventControllerBase.
     virtual void registerWithDispatcher() OVERRIDE;
     virtual void unregisterWithDispatcher() OVERRIDE;
-
-    DeviceOrientationData* lastData();
     virtual bool hasLastData() OVERRIDE;
-    virtual PassRefPtrWillBeRawPtr<Event> getLastEvent() OVERRIDE;
-    virtual bool isNullEvent(Event*) OVERRIDE;
-    virtual Document* document() OVERRIDE;
+
+    // Inherited from DeviceSingleWindowEventController.
+    virtual PassRefPtrWillBeRawPtr<Event> lastEvent() const OVERRIDE;
+    virtual const AtomicString& eventTypeName() const OVERRIDE;
+    virtual bool isNullEvent(Event*) const OVERRIDE;
+
+    DeviceOrientationData* lastData() const;
 
     RefPtrWillBeMember<DeviceOrientationData> m_overrideOrientationData;
-    Document& m_document;
 };
 
 } // namespace WebCore