Merge m-c to a CLOSED TREE b-i

This commit is contained in:
Phil Ringnalda 2014-05-26 23:36:20 -07:00
commit 1bb060bd4f
2 changed files with 3 additions and 4 deletions

View File

@ -109,7 +109,6 @@ pref("mozilla.widget.use-buffer-pixmap", true);
pref("mozilla.widget.disable-native-theme", true); pref("mozilla.widget.disable-native-theme", true);
pref("layout.reflow.synthMouseMove", false); pref("layout.reflow.synthMouseMove", false);
pref("layers.enable-tiles", true); pref("layers.enable-tiles", true);
pref("layers.low-precision-buffer", true);
/* /*
Cross Process Mutex is not supported on Mac OS X so progressive Cross Process Mutex is not supported on Mac OS X so progressive
paint can not be enabled for B2G on Mac OS X desktop paint can not be enabled for B2G on Mac OS X desktop
@ -117,7 +116,7 @@ pref("layers.low-precision-buffer", true);
#ifdef MOZ_WIDGET_COCOA #ifdef MOZ_WIDGET_COCOA
pref("layers.progressive-paint", false); pref("layers.progressive-paint", false);
#else #else
pref("layers.progressive-paint", true); pref("layers.progressive-paint", false);
#endif #endif
/* download manager (don't show the window or alert) */ /* download manager (don't show the window or alert) */

View File

@ -3,4 +3,4 @@ skip-if(B2G&&browserIsRemote) != textbox-multiline-resize.xul textbox-multiline-
skip-if(B2G&&browserIsRemote) == popup-explicit-size.xul popup-explicit-size-ref.xul skip-if(B2G&&browserIsRemote) == popup-explicit-size.xul popup-explicit-size-ref.xul
random-if(Android) skip-if(B2G&&browserIsRemote) == image-size.xul image-size-ref.xul random-if(Android) skip-if(B2G&&browserIsRemote) == image-size.xul image-size-ref.xul
skip-if(B2G&&browserIsRemote) == image-scaling-min-height-1.xul image-scaling-min-height-1-ref.xul skip-if(B2G&&browserIsRemote) == image-scaling-min-height-1.xul image-scaling-min-height-1-ref.xul
== textbox-text-transform.xul textbox-text-transform-ref.xul skip-if(B2G&&browserIsRemote) == textbox-text-transform.xul textbox-text-transform-ref.xul