Changeset 209865 in webkit

Timestamp:

Dec 15, 2016 10:37:18 AM (7 years ago)

Author:

akling@apple.com

Message:

Always clear RenderLayer backing stores when going into page cache.
<​https://webkit.org/b/165901>

Reviewed by Simon Fraser.

Source/WebCore:

We were already doing this for the iOS and GTK+ ports, let's do it everywhere
for consistency, and a bit of memory usage improvement.

This patch just removes the setting and always calls FrameView::clearBackingStores()
when there is composited content going into page cache.

• history/CachedFrame.cpp:

(WebCore::CachedFrame::CachedFrame):

• history/PageCache.h:

(WebCore::PageCache::shouldClearBackingStores): Deleted.
(WebCore::PageCache::setShouldClearBackingStores): Deleted.

Source/WebKit/mac:

• WebView/WebView.mm:

(+[WebView _setCacheModel:]):

Source/WebKit2:

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::WebProcess):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/history/CachedFrame.cpp (modified) (1 diff)
• WebCore/history/PageCache.h (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebView.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebProcess.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-12-15  Andreas Kling  <akling@apple.com>
+
+        Always clear RenderLayer backing stores when going into page cache.
+        <https://webkit.org/b/165901>
+
+        Reviewed by Simon Fraser.
+
+        We were already doing this for the iOS and GTK+ ports, let's do it everywhere
+        for consistency, and a bit of memory usage improvement.
+
+        This patch just removes the setting and always calls FrameView::clearBackingStores()
+        when there is composited content going into page cache.
+
+        * history/CachedFrame.cpp:
+        (WebCore::CachedFrame::CachedFrame):
+        * history/PageCache.h:
+        (WebCore::PageCache::shouldClearBackingStores): Deleted.
+        (WebCore::PageCache::setShouldClearBackingStores): Deleted.
+
 2016-12-15  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/history/CachedFrame.cpp

@@ -165 +165 @@
     frame.loader().client().savePlatformDataToCachedFrame(this);
 
-    if (m_isComposited && PageCache::singleton().shouldClearBackingStores())
+    if (m_isComposited)
         frame.view()->clearBackingStores();
 

trunk/Source/WebCore/history/PageCache.h

@@ -67 +67 @@
 #endif
 
-    bool shouldClearBackingStores() const { return m_shouldClearBackingStores; }
-    void setShouldClearBackingStores(bool flag) { m_shouldClearBackingStores = flag; }
-
 private:
     PageCache() = default; // Use singleton() instead.
@@ -80 +77 @@
     ListHashSet<RefPtr<HistoryItem>> m_items;
     unsigned m_maxSize {0};
-    bool m_shouldClearBackingStores {false};
 
     friend class WTF::NeverDestroyed<PageCache>;

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2016-12-15  Andreas Kling  <akling@apple.com>
+
+        Always clear RenderLayer backing stores when going into page cache.
+        <https://webkit.org/b/165901>
+
+        Reviewed by Simon Fraser.
+
+        * WebView/WebView.mm:
+        (+[WebView _setCacheModel:]):
+
 2016-12-12  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/mac/WebView/WebView.mm

@@ -8521 +8521 @@
     pageCache.setMaxSize(pageCacheSize);
 #if PLATFORM(IOS)
-    pageCache.setShouldClearBackingStores(true);
     nsurlCacheMemoryCapacity = std::max(nsurlCacheMemoryCapacity, [nsurlCache memoryCapacity]);
     CFURLCacheRef cfCache;

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-12-15  Andreas Kling  <akling@apple.com>
+
+        Always clear RenderLayer backing stores when going into page cache.
+        <https://webkit.org/b/165901>
+
+        Reviewed by Simon Fraser.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::WebProcess):
+
 2016-12-15  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -204 +204 @@
 #endif
 
-#if PLATFORM(IOS) || PLATFORM(GTK)
-    PageCache::singleton().setShouldClearBackingStores(true);
-#endif
-
     ResourceLoadObserver::sharedObserver().setStatisticsStore(m_resourceLoadStatisticsStorage.copyRef());
     m_resourceLoadStatisticsStorage->setNotificationCallback([this] {