Changeset 180510 in webkit

Timestamp:

Feb 23, 2015, 11:27:36 AM (10 years ago)

Author:

eric.carlson@apple.com

Message:

Occasional crash in MediaPlayer::setPrivateBrowsingMode
​https://bugs.webkit.org/show_bug.cgi?id=141910

Reviewed by Jer Noble.

No new tests, I was unable to reproduce the crash.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::stopPeriodicTimers): Use EveryDelayedAction instead of -1.
(WebCore::HTMLMediaElement::stop): Call clearMediaPlayer instead of just setting m_player

to NULL.

• html/HTMLMediaElement.h: Define EveryDelayedAction.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (2 diffs)
• html/HTMLMediaElement.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-23  Eric Carlson  <eric.carlson@apple.com>
+
+        Occasional crash in MediaPlayer::setPrivateBrowsingMode
+        https://bugs.webkit.org/show_bug.cgi?id=141910
+
+        Reviewed by Jer Noble.
+
+        No new tests, I was unable to reproduce the crash.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::stopPeriodicTimers): Use EveryDelayedAction instead of -1.
+        (WebCore::HTMLMediaElement::stop): Call clearMediaPlayer instead of just setting m_player
+            to NULL.
+        * html/HTMLMediaElement.h: Define EveryDelayedAction.
+
 2015-02-23  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -4631 +4631 @@
 
     // 1 - The user agent should cancel the fetching process.
-    clearMediaPlayer(-1);
+    clearMediaPlayer(EveryDelayedAction);
 
     // 2 - Set the error attribute to a new MediaError object whose code attribute is set to MEDIA_ERR_ABORTED.
@@ -4738 +4738 @@
 
     // Once an active DOM object has been stopped it can not be restarted, so we can deallocate
-    // the media player now. Note that userCancelledLoad will already have cleared the player
-    // if the media was not fully loaded. This handles all other cases.
-    m_player = nullptr;
+    // the media player now. Note that userCancelledLoad will already called clearMediaPlayer
+    // if the media was not fully loaded, but we need the same cleanup if the file was completely
+    // loaded and calling it again won't cause any problems.
+    clearMediaPlayer(EveryDelayedAction);
 
     updateSleepDisabling();

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -138 +138 @@
         TextTrackChangesNotification = 1 << 2,
         ConfigureTextTrackDisplay = 1 << 3,
+
+        EveryDelayedAction = LoadMediaResource | ConfigureTextTracks | TextTrackChangesNotification | ConfigureTextTrackDisplay,
     };
     void scheduleDelayedAction(DelayedActionType);