mozilla-central: changeset 69889:f9a070327df82649462232cfebcaf35203c20167

☠☠ backed out by 5373d5d7e0f1 ☠ ☠
author	Matt Woodrow <mwoodrow@mozilla.com>
	Mon, 23 May 2011 11:05:25 +1200
changeset 69889	f9a070327df82649462232cfebcaf35203c20167
parent 69888	4b0b0441b94950f01099d250e0b561cadec76924
child 69890	5373d5d7e0f1f5512208b1b4285db817dca6d978
push id	20138
push user	mwoodrow@mozilla.com
push date	Sun, 22 May 2011 23:16:19 +0000
treeherder	mozilla-central@f9a070327df8 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	joe
bugs	594876
milestone	6.0a1
first release with	nightly linux32 11d04991cdd0 / 6.0a1 / 20110523030619 / files nightly linux64 11d04991cdd0 / 6.0a1 / 20110523030619 / files nightly mac 11d04991cdd0 / 6.0a1 / 20110523030619 / files nightly win32 11d04991cdd0 / 6.0a1 / 20110523030619 / files nightly win64 0f9347d40121 / 6.0a1 / 20110523030219 / files
last release without	nightly linux32 52f72d71dc59 / 6.0a1 / 20110522030613 / files nightly linux64 52f72d71dc59 / 6.0a1 / 20110522030613 / files nightly mac 52f72d71dc59 / 6.0a1 / 20110522030613 / files nightly win32 52f72d71dc59 / 6.0a1 / 20110522030613 / files nightly win64 107bbdaf84c0 / 6.0a1 / 20110522030217 / files

--- 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)
+#if defined(XP_WIN) || defined(ANDROID) || (MOZ_PLATFORM_MAEMO > 5) || (!defined(MOZ_PLATFORM_MAEMO) && defined(MOZ_X11))
   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