Unset the page-scale-factor limits if enable-pinch flag is turned on.

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/WebCompositor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifier.h"
@@ skipping 92 matching lines @@
       should_print_backgrounds(false),
       enable_scroll_animator(false),
       hixie76_websocket_protocol_enabled(false),
       visual_word_movement_enabled(false),
       per_tile_painting_enabled(false),
       css_regions_enabled(false),
       css_shaders_enabled(false),
       default_tile_width(256),
       default_tile_height(256),
       max_untiled_layer_width(512),
-      max_untiled_layer_height(512) {
+      max_untiled_layer_height(512),
+      force_enable_page_scale(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 68 matching lines @@
                     settings);
   ApplyFontsFromMap(cursive_font_family_map, setCursiveFontFamilyWrapper,
                     settings);
   ApplyFontsFromMap(fantasy_font_family_map, setFantasyFontFamilyWrapper,
                     settings);
   settings->setDefaultFontSize(default_font_size);
   settings->setDefaultFixedFontSize(default_fixed_font_size);
   settings->setMinimumFontSize(minimum_font_size);
   settings->setMinimumLogicalFontSize(minimum_logical_font_size);
   settings->setDefaultDeviceScaleFactor(default_device_scale_factor);
+  settings->setForceEnablePageScaleFactor(force_enable_page_scale);
   settings->setDefaultTextEncodingName(ASCIIToUTF16(default_encoding));
   settings->setApplyDefaultDeviceScaleFactorInCompositor(
       apply_default_device_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);
@@ skipping 158 matching lines @@
 
   settings->setDefaultTileSize(
       WebSize(default_tile_width, default_tile_height));
   settings->setMaxUntiledLayerSize(
       WebSize(max_untiled_layer_width, max_untiled_layer_height));
 
   WebNetworkStateNotifier::setOnLine(is_online);
 }
 
 }  // namespace webkit_glue