Title: [154774] branches/safari-537.60-branch/Source/WebCore
- Revision
- 154774
- Author
- [email protected]
- Date
- 2013-08-28 13:06:11 -0700 (Wed, 28 Aug 2013)
Log Message
Merged r154694. <rdar://problem/14859826>
Modified Paths
Diff
Modified: branches/safari-537.60-branch/Source/WebCore/ChangeLog (154773 => 154774)
--- branches/safari-537.60-branch/Source/WebCore/ChangeLog 2013-08-28 20:03:52 UTC (rev 154773)
+++ branches/safari-537.60-branch/Source/WebCore/ChangeLog 2013-08-28 20:06:11 UTC (rev 154774)
@@ -1,5 +1,20 @@
2013-08-28 Lucas Forschler <[email protected]>
+ Merge r154694
+
+ 2013-08-27 Brent Fulgham <[email protected]>
+
+ [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-08-28 Lucas Forschler <[email protected]>
+
Merge r154693
2013-08-26 Brent Fulgham <[email protected]>
Modified: branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (154773 => 154774)
--- branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2013-08-28 20:03:52 UTC (rev 154773)
+++ branches/safari-537.60-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp 2013-08-28 20:06:11 UTC (rev 154774)
@@ -917,7 +917,7 @@
sizeChanged();
if (primaryAudioTrackLanguage != languageOfPrimaryAudioTrack())
- player()->characteristicChanged();
+ characteristicsChanged();
setDelayCharacteristicsChangedNotification(false);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
