Changeset 63312 in webkit

Timestamp:

Jul 14, 2010 5:54:49 AM (14 years ago)

Author:

steveblock@google.com

Message:

2010-07-14 Steve Block <​steveblock@google.com>

Reviewed by Jeremy Orlow.

Provide implementation of DeviceOrientationController and hook into DOMWindow
​https://bugs.webkit.org/show_bug.cgi?id=39588

Added DeviceOrientationController::addListener() and removeListener()
to start and stop the client and added calls from DomWindow. Implemented
DeviceOrientationController::onDeviceOrientationChange() to fire a
DeviceOrientationEvent on the window object.

No new tests yet, pending LayoutTestController methods for mock DeviceOrientation.

• dom/DeviceOrientationClient.h:
• dom/DeviceOrientationController.cpp: (WebCore::DeviceOrientation::addListener): (WebCore::DeviceOrientation::removeListener): (WebCore::DeviceOrientation::removeAllListeners): (WebCore::DeviceOrientationController::onDeviceOrientationChange):
• dom/DeviceOrientationController.h:
• page/DOMWindow.cpp: (WebCore::DOMWindow::addEventListener): (WebCore::DOMWindow::removeEventListener): (WebCore::DOMWindow::removeAllEventListeners):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/DeviceOrientationClient.h (modified) (1 diff)
• dom/DeviceOrientationController.cpp (modified) (2 diffs)
• dom/DeviceOrientationController.h (modified) (2 diffs)
• page/DOMWindow.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-14  Steve Block  <steveblock@google.com>
+
+        Reviewed by Jeremy Orlow.
+
+        Provide implementation of DeviceOrientationController and hook into DOMWindow
+        https://bugs.webkit.org/show_bug.cgi?id=39588
+
+        Added DeviceOrientationController::addListener() and removeListener()
+        to start and stop the client and added calls from DomWindow. Implemented
+        DeviceOrientationController::onDeviceOrientationChange() to fire a
+        DeviceOrientationEvent on the window object.
+
+        No new tests yet, pending LayoutTestController methods for mock DeviceOrientation.
+
+        * dom/DeviceOrientationClient.h:
+        * dom/DeviceOrientationController.cpp:
+        (WebCore::DeviceOrientation::addListener):
+        (WebCore::DeviceOrientation::removeListener):
+        (WebCore::DeviceOrientation::removeAllListeners):
+        (WebCore::DeviceOrientationController::onDeviceOrientationChange):
+        * dom/DeviceOrientationController.h:
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::addEventListener):
+        (WebCore::DOMWindow::removeEventListener):
+        (WebCore::DOMWindow::removeAllEventListeners):
+
 2010-07-14  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebCore/dom/DeviceOrientationClient.h

