Changeset 157983 in webkit

Timestamp:

Oct 24, 2013, 6:46:44 PM (13 years ago)

Author:

Lucas Forschler

Message:

Merged r154694. <rdar://problem/15109413>

Location:

branches/safari-537.73-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (modified) (1 diff)

branches/safari-537.73-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-24  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r154694
+
+    2013-08-27  Brent Fulgham  <bfulgham@apple.com>
+
+            [Windows] Correct method call for characteristic update.
+
+            Reviewed by Eric Carlson.
+
+            * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+            (WebCore::MediaPlayerPrivateAVFoundationCF::tracksChanged):
+            [Windows] Correct method call (should have been "characteristicsChanged", not
+            "player()->characteristicChanged()"
+
 2013-10-24  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp

@@ -918 +918 @@
 
     if (primaryAudioTrackLanguage != languageOfPrimaryAudioTrack())
-        player()->characteristicChanged();
+        characteristicsChanged();
 
     setDelayCharacteristicsChangedNotification(false);