Chromium compositor change implementing page-scale driven pinch-zoom.

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 102 matching lines @@
       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),
       number_of_cpu_cores(1),
-      cookie_enabled(true) {
+      cookie_enabled(true),
+      apply_page_scale_factor_in_compositor(false) {
   standard_font_family_map[kCommonScript] =
       ASCIIToUTF16("Times New Roman");
   fixed_font_family_map[kCommonScript] =
       ASCIIToUTF16("Courier New");
   serif_font_family_map[kCommonScript] =
       ASCIIToUTF16("Times New Roman");
   sans_serif_font_family_map[kCommonScript] =
       ASCIIToUTF16("Arial");
   cursive_font_family_map[kCommonScript] =
       ASCIIToUTF16("Script");
@@ skipping 108 matching lines @@
                     settings);
   ApplyFontsFromMap(pictograph_font_family_map, setPictographFontFamilyWrapper,
                     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->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 164 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);
+
   WebNetworkStateNotifier::setOnLine(is_online);
 }
 
 }  // namespace webkit_glue