WebKit & WebCore part of the device motion implementation using the platform layer.

Source/WebCore/dom/DeviceMotionController.h

Index: Source/WebCore/dom/DeviceMotionController.h
diff --git a/Source/WebCore/dom/DeviceMotionController.h b/Source/WebCore/dom/DeviceMotionController.h
index eac2313a72fb0337dd9e57d978d8c4d731fb8a1e..aa05319d29159dfd8382a2f4361902dc55f0b32f 100644
--- a/Source/WebCore/dom/DeviceMotionController.h
+++ b/Source/WebCore/dom/DeviceMotionController.h
@@ -1,29 +1,25 @@
 /*
- * Copyright (C) 2013 Google Inc. All rights reserved.
+ * 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:
+ * 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.
  *
- *     * 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
+ * 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.
  */
@@ -31,42 +27,55 @@
 #ifndef DeviceMotionController_h
 #define DeviceMotionController_h
 
-#include "DeviceController.h"
+#include "DOMWindow.h"
+#include "Event.h"
+#include "RefCountedSupplement.h"
+#include "Timer.h"
+#include <wtf/HashCountedSet.h>
 
 namespace WebCore {
 
 class DeviceMotionData;
 
-class DeviceMotionController : public DeviceController {
+class DeviceMotionController : public RefCountedSupplement<Page, DeviceMotionController> {

[Peter Beverloo, 2013/04/17 19:08:23]

We don't inherit from DeviceController anymore. Is this temporary? You talk
about it on line 56. This'd be a good thing to add a FIXME for.

[timvolodine, 2013/04/18 12:37:38]

Done.

+
 public:
-    virtual ~DeviceMotionController() { };
+    virtual ~DeviceMotionController();
 
-    static DeviceMotionController& shared();
+    static PassRefPtr<DeviceMotionController> create();
 
     void didChangeDeviceMotion(DeviceMotionData*);
 
     virtual bool hasLastData() OVERRIDE;
     virtual PassRefPtr<Event> getLastEvent() OVERRIDE;
-    bool isActiveAt(Page* page) { return m_activePages.contains(page); }
 
-    virtual void startUpdating();
-    virtual void stopUpdating();
+    static const char* supplementName();
+    static DeviceMotionController* from(Page*);
+    static bool isActiveAt(Page*);
 
-// -------------------------------------------------
+    // FIXME move these methods to DeviceController once the device orientation
+    // switches to the client-less design.
+    void dispatchDeviceEvent(PassRefPtr<Event>);

[Peter Beverloo, 2013/04/17 19:08:23]

Can we add the "const" modifier to the argument?  It's not necessary, but it's a
good way to indicate that we won't change the Event.

[timvolodine, 2013/04/18 12:37:38]

Done.

+    bool isActive() { return !m_listeners.isEmpty(); }
 
-    void addDeviceEventListener(DOMWindow*) OVERRIDE;
-    void removeDeviceEventListener(DOMWindow*) OVERRIDE;
-    void removeAllDeviceEventListeners(DOMWindow*) OVERRIDE;
+    virtual void addDeviceEventListener(DOMWindow*) OVERRIDE;
+    virtual void removeDeviceEventListener(DOMWindow*) OVERRIDE;
+    virtual void removeAllDeviceEventListeners(DOMWindow*) OVERRIDE;
 
-//    void dispatchDeviceEvent(PassRefPtr<Event>);
-//    bool isActive() { return !m_listeners.isEmpty(); }
-//    DeviceClient* client() { return m_client; }
+private:
+    DeviceMotionController() : m_timer(this, &DeviceMotionController::fireDeviceEvent) { }
 
-protected:
-    DeviceMotionController();
-    HashCountedSet<Page*> m_activePages;
+    void startUpdating();
+    void stopUpdating();
+    void fireDeviceEvent(Timer<DeviceMotionController>*);
+
+    HashCountedSet<RefPtr<DOMWindow> > m_listeners;
+    HashCountedSet<RefPtr<DOMWindow> > m_lastEventListeners;
+    Timer<DeviceMotionController> m_timer;
 };
 
+void provideDeviceMotionTo(Page*);

[Peter Beverloo, 2013/04/17 19:08:23]

It's very unfortunate that we still need this. I suppose it's an artifact of
using supplements to a Page..

[timvolodine, 2013/04/18 12:37:38]

yes, agree this is not very clean. But this is how it used to be and how the
supplements appear to be done. If we get rid of supplements (and use singletons
for example as in the first patch) we would probably need to change the
interface of DOMWindow or add some code to make Page accessible from the
controller.

+
 } // namespace WebCore
 
 #endif // DeviceMotionController_h