adding DiscardableMemory preferences for deferred image decoding

webkit/glue/webpreferences.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/webpreferences.h"
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
@@ skipping 109 matching lines @@
       device_supports_touch(false),
       device_supports_mouse(true),
       touch_adjustment_enabled(true),
       default_tile_width(256),
       default_tile_height(256),
       max_untiled_layer_width(512),
       max_untiled_layer_height(512),
       fixed_position_creates_stacking_context(false),
       sync_xhr_in_documents_enabled(true),
       deferred_image_decoding_enabled(false),
+      discardable_memory_limit_mb(32),
+      discardable_memory_entry_limit(128),
       should_respect_image_orientation(false),
       number_of_cpu_cores(1),
 #if defined(OS_MACOSX)
       editing_behavior(EDITING_BEHAVIOR_MAC),
 #elif defined(OS_WIN)
       editing_behavior(EDITING_BEHAVIOR_WIN),
 #elif defined(OS_POSIX)
       editing_behavior(EDITING_BEHAVIOR_UNIX),
 #else
       editing_behavior(EDITING_BEHAVIOR_MAC),
@@ skipping 326 matching lines @@
 
   settings->setDefaultTileSize(
       WebSize(default_tile_width, default_tile_height));
   settings->setMaxUntiledLayerSize(
       WebSize(max_untiled_layer_width, max_untiled_layer_height));
 
   settings->setFixedPositionCreatesStackingContext(
       fixed_position_creates_stacking_context);
 
   settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled);
+  settings->setDiscardableMemoryLimitMB(discardable_memory_limit_mb);
+  settings->setDiscardableMemoryEntryLimit(discardable_memory_entry_limit);
   settings->setShouldRespectImageOrientation(should_respect_image_orientation);
 
   settings->setUnsafePluginPastingEnabled(false);
   settings->setEditingBehavior(
       static_cast<WebSettings::EditingBehavior>(editing_behavior));
 
   settings->setSupportsMultipleWindows(supports_multiple_windows);
 
   settings->setViewportEnabled(viewport_enabled);
 
@@ skipping 17 matching lines @@
         mismatching_enums)
 
 COMPILE_ASSERT_MATCHING_ENUMS(
     WebPreferences::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
 COMPILE_ASSERT_MATCHING_ENUMS(
     WebPreferences::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
 COMPILE_ASSERT_MATCHING_ENUMS(
     WebPreferences::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
 
 }  // namespace webkit_glue