merge mc to kiwifox

This commit is contained in:
Ali Juma 2012-01-16 10:06:34 -05:00
commit c87786aba6

View File

@ -91,7 +91,7 @@ static gfxIntSize gAndroidTileSize = gfxIntSize(0, 0);
static gfxIntSize gAndroidScreenBounds; static gfxIntSize gAndroidScreenBounds;
#ifdef ACCESSIBILITY #ifdef ACCESSIBILITY
bool nsWindow::sAccessibilityEnabled = false; bool nsWindow::sAccessibilityEnabled = true;
#endif #endif
#ifdef MOZ_JAVA_COMPOSITOR #ifdef MOZ_JAVA_COMPOSITOR
@ -103,7 +103,7 @@ static AndroidDirectTexture* sDirectTexture = new AndroidDirectTexture(2048, 204
AndroidGraphicBuffer::UsageSoftwareWrite | AndroidGraphicBuffer::UsageTexture, AndroidGraphicBuffer::UsageSoftwareWrite | AndroidGraphicBuffer::UsageTexture,
gfxASurface::ImageFormatRGB16_565); gfxASurface::ImageFormatRGB16_565);
static bool sHasDirectTexture = true; static bool sHasDirectTexture = false;
#endif #endif