Changeset 101854 in webkit

Timestamp:

Dec 2, 2011 2:30:08 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[chromium] Recycle tile-sized textures during commit to prevent reallocations
​https://bugs.webkit.org/show_bug.cgi?id=70645

Patch by Grace Kloba <​klobag@chromium.org> on 2011-12-02
Reviewed by James Robinson.

Currently texture request is capped by the high limit while we reclaim the
textures in each commit. This triggers new tiles always allocated when scrolling.
The proposal is to recycle the texture during request if the total used memory
is about to exceed the reclaim limit.

• platform/graphics/chromium/ManagedTexture.cpp:

(WebCore::ManagedTexture::reserve):

• platform/graphics/chromium/TextureManager.cpp:

(WebCore::TextureManager::setMemoryLimitBytes):
(WebCore::TextureManager::replaceTexture):
(WebCore::TextureManager::requestTexture):

• platform/graphics/chromium/TextureManager.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/chromium/ManagedTexture.cpp (modified) (1 diff)
• platform/graphics/chromium/TextureManager.cpp (modified) (4 diffs)
• platform/graphics/chromium/TextureManager.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-02  Grace Kloba  <klobag@chromium.org>
+
+        [chromium] Recycle tile-sized textures during commit to prevent reallocations
+        https://bugs.webkit.org/show_bug.cgi?id=70645
+
+        Reviewed by James Robinson.
+
+        Currently texture request is capped by the high limit while we reclaim the
+        textures in each commit. This triggers new tiles always allocated when scrolling.
+        The proposal is to recycle the texture during request if the total used memory
+        is about to exceed the reclaim limit.
+
+        * platform/graphics/chromium/ManagedTexture.cpp:
+        (WebCore::ManagedTexture::reserve):
+        * platform/graphics/chromium/TextureManager.cpp:
+        (WebCore::TextureManager::setMemoryLimitBytes):
+        (WebCore::TextureManager::replaceTexture):
+        (WebCore::TextureManager::requestTexture):
+        * platform/graphics/chromium/TextureManager.h:
+
 2011-12-02  Kent Tamura  <tkent@chromium.org>
 

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

@@ -63 +63 @@
     else {
         m_textureId = 0;
-        reserved = m_textureManager->requestTexture(m_token, size, format);
+        reserved = m_textureManager->requestTexture(m_token, size, format, m_textureId);
         if (reserved) {
             m_size = size;

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

@@ -72 +72 @@
 {
     reduceMemoryToLimit(memoryLimitBytes);
-    ASSERT(currentMemoryUseBytes() < memoryLimitBytes);
+    ASSERT(currentMemoryUseBytes() <= memoryLimitBytes);
     m_memoryLimitBytes = memoryLimitBytes;
 }
@@ -142 +142 @@
 }
 
+unsigned TextureManager::replaceTexture(TextureToken newToken, TextureInfo newInfo)
+{
+    for (ListHashSet<TextureToken>::iterator lruIt = m_textureLRUSet.begin(); lruIt != m_textureLRUSet.end(); ++lruIt) {
+        TextureToken token = *lruIt;
+        TextureInfo info = m_textures.get(token);
+        if (info.isProtected)
+            continue;
+        if (!info.textureId)
+            continue;
+        if (newInfo.size != info.size || newInfo.format != info.format)
+            continue;
+        newInfo.textureId = info.textureId;
+#ifndef NDEBUG
+        newInfo.allocator = info.allocator;
+#endif
+        m_textures.remove(token);
+        m_textureLRUSet.remove(token);
+        m_textures.set(newToken, newInfo);
+        m_textureLRUSet.add(newToken);
+        return info.textureId;
+    }
+    return 0;
+}
+
 void TextureManager::addTexture(TextureToken token, TextureInfo info)
 {
@@ -206 +230 @@
 }
 
-bool TextureManager::requestTexture(TextureToken token, IntSize size, unsigned format)
-{
+bool TextureManager::requestTexture(TextureToken token, IntSize size, unsigned format, unsigned& textureId)
+{
+    textureId = 0;
+
     if (size.width() > m_maxTextureSize || size.height() > m_maxTextureSize)
         return false;
@@ -233 +259 @@
     info.allocator = 0;
 #endif
+    // Avoid churning by reusing the texture if it is about to be reclaimed and
+    // it has the same size and format as the requesting texture.
+    if (m_memoryUseBytes + memoryRequiredBytes > reclaimLimitBytes()) {
+        textureId = replaceTexture(token, info);
+        if (textureId)
+            return true;
+    }
     addTexture(token, info);
     return true;

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

@@ -70 +70 @@
     bool hasTexture(TextureToken);
 
-    bool requestTexture(TextureToken, IntSize, GC3Denum textureFormat);
+    bool requestTexture(TextureToken, IntSize, GC3Denum textureFormat, unsigned& textureId);
 
     void protectTexture(TextureToken);
@@ -100 +100 @@
     void addTexture(TextureToken, TextureInfo);
     void removeTexture(TextureToken, TextureInfo);
+    unsigned replaceTexture(TextureToken, TextureInfo);
 
     typedef HashMap<TextureToken, TextureInfo> TextureMap;