From bbd35fc8b8488ca08ae79460c65ba4c51c476814 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Wed, 1 Apr 2015 00:27:00 -0400 Subject: [PATCH] Bug 1148376 - Only force-enable layers acceleration on Gonk. r=jmuizelaar --- b2g/app/b2g.js | 5 ----- modules/libpref/init/all.js | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/b2g/app/b2g.js b/b2g/app/b2g.js index 5840b2b2a6eb..0998853f9b15 100644 --- a/b2g/app/b2g.js +++ b/b2g/app/b2g.js @@ -421,11 +421,6 @@ pref("security.apps.certified.CSP.default", "default-src *; script-src 'self'; o // Default Content Security Policy to apply to trusted apps. pref("security.apps.trusted.CSP.default", "default-src *; object-src 'none'; frame-src 'none'"); -// Temporarily force-enable GL compositing. This is default-disabled -// deep within the bowels of the widgetry system. Remove me when GL -// compositing isn't default disabled in widget/android. -pref("layers.acceleration.force-enabled", true); - // handle links targeting new windows // 1=current window/tab, 2=new window, 3=new tab in most recent window pref("browser.link.open_newwindow", 3); diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index 4837a40987a3..4f6f0a809506 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -3967,6 +3967,9 @@ pref("layers.bench.enabled", false); #ifdef ANDROID // bug 838603 -- on Android, accidentally blacklisting OpenGL layers // means a startup crash for everyone. +// Temporarily force-enable GL compositing. This is default-disabled +// deep within the bowels of the widgetry system. Remove me when GL +// compositing isn't default disabled in widget/android. pref("layers.acceleration.force-enabled", true); #else pref("layers.acceleration.force-enabled", false);