Commit b76d682e authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Cherry-pick: [Android WebView] Enable the Blink quirk for returning screen sizes in physical pixels

Cherry-pick of chromium http://crrev.com/26460004

Bug: 11026947

Original description:

This enables the browser to return screen.width / availWidth (and height),
@media device-width (and height), window.outerWidth (and height),
but not window.innerWidth (and height) in physical rather than CSS
pixels.

BUG=305236

Change-Id: I8050131f5ba39aaa25efcce900d227e1da81da01
parent ab145de0
......@@ -311,6 +311,7 @@ void AwSettings::PopulateWebPreferences(WebPreferences* web_prefs) {
web_prefs->viewport_meta_layout_size_quirk = support_quirks;
web_prefs->viewport_meta_zero_values_quirk = support_quirks;
web_prefs->ignore_main_frame_overflow_hidden_quirk = support_quirks;
web_prefs->report_screen_size_in_physical_pixels_quirk = support_quirks;
web_prefs->password_echo_enabled =
Java_AwSettings_getPasswordEchoEnabled(env, obj);
......
......@@ -209,6 +209,7 @@ IPC_STRUCT_TRAITS_BEGIN(WebPreferences)
IPC_STRUCT_TRAITS_MEMBER(viewport_meta_layout_size_quirk)
IPC_STRUCT_TRAITS_MEMBER(viewport_meta_zero_values_quirk)
IPC_STRUCT_TRAITS_MEMBER(ignore_main_frame_overflow_hidden_quirk)
IPC_STRUCT_TRAITS_MEMBER(report_screen_size_in_physical_pixels_quirk)
#endif
IPC_STRUCT_TRAITS_END()
......
......@@ -133,7 +133,8 @@ WebPreferences::WebPreferences()
use_wide_viewport(true),
viewport_meta_layout_size_quirk(false),
viewport_meta_zero_values_quirk(false),
ignore_main_frame_overflow_hidden_quirk(false)
ignore_main_frame_overflow_hidden_quirk(false),
report_screen_size_in_physical_pixels_quirk(false)
#endif
{
standard_font_family_map[webkit_glue::kCommonScript] =
......
......@@ -177,6 +177,7 @@ struct WEBKIT_COMMON_EXPORT WebPreferences {
bool viewport_meta_layout_size_quirk;
bool viewport_meta_zero_values_quirk;
bool ignore_main_frame_overflow_hidden_quirk;
bool report_screen_size_in_physical_pixels_quirk;
#endif
// We try to keep the default values the same as the default values in
......
......@@ -343,6 +343,8 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
prefs.viewport_meta_zero_values_quirk);
settings->setIgnoreMainFrameOverflowHiddenQuirk(
prefs.ignore_main_frame_overflow_hidden_quirk);
settings->setReportScreenSizeInPhysicalPixelsQuirk(
prefs.report_screen_size_in_physical_pixels_quirk);
#endif
WebNetworkStateNotifier::setOnLine(prefs.is_online);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment