Bug 996226 - Disable volatile images everywhere but Android. r=jrmuizel, a=1.4+
authorMichael Wu <mwu@mozilla.com>
Mon, 21 Apr 2014 15:50:54 -0700
changeset 193039 dbe3cb1e34fe114b6f1b3ebf4e515cad677f259f
parent 193038 9a3171e021cc880d34a01def18e73c5aea6130e8
child 193040 2a7332cb135874d7aac46eb67e83685800c5837e
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjrmuizel, 1
bugs996226
milestone30.0a2
Bug 996226 - Disable volatile images everywhere but Android. r=jrmuizel, a=1.4+
image/src/imgFrame.cpp
--- a/image/src/imgFrame.cpp
+++ b/image/src/imgFrame.cpp
@@ -841,17 +841,20 @@ void imgFrame::ApplyDirtToSurfaces()
 
     mDirty = false;
   }
 }
 
 void imgFrame::SetDiscardable()
 {
   MOZ_ASSERT(mLockCount, "Expected to be locked when SetDiscardable is called");
+  // Disabled elsewhere due to the cost of calling GetSourceSurfaceForSurface.
+#ifdef MOZ_WIDGET_ANDROID
   mDiscardable = true;
+#endif
 }
 
 int32_t imgFrame::GetRawTimeout() const
 {
   return mTimeout;
 }
 
 void imgFrame::SetRawTimeout(int32_t aTimeout)