Title: [92489] branches/safari-534.51-branch/Source/WebCore
Diff
Modified: branches/safari-534.51-branch/Source/WebCore/ChangeLog (92488 => 92489)
--- branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-05 18:04:29 UTC (rev 92488)
+++ branches/safari-534.51-branch/Source/WebCore/ChangeLog 2011-08-05 18:14:21 UTC (rev 92489)
@@ -1,3 +1,24 @@
+2011-08-03 Lucas Forschler <[email protected]>
+
+ Merged 92034.
+
+ 2011-07-29 Jeff Miller <[email protected]>
+
+ Work-in-progress on Adopt AVCF media back end on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=65400
+ <rdar://problem/9083559>
+
+ Make MediaPlayerPrivateAVFoundation::setDelayCallbacks() const and make the ivars
+ it references mutable so other const member functions can call it.
+
+ Reviewed by Darin Adler.
+
+ No changes to functionality so no new tests.
+
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::setDelayCallbacks):
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+
2011-08-04 Tim Horton <[email protected]>
Reviewed by Nikolas Zimmerman.
Modified: branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (92488 => 92489)
--- branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2011-08-05 18:04:29 UTC (rev 92488)
+++ branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2011-08-05 18:14:21 UTC (rev 92489)
@@ -646,7 +646,7 @@
setDelayCallbacks(false);
}
-void MediaPlayerPrivateAVFoundation::setDelayCallbacks(bool delay)
+void MediaPlayerPrivateAVFoundation::setDelayCallbacks(bool delay) const
{
MutexLocker lock(m_queueMutex);
if (delay)
Modified: branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (92488 => 92489)
--- branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2011-08-05 18:04:29 UTC (rev 92488)
+++ branches/safari-534.51-branch/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2011-08-05 18:14:21 UTC (rev 92489)
@@ -220,7 +220,7 @@
void setHasVideo(bool);
void setHasAudio(bool);
void setHasClosedCaptions(bool);
- void setDelayCallbacks(bool);
+ void setDelayCallbacks(bool) const;
void setIgnoreLoadStateChanges(bool delay) { m_ignoreLoadStateChanges = delay; }
void setNaturalSize(IntSize);
bool isLiveStream() const { return isinf(duration()); }
@@ -247,7 +247,7 @@
MediaPlayer* m_player;
Vector<Notification> m_queuedNotifications;
- Mutex m_queueMutex;
+ mutable Mutex m_queueMutex;
mutable RefPtr<TimeRanges> m_cachedLoadedTimeRanges;
@@ -266,7 +266,7 @@
float m_seekTo;
float m_requestedRate;
- int m_delayCallbacks;
+ mutable int m_delayCallbacks;
bool m_mainThreadCallPending;
bool m_assetIsPlayable;
bool m_visible;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
