Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev

core/java/android/view/GLES20Canvas.java

@@ -997,15 +997,4 @@ class GLES20Canvas extends HardwareCanvas {
             int indexOffset, int indexCount, Paint paint) {
         // TODO: Implement
     }
-
-    @Override
-    public void setOverrideXfermode(PorterDuff.Mode xfermode) {
-        int xfermodeValue = -1;
-        if (xfermode != null) {
-            xfermodeValue = xfermode.nativeInt;
-        }
-        nSetOverrideXfermode(mRenderer, xfermodeValue);
-    }
-
-    private static native void nSetOverrideXfermode(long renderer, int xfermode);
 }

core/jni/android_view_GLES20Canvas.cpp

@@ -172,12 +172,6 @@ static jint android_view_GLES20Canvas_getMaxTextureHeight(JNIEnv* env, jobject c
     return Caches::getInstance().maxTextureSize;
 }
 
-static void android_view_GLES20Canvas_setOverrideXfermode(JNIEnv* env, jobject clazz,
-        jlong rendererPtr, int xfermode) {
-    DisplayListRenderer* renderer = reinterpret_cast<DisplayListRenderer*>(rendererPtr);
-    renderer->setOverrideXfermode(xfermode);
-}
-
 // ----------------------------------------------------------------------------
 // State
 // ----------------------------------------------------------------------------
@@ -970,8 +964,6 @@ static JNINativeMethod gMethods[] = {
     { "nGetMaximumTextureWidth",  "()I",       (void*) android_view_GLES20Canvas_getMaxTextureWidth },
     { "nGetMaximumTextureHeight", "()I",       (void*) android_view_GLES20Canvas_getMaxTextureHeight },
 
-    { "nSetOverrideXfermode", "(JI)V",       (void*) android_view_GLES20Canvas_setOverrideXfermode },
-
 #endif
 };
 

graphics/java/android/graphics/Canvas.java

@@ -249,15 +249,6 @@ public class Canvas {
     /** @hide */
     public void insertInorderBarrier() {}
 
-    /**
-     * Set a transfer mode that overrides any transfer modes
-     * in paints used for drawing. Pass null to disable this
-     * override. Only implemented in GLES20Canvas.
-     *
-     * @hide
-     */
-    public void setOverrideXfermode(@Nullable PorterDuff.Mode xfermode) {}
-
     /**
      * Return true if the device that the current layer draws into is opaque
      * (i.e. does not support per-pixel alpha).

libs/hwui/DisplayListRenderer.cpp

@@ -39,7 +39,6 @@ DisplayListRenderer::DisplayListRenderer()
     , mTranslateY(0.0f)
     , mDeferredBarrierType(kBarrier_None)
     , mHighContrastText(false)
-    , mOverrideXfermode(-1)
     , mRestoreSaveCount(-1) {
 }
 

libs/hwui/DisplayListRenderer.h

@@ -20,7 +20,6 @@
 #include <SkMatrix.h>
 #include <SkPaint.h>
 #include <SkPath.h>
-#include <SkPorterDuff.h>
 #include <cutils/compiler.h>
 
 #include "DisplayListLogBuffer.h"
@@ -162,15 +161,6 @@ public:
     void setHighContrastText(bool highContrastText) {
         mHighContrastText = highContrastText;
     }
-
-    void setOverrideXfermode(int xfermode) {
-        if (xfermode != -1) {
-            SkPorterDuff::Mode porterDuffMode = static_cast<SkPorterDuff::Mode>(xfermode);
-            xfermode = SkPorterDuff::ToXfermodeMode(porterDuffMode);
-        }
-        mOverrideXfermode = xfermode;
-    };
-
 private:
     enum DeferredBarrierType {
         kBarrier_None,
@@ -230,26 +220,18 @@ private:
     inline const SkPaint* refPaint(const SkPaint* paint) {
         if (!paint) return NULL;
 
-        const SkPaint* paintCopy;
+        const SkPaint* paintCopy = mPaintMap.valueFor(paint);
-
+        if (paintCopy == NULL
-        if (mOverrideXfermode != -1) {
+                || paintCopy->getGenerationID() != paint->getGenerationID()
-            SkPaint* overriddenPaint = copyPaint(paint);
+                // We can't compare shader pointers because that will always
-            overriddenPaint->setXfermodeMode(static_cast<SkXfermode::Mode>(mOverrideXfermode));
+                // change as we do partial copying via wrapping. However, if the
-            paintCopy = overriddenPaint;
+                // shader changes the paint generationID will have changed and
-        } else {
+                // so we don't hit this comparison anyway
-            paintCopy = mPaintMap.valueFor(paint);
+                || !(paint->getShader() && paintCopy->getShader()
-            if (paintCopy == NULL
+                        && paint->getShader()->getGenerationID() == paintCopy->getShader()->getGenerationID())) {
-                    || paintCopy->getGenerationID() != paint->getGenerationID()
+            paintCopy = copyPaint(paint);
-                    // We can't compare shader pointers because that will always
+            // replaceValueFor() performs an add if the entry doesn't exist
-                    // change as we do partial copying via wrapping. However, if the
+            mPaintMap.replaceValueFor(paint, paintCopy);
-                    // shader changes the paint generationID will have changed and
-                    // so we don't hit this comparison anyway
-                    || !(paint->getShader() && paintCopy->getShader()
-                            && paint->getShader()->getGenerationID() == paintCopy->getShader()->getGenerationID())) {
-                paintCopy = copyPaint(paint);
-                // replaceValueFor() performs an add if the entry doesn't exist
-                mPaintMap.replaceValueFor(paint, paintCopy);
-            }
         }
 
         return paintCopy;
@@ -322,9 +304,6 @@ private:
     DeferredBarrierType mDeferredBarrierType;
     bool mHighContrastText;
 
-    // -1 if unset, or SkXfermode::Mode value if set
-    int mOverrideXfermode;
-
     int mRestoreSaveCount;
 
     friend class RenderNode;