Title: [87965] trunk/Source/WebKit/chromium
- Revision
- 87965
- Author
- [email protected]
- Date
- 2011-06-02 17:01:53 -0700 (Thu, 02 Jun 2011)
Log Message
2011-06-02 Aaron Colwell <[email protected]>
Reviewed by David Levin.
Add mediaTimeForTimeValue() implementation.
https://bugs.webkit.org/show_bug.cgi?id=61555
* public/WebMediaPlayer.h:
* src/WebMediaPlayerClientImpl.cpp:
(WebKit::WebMediaPlayerClientImpl::mediaTimeForTimeValue):
* src/WebMediaPlayerClientImpl.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (87964 => 87965)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-06-02 23:49:08 UTC (rev 87964)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-06-03 00:01:53 UTC (rev 87965)
@@ -1,3 +1,15 @@
+2011-06-02 Aaron Colwell <[email protected]>
+
+ Reviewed by David Levin.
+
+ Add mediaTimeForTimeValue() implementation.
+ https://bugs.webkit.org/show_bug.cgi?id=61555
+
+ * public/WebMediaPlayer.h:
+ * src/WebMediaPlayerClientImpl.cpp:
+ (WebKit::WebMediaPlayerClientImpl::mediaTimeForTimeValue):
+ * src/WebMediaPlayerClientImpl.h:
+
2011-06-02 Jay Civelli <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/Source/WebKit/chromium/public/WebMediaPlayer.h (87964 => 87965)
--- trunk/Source/WebKit/chromium/public/WebMediaPlayer.h 2011-06-02 23:49:08 UTC (rev 87964)
+++ trunk/Source/WebKit/chromium/public/WebMediaPlayer.h 2011-06-03 00:01:53 UTC (rev 87965)
@@ -135,6 +135,8 @@
virtual bool hasSingleSecurityOrigin() const = 0;
virtual MovieLoadType movieLoadType() const = 0;
+ virtual float mediaTimeForTimeValue(float timeValue) const = 0;
+
virtual unsigned decodedFrameCount() const = 0;
virtual unsigned droppedFrameCount() const = 0;
virtual unsigned audioDecodedByteCount() const = 0;
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (87964 => 87965)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2011-06-02 23:49:08 UTC (rev 87964)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2011-06-03 00:01:53 UTC (rev 87965)
@@ -485,6 +485,13 @@
return MediaPlayer::Unknown;
}
+float WebMediaPlayerClientImpl::mediaTimeForTimeValue(float timeValue) const
+{
+ if (m_webMediaPlayer.get())
+ return m_webMediaPlayer->mediaTimeForTimeValue(timeValue);
+ return timeValue;
+}
+
unsigned WebMediaPlayerClientImpl::decodedFrameCount() const
{
if (m_webMediaPlayer.get())
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h (87964 => 87965)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h 2011-06-02 23:49:08 UTC (rev 87964)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.h 2011-06-03 00:01:53 UTC (rev 87965)
@@ -117,6 +117,7 @@
virtual void setPreload(WebCore::MediaPlayer::Preload);
virtual bool hasSingleSecurityOrigin() const;
virtual WebCore::MediaPlayer::MovieLoadType movieLoadType() const;
+ virtual float mediaTimeForTimeValue(float timeValue) const;
virtual unsigned decodedFrameCount() const;
virtual unsigned droppedFrameCount() const;
virtual unsigned audioDecodedByteCount() const;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
