mozilla-inbound: changeset 166318:fc3d3be15c0ce1c237f4014379f5bfdbc93bc311

author	Michael Wu <mwu@mozilla.com>
	Fri, 31 Jan 2014 17:57:19 -0500
changeset 166318	fc3d3be15c0ce1c237f4014379f5bfdbc93bc311
parent 166317	977fb2494568352b1dd3f2cbde89b9cfd809a095
child 166319	5cf89fb575c4eb060d90d799502082706aae745d
push id	39177
push user	mwu@mozilla.com
push date	Fri, 31 Jan 2014 22:58:44 +0000
treeherder	mozilla-inbound@fc3d3be15c0c [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	jrmuizel
bugs	962667
milestone	29.0a1
first release with	nightly linux32 44ba69cacd7e / 29.0a1 / 20140203030203 / files nightly linux64 44ba69cacd7e / 29.0a1 / 20140203030203 / files nightly mac 44ba69cacd7e / 29.0a1 / 20140203030203 / files nightly win32 44ba69cacd7e / 29.0a1 / 20140203030203 / files nightly win64 44ba69cacd7e / 29.0a1 / 20140203030203 / files
last release without	nightly linux32 735a648bca0d / 29.0a1 / 20140131095418 / files nightly linux64 735a648bca0d / 29.0a1 / 20140131095418 / files nightly mac 735a648bca0d / 29.0a1 / 20140131095418 / files nightly win32 735a648bca0d / 29.0a1 / 20140131095418 / files nightly win64 735a648bca0d / 29.0a1 / 20140131095418 / files

--- a/image/src/imgFrame.cpp
+++ b/image/src/imgFrame.cpp
@@ -286,17 +286,16 @@ nsresult imgFrame::Optimize()
       mOptSurface = mWinSurface;
     }
   }
 #endif
 
 #ifdef XP_MACOSX
   if (mQuartzSurface) {
     mQuartzSurface->Flush();
-    mOptSurface = mQuartzSurface;
   }
 #endif
 
   if (mOptSurface == nullptr)
     mOptSurface = gfxPlatform::GetPlatform()->OptimizeImage(mImageSurface, mFormat);
 
   if (mOptSurface) {
     mImageSurface = nullptr;