Uncomment TransformLayerUserData and move it into Layers to fix build bustage

gfx/layers/Layers.h

@@ -1345,6 +1345,17 @@ protected:
   bool mDirty;
 };
 
+#ifdef MOZ_WIDGET_ANDROID
+class TransformLayerUserData : public LayerUserData {
+public:
+    gfx3DMatrix matrix;
+
+    TransformLayerUserData(gfx3DMatrix& aMatrix) : matrix(aMatrix) {}
+    virtual ~TransformLayerUserData() {}
+};
+
+#endif
+
 }
 }
 

gfx/layers/ipc/CompositorParent.cpp

@@ -186,14 +186,12 @@ CompositorParent::Composite()
   //layer->AsShadowLayer()->SetShadowTransform(worldTransform);
 #endif
 
-#if 0
 #ifdef MOZ_WIDGET_ANDROID
   // Hang the transform of the root layer off the layer manager.
   gfx3DMatrix transform = layer->GetTransform();
-  transform *= worldTransform;
+  transform *= v;
   TransformLayerUserData* transformUserData = new TransformLayerUserData(transform);
   mLayerManager->SetUserData(nsGkAtoms::transform, transformUserData);
-#endif
 #endif
 
   mLayerManager->EndEmptyTransaction();

widget/android/AndroidJavaWrappers.cpp

@@ -694,15 +694,11 @@ AndroidGeckoGLLayerClient::Init(jobject jobj)
 void
 AndroidLayerRendererFrame::Init(jobject jobj)
 {
-#if 0
     if (!isNull()) {
         Dispose();
     }
 
     wrapped_obj = GetJNIForThread()->NewGlobalRef(jobj);
-#else
-    wrapped_obj = jobj;
-#endif
 }
 
 void

widget/android/nsWindow.h

@@ -260,12 +260,4 @@ private:
 #endif
 };
 
-class TransformLayerUserData : public mozilla::layers::LayerUserData {
-public:
-    gfx3DMatrix matrix;
-
-    TransformLayerUserData(gfx3DMatrix& aMatrix) : matrix(aMatrix) {}
-    virtual ~TransformLayerUserData() {}
-};
-
 #endif /* NSWINDOW_H_ */