Reviewed by Gustavo Noronha Silva.
[GTK] fast/events/pagehide-timeout.html fails
https://bugs.webkit.org/show_bug.cgi?id=53771
* platform/gtk/Skipped: Unskip a test which is now passing.
2011-02-04 Martin Robinson <mrobinson@igalia.com>
Reviewed by Gustavo Noronha Silva.
[GTK] fast/events/pagehide-timeout.html fails
https://bugs.webkit.org/show_bug.cgi?id=53771
Add the document browser cache model. This model is optimized for viewing
a series of local files, while the document viewer is optimized for only
viewing one local file. Improve the documentation on the mapping of these
enum values to actual cache settings.
* webkit/webkitglobals.cpp:
(webkit_set_cache_model): Add support for the document browser cache model and
improve comments in this section better explaining where the magic numbers come from.
* webkit/webkitglobals.h: Added an enum value for the document browser cache model.
2011-02-04 Martin Robinson <mrobinson@igalia.com>
Reviewed by Gustavo Noronha Silva.
[GTK] fast/events/pagehide-timeout.html fails
https://bugs.webkit.org/show_bug.cgi?id=53771
Add knowledge of the document browser cache model the DRT. When resetting
WebKit settings to consistent values between tests, default to the document
browser cache model.
* DumpRenderTree/gtk/DumpRenderTree.cpp:
(resetDefaultsToConsistentValues): Reset the cache model to the document browser
cache model between tests.
* DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
(LayoutTestController::setCacheModel): An int value of 2 here corresponds to the
document browser cache model.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77710
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2011-02-04 Martin Robinson <mrobinson@igalia.com>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ [GTK] fast/events/pagehide-timeout.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=53771
+
+ * platform/gtk/Skipped: Unskip a test which is now passing.
+
2011-02-04 Adam Barth <abarth@webkit.org>
Reviewed by Eric Seidel.
http/tests/websocket/tests/url-with-empty-query.html
http/tests/websocket/tests/simple.html
http/tests/websocket/tests/cross-origin.html
-
-# Probably caused by https://bugs.webkit.org/show_bug.cgi?id=53733
-# Test was added in http://trac.webkit.org/changeset/77559
-fast/events/pagehide-timeout.html
\ No newline at end of file
+2011-02-04 Martin Robinson <mrobinson@igalia.com>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ [GTK] fast/events/pagehide-timeout.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=53771
+
+ Add the document browser cache model. This model is optimized for viewing
+ a series of local files, while the document viewer is optimized for only
+ viewing one local file. Improve the documentation on the mapping of these
+ enum values to actual cache settings.
+
+ * webkit/webkitglobals.cpp:
+ (webkit_set_cache_model): Add support for the document browser cache model and
+ improve comments in this section better explaining where the magic numbers come from.
+ * webkit/webkitglobals.h: Added an enum value for the document browser cache model.
+
2011-02-03 Yury Semikhatsky <yurys@chromium.org>
Reviewed by Pavel Feldman.
gdouble deadDecodedDataDeletionInterval;
guint pageCacheCapacity;
+ // FIXME: The Mac port calculates these values based on the amount of physical memory that's
+ // installed on the system. Currently these values match the Mac port for users with more than
+ // 512 MB and less than 1024 MB of physical memory.
switch (model) {
case WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER:
pageCacheCapacity = 0;
- cacheTotalCapacity = 0;
+ cacheTotalCapacity = 0; // FIXME: The Mac port actually sets this to larger than 0.
cacheMinDeadCapacity = 0;
cacheMaxDeadCapacity = 0;
deadDecodedDataDeletionInterval = 0;
break;
+ case WEBKIT_CACHE_MODEL_DOCUMENT_BROWSER:
+ pageCacheCapacity = 2;
+ cacheTotalCapacity = 16 * 1024 * 1024;
+ cacheMinDeadCapacity = cacheTotalCapacity / 8;
+ cacheMaxDeadCapacity = cacheTotalCapacity / 4;
+ deadDecodedDataDeletionInterval = 0;
+ break;
case WEBKIT_CACHE_MODEL_WEB_BROWSER:
// Page cache capacity (in pages). Comment from Mac port:
// (Research indicates that value / page drops substantially after 3 pages.)
* WEBKIT_CACHE_MODEL_WEB_BROWSER.
* @WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER: Disable the cache completely, which
* substantially reduces memory usage. Useful for applications that only
- * access local files.
+ * access a single local file, with no navigation to other pages. No remote
+ * resources will be cached.
+ * @WEBKIT_CACHE_MODEL_DOCUMENT_BROWSER: A cache model optimized for viewing
+ * a series of local files -- for example, a documentation viewer or a website
+ * designer. WebKit will cache a moderate number of resources.
* @WEBKIT_CACHE_MODEL_WEB_BROWSER: Improve document load speed substantially
- * by caching previously viewed content.
+ * by caching a very large number of resources and previously viewed content.
*
* Enum values used for determining the webview cache model.
*/
typedef enum {
WEBKIT_CACHE_MODEL_DEFAULT,
WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER,
- WEBKIT_CACHE_MODEL_WEB_BROWSER
+ WEBKIT_CACHE_MODEL_WEB_BROWSER,
+ WEBKIT_CACHE_MODEL_DOCUMENT_BROWSER,
} WebKitCacheModel;
WEBKIT_API SoupSession*
+2011-02-04 Martin Robinson <mrobinson@igalia.com>
+
+ Reviewed by Gustavo Noronha Silva.
+
+ [GTK] fast/events/pagehide-timeout.html fails
+ https://bugs.webkit.org/show_bug.cgi?id=53771
+
+ Add knowledge of the document browser cache model the DRT. When resetting
+ WebKit settings to consistent values between tests, default to the document
+ browser cache model.
+
+ * DumpRenderTree/gtk/DumpRenderTree.cpp:
+ (resetDefaultsToConsistentValues): Reset the cache model to the document browser
+ cache model between tests.
+ * DumpRenderTree/gtk/LayoutTestControllerGtk.cpp:
+ (LayoutTestController::setCacheModel): An int value of 2 here corresponds to the
+ document browser cache model.
+
2011-02-04 Adam Barth <abarth@webkit.org>
Reviewed by Eric Seidel.
"enable-fullscreen", TRUE,
NULL);
webkit_web_view_set_settings(webView, settings);
+ webkit_set_cache_model(WEBKIT_CACHE_MODEL_DOCUMENT_BROWSER);
DumpRenderTreeSupportGtk::clearMainFrameName(mainFrame);
void LayoutTestController::setCacheModel(int cacheModel)
{
- if (!cacheModel) // WebCacheModelDocumentViewer
- webkit_set_cache_model(WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
- else
- webkit_set_cache_model(WEBKIT_CACHE_MODEL_WEB_BROWSER);
+ // These constants are derived from the Mac cache model enum in Source/WebKit/mac/WebView/WebPreferences.h.
+ switch (cacheModel) {
+ case 0:
+ webkit_set_cache_model(WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER);
+ break;
+ case 1:
+ webkit_set_cache_model(WEBKIT_CACHE_MODEL_DOCUMENT_BROWSER);
+ break;
+ case 3:
+ webkit_set_cache_model(WEBKIT_CACHE_MODEL_DOCUMENT_BROWSER);
+ break;
+ default:
+ ASSERT_NOT_REACHED();
+ }
}
void LayoutTestController::setPersistentUserStyleSheetLocation(JSStringRef jsURL)
git://git.webkit.org / WebKit.git / commitdiff