summaryrefslogtreecommitdiffstatsci
path: root/src
diff options
context:
space:
mode:
authorsuyambulingamrm <suyambu.rm@samsung.com>2014-07-18 18:31:23 +0530
committersuyambulingamrm <suyambu.rm@samsung.com>2014-07-18 18:31:23 +0530
commite7a8b28ff681db88b2c570bf97b242f71d69dc93 (patch)
treecfb6500748a5c5af9338cab7f928781b35bcb80b /src
parent051ed08e74a5382d108e281b05c2e77a4d34b1fb (diff)
Changes required to use latest rebased skia branches.
Diffstat (limited to 'src')
-rw-r--r--src/skia-shapes.cpp4
-rw-r--r--src/skia-tests/shadow.cpp5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/skia-shapes.cpp b/src/skia-shapes.cpp
index ba10f1d..d38ccba 100644
--- a/src/skia-shapes.cpp
+++ b/src/skia-shapes.cpp
@@ -103,7 +103,7 @@ skiaCreateLinearGradientShader(int y1, int y2)
return SkGradientShader::CreateLinear(
linearPoints, linearColors, NULL, NUM_ELEM(linearColors),
- SkShader::kClamp_TileMode, NULL);
+ SkShader::kClamp_TileMode);
}
SkShader*
@@ -134,7 +134,7 @@ skiaCreateRadialGradientShader(const shapes_t *shape)
return SkGradientShader::CreateRadial(
center, radius,
colors, NULL, NUM_ELEM(colors),
- SkShader::kClamp_TileMode, NULL);
+ SkShader::kClamp_TileMode);
}
SkShader*
diff --git a/src/skia-tests/shadow.cpp b/src/skia-tests/shadow.cpp
index 4e0de46..4a363ee 100644
--- a/src/skia-tests/shadow.cpp
+++ b/src/skia-tests/shadow.cpp
@@ -15,6 +15,7 @@
#include "skia-shapes.h"
#include "kinetics.h"
#include "SkBlurMaskFilter.h"
+#include "SkBlurMask.h"
static double line_width;
@@ -61,9 +62,9 @@ static void particle_init ()
drop_line_width = line_width;
SkBlurMaskFilter::BlurFlags flags = SkBlurMaskFilter::kNone_BlurFlag;
- mf = SkBlurMaskFilter::Create(SkBlurMaskFilter::kInner_BlurStyle, (SkDoubleToScalar(drop_line_width)), flags);
+ mf = SkBlurMaskFilter::Create(kInner_SkBlurStyle, (SkDoubleToScalar(drop_line_width)), flags);
flags = SkBlurMaskFilter::kNone_BlurFlag;
- mf_spread = SkBlurMaskFilter::Create(SkBlurMaskFilter::kInner_BlurStyle, (SkDoubleToScalar(spread_line_width)), flags);
+ mf_spread = SkBlurMaskFilter::Create(kInner_SkBlurStyle, (SkDoubleToScalar(spread_line_width)), flags);
}
static void fill_particle (caskbench_context_t *ctx, shapes_t *shape)