merge mc to kiwifox
authorAli Juma <ajuma@mozilla.com>
Mon, 16 Jan 2012 10:06:34 -0500
changeset 89033 5e2da9e110c9c6bd908805cf26854ae9285061dc
parent 89032 723b97cb9362ba85be48fdfc25949cfd9fb8b445 (current diff)
parent 89031 88c617c283b4fa8e752ef063b87a07d4eb9c273b (diff)
child 89034 655e933a80b24bb8c70b8b40916fef22b0e093cc
push id22242
push userkgupta@mozilla.com
push dateWed, 14 Mar 2012 15:19:09 +0000
treeherdermozilla-central@936ef50fa498 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone12.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
merge mc to kiwifox
modules/libpref/src/init/all.js
widget/android/nsWindow.cpp
--- a/widget/android/nsWindow.cpp
+++ b/widget/android/nsWindow.cpp
@@ -86,29 +86,29 @@ using namespace mozilla::widget;
 NS_IMPL_ISUPPORTS_INHERITED0(nsWindow, nsBaseWidget)
 
 // The dimensions of the current android view
 static gfxIntSize gAndroidBounds = gfxIntSize(0, 0);
 static gfxIntSize gAndroidTileSize = gfxIntSize(0, 0);
 static gfxIntSize gAndroidScreenBounds;
 
 #ifdef ACCESSIBILITY
-bool nsWindow::sAccessibilityEnabled = false;
+bool nsWindow::sAccessibilityEnabled = true;
 #endif
 
 #ifdef MOZ_JAVA_COMPOSITOR
 #include "mozilla/Mutex.h"
 #include "nsThreadUtils.h"
 #include "AndroidDirectTexture.h"
 
 static AndroidDirectTexture* sDirectTexture = new AndroidDirectTexture(2048, 2048,
         AndroidGraphicBuffer::UsageSoftwareWrite | AndroidGraphicBuffer::UsageTexture,
         gfxASurface::ImageFormatRGB16_565);
 
-static bool sHasDirectTexture = true;
+static bool sHasDirectTexture = false;
 
 #endif
 
 
 class ContentCreationNotifier;
 static nsCOMPtr<ContentCreationNotifier> gContentCreationNotifier;
 // A helper class to send updates when content processes
 // are created. Currently an update for the screen size is sent.