summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 07:14:52 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 07:14:52 +0000
commitd7d2dc63052408fdacf9655ce127b1472272fe9f (patch)
treee626d1c8a04b5a8228d64cb349b35496b5004762 /webkit
parent4db2e91d32a62128d3f43001fcae0bbf6f98467c (diff)
downloadchromium_src-d7d2dc63052408fdacf9655ce127b1472272fe9f.zip
chromium_src-d7d2dc63052408fdacf9655ce127b1472272fe9f.tar.gz
chromium_src-d7d2dc63052408fdacf9655ce127b1472272fe9f.tar.bz2
Remove values from WebPreferences that are set by RenderViewImpl
The WebSettings corresponding to these bools: accelerated_compositing_for_overflow_scroll_enabled accelerated_compositing_for_scrollable_frames_enabled composited_scrolling_for_frames_enabled Are set by RenderViewImpl::Initialize and by RenderViewImpl::SetDeviceScaleFactor taking into account the device scale, command line flags and platform. These values were additionally being set by WebPreferences based on only the command line flags in the browser process. The browser process' version was obviously not consistent with the value computed by RenderViewImpl as it did not have access to all of the same information. This caused two problems: 1.) The value applied whenever the WebPreferences changed and were applied to the view did not match the desired value that RenderViewImpl computed 2.) The settings changed in ways that Blink did not expect In particular for this bug, the values computed by RenderViewImpl on a retina mac would all be "true". However when changing the font size the browser would send down a new WebPreferences struct with these bits set to "false" which RenderViewImpl::OnUpdateWebPreferences would apply to Blink. Changing the value of composited_scrolling_for_frames_enabled would then cause Blink's bookkeeping for a formerly composited scrollable frame to go haywire. The fix is to remove these from WebPreferences and let RenderViewImpl::{Initialize,SetDeviceScaleFactor} take care of setting the right values. BUG=346622 Review URL: https://codereview.chromium.org/183853012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/common/webpreferences.cc4
-rw-r--r--webkit/common/webpreferences.h4
2 files changed, 0 insertions, 8 deletions
diff --git a/webkit/common/webpreferences.cc b/webkit/common/webpreferences.cc
index dc64e62..2eca63d 100644
--- a/webkit/common/webpreferences.cc
+++ b/webkit/common/webpreferences.cc
@@ -55,10 +55,6 @@ WebPreferences::WebPreferences()
gl_multisampling_enabled(true),
privileged_webgl_extensions_enabled(false),
webgl_errors_to_console_enabled(true),
- accelerated_compositing_for_overflow_scroll_enabled(false),
- universal_accelerated_compositing_for_overflow_scroll_enabled(false),
- accelerated_compositing_for_scrollable_frames_enabled(false),
- composited_scrolling_for_frames_enabled(false),
mock_scrollbars_enabled(false),
layer_squashing_enabled(false),
threaded_html_parser(true),
diff --git a/webkit/common/webpreferences.h b/webkit/common/webpreferences.h
index dcca29e..8a7f292 100644
--- a/webkit/common/webpreferences.h
+++ b/webkit/common/webpreferences.h
@@ -103,10 +103,6 @@ struct WEBKIT_COMMON_EXPORT WebPreferences {
bool gl_multisampling_enabled;
bool privileged_webgl_extensions_enabled;
bool webgl_errors_to_console_enabled;
- bool accelerated_compositing_for_overflow_scroll_enabled;
- bool universal_accelerated_compositing_for_overflow_scroll_enabled;
- bool accelerated_compositing_for_scrollable_frames_enabled;
- bool composited_scrolling_for_frames_enabled;
bool mock_scrollbars_enabled;
bool layer_squashing_enabled;
bool threaded_html_parser;