Title: [186413] releases/WebKitGTK/webkit-2.8/Source/WebKit2
- Revision
- 186413
- Author
- [email protected]
- Date
- 2015-07-07 00:55:50 -0700 (Tue, 07 Jul 2015)
Log Message
Merge r185651 - [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.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog (186412 => 186413)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-07-07 07:54:30 UTC (rev 186412)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/ChangeLog 2015-07-07 07:55:50 UTC (rev 186413)
@@ -1,3 +1,21 @@
+2015-06-17 Carlos Garcia Campos <[email protected]>
+
+ [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-13 Chris Dumez <[email protected]>
[WK2] API::Navigation objects are leaked on history navigation to HistoryItems in PageCache
Modified: releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (186412 => 186413)
--- releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2015-07-07 07:54:30 UTC (rev 186412)
+++ releases/WebKitGTK/webkit-2.8/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2015-07-07 07:55:50 UTC (rev 186413)
@@ -106,6 +106,8 @@
parameters.ignoreTLSErrors = m_ignoreTLSErrors;
}
+
+ parameters.memoryCacheDisabled = m_memoryCacheDisabled || m_cacheModel == CacheModelDocumentViewer;
}
void WebProcessPool::platformInvalidateContext()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
