Bug 1148376 - Only force-enable layers acceleration on Gonk. r=jmuizelaar

This commit is contained in:
Alexandre Lissy 2015-04-01 00:27:00 -04:00
parent 19543b2301
commit bbd35fc8b8
2 changed files with 3 additions and 5 deletions

View File

@ -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. // Default Content Security Policy to apply to trusted apps.
pref("security.apps.trusted.CSP.default", "default-src *; object-src 'none'; frame-src 'none'"); 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 // handle links targeting new windows
// 1=current window/tab, 2=new window, 3=new tab in most recent window // 1=current window/tab, 2=new window, 3=new tab in most recent window
pref("browser.link.open_newwindow", 3); pref("browser.link.open_newwindow", 3);

View File

@ -3967,6 +3967,9 @@ pref("layers.bench.enabled", false);
#ifdef ANDROID #ifdef ANDROID
// bug 838603 -- on Android, accidentally blacklisting OpenGL layers // bug 838603 -- on Android, accidentally blacklisting OpenGL layers
// means a startup crash for everyone. // 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); pref("layers.acceleration.force-enabled", true);
#else #else
pref("layers.acceleration.force-enabled", false); pref("layers.acceleration.force-enabled", false);