Changeset 185651 in webkit

Timestamp:

Jun 17, 2015, 8:32:38 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER doesn't disable memory cache when set before the web process is launched
​https://bugs.webkit.org/show_bug.cgi?id=146053

Reviewed by Martin Robinson.

The cache is disabled in WebProcess::platformSetCacheModel() when
the cache model is CacheModelDocumentViewer, but it's enabled
again by WebProcess::setMemoryCacheDisabled() when
memoryCacheDisabled creation parameter is processed. We need to
make sure the cache model and memoryCacheDisabled parameters are consistent.

• UIProcess/gtk/WebProcessPoolGtk.cpp:

(WebKit::WebProcessPool::platformInitializeWebProcess): Initialize
memoryCacheDisabled parameter to true if memory cache was
explicitly disabled or cache model is CacheModelDocumentViewer.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/WebProcessPoolGtk.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-17  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER doesn't disable memory cache when set before the web process is launched
+        https://bugs.webkit.org/show_bug.cgi?id=146053
+
+        Reviewed by Martin Robinson.
+
+        The cache is disabled in WebProcess::platformSetCacheModel() when
+        the cache model is CacheModelDocumentViewer, but it's enabled
+        again by WebProcess::setMemoryCacheDisabled() when
+        memoryCacheDisabled creation parameter is processed. We need to
+        make sure the cache model and memoryCacheDisabled parameters are consistent.
+
+        * UIProcess/gtk/WebProcessPoolGtk.cpp:
+        (WebKit::WebProcessPool::platformInitializeWebProcess): Initialize
+        memoryCacheDisabled parameter to true if memory cache was
+        explicitly disabled or cache model is CacheModelDocumentViewer.
+
 2015-06-17  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp

@@ -109 +109 @@
         parameters.diskCacheDirectory = m_configuration->diskCacheDirectory();
     }
+
+    parameters.memoryCacheDisabled = m_memoryCacheDisabled || m_cacheModel == CacheModelDocumentViewer;
 }