diff options
| author | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 11:47:18 +0000 |
|---|---|---|
| committer | mnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 11:47:18 +0000 |
| commit | 5c0fb8bac91e8dbbc874deeaed01e968cc426499 (patch) | |
| tree | 0bd9293c9704d7d069636f1b46747b47833f001b /webkit | |
| parent | 445f4fb61b4f34d539fc53d9330ab8f82d78fb17 (diff) | |
| download | chromium_src-5c0fb8bac91e8dbbc874deeaed01e968cc426499.zip chromium_src-5c0fb8bac91e8dbbc874deeaed01e968cc426499.tar.gz chromium_src-5c0fb8bac91e8dbbc874deeaed01e968cc426499.tar.bz2 | |
[Android WebView] Wire up legacy quirks added to Blink
This is a companion for the following Blink changes:
- Add a quirk to clobber initial scale in certain cases https://codereview.chromium.org/55073002/
- Add a legacy quirk for 'user-scalable=no' case https://codereview.chromium.org/53053002/
Wires up the new settings and adds integration tests
BUG=312691,313754
Review URL: https://codereview.chromium.org/67193002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/common/webpreferences.cc | 2 | ||||
| -rw-r--r-- | webkit/common/webpreferences.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/webkit/common/webpreferences.cc b/webkit/common/webpreferences.cc index 16860d5..1fa918d 100644 --- a/webkit/common/webpreferences.cc +++ b/webkit/common/webpreferences.cc @@ -135,7 +135,9 @@ WebPreferences::WebPreferences() use_wide_viewport(true), viewport_meta_layout_size_quirk(false), viewport_meta_merge_content_quirk(false), + viewport_meta_non_user_scalable_quirk(false), viewport_meta_zero_values_quirk(false), + clobber_user_agent_initial_scale_quirk(false), ignore_main_frame_overflow_hidden_quirk(false), report_screen_size_in_physical_pixels_quirk(false) #endif diff --git a/webkit/common/webpreferences.h b/webkit/common/webpreferences.h index 3f0c895..a07b258 100644 --- a/webkit/common/webpreferences.h +++ b/webkit/common/webpreferences.h @@ -177,7 +177,9 @@ struct WEBKIT_COMMON_EXPORT WebPreferences { bool use_wide_viewport; bool viewport_meta_layout_size_quirk; bool viewport_meta_merge_content_quirk; + bool viewport_meta_non_user_scalable_quirk; bool viewport_meta_zero_values_quirk; + bool clobber_user_agent_initial_scale_quirk; bool ignore_main_frame_overflow_hidden_quirk; bool report_screen_size_in_physical_pixels_quirk; #endif |