Changeset 66311 in webkit

Timestamp:

Aug 28, 2010 11:48:49 AM (14 years ago)

Author:

eric.carlson@apple.com

Message:

2010-08-28 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Simon Fraser.

Crash reloading fast/events/tabindex-focus-blur-all.html test
​https://bugs.webkit.org/show_bug.cgi?id=44743

• html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::asyncEventTimerFired): If m_isWaitingToDecrementLoadEventDelayCount is true, call setShouldDelayLoadEvent(false) and set the timer to fire the pending events on the next idle. (WebCore::HTMLMediaElement::setShouldDelayLoadEvent): Don't clear the delay from within a media engine callback because document 'load' event handlers that cause the page to become inactive will delete the media engine.
• html/HTMLMediaElement.h: Add m_isWaitingToDecrementLoadEventDelayCount.

2010-08-28 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Simon Fraser.

Crash reloading fast/events/tabindex-focus-blur-all.html test
​https://bugs.webkit.org/show_bug.cgi?id=44743

• platform/mac/Skipped: Remove tabindex-focus-blur-all.html from the skip list.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/Skipped (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/html/HTMLMediaElement.cpp (modified) (3 diffs)
• WebCore/html/HTMLMediaElement.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-08-28  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Crash reloading fast/events/tabindex-focus-blur-all.html test
+        https://bugs.webkit.org/show_bug.cgi?id=44743
+
+        * platform/mac/Skipped: Remove tabindex-focus-blur-all.html from the skip list.
+
 2010-08-28  Adam Barth  <abarth@webkit.org>
 

trunk/LayoutTests/platform/mac/Skipped

@@ -299 +299 @@
 # https://bugs.webkit.org/show_bug.cgi?id=44566
 fast/canvas/webgl/gl-teximage.html
-
-# https://bugs.webkit.org/show_bug.cgi?id=44743
-# Test always crashes on snowleopard, crashes on reload on leopard
-fast/events/tabindex-focus-blur-all.html
-

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-28  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Simon Fraser.
+
+        Crash reloading fast/events/tabindex-focus-blur-all.html test
+        https://bugs.webkit.org/show_bug.cgi?id=44743
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::asyncEventTimerFired): If m_isWaitingToDecrementLoadEventDelayCount
+        is true, call setShouldDelayLoadEvent(false) and set the timer to fire the pending events
+        on the next idle.
+        (WebCore::HTMLMediaElement::setShouldDelayLoadEvent): Don't clear the delay from within a
+        media engine callback because document 'load' event handlers that cause the page to become
+        inactive will delete the media engine. 
+        * html/HTMLMediaElement.h: Add m_isWaitingToDecrementLoadEventDelayCount.
+
 2010-08-28  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/html/HTMLMediaElement.cpp

@@ -113 +113 @@
     , m_isWaitingUntilMediaCanStart(false)
     , m_shouldDelayLoadEvent(false)
+    , m_isWaitingToDecrementLoadEventDelayCount(false)
     , m_haveFiredLoadedData(false)
     , m_inActiveDocument(true)
@@ -372 +373 @@
 void HTMLMediaElement::asyncEventTimerFired(Timer<HTMLMediaElement>*)
 {
+    // If we are waiting to release our delay on the load event, do that first and post
+    // the pending events on the next go around.
+    if (m_isWaitingToDecrementLoadEventDelayCount) {
+        setShouldDelayLoadEvent(false);
+        if (!m_asyncEventTimer.isActive())
+            m_asyncEventTimer.startOneShot(0);
+        return;
+    }
+
     Vector<RefPtr<Event> > pendingEvents;
     ExceptionCode ec = 0;
@@ -2084 +2094 @@
 }
 
-void HTMLMediaElement::setShouldDelayLoadEvent(bool delay)
-{
-    if (m_shouldDelayLoadEvent == delay)
-        return;
-
-    m_shouldDelayLoadEvent = delay;
-    if (delay)
+void HTMLMediaElement::setShouldDelayLoadEvent(bool shouldDelay)
+{
+    if (m_shouldDelayLoadEvent == shouldDelay)
+        return;
+
+    // Don't decrement the load event delay if we are in the middle of a callback from
+    // the media engine. The load event is sent synchronously and may trigger a script that
+    // causes the document to be come inactive and that will clear the media engine, causing 
+    // the return to be a rough one.
+    if (!shouldDelay && processingMediaPlayerCallback()) {
+        m_isWaitingToDecrementLoadEventDelayCount = true;
+
+        // Instead of creating yet-another-timer, reuse the async event timer which is always
+        // used as a one-shot.
+        if (!m_asyncEventTimer.isActive())
+            m_asyncEventTimer.startOneShot(0);
+        return;
+    }
+
+    m_shouldDelayLoadEvent = shouldDelay;
+    m_isWaitingToDecrementLoadEventDelayCount = false;
+    if (shouldDelay)
         document()->incrementLoadEventDelayCount();
     else

trunk/WebCore/html/HTMLMediaElement.h

@@ -343 +343 @@
     bool m_isWaitingUntilMediaCanStart : 1;
     bool m_shouldDelayLoadEvent : 1;
+    bool m_isWaitingToDecrementLoadEventDelayCount : 1;
     bool m_haveFiredLoadedData : 1;
     bool m_inActiveDocument : 1;