Bug 1178274 - Don't enable decode-only-on-draw if the APZ pref is true but e10s is disabled. r=dvander
authorKartikaya Gupta <kgupta@mozilla.com>
Tue, 30 Jun 2015 06:43:07 -0400
changeset 250658 e51ef562f1c590341afa9a3f540223abe165924c
parent 250657 6d72455a884ea50aab6fcec08b17e8589b006dd3
child 250659 22b3af8c20b2ff41091b73e19b3f3210b60891f8
push id61621
push userkgupta@mozilla.com
push dateTue, 30 Jun 2015 10:43:41 +0000
treeherdermozilla-inbound@e8ea2a9493da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdvander
bugs1178274
milestone42.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1178274 - Don't enable decode-only-on-draw if the APZ pref is true but e10s is disabled. r=dvander
image/ImageFactory.cpp
--- a/image/ImageFactory.cpp
+++ b/image/ImageFactory.cpp
@@ -45,22 +45,22 @@ ComputeImageFlags(ImageURL* uri, const n
 {
   nsresult rv;
 
   // We default to the static globals.
   bool isDiscardable = gfxPrefs::ImageMemDiscardable();
   bool doDecodeImmediately = gfxPrefs::ImageDecodeImmediatelyEnabled();
   bool doDownscaleDuringDecode = gfxPrefs::ImageDownscaleDuringDecodeEnabled();
 
-  // We use the compositor APZ pref here since we don't have a widget to test.
+  // We use the platform APZ value here since we don't have a widget to test.
   // It's safe since this is an optimization, and the only platform
   // ImageDecodeOnlyOnDraw is disabled on is B2G (where APZ is enabled in all
   // widgets anyway).
   bool doDecodeOnlyOnDraw = gfxPrefs::ImageDecodeOnlyOnDrawEnabled() &&
-                            gfxPrefs::AsyncPanZoomEnabledDoNotUseDirectly();
+                            gfxPlatform::AsyncPanZoomEnabled();
 
   // We want UI to be as snappy as possible and not to flicker. Disable
   // discarding and decode-only-on-draw for chrome URLS.
   bool isChrome = false;
   rv = uri->SchemeIs("chrome", &isChrome);
   if (NS_SUCCEEDED(rv) && isChrome) {
     isDiscardable = doDecodeOnlyOnDraw = false;
   }