Changeset 95957 in webkit

Timestamp:

Sep 26, 2011 9:44:18 AM (13 years ago)

Author:

enne@google.com

Message:

[chromium] Update VideoLayerChromium textures after texture resources are reclaimed
​https://bugs.webkit.org/show_bug.cgi?id=68742

Reviewed by James Robinson.

Source/WebCore:

If video textures are reclaimed (such as during a visibility change on
a tab), the dirty rect for the layer is empty and it skips out of
updating compositor resources, leaving the video textures invalid.
Instead, check the textures here to make sure they're still valid
first before early out so that they can get reupdated if necessary.

Additionally, fix a small bug in pushPropertiesTo where 1 plane RGB
videos would not get drawn because all 3 planes didn't have valid
textures.

Test: compositing/video-page-visibility.html

• platform/graphics/chromium/VideoLayerChromium.cpp:

(WebCore::VideoLayerChromium::VideoLayerChromium):
(WebCore::VideoLayerChromium::cleanupResources):
(WebCore::VideoLayerChromium::updateCompositorResources):
(WebCore::VideoLayerChromium::pushPropertiesTo):
(WebCore::VideoLayerChromium::setLayerTreeHost):
(WebCore::VideoLayerChromium::texturesValid):

• platform/graphics/chromium/VideoLayerChromium.h:

LayoutTests:

Without this patch, this video texture is invalid.

• compositing/video-page-visibility-expected.png: Added.
• compositing/video-page-visibility-expected.txt: Added.
• compositing/video-page-visibility.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/video-page-visibility-expected.png (added)
• LayoutTests/compositing/video-page-visibility-expected.txt (added)
• LayoutTests/compositing/video-page-visibility.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp (modified) (8 diffs)
• Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-09-23  Adrienne Walker  <enne@google.com>
+
+        [chromium] Update VideoLayerChromium textures after texture resources are reclaimed
+        https://bugs.webkit.org/show_bug.cgi?id=68742
+
+        Reviewed by James Robinson.
+
+        Without this patch, this video texture is invalid.
+
+        * compositing/video-page-visibility-expected.png: Added.
+        * compositing/video-page-visibility-expected.txt: Added.
+        * compositing/video-page-visibility.html: Added.
+
 2011-09-26  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-23  Adrienne Walker  <enne@google.com>
+
+        [chromium] Update VideoLayerChromium textures after texture resources are reclaimed
+        https://bugs.webkit.org/show_bug.cgi?id=68742
+
+        Reviewed by James Robinson.
+
+        If video textures are reclaimed (such as during a visibility change on
+        a tab), the dirty rect for the layer is empty and it skips out of
+        updating compositor resources, leaving the video textures invalid.
+        Instead, check the textures here to make sure they're still valid
+        first before early out so that they can get reupdated if necessary.
+
+        Additionally, fix a small bug in pushPropertiesTo where 1 plane RGB
+        videos would not get drawn because all 3 planes didn't have valid
+        textures.
+
+        Test: compositing/video-page-visibility.html
+
+        * platform/graphics/chromium/VideoLayerChromium.cpp:
+        (WebCore::VideoLayerChromium::VideoLayerChromium):
+        (WebCore::VideoLayerChromium::cleanupResources):
+        (WebCore::VideoLayerChromium::updateCompositorResources):
+        (WebCore::VideoLayerChromium::pushPropertiesTo):
+        (WebCore::VideoLayerChromium::setLayerTreeHost):
+        (WebCore::VideoLayerChromium::texturesValid):
+        * platform/graphics/chromium/VideoLayerChromium.h:
+
 2011-09-26  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/platform/graphics/chromium/VideoLayerChromium.cpp

@@ -56 +56 @@
     , m_frameFormat(VideoFrameChromium::Invalid)
     , m_provider(provider)
+    , m_planes(0)
     , m_currentFrame(0)
 {
@@ -73 +74 @@
 {
     LayerChromium::cleanupResources();
-    for (size_t i = 0; i < 3; ++i)
+    for (unsigned i = 0; i < MaxPlanes; ++i)
         m_textures[i].m_texture.clear();
     releaseCurrentFrame();
@@ -80 +81 @@
 void VideoLayerChromium::updateCompositorResources(GraphicsContext3D* context)
 {
-    if (m_dirtyRect.isEmpty() || !m_delegate)
-        return;
+    if (!m_delegate)
+        return;
+
+    if (m_dirtyRect.isEmpty() && texturesValid()) {
+        for (unsigned plane = 0; plane < m_planes; plane++) {
+            ManagedTexture* tex = m_textures[plane].m_texture.get();
+            if (!tex->reserve(tex->size(), tex->format())) {
+                m_skipsDraw = true;
+                break;
+            }
+        }
+        return;
+    }
 
     ASSERT(drawsContent());
 
+    m_planes = 0;
     m_skipsDraw = false;
+
     VideoFrameChromium* frame = m_provider->getCurrentFrame();
     if (!frame) {
@@ -120 +134 @@
     }
 
+    m_planes = frame->planes();
+    ASSERT(m_planes <= MaxPlanes);
+
     resetNeedsDisplay();
 
@@ -132 +149 @@
     videoLayer->setSkipsDraw(m_skipsDraw);
     videoLayer->setFrameFormat(m_frameFormat);
-    for (size_t i = 0; i < 3; ++i) {
+    for (unsigned i = 0; i < m_planes; ++i) {
         if (!m_textures[i].m_texture) {
             videoLayer->setSkipsDraw(true);
@@ -139 +156 @@
         videoLayer->setTexture(i, m_textures[i].m_texture->textureId(), m_textures[i].m_texture->size(), m_textures[i].m_visibleSize);
     }
+    for (unsigned i = m_planes; i < MaxPlanes; ++i)
+        videoLayer->setTexture(i, 0, IntSize(), IntSize());
 }
 
@@ -144 +163 @@
 {
     if (host && layerTreeHost() != host) {
-        for (size_t i = 0; i < 3; ++i) {
+        for (unsigned i = 0; i < MaxPlanes; ++i) {
             m_textures[i].m_visibleSize = IntSize();
             m_textures[i].m_texture = ManagedTexture::create(host->contentsTextureManager());
@@ -165 +184 @@
     }
     return GraphicsContext3D::INVALID_VALUE;
+}
+
+bool VideoLayerChromium::texturesValid()
+{
+    for (unsigned plane = 0; plane < m_planes; plane++) {
+        ManagedTexture* tex = m_textures[plane].m_texture.get();
+        if (!tex->isValid(tex->size(), tex->format()))
+            return false;
+    }
+    return true;
 }
 

trunk/Source/WebCore/platform/graphics/chromium/VideoLayerChromium.h

@@ -75 +75 @@
     static GC3Denum determineTextureFormat(const VideoFrameChromium*);
     static IntSize computeVisibleSize(const VideoFrameChromium*, unsigned plane);
+    bool texturesValid();
     bool reserveTextures(const VideoFrameChromium*, GC3Denum textureFormat);
     void updateTexture(GraphicsContext3D*, Texture&, const void*) const;
@@ -84 +85 @@
     VideoFrameProvider* m_provider;
 
-    Texture m_textures[3];
+    enum { MaxPlanes = 3 };
+    Texture m_textures[MaxPlanes];
+    unsigned m_planes;
 
     // This will be null for the entire duration of video playback if hardware