Have ScreenOrientationController use a timer for async event dispatch again

Source/modules/screen_orientation/ScreenOrientationController.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/screen_orientation/ScreenOrientationController.h"
 
-#include "core/dom/Document.h"
-#include "core/dom/ExecutionContextTask.h"
 #include "core/events/Event.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/page/ChromeClient.h"
 #include "core/page/Page.h"
 #include "modules/screen_orientation/ScreenOrientation.h"
 #include "modules/screen_orientation/ScreenOrientationDispatcher.h"
 #include "platform/LayoutTestSupport.h"
 #include "public/platform/WebScreenInfo.h"
@@ skipping 15 matching lines @@
 
 ScreenOrientationController* ScreenOrientationController::from(LocalFrame& frame)
 {
     return static_cast<ScreenOrientationController*>(WillBeHeapSupplement<LocalFrame>::from(frame, supplementName()));
 }
 
 ScreenOrientationController::ScreenOrientationController(LocalFrame& frame, WebScreenOrientationClient* client)
     : LocalFrameLifecycleObserver(&frame)
     , PlatformEventController(frame.page())
     , m_client(client)
-    , m_isDispatchingEvent(false)
+    , m_dispatchEventTimer(this, &ScreenOrientationController::dispatchEventTimerFired)
 {
 }
 
 const char* ScreenOrientationController::supplementName()
 {
     return "ScreenOrientationController";
 }
 
 // Compute the screen orientation using the orientation angle and the screen width / height.
 WebScreenOrientationType ScreenOrientationController::computeOrientation(ChromeClient& chromeClient)
@@ skipping 77 matching lines @@
     // Keep track of the frames that need to be notified before notifying the
     // current frame as it will prevent side effects from the change event
     // handlers.
     WillBeHeapVector<RefPtrWillBeMember<LocalFrame>> childFrames;
     for (Frame* child = frame()->tree().firstChild(); child; child = child->tree().nextSibling()) {
         if (child->isLocalFrame())
             childFrames.append(toLocalFrame(child));
     }
 
     // Notify current orientation object.
-    if (!m_isDispatchingEvent) {
-        if (Document* document = frame()->document()) {
-            document->postTask(FROM_HERE, createSameThreadTask(&ScreenOrientationController::dispatchChangeEvent, this));
-            m_isDispatchingEvent = true;
-        }
-    }
+    if (!m_dispatchEventTimer.isActive())
+        m_dispatchEventTimer.startOneShot(0, FROM_HERE);

[haraken, 2015/06/19 11:04:15]

Would you help me understand why the new code is safe? Does the Timer heap has
an ability to not fire a Timer for a detached frame?

[sof, 2015/06/19 11:08:27]

This controller owns the timer, so it'll be finalized (and stop'ed) along with
it.

[haraken, 2015/06/19 11:11:40]

Ah, makes sense. LGTM.

 
     // ... and child frames, if they have a ScreenOrientationController.
     for (size_t i = 0; i < childFrames.size(); ++i) {
         if (ScreenOrientationController* controller = ScreenOrientationController::from(*childFrames[i]))
             controller->notifyOrientationChanged();
     }
 }
 
 void ScreenOrientationController::setOrientation(ScreenOrientation* orientation)
 {
@@ skipping 12 matching lines @@
 }
 
 void ScreenOrientationController::unlock()
 {
     // When detached, the client is no longer valid.
     if (!m_client)
         return;
     m_client->unlockOrientation();
 }
 
-void ScreenOrientationController::dispatchChangeEvent()
+void ScreenOrientationController::dispatchEventTimerFired(Timer<ScreenOrientationController>*)
 {
-    m_isDispatchingEvent = false;
     if (!m_orientation)
         return;
     m_orientation->dispatchEvent(Event::create(EventTypeNames::change));
 }
 
 void ScreenOrientationController::didUpdateData()
 {
     // Do nothing.
 }
 
@@ skipping 27 matching lines @@
 
 DEFINE_TRACE(ScreenOrientationController)
 {
     visitor->trace(m_orientation);
     LocalFrameLifecycleObserver::trace(visitor);
     WillBeHeapSupplement<LocalFrame>::trace(visitor);
     PlatformEventController::trace(visitor);
 }
 
 } // namespace blink