diff options
author | 2016-01-27 13:08:33 -0800 | |
---|---|---|
committer | 2016-01-27 13:08:33 -0800 | |
commit | bbb6dc80fdfe6ff08cc1abb1a401bd958ced9602 (patch) | |
tree | 7df9509f48a0183588f808a163ae652be46d83b6 /src/effects/SkPixelXorXfermode.cpp | |
parent | 372d65cc6ee743944a9fb58a734b3f1eb253b015 (diff) |
kill SkValue
This is clearly not what we're going to do.
TBR=reed@google.com
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1643753002
Review URL: https://codereview.chromium.org/1643753002
Diffstat (limited to 'src/effects/SkPixelXorXfermode.cpp')
-rw-r--r-- | src/effects/SkPixelXorXfermode.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/effects/SkPixelXorXfermode.cpp b/src/effects/SkPixelXorXfermode.cpp index 5ea82e6309..e2ecb0e365 100644 --- a/src/effects/SkPixelXorXfermode.cpp +++ b/src/effects/SkPixelXorXfermode.cpp @@ -10,8 +10,6 @@ #include "SkReadBuffer.h" #include "SkWriteBuffer.h" #include "SkString.h" -#include "SkValue.h" -#include "SkValueKeys.h" // we always return an opaque color, 'cause I don't know what to do with // the alpha-component and still return a valid premultiplied color. @@ -66,8 +64,8 @@ static void add_pixelxor_code(GrGLSLFragmentBuilder* fragBuilder, SkString xorFuncName; // The xor function checks if the three passed in floats (f1, f2, f3) would - // have a bit in the log2(fPowerOf2Divisor)-th position if they were - // represented by an int. It then performs an xor of the 3 bits (using + // have a bit in the log2(fPowerOf2Divisor)-th position if they were + // represented by an int. It then performs an xor of the 3 bits (using // the property that serial xors can be treated as a sum of 0s & 1s mod 2). fragBuilder->emitFunction(kFloat_GrSLType, "xor", @@ -298,7 +296,7 @@ private: void onSetData(const GrGLSLProgramDataManager& pdman, const GrXferProcessor& processor) override { const PixelXorXP& pixelXor = processor.cast<PixelXorXP>(); - pdman.set3f(fOpColorUni, + pdman.set3f(fOpColorUni, SkColorGetR(pixelXor.opColor())/255.0f, SkColorGetG(pixelXor.opColor())/255.0f, SkColorGetB(pixelXor.opColor())/255.0f); @@ -388,10 +386,3 @@ bool SkPixelXorXfermode::asXPFactory(GrXPFactory** xpf) const { } #endif - -SkValue SkPixelXorXfermode::asValue() const { - auto value = SkValue::Object(SkValue::PixelXorXfermode); - value.set(SkValueKeys::PixelXorXfermode::kOpColor, - SkValue::FromU32(SkToU32(fOpColor))); - return value; -} |