[chromium] Don't create a quad for video layers without a frame (avoid use of uniniti...

https://bugs.webkit.org/show_bug.cgi?id=81250

Patch by Dana Jansens <danakj@chromium.org> on 2012-03-16
Reviewed by James Robinson.

* platform/graphics/chromium/cc/CCVideoLayerImpl.cpp:
(WebCore::CCVideoLayerImpl::appendQuads):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@110964 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b5445da6e271b1717fb5905a899253780cd65cc6..f0adc8f61b1fd74cde3fe0918655c1e0891c98d7 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-16  Dana Jansens  <danakj@chromium.org>
+
+        [chromium] Don't create a quad for video layers without a frame (avoid use of uninitialized m_format)
+        https://bugs.webkit.org/show_bug.cgi?id=81250
+
+        Reviewed by James Robinson.
+
+        * platform/graphics/chromium/cc/CCVideoLayerImpl.cpp:
+        (WebCore::CCVideoLayerImpl::appendQuads):
+
 2012-03-16  Hajime Morrita  <morrita@chromium.org>
 
         Unreviewed attempt to fix Chromium windows build.

diff --git a/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp b/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp
index 480c74e1f9ee2bb0e3df8c3400ba381aa5f4cd04..b5aa3e17150fe054f73e51ef002a6fdabf7fc647 100644 (file)
--- a/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp
+++ b/Source/WebCore/platform/graphics/chromium/cc/CCVideoLayerImpl.cpp
@@ -156,6 +156,9 @@ void CCVideoLayerImpl::willDraw(LayerRendererChromium* layerRenderer)
 
 void CCVideoLayerImpl::appendQuads(CCQuadCuller& quadList, const CCSharedQuadState* sharedQuadState)
 {
+    if (!m_frame)
+        return;
+
     IntRect quadRect(IntPoint(), bounds());
     OwnPtr<CCVideoDrawQuad> videoQuad = CCVideoDrawQuad::create(sharedQuadState, quadRect, m_textures, m_frame, m_format);