corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 803299 - Enable 32-bit colour on Android. r=kats

Browse Source
This commit is contained in:
Chris Lord
2013-05-29 15:25:40 +01:00
parent 5e83134e5d
commit 50319e6e66
9 changed files with 122 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
widget/android/AndroidBridge.cpp
View File

@@ -131,6 +131,7 @@ AndroidBridge::Init(JNIEnv *jEnv,
jAlertsProgressListener_OnProgress = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "alertsProgressListener_OnProgress", "(Ljava/lang/String;JJLjava/lang/String;)V");
jCloseNotification = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "closeNotification", "(Ljava/lang/String;)V");
jGetDpi = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "getDpi", "()I");
jGetScreenDepth = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "getScreenDepth", "()I");
jSetFullScreen = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "setFullScreen", "(Z)V");
jShowInputMethodPicker = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "showInputMethodPicker", "()V");
jNotifyDefaultPrevented = (jmethodID) jEnv->GetStaticMethodID(jGeckoAppShellClass, "notifyDefaultPrevented", "(Z)V");
@@ -772,6 +773,29 @@ AndroidBridge::GetDPI()
return sDPI;
}
int
AndroidBridge::GetScreenDepth()
{
static int sDepth = 0;
if (sDepth)
return sDepth;
ALOG_BRIDGE("AndroidBridge::GetScreenDepth");
const int DEFAULT_DEPTH = 16;
JNIEnv *env = GetJNIEnv();
if (!env)
return DEFAULT_DEPTH;
AutoLocalJNIFrame jniFrame(env);
sDepth = (int)env->CallStaticIntMethod(mGeckoAppShellClass, jGetScreenDepth);
if (jniFrame.CheckForException()) {
sDepth = 0;
return DEFAULT_DEPTH;
}
return sDepth;
}
void
AndroidBridge::ShowFilePickerForExtensions(nsAString& aFilePath, const nsAString& aExtensions)
{
@@ -2654,13 +2678,17 @@ nsresult AndroidBridge::CaptureThumbnail(nsIDOMWindow *window, int32_t bufW, int
nsPresContext::CSSPixelsToAppUnits(srcW / scale),
nsPresContext::CSSPixelsToAppUnits(srcH / scale));
uint32_t stride = bufW * 2 /* 16 bpp */;
bool is24bit = (GetScreenDepth() == 24);
uint32_t stride = bufW * (is24bit ? 4 : 2);
void* data = env->GetDirectBufferAddress(buffer);
if (!data)
return NS_ERROR_FAILURE;
nsRefPtr<gfxImageSurface> surf = new gfxImageSurface(static_cast<unsigned char*>(data), nsIntSize(bufW, bufH), stride, gfxASurface::ImageFormatRGB16_565);
nsRefPtr<gfxImageSurface> surf =
new gfxImageSurface(static_cast<unsigned char*>(data), nsIntSize(bufW, bufH), stride,
is24bit ? gfxASurface::ImageFormatRGB24 :
gfxASurface::ImageFormatRGB16_565);
if (surf->CairoStatus() != 0) {
ALOG_BRIDGE("Error creating gfxImageSurface");
return NS_ERROR_FAILURE;