Changeset 175657 in webkit

Timestamp:

Nov 5, 2014 6:37:45 PM (9 years ago)

Author:

Chris Dumez

Message:

Revert r175441 as it seems to be causing intermittent crashes in DOMTimer
​https://bugs.webkit.org/show_bug.cgi?id=138449

Unreviewed roll out.

Revert r175441 as it seems to be causing intermittent crashes in DOMTimer due
to the scriptExecutionContext going away. See <rdar://problem/18883681>.

• page/DOMTimer.cpp:

(WebCore::DOMTimer::install):
(WebCore::DOMTimer::fired):
(WebCore::NestedTimersVector::NestedTimersVector): Deleted.
(WebCore::NestedTimersVector::~NestedTimersVector): Deleted.
(WebCore::NestedTimersVector::registerTimer): Deleted.
(WebCore::NestedTimersVector::begin): Deleted.
(WebCore::NestedTimersVector::end): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/DOMTimer.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-11-05  Chris Dumez  <cdumez@apple.com>
+
+        Revert r175441 as it seems to be causing intermittent crashes in DOMTimer
+        https://bugs.webkit.org/show_bug.cgi?id=138449
+
+        Unreviewed roll out.
+
+        Revert r175441 as it seems to be causing intermittent crashes in DOMTimer due
+        to the scriptExecutionContext going away. See <rdar://problem/18883681>.
+
+        * page/DOMTimer.cpp:
+        (WebCore::DOMTimer::install):
+        (WebCore::DOMTimer::fired):
+        (WebCore::NestedTimersVector::NestedTimersVector): Deleted.
+        (WebCore::NestedTimersVector::~NestedTimersVector): Deleted.
+        (WebCore::NestedTimersVector::registerTimer): Deleted.
+        (WebCore::NestedTimersVector::begin): Deleted.
+        (WebCore::NestedTimersVector::end): Deleted.
+
 2014-11-05  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/page/DOMTimer.cpp

@@ -86 +86 @@
 DOMTimerFireState* DOMTimerFireState::current = nullptr;
 
-struct NestedTimersVector {
-    typedef Vector<DOMTimer*, 1>::const_iterator const_iterator;
-
-    NestedTimersVector(ScriptExecutionContext* context)
-        : shouldSetCurrent(context->isDocument())
-    {
-        if (shouldSetCurrent) {
-            previous = current;
-            current = this;
-        }
-    }
-
-    ~NestedTimersVector()
-    {
-        if (shouldSetCurrent)
-            current = previous;
-    }
-
-    static NestedTimersVector* current;
-
-    void registerTimer(DOMTimer* timer)
-    {
-        nestedTimers.append(timer);
-    }
-
-    const_iterator begin() const { return nestedTimers.begin(); }
-    const_iterator end() const { return nestedTimers.end(); }
-
-private:
-    bool shouldSetCurrent;
-    NestedTimersVector* previous;
-    Vector<DOMTimer*, 1> nestedTimers;
-};
-
-NestedTimersVector* NestedTimersVector::current = nullptr;
-
 static inline bool shouldForwardUserGesture(int interval, int nestingLevel)
 {
@@ -171 +135 @@
     InspectorInstrumentation::didInstallTimer(context, timer->m_timeoutId, timeout, singleShot);
 
-    // Keep track of nested timer installs.
-    if (NestedTimersVector::current)
-        NestedTimersVector::current->registerTimer(timer);
-
     return timer->m_timeoutId;
 }
@@ -279 +239 @@
 #endif
 
-    // Keep track nested timer installs.
-    NestedTimersVector nestedTimers(context);
     m_action->execute(context);
 
@@ -294 +252 @@
 
     InspectorInstrumentation::didFireTimer(cookie);
-
-    // Check if we should throttle nested single-shot timers.
-    for (auto* timer : nestedTimers) {
-        if (!timer->repeatInterval())
-            timer->updateThrottlingStateIfNecessary(fireState);
-    }
 
     context->setTimerNestingLevel(0);