Backed out changeset f9a070327df8. r=orange
authorMatt Woodrow <mwoodrow@mozilla.com>
Mon, 23 May 2011 12:18:46 +1200
changeset 69890 5373d5d7e0f1f5512208b1b4285db817dca6d978
parent 69889 f9a070327df82649462232cfebcaf35203c20167
child 69891 6c3b228838e5c67972fb350e5f877aff91bfb308
push id20139
push usermwoodrow@mozilla.com
push dateMon, 23 May 2011 00:19:56 +0000
treeherdermozilla-central@5373d5d7e0f1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersorange
milestone6.0a1
backs outf9a070327df82649462232cfebcaf35203c20167
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
Backed out changeset f9a070327df8. r=orange
widget/src/xpwidgets/nsBaseWidget.cpp
--- a/widget/src/xpwidgets/nsBaseWidget.cpp
+++ b/widget/src/xpwidgets/nsBaseWidget.cpp
@@ -777,17 +777,17 @@ nsBaseWidget::AutoUseBasicLayerManager::
 
 PRBool
 nsBaseWidget::GetShouldAccelerate()
 {
   nsCOMPtr<nsIPrefBranch2> prefs = do_GetService(NS_PREFSERVICE_CONTRACTID);
 
   PRBool disableAcceleration = PR_FALSE;
   PRBool forceAcceleration = PR_FALSE;
-#if defined(XP_WIN) || defined(ANDROID) || (MOZ_PLATFORM_MAEMO > 5) || (!defined(MOZ_PLATFORM_MAEMO) && defined(MOZ_X11))
+#if defined(XP_WIN) || defined(ANDROID) || (MOZ_PLATFORM_MAEMO > 5)
   PRBool accelerateByDefault = PR_TRUE;
 #elif defined(XP_MACOSX)
 /* quickdraw plugins don't work with OpenGL so we need to avoid OpenGL when we want to support
  * them. e.g. 10.5 */
 # if defined(NP_NO_QUICKDRAW)
   PRBool accelerateByDefault = PR_TRUE;
 
   // 10.6.2 and lower have a bug involving textures and pixel buffer objects