summaryrefslogtreecommitdiffstats
path: root/content/DEPS
diff options
context:
space:
mode:
authorccameron <ccameron@chromium.org>2015-04-29 16:40:03 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-29 23:40:42 +0000
commit908e43770ab94c7d5bcc97f0cbbea9e676a9ba6c (patch)
tree48ccbb700b4756467c15cf267cbcc3953e7641f4 /content/DEPS
parent5125cfbdf5bfef2e90f7657a881d573d444aa8f7 (diff)
downloadchromium_src-908e43770ab94c7d5bcc97f0cbbea9e676a9ba6c.zip
chromium_src-908e43770ab94c7d5bcc97f0cbbea9e676a9ba6c.tar.gz
chromium_src-908e43770ab94c7d5bcc97f0cbbea9e676a9ba6c.tar.bz2
Mac: Make pinch less sensitive
Require a cumulative 40% zoom before forwarding a pinch to the renderer. For the discrete browser zoom pre-M42, we required 60% (this code was removed in https://codereview.chromium.org/899283004). If a zoom gesture (which crossed the 40% line) has occurred in the last second, do not require the 40% threshold (since this is likely an effort to re-zoom in). Of note is that these percentages are additive (the sum of the magnification factors), not multiplicative (the product of 1 plus the magnification factors). This is to be consistent with the previous zoom threshold code. Also limit the maximum pinch-zoom level to 3x, since the full 4x is rarely useful. BUG=478981 Review URL: https://codereview.chromium.org/1110253002 Cr-Commit-Position: refs/heads/master@{#327619}
Diffstat (limited to 'content/DEPS')
-rw-r--r--content/DEPS1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/DEPS b/content/DEPS
index fb2bf9d..91328cc 100644
--- a/content/DEPS
+++ b/content/DEPS
@@ -65,6 +65,7 @@ include_rules = [
"+third_party/mojo/src/mojo/public",
"+third_party/mozilla",
"+third_party/npapi/bindings",
+ "+third_party/ocmock",
"+third_party/re2",
"+third_party/skia",
"+third_party/sqlite",