Changeset 130573 in webkit

Timestamp:

Oct 5, 2012 6:28:05 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[mac] REGRESSION (r122215): Animated GIF outside the viewport doesn't play when scrolled into view.
​https://bugs.webkit.org/show_bug.cgi?id=94874

Patch by Huang Dongsung <​luxtella@company100.net> on 2012-10-05
Reviewed by Simon Fraser.

Rollback previous patch because this patch caused two problems.

1. GIF animation is occasionally paused when tiled scrolling is enabled.
2. This change regressed Apple's Membuster benchmark by ~20% (80MB.)

• loader/cache/CachedImage.cpp:

(WebCore::CachedImage::shouldPauseAnimation):

• loader/cache/CachedImage.h:

(CachedImage):

• loader/cache/CachedResource.h:
• loader/cache/MemoryCache.cpp:

(WebCore::MemoryCache::pruneLiveResourcesToSize):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::willRenderImage):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/cache/CachedImage.cpp (modified) (2 diffs)
• loader/cache/CachedImage.h (modified) (1 diff)
• loader/cache/CachedResource.h (modified) (1 diff)
• loader/cache/MemoryCache.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-05  Huang Dongsung  <luxtella@company100.net>
+
+        [mac] REGRESSION (r122215): Animated GIF outside the viewport doesn't play when scrolled into view.
+        https://bugs.webkit.org/show_bug.cgi?id=94874
+
+        Reviewed by Simon Fraser.
+
+        Rollback previous patch because this patch caused two problems.
+        1. GIF animation is occasionally paused when tiled scrolling is enabled.
+        2. This change regressed Apple's Membuster benchmark by ~20% (80MB.)
+
+        * loader/cache/CachedImage.cpp:
+        (WebCore::CachedImage::shouldPauseAnimation):
+        * loader/cache/CachedImage.h:
+        (CachedImage):
+        * loader/cache/CachedResource.h:
+        * loader/cache/MemoryCache.cpp:
+        (WebCore::MemoryCache::pruneLiveResourcesToSize):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::willRenderImage):
+
 2012-10-05  Xianzhu Wang  <wangxianzhu@chromium.org>
 

trunk/Source/WebCore/loader/cache/CachedImage.cpp

@@ -423 +423 @@
 }
 
-bool CachedImage::likelyToBeUsedSoon()
-{
-    CachedResourceClientWalker<CachedImageClient> walker(m_clients);
-    while (CachedImageClient* client = walker.next()) {
-        if (client->willRenderImage(this))
-            return true;
-    }
-
-    return false;
-}
-
 void CachedImage::didDraw(const Image* image)
 {
@@ -451 +440 @@
         return false;
     
-    return !likelyToBeUsedSoon();
+    CachedResourceClientWalker<CachedImageClient> w(m_clients);
+    while (CachedImageClient* c = w.next()) {
+        if (c->willRenderImage(this))
+            return false;
+    }
+
+    return true;
 }
 

trunk/Source/WebCore/loader/cache/CachedImage.h

@@ -73 +73 @@
     virtual void destroyDecodedData();
 
-    virtual bool likelyToBeUsedSoon();
-
     virtual void data(PassRefPtr<SharedBuffer> data, bool allDataReceived);
     virtual void error(CachedResource::Status);

trunk/Source/WebCore/loader/cache/CachedResource.h

@@ -216 +216 @@
     void setOwningCachedResourceLoader(CachedResourceLoader* cachedResourceLoader) { m_owningCachedResourceLoader = cachedResourceLoader; }
     
-    // MemoryCache does not destroy the decoded data of a CachedResource if the decoded data will be likely used.
-    virtual bool likelyToBeUsedSoon() { return false; }
-
     bool isPreloaded() const { return m_preloadCount; }
     void increasePreloadCount() { ++m_preloadCount; }

trunk/Source/WebCore/loader/cache/MemoryCache.cpp

@@ -239 +239 @@
                 return;
 
-            // Check to see if the current resource are likely to be used again soon.
-            if (current->likelyToBeUsedSoon()) {
-                current = prev;
-                continue;
-            }
-
             // Destroy our decoded data. This will remove us from 
             // m_liveDecodedResources, and possibly move us to a different LRU 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -2807 +2807 @@
     // If we're not in a window (i.e., we're dormant from being put in the b/f cache or in a background tab)
     // then we don't want to render either.
-    if (document()->inPageCache() || document()->view()->isOffscreen())
-        return false;
-
-    // If the document is being destroyed or has not been attached, then this
-    // RenderObject will not be rendered.
-    if (!view())
-        return false;
-
-    // If a renderer is outside the viewport, we won't render.
-    return viewRect().intersects(absoluteClippedOverflowRect());
+    return !document()->inPageCache() && !document()->view()->isOffscreen();
 }