Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / effects / SkAvoidXfermode.cpp

diff --git a/src/third_party/skia/src/effects/SkAvoidXfermode.cpp b/src/third_party/skia/src/effects/SkAvoidXfermode.cpp
index ffe6a21..b596bfd 100644 (file)
--- a/src/third_party/skia/src/effects/SkAvoidXfermode.cpp
+++ b/src/third_party/skia/src/effects/SkAvoidXfermode.cpp
@@ -15,24 +15,30 @@ SkAvoidXfermode::SkAvoidXfermode(SkColor opColor, U8CPU tolerance, Mode mode) {
     if (tolerance > 255) {
         tolerance = 255;
     }
-
+    fTolerance = SkToU8(tolerance);
     fOpColor = opColor;
     fDistMul = (256 << 14) / (tolerance + 1);
     fMode = mode;
 }
 
-SkAvoidXfermode::SkAvoidXfermode(SkReadBuffer& buffer)
-    : INHERITED(buffer) {
+#ifdef SK_SUPPORT_LEGACY_DEEPFLATTENING
+SkAvoidXfermode::SkAvoidXfermode(SkReadBuffer& buffer) : INHERITED(buffer) {
     fOpColor = buffer.readColor();
     fDistMul = buffer.readUInt();
     fMode = (Mode)buffer.readUInt();
 }
+#endif
 
-void SkAvoidXfermode::flatten(SkWriteBuffer& buffer) const {
-    this->INHERITED::flatten(buffer);
+SkFlattenable* SkAvoidXfermode::CreateProc(SkReadBuffer& buffer) {
+    const SkColor color = buffer.readColor();
+    const unsigned tolerance = buffer.readUInt();
+    const unsigned mode = buffer.readUInt();
+    return Create(color, tolerance, (Mode)mode);
+}
 
+void SkAvoidXfermode::flatten(SkWriteBuffer& buffer) const {
     buffer.writeColor(fOpColor);
-    buffer.writeUInt(fDistMul);
+    buffer.writeUInt(fTolerance);
     buffer.writeUInt(fMode);
 }
 
@@ -102,7 +108,7 @@ void SkAvoidXfermode::xfer32(SkPMColor dst[], const SkPMColor src[], int count,
         SkASSERT(d <= 256);
 
         if (d > 0) {
-            if (NULL != aa) {
+            if (aa) {
                 d = SkAlphaMul(d, Accurate255To256(*aa++));
                 if (0 == d) {
                     continue;
@@ -151,7 +157,7 @@ void SkAvoidXfermode::xfer16(uint16_t dst[], const SkPMColor src[], int count,
         SkASSERT(d <= 32);
 
         if (d > 0) {
-            if (NULL != aa) {
+            if (aa) {
                 d = SkAlphaMul(d, Accurate255To256(*aa++));
                 if (0 == d) {
                     continue;