Diff
Modified: trunk/Source/WebCore/ChangeLog (149778 => 149779)
--- trunk/Source/WebCore/ChangeLog 2013-05-08 23:38:46 UTC (rev 149778)
+++ trunk/Source/WebCore/ChangeLog 2013-05-08 23:43:53 UTC (rev 149779)
@@ -1,3 +1,18 @@
+2013-05-08 Roger Fong <[email protected]>
+
+ Unreviewed build fix, AppleWin port.
+
+ * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
+ * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h:
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundation::MediaPlayerPrivateAVFoundation):
+ (WebCore::MediaPlayerPrivateAVFoundation::seek):
+ (WebCore::MediaPlayerPrivateAVFoundation::seekCompleted):
+ (WebCore::MediaPlayerPrivateAVFoundation::dispatchNotification):
+ (WebCore):
+ * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+ (MediaPlayerPrivateAVFoundation):
+
2013-05-08 Xingnan Wang <[email protected]>
Heap-use-after-free in WebCore::AudioNodeOutput::pull
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (149778 => 149779)
--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2013-05-08 23:38:46 UTC (rev 149778)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2013-05-08 23:43:53 UTC (rev 149779)
@@ -25,7 +25,7 @@
#include "config.h"
-#if ENABLE(VIDEO) && (USE(AVFOUNDATION) || PLATFORM(IOS))
+#if ENABLE(VIDEO) && ((USE(AVFOUNDATION) && !PLATFORM(WIN)) || PLATFORM(IOS))
#include "InbandTextTrackPrivateAVF.h"
@@ -447,4 +447,4 @@
} // namespace WebCore
-#endif // ENABLE(VIDEO) && (USE(AVFOUNDATION) || PLATFORM(IOS))
+#endif // ENABLE(VIDEO) && ((USE(AVFOUNDATION) && !PLATFORM(WIN)) || PLATFORM(IOS))
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h (149778 => 149779)
--- trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h 2013-05-08 23:38:46 UTC (rev 149778)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h 2013-05-08 23:43:53 UTC (rev 149779)
@@ -26,7 +26,7 @@
#ifndef InbandTextTrackPrivateAVF_h
#define InbandTextTrackPrivateAVF_h
-#if ENABLE(VIDEO) && (USE(AVFOUNDATION) || PLATFORM(IOS))
+#if ENABLE(VIDEO) && ((USE(AVFOUNDATION) && !PLATFORM(WIN)) || PLATFORM(IOS))
#include "InbandTextTrackPrivate.h"
#include "InbandTextTrackPrivateClient.h"
@@ -90,6 +90,6 @@
} // namespace WebCore
-#endif // ENABLE(VIDEO) && (USE(AVFOUNDATION) || PLATFORM(IOS))
+#endif // ENABLE(VIDEO) && ((USE(AVFOUNDATION) && !PLATFORM(WIN)) || PLATFORM(IOS))
#endif // InbandTextTrackPrivateAVF_h
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (149778 => 149779)
--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2013-05-08 23:38:46 UTC (rev 149778)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp 2013-05-08 23:43:53 UTC (rev 149779)
@@ -75,7 +75,9 @@
, m_ignoreLoadStateChanges(false)
, m_haveReportedFirstVideoFrame(false)
, m_playWhenFramesAvailable(false)
+#if !PLATFORM(WIN)
, m_inbandTrackConfigurationPending(false)
+#endif
{
LOG(Media, "MediaPlayerPrivateAVFoundation::MediaPlayerPrivateAVFoundation(%p)", this);
}
@@ -265,8 +267,10 @@
if (currentTime() == time)
return;
+#if !PLATFORM(WIN)
if (currentTrack())
currentTrack()->beginSeeking();
+#endif
LOG(Media, "MediaPlayerPrivateAVFoundation::seek(%p) - seeking to %f", this, time);
m_seekTo = time;
@@ -590,8 +594,10 @@
LOG(Media, "MediaPlayerPrivateAVFoundation::seekCompleted(%p) - finished = %d", this, finished);
UNUSED_PARAM(finished);
+#if !PLATFORM(WIN)
if (currentTrack())
currentTrack()->endSeeking();
+#endif
m_seekTo = MediaPlayer::invalidTime();
updateStates();
@@ -822,8 +828,10 @@
contentsNeedsDisplay();
break;
case Notification::InbandTracksNeedConfiguration:
+#if !PLATFORM(WIN)
m_inbandTrackConfigurationPending = false;
configureInbandTracks();
+#endif
break;
case Notification::None:
@@ -832,6 +840,7 @@
}
}
+#if !PLATFORM(WIN)
void MediaPlayerPrivateAVFoundation::configureInbandTracks()
{
RefPtr<InbandTextTrackPrivateAVF> trackToEnable;
@@ -858,6 +867,7 @@
m_inbandTrackConfigurationPending = true;
scheduleMainThreadNotification(Notification::InbandTracksNeedConfiguration);
}
+#endif
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (149778 => 149779)
--- trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2013-05-08 23:38:46 UTC (rev 149778)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h 2013-05-08 23:43:53 UTC (rev 149779)
@@ -40,7 +40,9 @@
class GenericCueData;
class MediaPlayerPrivateAVFoundation : public MediaPlayerPrivateInterface
+#if !PLATFORM(WIN)
, public AVFInbandTrackParent
+#endif
{
public:
@@ -54,9 +56,11 @@
virtual void seekCompleted(bool);
virtual void didEnd();
virtual void contentsNeedsDisplay() { }
+#if !PLATFORM(WIN)
virtual void configureInbandTracks();
virtual void setCurrentTrack(InbandTextTrackPrivateAVF*) { }
virtual InbandTextTrackPrivateAVF* currentTrack() const = 0;
+#endif
class Notification {
public:
@@ -262,8 +266,10 @@
virtual String engineDescription() const { return "AVFoundation"; }
+#if !PLATFORM(WIN)
virtual void trackModeChanged() OVERRIDE;
Vector<RefPtr<InbandTextTrackPrivateAVF> > m_textTracks;
+#endif
private:
MediaPlayer* m_player;
@@ -300,7 +306,9 @@
bool m_ignoreLoadStateChanges;
bool m_haveReportedFirstVideoFrame;
bool m_playWhenFramesAvailable;
+#if !PLATFORM(WIN)
bool m_inbandTrackConfigurationPending;
+#endif
};
} // namespace WebCore
