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

Back out 083d36bafbc8 (bug 763166) on suspicion of android talos redness. r=me

Browse Source
This commit is contained in:
Kartikaya Gupta
2012-07-13 17:34:58 -04:00
parent bb937ea1ae
commit d2eb819965
4 changed files with 18 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
widget/android/AndroidJavaWrappers.cpp
View File

@@ -663,7 +663,7 @@ void
AndroidGeckoLayerClient::SetFirstPaintViewport(const nsIntPoint& aOffset, float aZoom, const nsIntRect& aPageRect, const gfx::Rect& aCssPageRect)
{
NS_ASSERTION(!isNull(), "SetFirstPaintViewport called on null layer client!");
JNIEnv *env = AndroidBridge::GetJNIForCompositorThread();
JNIEnv *env = GetJNIForThread(); // this is called on the compositor thread
if (!env)
return;
@@ -677,7 +677,7 @@ void
AndroidGeckoLayerClient::SetPageRect(const gfx::Rect& aCssPageRect)
{
NS_ASSERTION(!isNull(), "SetPageRect called on null layer client!");
JNIEnv *env = AndroidBridge::GetJNIForCompositorThread();
JNIEnv *env = GetJNIForThread(); // this is called on the compositor thread
if (!env)
return;
@@ -691,7 +691,7 @@ AndroidGeckoLayerClient::SyncViewportInfo(const nsIntRect& aDisplayPort, float a
nsIntPoint& aScrollOffset, float& aScaleX, float& aScaleY)
{
NS_ASSERTION(!isNull(), "SyncViewportInfo called on null layer client!");
JNIEnv *env = AndroidBridge::GetJNIForCompositorThread();
JNIEnv *env = GetJNIForThread(); // this is called on the compositor thread
if (!env)
return;