Changeset 85872 in webkit

Timestamp:

May 5, 2011 1:21:38 PM (13 years ago)

Author:

eric.carlson@apple.com

Message:

2011-05-05 Eric Carlson <​eric.carlson@apple.com>

Reviewed by Adam Roben.

Block callbacks delivered during destruction
​https://bugs.webkit.org/show_bug.cgi?id=60291
<rdar://problem/9382942>

No new tests, tested by existing tests.

• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp: (WebCore::MediaPlayerPrivateAVFoundation::~MediaPlayerPrivateAVFoundation): Call

setIgnoreLoadStateChanges(true) to cancel all callbacks.

(WebCore::MediaPlayerPrivateAVFoundation::updateStates): Return immediately if

m_ignoreLoadStateChanges is true.

(WebCore::MediaPlayerPrivateAVFoundation::dispatchNotification): loadStateChanged -> updateStates.

Don't call updateStates after calling loadedTimeRangesChanged, it already does it.

• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (modified) (5 diffs)
• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-05  Eric Carlson  <eric.carlson@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Block callbacks delivered during destruction
+        https://bugs.webkit.org/show_bug.cgi?id=60291
+        <rdar://problem/9382942>
+
+        No new tests, tested by existing tests.
+
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+        (WebCore::MediaPlayerPrivateAVFoundation::~MediaPlayerPrivateAVFoundation): Call 
+            setIgnoreLoadStateChanges(true) to cancel all callbacks.
+        (WebCore::MediaPlayerPrivateAVFoundation::updateStates): Return immediately if 
+            m_ignoreLoadStateChanges is true.
+        (WebCore::MediaPlayerPrivateAVFoundation::dispatchNotification): loadStateChanged -> updateStates.
+            Don't call updateStates after calling loadedTimeRangesChanged, it already does it.
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+
 2011-05-05  David Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp

@@ -80 +80 @@
 {
     LOG(Media, "MediaPlayerPrivateAVFoundation::~MediaPlayerPrivateAVFoundation(%p)", this);
+    setIgnoreLoadStateChanges(true);
     cancelCallOnMainThread(mainThreadCallback, this);
 }
@@ -383 +384 @@
 void MediaPlayerPrivateAVFoundation::updateStates()
 {
+    if (m_ignoreLoadStateChanges)
+        return;
+
     MediaPlayer::NetworkState oldNetworkState = m_networkState;
     MediaPlayer::ReadyState oldReadyState = m_readyState;
@@ -509 +513 @@
 }
 
-void MediaPlayerPrivateAVFoundation::loadStateChanged()
-{
-    if (m_ignoreLoadStateChanges)
-        return;
-    updateStates();
-}
-
 void MediaPlayerPrivateAVFoundation::rateChanged()
 {
@@ -731 +728 @@
         break;
     case Notification::ItemStatusChanged:
-        loadStateChanged();
+        updateStates();
         break;
     case Notification::ItemSeekableTimeRangesChanged:
         seekableTimeRangesChanged();
-        loadStateChanged();
         break;
     case Notification::ItemLoadedTimeRangesChanged:
         loadedTimeRangesChanged();
-        loadStateChanged();
         break;
     case Notification::ItemPresentationSizeChanged:
@@ -746 +741 @@
         break;
     case Notification::ItemIsPlaybackLikelyToKeepUpChanged:
-        loadStateChanged();
+        updateStates();
         break;
     case Notification::ItemIsPlaybackBufferEmptyChanged:
-        loadStateChanged();
+        updateStates();
         break;
     case Notification::ItemIsPlaybackBufferFullChanged:
-        loadStateChanged();
+        updateStates();
         break;
     case Notification::PlayerRateChanged:

trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h

@@ -43 +43 @@
     virtual void repaint();
     virtual void metadataLoaded();
-    virtual void loadStateChanged();
     virtual void playabilityKnown();
     virtual void rateChanged();