diff options
| author | mstensho@opera.com <mstensho@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 15:51:15 +0000 |
|---|---|---|
| committer | mstensho@opera.com <mstensho@opera.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-18 15:51:15 +0000 |
| commit | 73721de026a150c7d42740cbfc054a0d9713b5ac (patch) | |
| tree | d73ecb4ffffeaaa25af1ff6267575c1060a82100 /webkit | |
| parent | c5d572057739dcc66e9e6d7499f3f9e7661e1775 (diff) | |
| download | chromium_src-73721de026a150c7d42740cbfc054a0d9713b5ac.zip chromium_src-73721de026a150c7d42740cbfc054a0d9713b5ac.tar.gz chromium_src-73721de026a150c7d42740cbfc054a0d9713b5ac.tar.bz2 | |
Add command line switch to enable region based columns.
This needs to be a separate switch - we cannot lump it together with
--enable-experimental-webkit-features , because we don't want
to unconditionally enable region based columns when running LayoutTests
(there are LayoutTests that compare rendering in the old and new multicol
implementations, using internals.settings.setRegionBasedColumnsEnabled(true)).
BUG=242905
Review URL: https://chromiumcodereview.appspot.com/17057003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207005 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/common/webpreferences.cc | 1 | ||||
| -rw-r--r-- | webkit/common/webpreferences.h | 1 | ||||
| -rw-r--r-- | webkit/renderer/webpreferences_renderer.cc | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/webkit/common/webpreferences.cc b/webkit/common/webpreferences.cc index d0d8ac7..a643d95 100644 --- a/webkit/common/webpreferences.cc +++ b/webkit/common/webpreferences.cc @@ -87,6 +87,7 @@ WebPreferences::WebPreferences() css_shaders_enabled(false), css_grid_layout_enabled(false), lazy_layout_enabled(false), + region_based_columns_enabled(false), touch_enabled(false), device_supports_touch(false), device_supports_mouse(true), diff --git a/webkit/common/webpreferences.h b/webkit/common/webpreferences.h index df37c1d..194b44e 100644 --- a/webkit/common/webpreferences.h +++ b/webkit/common/webpreferences.h @@ -135,6 +135,7 @@ struct WEBKIT_COMMON_EXPORT WebPreferences { bool css_variables_enabled; bool css_grid_layout_enabled; bool lazy_layout_enabled; + bool region_based_columns_enabled; bool touch_enabled; bool device_supports_touch; bool device_supports_mouse; diff --git a/webkit/renderer/webpreferences_renderer.cc b/webkit/renderer/webpreferences_renderer.cc index 9267ae2..f484622 100644 --- a/webkit/renderer/webpreferences_renderer.cc +++ b/webkit/renderer/webpreferences_renderer.cc @@ -288,6 +288,7 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) { settings->setCSSStickyPositionEnabled(prefs.css_sticky_position_enabled); settings->setExperimentalCSSCustomFilterEnabled(prefs.css_shaders_enabled); settings->setExperimentalCSSGridLayoutEnabled(prefs.css_grid_layout_enabled); + settings->setRegionBasedColumnsEnabled(prefs.region_based_columns_enabled); WebRuntimeFeatures::enableLazyLayout(prefs.lazy_layout_enabled); WebRuntimeFeatures::enableTouch(prefs.touch_enabled); |