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

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

Issue 1724103002: Reverting changes that made window.scroll properties relative to the layout viewport. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2623
Patch Set: Created 4 years, 10 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
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 1019 matching lines...) Expand 10 before | Expand all | Expand 10 after
1030 prefs.image_color_profiles_enabled); 1030 prefs.image_color_profiles_enabled);
1031 settings->setShouldRespectImageOrientation( 1031 settings->setShouldRespectImageOrientation(
1032 prefs.should_respect_image_orientation); 1032 prefs.should_respect_image_orientation);
1033 1033
1034 settings->setUnsafePluginPastingEnabled(false); 1034 settings->setUnsafePluginPastingEnabled(false);
1035 settings->setEditingBehavior( 1035 settings->setEditingBehavior(
1036 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior)); 1036 static_cast<WebSettings::EditingBehavior>(prefs.editing_behavior));
1037 1037
1038 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows); 1038 settings->setSupportsMultipleWindows(prefs.supports_multiple_windows);
1039 1039
1040 settings->setInertVisualViewport(prefs.inert_visual_viewport);
1041
1040 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled); 1042 settings->setSmartInsertDeleteEnabled(prefs.smart_insert_delete_enabled);
1041 1043
1042 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled); 1044 settings->setSpatialNavigationEnabled(prefs.spatial_navigation_enabled);
1043 1045
1044 settings->setSelectionIncludesAltImageText(true); 1046 settings->setSelectionIncludesAltImageText(true);
1045 1047
1046 settings->setV8CacheOptions( 1048 settings->setV8CacheOptions(
1047 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options)); 1049 static_cast<WebSettings::V8CacheOptions>(prefs.v8_cache_options));
1048 1050
1049 settings->setImageAnimationPolicy( 1051 settings->setImageAnimationPolicy(
(...skipping 2673 matching lines...) Expand 10 before | Expand all | Expand 10 after
3723 if (IsUseZoomForDSFEnabled()) { 3725 if (IsUseZoomForDSFEnabled()) {
3724 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_); 3726 webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
3725 } else { 3727 } else {
3726 webview()->setDeviceScaleFactor(device_scale_factor_); 3728 webview()->setDeviceScaleFactor(device_scale_factor_);
3727 } 3729 }
3728 webview()->settings()->setPreferCompositingToLCDTextEnabled( 3730 webview()->settings()->setPreferCompositingToLCDTextEnabled(
3729 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_)); 3731 PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
3730 } 3732 }
3731 3733
3732 } // namespace content 3734 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698