Bug 1027365 - Activate ImageBridge by default when OMTC on. r=sotaro

This commit is contained in:
Nicolas Silva 2014-06-19 11:45:19 +02:00
parent b4f9af6703
commit 72ac06e54c
3 changed files with 7 additions and 17 deletions

View File

@ -290,12 +290,9 @@ pref("layers.offmainthreadcomposition.enabled", true);
pref("layers.offmainthreadcomposition.async-animations", true);
#ifndef MOZ_WIDGET_GONK
pref("dom.ipc.tabs.disabled", true);
pref("layers.async-video.enabled", false);
#else
pref("dom.ipc.tabs.disabled", false);
pref("layers.acceleration.disabled", false);
pref("layers.async-video.enabled", true);
pref("layers.async-video-oop.enabled",true);
pref("layers.async-pan-zoom.enabled", true);
pref("gfx.content.azure.backends", "cairo");
#endif

View File

@ -172,8 +172,8 @@ private:
DECL_GFX_PREF(Live, "layers.acceleration.draw-fps.print-histogram", FPSPrintHistogram, bool, false);
DECL_GFX_PREF(Live, "layers.acceleration.draw-fps.write-to-file", WriteFPSToFile, bool, false);
DECL_GFX_PREF(Once, "layers.acceleration.force-enabled", LayersAccelerationForceEnabled, bool, false);
DECL_GFX_PREF(Once, "layers.async-video.enabled", AsyncVideoEnabled, bool, false);
DECL_GFX_PREF(Once, "layers.async-video-oop.enabled", AsyncVideoOOPEnabled, bool, false);
DECL_GFX_PREF(Once, "layers.async-video.enabled", AsyncVideoEnabled, bool, true);
DECL_GFX_PREF(Once, "layers.async-video-oop.enabled", AsyncVideoOOPEnabled, bool, true);
DECL_GFX_PREF(Once, "layers.async-pan-zoom.enabled", AsyncPanZoomEnabled, bool, false);
DECL_GFX_PREF(Live, "layers.bench.enabled", LayersBenchEnabled, bool, false);
DECL_GFX_PREF(Once, "layers.bufferrotation.enabled", BufferRotationEnabled, bool, true);

View File

@ -3783,36 +3783,29 @@ pref("layers.offmainthreadcomposition.enabled", false);
// -1 -> default (match layout.frame_rate or 60 FPS)
// 0 -> full-tilt mode: Recomposite even if not transaction occured.
pref("layers.offmainthreadcomposition.frame-rate", -1);
#ifndef XP_WIN
// Asynchonous video compositing using the ImageBridge IPDL protocol.
// requires off-main-thread compositing.
pref("layers.async-video.enabled",false);
#endif
pref("layers.async-video.enabled", true);
pref("layers.async-video-oop.enabled",true);
#ifdef XP_WIN
pref("layers.offmainthreadcomposition.enabled", true);
pref("layers.async-video.enabled", true);
#endif
#ifdef MOZ_X11
// OMTC off by default on Linux, but if activated, use new textures and async-video.
pref("layers.async-video.enabled", true);
// XXX - see bug 1009616
pref("layers.async-video-oop.enabled", false);
#endif
#ifdef MOZ_WIDGET_QT
pref("layers.offmainthreadcomposition.enabled", true);
pref("layers.async-video.enabled",true);
#endif
#ifdef XP_MACOSX
pref("layers.offmainthreadcomposition.enabled", true);
pref("layers.async-video.enabled",true);
#endif
// ANDROID covers android and b2g
#ifdef ANDROID
pref("layers.offmainthreadcomposition.enabled", true);
pref("layers.async-video.enabled",true);
#endif
// same effect as layers.offmainthreadcomposition.enabled, but specifically for