@@ -29 +29 @@
 namespace WebCore {
 
+class DeviceOrientation;
+
 class DeviceOrientationClient {
 public:
     virtual void startUpdating() = 0;
     virtual void stopUpdating() = 0;
+    virtual DeviceOrientation* lastOrientation() const = 0;
 
 protected:

trunk/WebCore/dom/DeviceOrientationController.cpp

@@ -29 +29 @@
 #if ENABLE(DEVICE_ORIENTATION)
 
+#include "DeviceOrientation.h"
 #include "DeviceOrientationClient.h"
 #include "DeviceOrientationEvent.h"
-#include <wtf/UnusedParam.h>
 
 namespace WebCore {
@@ -41 +41 @@
 }
 
-void DeviceOrientationController::onDeviceOrientationChange(double alpha, double beta, double gamma)
+void DeviceOrientationController::addListener(DOMWindow* window)
 {
-    // FIXME: Fire DeviceOrientationEvents on the window object of all frames
-    // that are listening to orientation.
-    UNUSED_PARAM(alpha);
-    UNUSED_PARAM(beta);
-    UNUSED_PARAM(gamma);
+    // If no client is present, signal that no orientation data is available.
+    // If the client already has an orientation, call back to this new listener
+    // immediately.
+    if (!m_client) {
+        RefPtr<DeviceOrientation> emptyOrientation = DeviceOrientation::create();
+        window->dispatchEvent(DeviceOrientationEvent::create(eventNames().deviceorientationEvent, emptyOrientation.get()));
+    } else if (m_client && m_client->lastOrientation())
+        window->dispatchEvent(DeviceOrientationEvent::create(eventNames().deviceorientationEvent, m_client->lastOrientation()));
+
+    // The client may call back synchronously.
+    bool wasEmpty = m_listeners.isEmpty();
+    m_listeners.add(window);
+    if (wasEmpty && m_client)
+        m_client->startUpdating();
+}
+
+void DeviceOrientationController::removeListener(DOMWindow* window)
+{
+    m_listeners.remove(window);
+    if (m_listeners.isEmpty() && m_client)
+        m_client->stopUpdating();
+}
+
+void DeviceOrientationController::removeAllListeners(DOMWindow* window)
+{
+    // May be called with a DOMWindow that's not a listener.
+    if (!m_listeners.contains(window))
+        return;
+
+    m_listeners.removeAll(window);
+    if (m_listeners.isEmpty() && m_client)
+        m_client->stopUpdating();
+}
+
+void DeviceOrientationController::onDeviceOrientationChange(DeviceOrientation* orientation)
+{
+    RefPtr<DeviceOrientationEvent> event = DeviceOrientationEvent::create(eventNames().deviceorientationEvent, orientation);
+    Vector<DOMWindow*> listenersVector;
+    copyToVector(m_listeners, listenersVector);
+    for (size_t i = 0; i < listenersVector.size(); ++i)
+        listenersVector[i]->dispatchEvent(event);
 }
 

trunk/WebCore/dom/DeviceOrientationController.h

@@ -27 +27 @@
 #define DeviceOrientationController_h
 
+#include "DOMWindow.h"
+#include <wtf/HashCountedSet.h>
+
 namespace WebCore {
 
+class DeviceOrientation;
 class DeviceOrientationClient;
 class Page;
@@ -36 +40 @@
     DeviceOrientationController(Page*, DeviceOrientationClient*);
 
-    // FIXME: Add methods to start and stop the service.
+    void addListener(DOMWindow*);
+    void removeListener(DOMWindow*);
+    void removeAllListeners(DOMWindow*);
 
-    void onDeviceOrientationChange(double alpha, double beta, double gamma);
+    void onDeviceOrientationChange(DeviceOrientation*);
 
 private:
     Page* m_page;
     DeviceOrientationClient* m_client;
+    typedef HashCountedSet<DOMWindow*> ListenersSet;
+    ListenersSet m_listeners;
 };
 

trunk/WebCore/page/DOMWindow.cpp

@@ -36 +36 @@
 #include "Chrome.h"
 #include "Console.h"
-#include "Database.h"
-#include "DatabaseCallback.h"
 #include "DOMApplicationCache.h"
 #include "DOMSelection.h"
 #include "DOMTimer.h"
+#include "Database.h"
+#include "DatabaseCallback.h"
+#include "DeviceOrientationController.h"
 #include "PageTransitionEvent.h"
 #include "Document.h"
@@ -1411 +1412 @@
     else if (eventType == eventNames().beforeunloadEvent && allowsBeforeUnloadListeners(this))
         addBeforeUnloadEventListener(this);
+#if ENABLE(DEVICE_ORIENTATION)
+    else if (eventType == eventNames().deviceorientationEvent && frame() && frame()->page())
+        frame()->page()->deviceOrientation()->addListener(this);
+#endif
 
     return true;
@@ -1424 +1429 @@
     else if (eventType == eventNames().beforeunloadEvent && allowsBeforeUnloadListeners(this))
         removeBeforeUnloadEventListener(this);
+#if ENABLE(DEVICE_ORIENTATION)
+    else if (eventType == eventNames().deviceorientationEvent && frame() && frame()->page())
+        frame()->page()->deviceOrientation()->removeListener(this);
+#endif
 
     return true;
@@ -1498 +1507 @@
     EventTarget::removeAllEventListeners();
 
+#if ENABLE(DEVICE_ORIENTATION)
+    if (frame() && frame()->page())
+        frame()->page()->deviceOrientation()->removeAllListeners(this);
+#endif
+
     removeAllUnloadEventListeners(this);
     removeAllBeforeUnloadEventListeners(this);