remove dead code

gfx/layers/ipc/CompositorParent.cpp

@@ -181,9 +181,6 @@ CompositorParent::Composite()
   printf_stderr("Correcting for position fixed %i, %i\n", -mScrollOffset.x, -mScrollOffset.y);
   ViewTransform v(mScrollOffset, mXScale, mYScale);
   TransformShadowTree(layer, v);
-#else
-  Layer* layer = mLayerManager->GetRoot();
-  //layer->AsShadowLayer()->SetShadowTransform(worldTransform);
 #endif
 
   mLayerManager->EndEmptyTransaction();
@@ -330,33 +327,6 @@ CompositorParent::AsyncRender()
     return;
   }
 
-/*
-  ContainerLayer* container = root->AsContainerLayer();
-  if (!container)
-    return;
-
-  FrameMetrics metrics = container->GetFrameMetrics();
-    printf("FrameMetrics: mViewPort: X: %d, Y: %d, Width: %d, Height: %d ",
-            metrics.mViewport.X(), metrics.mViewport.Y(), metrics.mViewport.Width(),
-            metrics.mViewport.Height());
-    printf("mDisplayPort: X: %d, Y: %d, Width: %d, Height: %d ",
-            metrics.mDisplayPort.X(), metrics.mDisplayPort.Y(), metrics.mDisplayPort.Width(),
-            metrics.mDisplayPort.Height());
-    printf("mContentSize: width: %d, height: %d ", metrics.mContentSize.width,
-           metrics. mContentSize.height);
-    printf("mViewPortScrollOffset: x: %d, y: %d\n",
-            metrics.mViewportScrollOffset.x,
-            metrics.mViewportScrollOffset.y);
-    // Modify framemetrics here, just as a test.
-  metrics.mScrollId = FrameMetrics::ROOT_SCROLL_ID;
-  container->SetFrameMetrics(metrics);
-*/
-
-#if 0
-  ViewTransform transform;
-  TransformShadowTree(root, transform);
-#endif
-
   ScheduleComposition();
 }
 

gfx/layers/ipc/CompositorParent.h

@@ -104,16 +104,16 @@ public:
   void SchedulePauseOnCompositorThread(::base::Thread &aCompositorThread);
   void ScheduleResumeOnCompositorThread(::base::Thread &aCompositorThread);
 
-  void PauseComposition();
-  void ResumeComposition();
-
 protected:
   virtual PLayersParent* AllocPLayers(const LayersBackend &backendType);
   virtual bool DeallocPLayers(PLayersParent* aLayers);
 
 private:
-  void ScheduleComposition();
+  void PauseComposition();
+  void ResumeComposition();
+
   void Composite();
+  void ScheduleComposition();
   void TransformShadowTree(Layer* aLayer, const ViewTransform& aTransform,
                            float aTempScaleDiffX = 1.0,
                            float aTempScaleDiffY = 1.0);

widget/android/AndroidBridge.cpp

@@ -1095,32 +1095,6 @@ AndroidBridge::ProvideEGLSurface()
     return sController.ProvideEGLSurface();
 }
 
-void
-AndroidBridge::PerformPreRenderHook()
-{
-    JNIEnv *env = GetJNIForThread();
-    if (!env) {
-        return;
-    }
-
-    AutoLocalJNIFrame jniFrame(env, 3);
-
-    // TODO
-}
-
-void
-AndroidBridge::PerformPostRenderHook()
-{
-    JNIEnv *env = GetJNIForThread();
-    if (!env) {
-        return;
-    }
-
-    AutoLocalJNIFrame jniFrame(env, 3);
-
-    // TODO
-}
-
 bool
 AndroidBridge::GetStaticIntField(const char *className, const char *fieldName, PRInt32* aInt)
 {

widget/android/AndroidBridge.h

@@ -332,8 +332,6 @@ public:
     // Switch Java to composite with the Gecko Compositor thread
     void RegisterCompositor();
     EGLSurface ProvideEGLSurface();
-    void PerformPreRenderHook();
-    void PerformPostRenderHook();
 
     bool GetStaticStringField(const char *classID, const char *field, nsAString &result);
 
@@ -537,8 +535,6 @@ protected:
     jclass jFlexSurfaceView;
 
     jmethodID jRegisterCompositorMethod;
-    jmethodID jPerformPreRenderHookMethod;
-    jmethodID jPerformPostRenderHookMethod;
 
     // calls we've dlopened from libjnigraphics.so
     int (* AndroidBitmap_getInfo)(JNIEnv *env, jobject bitmap, void *info);