Changeset 126122 in webkit

Timestamp:

Aug 20, 2012 7:35:33 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Texture layer should not generate zero textureId quads
​https://bugs.webkit.org/show_bug.cgi?id=94550

Patch by Alexandre Elias <​aelias@google.com> on 2012-08-20
Reviewed by Adrienne Walker.

After a context loss, CCTextureLayerImpl would clear its textureId
but continued to produce external resources and quads with the zero
textureid. Add early returns so that CCTextureLayerImpl becomes
inert after a context loss.

Added assertion in read lock so that dontUseOldResourcesAfterLostContext
test catches the problem.

• platform/graphics/chromium/cc/CCResourceProvider.h:

(WebCore::CCScopedLockResourceForRead::CCScopedLockResourceForRead):

• platform/graphics/chromium/cc/CCTextureLayerImpl.cpp:

(WebCore::CCTextureLayerImpl::willDraw):
(WebCore::CCTextureLayerImpl::appendQuads):
(WebCore::CCTextureLayerImpl::didDraw):
(WebCore::CCTextureLayerImpl::didLoseContext):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/cc/CCResourceProvider.h (modified) (1 diff)
• platform/graphics/chromium/cc/CCTextureLayerImpl.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-20  Alexandre Elias  <aelias@google.com>
+
+        [chromium] Texture layer should not generate zero textureId quads
+        https://bugs.webkit.org/show_bug.cgi?id=94550
+
+        Reviewed by Adrienne Walker.
+
+        After a context loss, CCTextureLayerImpl would clear its textureId
+        but continued to produce external resources and quads with the zero
+        textureid.  Add early returns so that CCTextureLayerImpl becomes
+        inert after a context loss.
+
+        Added assertion in read lock so that dontUseOldResourcesAfterLostContext
+        test catches the problem.
+
+        * platform/graphics/chromium/cc/CCResourceProvider.h:
+        (WebCore::CCScopedLockResourceForRead::CCScopedLockResourceForRead):
+        * platform/graphics/chromium/cc/CCTextureLayerImpl.cpp:
+        (WebCore::CCTextureLayerImpl::willDraw):
+        (WebCore::CCTextureLayerImpl::appendQuads):
+        (WebCore::CCTextureLayerImpl::didDraw):
+        (WebCore::CCTextureLayerImpl::didLoseContext):
+
 2012-08-20  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/cc/CCResourceProvider.h

@@ -225 +225 @@
         : m_resourceProvider(resourceProvider)
         , m_resourceId(resourceId)
-        , m_textureId(resourceProvider->lockForRead(resourceId)) { }
+        , m_textureId(resourceProvider->lockForRead(resourceId))
+    {
+        ASSERT(m_textureId);
+    }
 
     ~CCScopedLockResourceForRead()

trunk/Source/WebCore/platform/graphics/chromium/cc/CCTextureLayerImpl.cpp

@@ -53 +53 @@
 void CCTextureLayerImpl::willDraw(CCResourceProvider* resourceProvider)
 {
+    if (!m_textureId)
+        return;
     ASSERT(!m_externalTextureResource);
     m_externalTextureResource = resourceProvider->createResourceFromExternalTexture(m_textureId);
@@ -59 +61 @@
 void CCTextureLayerImpl::appendQuads(CCQuadSink& quadList, const CCSharedQuadState* sharedQuadState, bool&)
 {
-    ASSERT(m_externalTextureResource);
+    if (!m_externalTextureResource)
+        return;
     IntRect quadRect(IntPoint(), contentBounds());
     quadList.append(CCTextureDrawQuad::create(sharedQuadState, quadRect, m_externalTextureResource, m_premultipliedAlpha, m_uvRect, m_flipped));
@@ -66 +69 @@
 void CCTextureLayerImpl::didDraw(CCResourceProvider* resourceProvider)
 {
-    ASSERT(m_externalTextureResource);
+    if (!m_externalTextureResource)
+        return;
     // FIXME: the following assert will not be true when sending resources to a
     // parent compositor. A synchronization scheme (double-buffering or
@@ -85 +89 @@
 {
     m_textureId = 0;
+    m_externalTextureResource = 0;
 }