Changeset 73353 in webkit
- Timestamp:
- Dec 6, 2010 3:18:20 AM (13 years ago)
- Location:
- trunk/WebKit/gtk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/gtk/ChangeLog
r73348 r73353 1 2010-12-06 Joone Hur <joone@kldp.org> 2 3 Reviewed by Xan Lopez. 4 5 [GTK] The webkit cache model needs to be set when WebFrameLoaderClient::didPerformFirstNavigation() is called 6 https://bugs.webkit.org/show_bug.cgi?id=50430 7 8 * WebCoreSupport/FrameLoaderClientGtk.cpp: 9 (WebKit::FrameLoaderClient::didPerformFirstNavigation): Set the webview cache model. 10 * webkit/webkitprivate.cpp: 11 (webkit_init): Removed the code of setting the webview cache model. 12 1 13 2010-12-04 Antonio Gomes <agomes@rim.com> 2 14 -
trunk/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp
r72904 r73353 691 691 void FrameLoaderClient::didPerformFirstNavigation() const 692 692 { 693 WebKitCacheModel cacheModel = webkit_get_cache_model(); 694 // If user agents do not determine the cache model, we use WEBKIT_CACHE_MODEL_WEB_BROWSER by default. 695 if (cacheModel == WEBKIT_CACHE_MODEL_DEFAULT) 696 webkit_set_cache_model(WEBKIT_CACHE_MODEL_WEB_BROWSER); 693 697 } 694 698 -
trunk/WebKit/gtk/webkit/webkitprivate.cpp
r73348 r73353 284 284 atomicCanonicalTextEncodingName("UTF-8"); 285 285 286 // Page cache capacity (in pages). Comment from Mac port:287 // (Research indicates that value / page drops substantially after 3 pages.)288 // FIXME: Expose this with an API and/or calculate based on available resources289 webkit_set_cache_model(WEBKIT_CACHE_MODEL_WEB_BROWSER);290 291 286 #if ENABLE(DATABASE) 292 287 gchar* databaseDirectory = g_build_filename(g_get_user_data_dir(), "webkit", "databases", NULL); -
trunk/WebKit/gtk/webkit/webkitwebview.cpp
r73348 r73353 126 126 127 127 static const double defaultDPI = 96.0; 128 static WebKitCacheModel cacheModel ;128 static WebKitCacheModel cacheModel = WEBKIT_CACHE_MODEL_DEFAULT; 129 129 static IntPoint globalPointForClientPoint(GdkWindow* window, const IntPoint& clientPoint); 130 130 … … 4995 4995 break; 4996 4996 case WEBKIT_CACHE_MODEL_WEB_BROWSER: 4997 // Page cache capacity (in pages). Comment from Mac port: 4998 // (Research indicates that value / page drops substantially after 3 pages.) 4997 4999 pageCacheCapacity = 3; 4998 5000 cacheTotalCapacity = 32 * 1024 * 1024; -
trunk/WebKit/gtk/webkit/webkitwebview.h
r72675 r73353 51 51 } WebKitNavigationResponse; 52 52 53 /* 54 * WebKitCacheModel: 55 * @WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER: Disable the cache completely, which 56 * substantially reduces memory usage. Useful for applications that only 57 * access local files. 58 * @WEBKIT_CACHE_MODEL_WEB_BROWSER: Improve document load speed substantially 59 * by caching previously viewed content. This is the default setting. 60 * 61 * Enum values used for determining the webview cache model. 62 */ 53 63 typedef enum { 54 WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER = 1, 64 /*< private >*/ 65 WEBKIT_CACHE_MODEL_DEFAULT, 66 /*< public >*/ 67 WEBKIT_CACHE_MODEL_DOCUMENT_VIEWER, 55 68 WEBKIT_CACHE_MODEL_WEB_BROWSER 56 69 } WebKitCacheModel;
Note: See TracChangeset
for help on using the changeset viewer.