Bug 820556 - Kill mUsesDefaultProgram which is always true. r=snorp

mozilla-spidermonkey · Dec 11, 2012 · 3a9edbd · 3a9edbd
1 parent 7bf4c78
commit 3a9edbd
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/mobile/android/base/gfx/Layer.java b/mobile/android/base/gfx/Layer.java
@@ -22,7 +22,6 @@ public abstract class Layer {
 
     protected Rect mPosition;
     protected float mResolution;
-    protected boolean mUsesDefaultProgram = true;
 
     public Layer() {
         this(null);
@@ -133,10 +132,6 @@ public void setResolution(float newResolution) {
         mNewResolution = newResolution;
     }
 
-    public boolean usesDefaultProgram() {
-        return mUsesDefaultProgram;
-    }
-
     /**
      * Subclasses may override this method to perform custom layer updates. This will be called
      * with the transaction lock held. Subclass implementations of this method must call the

diff --git a/mobile/android/base/gfx/LayerRenderer.java b/mobile/android/base/gfx/LayerRenderer.java
@@ -576,13 +576,7 @@ public void drawForeground() {
             /* Draw any extra layers that were added (likely plugins) */
             if (mExtraLayers.size() > 0) {
                 for (Layer layer : mExtraLayers) {
-                    if (!layer.usesDefaultProgram())
-                        deactivateDefaultProgram();
-
                     layer.draw(mPageContext);
-
-                    if (!layer.usesDefaultProgram())
-                        activateDefaultProgram();
                 }
             }