cc: Remove cc::settings, move them to LayerTreeSettings.

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/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifier.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
@@ skipping 19 matching lines @@
 // "Zyyy" is the ISO 15924 script code for undetermined script aka Common.
 const char WebPreferences::kCommonScript[] = "Zyyy";
 
 WebPreferences::WebPreferences()
     : default_font_size(16),
       default_fixed_font_size(13),
       minimum_font_size(0),
       minimum_logical_font_size(6),
       default_encoding("ISO-8859-1"),
       apply_default_device_scale_factor_in_compositor(false),
+      apply_page_scale_factor_in_compositor(false),
+      per_tile_painting_enabled(false),
+      accelerated_animation_enabled(false),
       javascript_enabled(true),
       web_security_enabled(true),
       javascript_can_open_windows_automatically(true),
       loads_images_automatically(true),
       images_enabled(true),
       plugins_enabled(true),
       dom_paste_enabled(false),  // enables execCommand("paste")
       developer_extras_enabled(false),  // Requires extra work by embedder
       site_specific_quirks_enabled(false),
       shrinks_standalone_images_to_fit(true),
@@ skipping 29 matching lines @@
       show_composited_layer_tree(false),
       show_fps_counter(false),
       accelerated_compositing_for_overflow_scroll_enabled(false),
       show_paint_rects(false),
       render_vsync_enabled(true),
       asynchronous_spell_checking_enabled(true),
       unified_textchecker_enabled(false),
       accelerated_compositing_enabled(false),
       force_compositing_mode(false),
       fixed_position_compositing_enabled(false),
-      accelerated_layers_enabled(false),
-      accelerated_animation_enabled(false),
-      accelerated_video_enabled(false),
+      accelerated_compositing_for_3d_transforms_enabled(false),
+      accelerated_compositing_for_animation_enabled(false),
+      accelerated_compositing_for_video_enabled(false),
       accelerated_2d_canvas_enabled(false),
       deferred_2d_canvas_enabled(false),
       accelerated_painting_enabled(false),
       accelerated_filters_enabled(false),
       gesture_tap_highlight_enabled(false),
-      accelerated_plugins_enabled(false),
+      accelerated_compositing_for_plugins_enabled(false),
       memory_info_enabled(false),
       fullscreen_enabled(false),
       allow_displaying_insecure_content(true),
       allow_running_insecure_content(false),
       password_echo_enabled(false),
       should_print_backgrounds(false),
       enable_scroll_animator(false),
       visual_word_movement_enabled(false),
       css_sticky_position_enabled(false),
       css_regions_enabled(false),
       css_shaders_enabled(false),
       css_variables_enabled(false),
       device_supports_touch(false),
       device_supports_mouse(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),
       number_of_cpu_cores(1),
-      cookie_enabled(true),
-      apply_page_scale_factor_in_compositor(false)
+      cookie_enabled(true)
 #if defined(OS_ANDROID)
       ,
       text_autosizing_enabled(true),
       font_scale_factor(1.0f),
       force_enable_zoom(false),
       user_gesture_required_for_media_playback(true),
       supports_multiple_windows(true)
 #endif
 {
   standard_font_family_map[kCommonScript] =
@@ skipping 115 matching lines @@
                     settings);
   settings->setDefaultFontSize(default_font_size);
   settings->setDefaultFixedFontSize(default_fixed_font_size);
   settings->setMinimumFontSize(minimum_font_size);
   settings->setMinimumLogicalFontSize(minimum_logical_font_size);
   settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding));
   settings->setApplyDefaultDeviceScaleFactorInCompositor(
       apply_default_device_scale_factor_in_compositor);
   settings->setApplyPageScaleFactorInCompositor(
       apply_page_scale_factor_in_compositor);
+  settings->setPerTilePaintingEnabled(per_tile_painting_enabled);
+  settings->setAcceleratedAnimationEnabled(accelerated_animation_enabled);
   settings->setJavaScriptEnabled(javascript_enabled);
   settings->setWebSecurityEnabled(web_security_enabled);
   settings->setJavaScriptCanOpenWindowsAutomatically(
       javascript_can_open_windows_automatically);
   settings->setLoadsImagesAutomatically(loads_images_automatically);
   settings->setImagesEnabled(images_enabled);
   settings->setPluginsEnabled(plugins_enabled);
   settings->setDOMPasteAllowed(dom_paste_enabled);
   settings->setDeveloperExtrasEnabled(developer_extras_enabled);
   settings->setNeedsSiteSpecificQuirks(site_specific_quirks_enabled);
@@ skipping 101 matching lines @@
 
   // Enable gpu-accelerated filters if requested on the command line.
   settings->setAcceleratedFiltersEnabled(accelerated_filters_enabled);
 
   // Enable gesture tap highlight if requested on the command line.
   settings->setGestureTapHighlightEnabled(gesture_tap_highlight_enabled);
 
   // Enabling accelerated layers from the command line enabled accelerated
   // 3D CSS, Video, and Animations.
   settings->setAcceleratedCompositingFor3DTransformsEnabled(
-      accelerated_layers_enabled);
+      accelerated_compositing_for_3d_transforms_enabled);
   settings->setAcceleratedCompositingForVideoEnabled(
-      accelerated_video_enabled);
+      accelerated_compositing_for_video_enabled);
   settings->setAcceleratedCompositingForAnimationEnabled(
-      accelerated_animation_enabled);
+      accelerated_compositing_for_animation_enabled);
 
   // Enabling accelerated plugins if specified from the command line.
   settings->setAcceleratedCompositingForPluginsEnabled(
-      accelerated_plugins_enabled);
+      accelerated_compositing_for_plugins_enabled);
 
   // WebGL and accelerated 2D canvas are always gpu composited.
   settings->setAcceleratedCompositingForCanvasEnabled(
       experimental_webgl_enabled || accelerated_2d_canvas_enabled);
 
   // Enable memory info reporting to page if requested on the command line.
   settings->setMemoryInfoEnabled(memory_info_enabled);
 
   settings->setAsynchronousSpellCheckingEnabled(
       asynchronous_spell_checking_enabled);
@@ skipping 27 matching lines @@
   settings->setDeviceSupportsMouse(device_supports_mouse);
 
   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->setApplyPageScaleFactorInCompositor(
-      apply_page_scale_factor_in_compositor);
-
   settings->setDeferredImageDecodingEnabled(deferred_image_decoding_enabled);
 
 #if defined(OS_ANDROID)
   settings->setTextAutosizingEnabled(text_autosizing_enabled);
   settings->setTextAutosizingFontScaleFactor(font_scale_factor);
   web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom);
   settings->setAutoZoomFocusedNodeToLegibleScale(true);
   settings->setDoubleTapToZoomEnabled(true);
   settings->setMediaPlaybackRequiresUserGesture(
       user_gesture_required_for_media_playback);
   settings->setSupportsMultipleWindows(supports_multiple_windows);
 #endif
 
   WebNetworkStateNotifier::setOnLine(is_online);
 }
 
 }  // namespace webkit_glue