summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorfsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-22 23:08:05 +0000
committerfsamuel@chromium.org <fsamuel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-22 23:08:05 +0000
commit7ddea98038d04e31da38f5420ddb1b56ebcfb93e (patch)
treeb5ca4553ac2cefeaf1cb843ded35c492b0cbd956 /build
parente58c1b8db87ac5536ed93daa49513bad4b35f99e (diff)
downloadchromium_src-7ddea98038d04e31da38f5420ddb1b56ebcfb93e.zip
chromium_src-7ddea98038d04e31da38f5420ddb1b56ebcfb93e.tar.gz
chromium_src-7ddea98038d04e31da38f5420ddb1b56ebcfb93e.tar.bz2
Compute pageScaleFactor on page so that fixed layout page fits width of window.
Fixed layout mode can now be enabled with the command line flag --enable-fixed-layout. This mode does not interact well with zoom at this point in time. This will be fixed shortly. This bug replaces http://codereview.chromium.org/7764006/ which is no longer relevant. BUG=none TEST=manually Review URL: http://codereview.chromium.org/7831028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi9
1 files changed, 9 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index 056d797..fa82663 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -42,6 +42,9 @@
# Disable Virtual keyboard support by default.
'use_virtual_keyboard%': 0,
+ # Disable viewport meta tag by default.
+ 'enable_viewport%': 0,
+
# Default setting for use_skia on mac platform.
# This is typically overridden in use_skia_on_mac.gypi.
'use_skia_on_mac%': 0,
@@ -53,6 +56,7 @@
'use_ash%': '<(use_ash)',
'use_openssl%': '<(use_openssl)',
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
+ 'enable_viewport%': '<(enable_viewport)',
'use_skia_on_mac%': '<(use_skia_on_mac)',
# Compute the architecture that we're building on.
@@ -95,6 +99,7 @@
'use_ash%': '<(use_ash)',
'use_openssl%': '<(use_openssl)',
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
+ 'enable_viewport%': '<(enable_viewport)',
'use_skia_on_mac%': '<(use_skia_on_mac)',
# We used to provide a variable for changing how libraries were built.
@@ -426,6 +431,7 @@
'chromeos%': '<(chromeos)',
'chromeos_gtk%': '<(chromeos_gtk)',
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
+ 'enable_viewport%': '<(enable_viewport)',
'use_skia_on_mac%': '<(use_skia_on_mac)',
'use_xi2_mt%':'<(use_xi2_mt)',
'file_manager_extension%': '<(file_manager_extension)',
@@ -1110,6 +1116,9 @@
['enable_pepper_threading==1', {
'defines': ['ENABLE_PEPPER_THREADING'],
}],
+ ['enable_viewport==1', {
+ 'defines': ['ENABLE_VIEWPORT'],
+ }],
['configuration_policy==1', {
'defines': ['ENABLE_CONFIGURATION_POLICY'],
}],