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

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

Issue 1509783002: Revert of Remove invert viewport scroll order setting from Blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
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 "content/renderer/render_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1020 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 prefs.image_color_profiles_enabled); 1031 prefs.image_color_profiles_enabled);
1032 settings->setShouldRespectImageOrientation( 1032 settings->setShouldRespectImageOrientation(
1033 prefs.should_respect_image_orientation); 1033 prefs.should_respect_image_orientation);
1034 1034
1035 settings->setUnsafePluginPastingEnabled(false); 1035 settings->setUnsafePluginPastingEnabled(false);
1036 settings->setEditingBehavior( 1036 settings->setEditingBehavior(
1037 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior)); 1037 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior));
1038 1038
1039 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows); 1039 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows);
1040 1040
1041 // TODO(bokan): Remove once Blink side is gone.
1042 settings->setInvertViewportScrollOrder(true);
1043
1041 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); 1044 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled);
1042 1045
1043 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); 1046 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled);
1044 1047
1045 settings->setSelectionIncludesAltImageText(true); 1048 settings->setSelectionIncludesAltImageText(true);
1046 1049
1047 settings->setV8CacheOptions( 1050 settings->setV8CacheOptions(
1048 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); 1051 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options));
1049 1052
1050 settings->setImageAnimationPolicy( 1053 settings->setImageAnimationPolicy(
(...skipping 2666 matching lines...) Expand 10 before | Expand all | Expand 10 after
3717 if (IsUseZoomForDSFEnabled()) { 3720 if (IsUseZoomForDSFEnabled()) {
3718 compositor_->SetPaintedDeviceScaleFactor(device_scale_factor_); 3721 compositor_->SetPaintedDeviceScaleFactor(device_scale_factor_);
3719 webview()->setZoomFactorForDeviceScaleFactor( 3722 webview()->setZoomFactorForDeviceScaleFactor(
3720 device_scale_factor_); 3723 device_scale_factor_);
3721 } else { 3724 } else {
3722 webview()->setDeviceScaleFactor(device_scale_factor_); 3725 webview()->setDeviceScaleFactor(device_scale_factor_);
3723 } 3726 }
3724 } 3727 }
3725 3728
3726 } // namespace content 3729 } // namespace content
OLDNEW
« no previous file with comments | « components/html_viewer/blink_settings_impl.cc ('k') | third_party/WebKit/Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698