Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Side by Side Diff: webkit/glue/webpreferences.cc

Issue 11081003: Upstream scrollFocusedNodeIntoRect (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nit fix Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "webkit/glue/webpreferences.h" 5 #include "webkit/glue/webpreferences.h"
6 6
7 #include "base/string_util.h" 7 #include "base/string_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h" 9 #include "third_party/WebKit/Source/WebKit/chromium/public/WebNetworkStateNotifi er.h"
10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h" 10 #include "third_party/WebKit/Source/WebKit/chromium/public/WebRuntimeFeatures.h"
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 web_view->setTabsToLinks(tabs_to_links); 404 web_view->setTabsToLinks(tabs_to_links);
405 405
406 settings->setInteractiveFormValidationEnabled(true); 406 settings->setInteractiveFormValidationEnabled(true);
407 407
408 settings->setFullScreenEnabled(fullscreen_enabled); 408 settings->setFullScreenEnabled(fullscreen_enabled);
409 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content); 409 settings->setAllowDisplayOfInsecureContent(allow_displaying_insecure_content);
410 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content); 410 settings->setAllowRunningOfInsecureContent(allow_running_insecure_content);
411 #if defined(OS_ANDROID) 411 #if defined(OS_ANDROID)
412 settings->setTextAutosizingFontScaleFactor(font_scale_factor); 412 settings->setTextAutosizingFontScaleFactor(font_scale_factor);
413 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom); 413 web_view->setIgnoreViewportTagMaximumScale(force_enable_zoom);
414 settings->setAutoZoomFocusedNodeToLegibleScale(true);
414 #endif 415 #endif
415 settings->setPasswordEchoEnabled(password_echo_enabled); 416 settings->setPasswordEchoEnabled(password_echo_enabled);
416 settings->setShouldPrintBackgrounds(should_print_backgrounds); 417 settings->setShouldPrintBackgrounds(should_print_backgrounds);
417 settings->setEnableScrollAnimator(enable_scroll_animator); 418 settings->setEnableScrollAnimator(enable_scroll_animator);
418 settings->setVisualWordMovementEnabled(visual_word_movement_enabled); 419 settings->setVisualWordMovementEnabled(visual_word_movement_enabled);
419 420
420 settings->setCSSStickyPositionEnabled(css_sticky_position_enabled); 421 settings->setCSSStickyPositionEnabled(css_sticky_position_enabled);
421 settings->setExperimentalCSSRegionsEnabled(css_regions_enabled); 422 settings->setExperimentalCSSRegionsEnabled(css_regions_enabled);
422 settings->setExperimentalCSSCustomFilterEnabled(css_shaders_enabled); 423 settings->setExperimentalCSSCustomFilterEnabled(css_shaders_enabled);
423 settings->setExperimentalCSSVariablesEnabled(css_variables_enabled); 424 settings->setExperimentalCSSVariablesEnabled(css_variables_enabled);
424 425
425 settings->setDeviceSupportsTouch(device_supports_touch); 426 settings->setDeviceSupportsTouch(device_supports_touch);
426 settings->setDeviceSupportsMouse(device_supports_mouse); 427 settings->setDeviceSupportsMouse(device_supports_mouse);
427 428
428 settings->setDefaultTileSize( 429 settings->setDefaultTileSize(
429 WebSize(default_tile_width, default_tile_height)); 430 WebSize(default_tile_width, default_tile_height));
430 settings->setMaxUntiledLayerSize( 431 settings->setMaxUntiledLayerSize(
431 WebSize(max_untiled_layer_width, max_untiled_layer_height)); 432 WebSize(max_untiled_layer_width, max_untiled_layer_height));
432 433
433 settings->setFixedPositionCreatesStackingContext( 434 settings->setFixedPositionCreatesStackingContext(
434 fixed_position_creates_stacking_context); 435 fixed_position_creates_stacking_context);
435 436
436 WebNetworkStateNotifier::setOnLine(is_online); 437 WebNetworkStateNotifier::setOnLine(is_online);
437 } 438 }
438 439
439 } // namespace webkit_glue 440 } // namespace webkit_glue
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698