Changeset 107014 in webkit

Timestamp:

Feb 7, 2012 5:03:07 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Chromium] REGRESSION(r101854): Causing large amounts of unnecessary repainting.
​https://bugs.webkit.org/show_bug.cgi?id=78020

Patch by David Reveman <​reveman@chromium.org> on 2012-02-07
Reviewed by James Robinson.

Source/WebCore:

Revert r101854.

This patch is tested by the following unit test:

• TextureManagerTest.requestTextureExceedingPreferredLimit

• platform/graphics/chromium/ManagedTexture.cpp:

(WebCore::ManagedTexture::reserve):

• platform/graphics/chromium/TextureManager.cpp:

(WebCore::TextureManager::requestTexture):

• platform/graphics/chromium/TextureManager.h:

(TextureManager):

Source/WebKit/chromium:

Update TextureManagerTest.requestTextureExceedingPreferredLimit test.

• tests/TextureManagerTest.cpp:

(WTF::TextureManagerTest::requestTexture):
(WTF::TEST_F):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/chromium/ManagedTexture.cpp (modified) (1 diff)
• WebCore/platform/graphics/chromium/TextureManager.cpp (modified) (3 diffs)
• WebCore/platform/graphics/chromium/TextureManager.h (modified) (2 diffs)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/tests/TextureManagerTest.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-07  David Reveman  <reveman@chromium.org>
+
+        [Chromium] REGRESSION(r101854): Causing large amounts of unnecessary repainting.
+        https://bugs.webkit.org/show_bug.cgi?id=78020
+
+        Reviewed by James Robinson.
+
+        Revert r101854.
+
+        This patch is tested by the following unit test:
+        - TextureManagerTest.requestTextureExceedingPreferredLimit
+
+        * platform/graphics/chromium/ManagedTexture.cpp:
+        (WebCore::ManagedTexture::reserve):
+        * platform/graphics/chromium/TextureManager.cpp:
+        (WebCore::TextureManager::requestTexture):
+        * platform/graphics/chromium/TextureManager.h:
+        (TextureManager):
+
 2012-02-07  Anders Carlsson  <andersca@apple.com>
 

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

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

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

@@ -204 +204 @@
 }
 
-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)
 {
@@ -292 +268 @@
 }
 
-bool TextureManager::requestTexture(TextureToken token, IntSize size, unsigned format, unsigned& textureId)
-{
-    textureId = 0;
-
+bool TextureManager::requestTexture(TextureToken token, IntSize size, unsigned format)
+{
     if (size.width() > m_maxTextureSize || size.height() > m_maxTextureSize)
         return false;
@@ -321 +295 @@
     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 > m_preferredMemoryLimitBytes) {
-        textureId = replaceTexture(token, info);
-        if (textureId)
-            return true;
-    }
     addTexture(token, info);
     return true;

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

@@ -80 +80 @@
     bool hasTexture(TextureToken);
 
-    bool requestTexture(TextureToken, IntSize, GC3Denum textureFormat, unsigned& textureId);
+    bool requestTexture(TextureToken, IntSize, GC3Denum textureFormat);
 
     void protectTexture(TextureToken);
@@ -110 +110 @@
     void addTexture(TextureToken, TextureInfo);
     void removeTexture(TextureToken, TextureInfo);
-    unsigned replaceTexture(TextureToken, TextureInfo);
 
     HashSet<ManagedTexture*> m_registeredTextures;

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-02-07  David Reveman  <reveman@chromium.org>
+
+        [Chromium] REGRESSION(r101854): Causing large amounts of unnecessary repainting.
+        https://bugs.webkit.org/show_bug.cgi?id=78020
+
+        Reviewed by James Robinson.
+
+        Update TextureManagerTest.requestTextureExceedingPreferredLimit test.
+
+        * tests/TextureManagerTest.cpp:
+        (WTF::TextureManagerTest::requestTexture):
+        (WTF::TEST_F):
+
 2012-02-07  Dana Jansens  <danakj@chromium.org>
 

trunk/Source/WebKit/chromium/tests/TextureManagerTest.cpp

@@ -66 +66 @@
     bool requestTexture(TextureManager* manager, TextureToken token)
     {
-        unsigned textureId;
-        bool result = manager->requestTexture(token, m_textureSize, m_textureFormat, textureId);
+        bool result = manager->requestTexture(token, m_textureSize, m_textureFormat);
         if (result)
             manager->allocateTexture(&m_fakeTextureAllocator, token);
@@ -118 +117 @@
         EXPECT_TRUE(requestTexture(textureManager.get(), tokens[i]));
         EXPECT_TRUE(textureManager->hasTexture(tokens[i]));
-        textureManager->unprotectTexture(tokens[i]);
-    }
+    }
+
+    textureManager->unprotectTexture(tokens[4]);
+    textureManager->unprotectTexture(tokens[5]);
+
+    // These textures should be valid before the reduceMemoryToLimit call.
+    EXPECT_TRUE(textureManager->hasTexture(tokens[0]));
+    EXPECT_TRUE(textureManager->hasTexture(tokens[2]));
+
+    textureManager->reduceMemoryToLimit(texturesMemorySize(preferredTextures));
 
     EXPECT_FALSE(textureManager->hasTexture(tokens[0]));