Revert "Add a way to override Xfermode"
Feature no longer needed.
bug:18448377
This reverts commit c495e611b9fa1fc6b47a647c714bbbf94dd63461.
Change-Id: Ia3e37f06953ffd81ca3fac367ee790d26b1b5d29
diff --git a/libs/hwui/DisplayListRenderer.h b/libs/hwui/DisplayListRenderer.h
index c8a97424..6646da7 100644
--- a/libs/hwui/DisplayListRenderer.h
+++ b/libs/hwui/DisplayListRenderer.h
@@ -23,7 +23,6 @@
#include <SkPath.h>
#include <SkRegion.h>
#include <SkTLazy.h>
-#include <SkPorterDuff.h>
#include <cutils/compiler.h>
#include "CanvasState.h"
@@ -190,14 +189,6 @@
virtual void onSnapshotRestored(const Snapshot& removed, const Snapshot& restored) { }
virtual GLuint onGetTargetFbo() const { return -1; }
- void setOverrideXfermode(int xfermode) {
- if (xfermode != -1) {
- SkPorterDuff::Mode porterDuffMode = static_cast<SkPorterDuff::Mode>(xfermode);
- xfermode = SkPorterDuff::ToXfermodeMode(porterDuffMode);
- }
- mOverrideXfermode = xfermode;
- };
-
private:
CanvasState mState;
@@ -262,16 +253,10 @@
// If there is a draw filter apply it here and store the modified paint
// so that we don't need to modify the paint every time we access it.
- SkTLazy<SkPaint> localPaint;
+ SkTLazy<SkPaint> filteredPaint;
if (mDrawFilter.get()) {
- paint = localPaint.set(*paint);
- mDrawFilter->filter(localPaint.get(), SkDrawFilter::kPaint_Type);
- }
-
- if (mOverrideXfermode != -1) {
- SkPaint* overriddenPaint = localPaint.set(*paint);
- overriddenPaint->setXfermodeMode(static_cast<SkXfermode::Mode>(mOverrideXfermode));
- paint = overriddenPaint;
+ paint = filteredPaint.init();
+ mDrawFilter->filter(filteredPaint.get(), SkDrawFilter::kPaint_Type);
}
// compute the hash key for the paint and check the cache.
@@ -349,9 +334,6 @@
DeferredBarrierType mDeferredBarrierType;
bool mHighContrastText;
- // -1 if unset, or SkXfermode::Mode value if set
- int mOverrideXfermode;
-
int mRestoreSaveCount;
SkAutoTUnref<SkDrawFilter> mDrawFilter;