Title: [92034] trunk/Source/WebCore
- Revision
- 92034
- Author
- [email protected]
- Date
- 2011-07-29 17:47:23 -0700 (Fri, 29 Jul 2011)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (92033 => 92034)
--- trunk/Source/WebCore/ChangeLog 2011-07-30 00:09:20 UTC (rev 92033)
+++ trunk/Source/WebCore/ChangeLog 2011-07-30 00:47:23 UTC (rev 92034)
@@ -1,3 +1,20 @@
+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-07-29 Zhenyao Mo <[email protected]>
Unreviewed, rolling out r92011.
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (92033 => 92034)
--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2011-07-30 00:09:20 UTC (rev 92033)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2011-07-30 00:47:23 UTC (rev 92034)
@@ -629,7 +629,7 @@
setDelayCallbacks(false);
}
-void MediaPlayerPrivateAVFoundation::setDelayCallbacks(bool delay)
+void MediaPlayerPrivateAVFoundation::setDelayCallbacks(bool delay) const
{
MutexLocker lock(m_queueMutex);
if (delay)
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (92033 => 92034)
--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2011-07-30 00:09:20 UTC (rev 92033)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2011-07-30 00:47:23 UTC (rev 92034)
@@ -215,7 +215,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()); }
@@ -242,7 +242,7 @@
MediaPlayer* m_player;
Vector<Notification> m_queuedNotifications;
- Mutex m_queueMutex;
+ mutable Mutex m_queueMutex;
mutable RefPtr<TimeRanges> m_cachedLoadedTimeRanges;
@@ -261,7 +261,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
