Title: [105559] trunk/Source
- Revision
- 105559
- Author
- commit-qu...@webkit.org
- Date
- 2012-01-20 17:34:07 -0800 (Fri, 20 Jan 2012)
Log Message
Small cleanup of {get,put}CurrentFrame for WebMediaPlayerClientImpl/CCVideoLayerImpl.
https://bugs.webkit.org/show_bug.cgi?id=76332
Patch by Ami Fischman <fisch...@chromium.org> on 2012-01-20
Reviewed by James Robinson.
Source/WebCore:
* platform/graphics/chromium/cc/CCVideoLayerImpl.cpp:
(WebCore::CCVideoLayerImpl::draw):
Source/WebKit/chromium:
* src/WebMediaPlayerClientImpl.cpp:
(WebKit::WebMediaPlayerClientImpl::getCurrentFrame):
(WebKit::WebMediaPlayerClientImpl::putCurrentFrame):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (105558 => 105559)
--- trunk/Source/WebCore/ChangeLog 2012-01-21 01:16:49 UTC (rev 105558)
+++ trunk/Source/WebCore/ChangeLog 2012-01-21 01:34:07 UTC (rev 105559)
@@ -1,3 +1,13 @@
+2012-01-20 Ami Fischman <fisch...@chromium.org>
+
+ Small cleanup of {get,put}CurrentFrame for WebMediaPlayerClientImpl/CCVideoLayerImpl.
+ https://bugs.webkit.org/show_bug.cgi?id=76332
+
+ Reviewed by James Robinson.
+
+ * platform/graphics/chromium/cc/CCVideoLayerImpl.cpp:
+ (WebCore::CCVideoLayerImpl::draw):
+
2012-01-20 Brady Eidson <beid...@apple.com>
<rdar://problem/9328684> and https://bugs.webkit.org/show_bug.cgi?id=62764
Modified: trunk/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp (105558 => 105559)
--- trunk/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp 2012-01-21 01:16:49 UTC (rev 105558)
+++ trunk/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp 2012-01-21 01:34:07 UTC (rev 105559)
@@ -126,11 +126,15 @@
return;
GC3Denum format = convertVFCFormatToGC3DFormat(frame->format());
- if (format == GraphicsContext3D::INVALID_VALUE)
+ if (format == GraphicsContext3D::INVALID_VALUE) {
+ m_provider->putCurrentFrame(frame);
return;
+ }
- if (!copyFrameToTextures(frame, format, layerRenderer))
+ if (!copyFrameToTextures(frame, format, layerRenderer)) {
+ m_provider->putCurrentFrame(frame);
return;
+ }
switch (format) {
case GraphicsContext3D::LUMINANCE:
Modified: trunk/Source/WebKit/chromium/ChangeLog (105558 => 105559)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-01-21 01:16:49 UTC (rev 105558)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-01-21 01:34:07 UTC (rev 105559)
@@ -1,3 +1,14 @@
+2012-01-20 Ami Fischman <fisch...@chromium.org>
+
+ Small cleanup of {get,put}CurrentFrame for WebMediaPlayerClientImpl/CCVideoLayerImpl.
+ https://bugs.webkit.org/show_bug.cgi?id=76332
+
+ Reviewed by James Robinson.
+
+ * src/WebMediaPlayerClientImpl.cpp:
+ (WebKit::WebMediaPlayerClientImpl::getCurrentFrame):
+ (WebKit::WebMediaPlayerClientImpl::putCurrentFrame):
+
2012-01-20 Ryosuke Niwa <rn...@webkit.org>
Roll Chromium DEPS from 118291 to 118493.
Modified: trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp (105558 => 105559)
--- trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-01-21 01:16:49 UTC (rev 105558)
+++ trunk/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp 2012-01-21 01:34:07 UTC (rev 105559)
@@ -603,7 +603,7 @@
{
MutexLocker locker(m_compositingMutex);
ASSERT(!m_currentVideoFrame);
- if (m_webMediaPlayer && !m_currentVideoFrame) {
+ if (m_webMediaPlayer) {
WebVideoFrame* webkitVideoFrame = m_webMediaPlayer->getCurrentFrame();
if (webkitVideoFrame)
m_currentVideoFrame = adoptPtr(new VideoFrameChromiumImpl(webkitVideoFrame));
@@ -614,14 +614,14 @@
void WebMediaPlayerClientImpl::putCurrentFrame(VideoFrameChromium* videoFrame)
{
MutexLocker locker(m_compositingMutex);
- if (videoFrame && videoFrame == m_currentVideoFrame) {
- if (m_webMediaPlayer) {
- m_webMediaPlayer->putCurrentFrame(
- VideoFrameChromiumImpl::toWebVideoFrame(videoFrame));
- }
- ASSERT(videoFrame == m_currentVideoFrame);
- m_currentVideoFrame.clear();
+ ASSERT(videoFrame == m_currentVideoFrame);
+ if (!videoFrame)
+ return;
+ if (m_webMediaPlayer) {
+ m_webMediaPlayer->putCurrentFrame(
+ VideoFrameChromiumImpl::toWebVideoFrame(videoFrame));
}
+ m_currentVideoFrame.clear();
}
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
