Fix busted build.
authorAli Juma <ajuma@mozilla.com>
Fri, 10 Feb 2012 10:40:57 -0500
changeset 92428 2983e4b0c419d9552fc942ec145a33b06cefeb1e
parent 92427 068db2c36aae7da7b9d90d29390116cd7cd076d1
child 92429 295fbbce99f057ba5b207025a90a76c163b72d25
push id886
push userlsblakk@mozilla.com
push dateMon, 04 Jun 2012 19:57:52 +0000
treeherdermozilla-beta@bbd8d5efd6d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone13.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
Fix busted build.
gfx/layers/ipc/CompositorParent.cpp
widget/android/AndroidJavaWrappers.cpp
--- a/gfx/layers/ipc/CompositorParent.cpp
+++ b/gfx/layers/ipc/CompositorParent.cpp
@@ -177,23 +177,25 @@ CompositorParent::Composite()
   worldTransform.Scale(mXScale, mYScale, 1.0f);
 #ifdef MOZ_WIDGET_ANDROID
   Layer* layer = GetPrimaryScrollableLayer();
 #else
   Layer* layer = mLayerManager->GetRoot();
 #endif
   layer->AsShadowLayer()->SetShadowTransform(worldTransform);
 
+#if 0
 #ifdef MOZ_WIDGET_ANDROID
   // Hang the transform of the root layer off the layer manager.
   gfx3DMatrix transform = layer->GetTransform();
   transform *= worldTransform;
   TransformLayerUserData* transformUserData = new TransformLayerUserData(transform);
   mLayerManager->SetUserData(nsGkAtoms::transform, transformUserData);
 #endif
+#endif
 
   mLayerManager->EndEmptyTransaction();
   mLastCompose = mozilla::TimeStamp::Now();
 }
 
 #ifdef MOZ_WIDGET_ANDROID
 // Do a breadth-first search to find the first layer in the tree with a
 // displayport set.
--- a/widget/android/AndroidJavaWrappers.cpp
+++ b/widget/android/AndroidJavaWrappers.cpp
@@ -689,21 +689,25 @@ AndroidGeckoGLLayerClient::Init(jobject 
 
     // Register the view transform getter.
     AndroidBridge::Bridge()->SetViewTransformGetter(mViewTransformGetter);
 }
 
 void
 AndroidLayerRendererFrame::Init(jobject jobj)
 {
+#if 0
     if (!isNull()) {
         Dispose();
     }
 
     wrapped_obj = GetJNIForThread()->NewGlobalRef(jobj);
+#else
+    wrapped_obj = jobj;
+#endif
 }
 
 void
 AndroidLayerRendererFrame::Dispose()
 {
     if (isNull()) {
         return;
     }