diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-09-27 09:07:52 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-09-27 09:07:52 +0200 |
| commit | 314fb761d144b160d3aeb72840c89e31c4f21a4a (patch) | |
| tree | 0794190c7b9f541b3dced0b1f6b15979f447e3e5 /gfx | |
| parent | fbaab39c94a047f2a0b0bfbe6cf24a790cd7e8b5 (diff) | |
| parent | 2b9e0ca0bbea04fca6e0fd5079877d355f27c9b6 (diff) | |
| download | UXP-314fb761d144b160d3aeb72840c89e31c4f21a4a.tar UXP-314fb761d144b160d3aeb72840c89e31c4f21a4a.tar.gz UXP-314fb761d144b160d3aeb72840c89e31c4f21a4a.tar.lz UXP-314fb761d144b160d3aeb72840c89e31c4f21a4a.tar.xz UXP-314fb761d144b160d3aeb72840c89e31c4f21a4a.zip | |
Merge branch 'master' into Basilisk-releasev2018.09.27
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/thebes/gfxPlatform.cpp | 10 | ||||
| -rw-r--r-- | gfx/thebes/gfxPrefs.h | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp index d5af16a19..65227a8a7 100644 --- a/gfx/thebes/gfxPlatform.cpp +++ b/gfx/thebes/gfxPlatform.cpp @@ -2380,13 +2380,13 @@ gfxPlatform::AsyncPanZoomEnabled() { #if !defined(MOZ_WIDGET_ANDROID) && !defined(MOZ_WIDGET_UIKIT) // For XUL applications (everything but Firefox on Android) we only want - // to use APZ when E10S is enabled. If we ever get input events off the - // main thread we can consider relaxing this requirement. - if (!BrowserTabsRemoteAutostart()) { + // to use APZ when E10S is enabled or when the user explicitly enable it. + if (BrowserTabsRemoteAutostart() || gfxPrefs::APZDesktopEnabled()) { + return gfxPrefs::AsyncPanZoomEnabledDoNotUseDirectly(); + } else { return false; } -#endif -#ifdef MOZ_WIDGET_ANDROID +#elif defined(MOZ_WIDGET_ANDROID) return true; #else return gfxPrefs::AsyncPanZoomEnabledDoNotUseDirectly(); diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h index 359a258c7..1253fdb48 100644 --- a/gfx/thebes/gfxPrefs.h +++ b/gfx/thebes/gfxPrefs.h @@ -310,6 +310,7 @@ private: DECL_GFX_PREF(Live, "apz.y_stationary_size_multiplier", APZYStationarySizeMultiplier, float, 3.5f); DECL_GFX_PREF(Live, "apz.zoom_animation_duration_ms", APZZoomAnimationDuration, int32_t, 250); DECL_GFX_PREF(Live, "apz.scale_repaint_delay_ms", APZScaleRepaintDelay, int32_t, 500); + DECL_GFX_PREF(Once, "apz.desktop.enabled", APZDesktopEnabled, bool, false); DECL_GFX_PREF(Live, "browser.ui.zoom.force-user-scalable", ForceUserScalable, bool, false); DECL_GFX_PREF(Live, "browser.viewport.desktopWidth", DesktopViewportWidth, int32_t, 980); |