summaryrefslogtreecommitdiffstats
path: root/content/shell/common
diff options
context:
space:
mode:
authorpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-20 14:55:15 +0000
committerpeter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-20 14:55:15 +0000
commit6d2eabc1b36f531ede574c7d3a945dce066b14f8 (patch)
tree9fcfdb72eb2bce8450955cb8265d5d51631fd666 /content/shell/common
parente2eb2f22be4cb7938737a37e524614d9ef44e308 (diff)
downloadchromium_src-6d2eabc1b36f531ede574c7d3a945dce066b14f8.zip
chromium_src-6d2eabc1b36f531ede574c7d3a945dce066b14f8.tar.gz
chromium_src-6d2eabc1b36f531ede574c7d3a945dce066b14f8.tar.bz2
Revert "Support viewport in content_shell."
This patch changes layout tests on Android to be ran using a 980x735 canvas instead of an 800x600 one, basically breaking everything. The "WebKit Android (Nexus4)" tester is currently red because of this. > Support viewport in content_shell. > > Viewport preferences are overridden even with the --enable-viewport > flag passed in. > > BUG=343993 > BUG=343993, 345221 NOTRY=true TBR=zeeshankq@chromium.org, aelias, jochen Review URL: https://codereview.chromium.org/171603015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252234 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/common')
-rw-r--r--content/shell/common/webkit_test_helpers.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/shell/common/webkit_test_helpers.cc b/content/shell/common/webkit_test_helpers.cc
index 316b559..f7c2ca3 100644
--- a/content/shell/common/webkit_test_helpers.cc
+++ b/content/shell/common/webkit_test_helpers.cc
@@ -108,6 +108,7 @@ void ApplyLayoutTestDefaultPreferences(WebPreferences* prefs) {
#if defined(OS_ANDROID)
prefs->text_autosizing_enabled = false;
#endif
+ prefs->viewport_enabled = false;
}
base::FilePath GetWebKitRootDirFilePath() {