Make OMTC changes not effect desktop

gfx/layers/opengl/LayerManagerOGL.cpp

@@ -782,7 +782,7 @@ LayerManagerOGL::Render()
 
   mGLContext->fEnable(LOCAL_GL_SCISSOR_TEST);
 
-  mGLContext->fClearColor(1.0, 1.0, 1.0, 0.0);
+  mGLContext->fClearColor(0.0, 0.0, 0.0, 0.0);
   mGLContext->fClear(LOCAL_GL_COLOR_BUFFER_BIT | LOCAL_GL_DEPTH_BUFFER_BIT);
 
   // Allow widget to render a custom background.

layout/base/FrameLayerBuilder.cpp

@@ -872,7 +872,7 @@ ContainerState::CreateOrRecycleThebesLayer(nsIFrame* aActiveScrolledRoot)
   layer->SetTransform(gfx3DMatrix::From2D(matrix));
 
    // FIXME: Temporary workaround for bug 681192 and bug 724786. Uncomment this code before review!
-#if 0
+#ifndef MOZ_JAVA_COMPOSITOR
   // Calculate exact position of the top-left of the active scrolled root.
   // This might not be 0,0 due to the snapping in ScaleToNearestPixels.
   gfxPoint activeScrolledRootTopLeft = scaledOffset - matrix.GetTranslation();

widget/android/nsWindow.cpp

@@ -921,8 +921,14 @@ nsWindow::OnGlobalAndroidEvent(AndroidGeckoEvent *ae)
             nsTArray<nsIntPoint> points = ae->Points();
             NS_ASSERTION(points.Length() != 3, "Size changed does not have enough coordinates");
 
+#ifdef MOZ_JAVA_COMPOSITOR
             int nw = points[1].x;
             int nh = points[1].y;
+#else
+            int nw = points[0].x;
+            int nh = points[0].y;
+#endif
+
 
             if (ae->Type() == AndroidGeckoEvent::FORCED_RESIZE || nw != gAndroidBounds.width ||
                 nh != gAndroidBounds.height) {