Changeset 65924 in webkit

Timestamp:

Aug 24, 2010 12:52:25 PM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-24 Hans Wennborg <​hans@chromium.org>

Reviewed by Steve Block.

Remove null-checks from DeviceOrientationController
​https://bugs.webkit.org/show_bug.cgi?id=44504

Remove checks for m_client being NULL from DeviceOrientationController.
It will never be NULL, and this is checked by an ASSERT on construction.

Will be covered by layout tests for device orientation.

• dom/DeviceOrientationController.cpp: (WebCore::DeviceOrientationController::timerFired): (WebCore::DeviceOrientationController::addListener): (WebCore::DeviceOrientationController::removeListener): (WebCore::DeviceOrientationController::removeAllListeners):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/DeviceOrientationController.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-24  Hans Wennborg  <hans@chromium.org>
+
+        Reviewed by Steve Block.
+
+        Remove null-checks from DeviceOrientationController
+        https://bugs.webkit.org/show_bug.cgi?id=44504
+
+        Remove checks for m_client being NULL from DeviceOrientationController.
+        It will never be NULL, and this is checked by an ASSERT on construction.
+
+        Will be covered by layout tests for device orientation.
+
+        * dom/DeviceOrientationController.cpp:
+        (WebCore::DeviceOrientationController::timerFired):
+        (WebCore::DeviceOrientationController::addListener):
+        (WebCore::DeviceOrientationController::removeListener):
+        (WebCore::DeviceOrientationController::removeAllListeners):
+
 2010-08-24  Stephen White  <senorblanco@chromium.org>
 

trunk/WebCore/dom/DeviceOrientationController.cpp

@@ -45 +45 @@
 {
     ASSERT_UNUSED(timer, timer == &m_timer);
-    ASSERT(!m_client || m_client->lastOrientation());
+    ASSERT(m_client->lastOrientation());
 
-    RefPtr<DeviceOrientation> orientation = m_client ?  m_client->lastOrientation() : DeviceOrientation::create();
+    RefPtr<DeviceOrientation> orientation = m_client->lastOrientation();
     RefPtr<DeviceOrientationEvent> event = DeviceOrientationEvent::create(eventNames().deviceorientationEvent, orientation.get());
 
@@ -59 +59 @@
 void DeviceOrientationController::addListener(DOMWindow* window)
 {
-    // If no client is present, we should fire an event with all parameters null. If
-    // the client already has an orientation, we should fire an event with that
-    // orientation. In both cases, the event is fired asynchronously, but without
+    // If the client already has an orientation, we should fire an event with that
+    // orientation. The event is fired asynchronously, but without
     // waiting for the client to get a new orientation.
-    if (!m_client || m_client->lastOrientation()) {
+    if (m_client->lastOrientation()) {
         m_newListeners.add(window);
         if (!m_timer.isActive())
@@ -72 +71 @@
     bool wasEmpty = m_listeners.isEmpty();
     m_listeners.add(window);
-    if (wasEmpty && m_client)
+    if (wasEmpty)
         m_client->startUpdating();
 }
@@ -80 +79 @@
     m_listeners.remove(window);
     m_newListeners.remove(window);
-    if (m_listeners.isEmpty() && m_client)
+    if (m_listeners.isEmpty())
         m_client->stopUpdating();
 }
@@ -92 +91 @@
     m_listeners.removeAll(window);
     m_newListeners.remove(window);
-    if (m_listeners.isEmpty() && m_client)
+    if (m_listeners.isEmpty())
         m_client->stopUpdating();
 }