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

Side by Side Diff: content/renderer/web_preferences.cc

Issue 49043010: Plumb device scale adjustment separately. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rmquirk
Patch Set: Created 7 years, 1 month 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
« no previous file with comments | « content/public/common/common_param_traits_macros.h ('k') | webkit/common/webpreferences.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/public/renderer/web_preferences.h" 5 #include "content/public/renderer/web_preferences.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "third_party/WebKit/public/platform/WebString.h" 8 #include "third_party/WebKit/public/platform/WebString.h"
9 #include "third_party/WebKit/public/platform/WebURL.h" 9 #include "third_party/WebKit/public/platform/WebURL.h"
10 #include "third_party/WebKit/public/web/WebKit.h" 10 #include "third_party/WebKit/public/web/WebKit.h"
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 323
324 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); 324 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled);
325 325
326 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); 326 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled);
327 327
328 settings->setSelectionIncludesAltImageText(true); 328 settings->setSelectionIncludesAltImageText(true);
329 329
330 #if defined(OS_ANDROID) 330 #if defined(OS_ANDROID)
331 settings->setAllowCustomScrollbarInMainFrame(false); 331 settings->setAllowCustomScrollbarInMainFrame(false);
332 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled); 332 settings->setTextAutosizingEnabled(prefs.text_autosizing_enabled);
333 settings->setTextAutosizingFontScaleFactor( 333 settings->setTextAutosizingFontScaleFactor(prefs.font_scale_factor);
334 prefs.text_autosizing_font_scale_factor); 334 settings->setDeviceScaleAdjustment(prefs.device_scale_adjustment);
335 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom); 335 web_view->setIgnoreViewportTagScaleLimits(prefs.force_enable_zoom);
336 settings->setAutoZoomFocusedNodeToLegibleScale(true); 336 settings->setAutoZoomFocusedNodeToLegibleScale(true);
337 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled); 337 settings->setDoubleTapToZoomEnabled(prefs.double_tap_to_zoom_enabled);
338 settings->setMediaPlaybackRequiresUserGesture( 338 settings->setMediaPlaybackRequiresUserGesture(
339 prefs.user_gesture_required_for_media_playback); 339 prefs.user_gesture_required_for_media_playback);
340 settings->setMediaFullscreenRequiresUserGesture( 340 settings->setMediaFullscreenRequiresUserGesture(
341 prefs.user_gesture_required_for_media_fullscreen); 341 prefs.user_gesture_required_for_media_fullscreen);
342 settings->setDefaultVideoPosterURL( 342 settings->setDefaultVideoPosterURL(
343 ASCIIToUTF16(prefs.default_video_poster_url.spec())); 343 ASCIIToUTF16(prefs.default_video_poster_url.spec()));
344 settings->setSupportDeprecatedTargetDensityDPI( 344 settings->setSupportDeprecatedTargetDensityDPI(
(...skipping 22 matching lines...) Expand all
367 settings->setPinchVirtualViewportEnabled( 367 settings->setPinchVirtualViewportEnabled(
368 prefs.pinch_virtual_viewport_enabled); 368 prefs.pinch_virtual_viewport_enabled);
369 369
370 settings->setPinchOverlayScrollbarThickness( 370 settings->setPinchOverlayScrollbarThickness(
371 prefs.pinch_overlay_scrollbar_thickness); 371 prefs.pinch_overlay_scrollbar_thickness);
372 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars); 372 settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
373 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing); 373 settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing);
374 } 374 }
375 375
376 } // namespace content 376 } // namespace content
OLDNEW
« no previous file with comments | « content/public/common/common_param_traits_macros.h ('k') | webkit/common/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698