projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
skia
/
gm
/
convexpolyeffect.cpp
diff --git
a/src/third_party/skia/gm/convexpolyeffect.cpp
b/src/third_party/skia/gm/convexpolyeffect.cpp
index
00e89db
..
e567208
100644
(file)
--- a/
src/third_party/skia/gm/convexpolyeffect.cpp
+++ b/
src/third_party/skia/gm/convexpolyeffect.cpp
@@
-22,15
+22,9
@@
#include "effects/GrConvexPolyEffect.h"
#include "effects/GrConvexPolyEffect.h"
-namespace {
-extern const GrVertexAttrib kAttribs[] = {
- {kVec2f_GrVertexAttribType, 0, kPosition_GrVertexAttribBinding},
-};
-}
-
namespace skiagm {
/**
namespace skiagm {
/**
- * This GM directly exercises a Gr
Effect
that draws convex polygons.
+ * This GM directly exercises a Gr
Processor
that draws convex polygons.
*/
class ConvexPolyEffect : public GM {
public:
*/
class ConvexPolyEffect : public GM {
public:
@@
-114,12
+108,12
@@
protected:
SkScalar y = 0;
for (SkTLList<SkPath>::Iter iter(fPaths, SkTLList<SkPath>::Iter::kHead_IterStart);
SkScalar y = 0;
for (SkTLList<SkPath>::Iter iter(fPaths, SkTLList<SkPath>::Iter::kHead_IterStart);
-
NULL !=
iter.get();
+ iter.get();
iter.next()) {
const SkPath* path = iter.get();
SkScalar x = 0;
iter.next()) {
const SkPath* path = iter.get();
SkScalar x = 0;
- for (int et = 0; et < kGr
Effect
EdgeTypeCnt; ++et) {
+ for (int et = 0; et < kGr
Processor
EdgeTypeCnt; ++et) {
GrTestTarget tt;
context->getTestTarget(&tt);
if (NULL == tt.target()) {
GrTestTarget tt;
context->getTestTarget(&tt);
if (NULL == tt.target()) {
@@
-127,19
+121,18
@@
protected:
return;
}
GrDrawState* drawState = tt.target()->drawState();
return;
}
GrDrawState* drawState = tt.target()->drawState();
- drawState->setVertexAttribs<kAttribs>(SK_ARRAY_COUNT(kAttribs));
SkMatrix m;
SkPath p;
m.setTranslate(x, y);
path->transform(m, &p);
SkMatrix m;
SkPath p;
m.setTranslate(x, y);
path->transform(m, &p);
- Gr
EffectEdgeType edgeType = (GrEffect
EdgeType) et;
- SkAutoTUnref<Gr
Effect> effect
(GrConvexPolyEffect::Create(edgeType, p));
- if (!
effect
) {
+ Gr
PrimitiveEdgeType edgeType = (GrPrimitive
EdgeType) et;
+ SkAutoTUnref<Gr
FragmentProcessor> fp
(GrConvexPolyEffect::Create(edgeType, p));
+ if (!
fp
) {
continue;
}
continue;
}
- drawState->addCoverage
Effect(effect, 1
);
+ drawState->addCoverage
Processor(fp
);
drawState->setIdentityViewMatrix();
drawState->setRenderTarget(rt);
drawState->setColor(0xff000000);
drawState->setIdentityViewMatrix();
drawState->setRenderTarget(rt);
drawState->setColor(0xff000000);
@@
-172,12
+165,12
@@
protected:
}
for (SkTLList<SkRect>::Iter iter(fRects, SkTLList<SkRect>::Iter::kHead_IterStart);
}
for (SkTLList<SkRect>::Iter iter(fRects, SkTLList<SkRect>::Iter::kHead_IterStart);
-
NULL !=
iter.get();
+ iter.get();
iter.next()) {
SkScalar x = 0;
iter.next()) {
SkScalar x = 0;
- for (int et = 0; et < kGr
Effect
EdgeTypeCnt; ++et) {
+ for (int et = 0; et < kGr
Processor
EdgeTypeCnt; ++et) {
GrTestTarget tt;
context->getTestTarget(&tt);
if (NULL == tt.target()) {
GrTestTarget tt;
context->getTestTarget(&tt);
if (NULL == tt.target()) {
@@
-186,15
+179,14
@@
protected:
}
SkRect rect = *iter.get();
rect.offset(x, y);
}
SkRect rect = *iter.get();
rect.offset(x, y);
- Gr
EffectEdgeType edgeType = (GrEffect
EdgeType) et;
- SkAutoTUnref<Gr
Effect> effect
(GrConvexPolyEffect::Create(edgeType, rect));
- if (!
effect
) {
+ Gr
PrimitiveEdgeType edgeType = (GrPrimitive
EdgeType) et;
+ SkAutoTUnref<Gr
FragmentProcessor> fp
(GrConvexPolyEffect::Create(edgeType, rect));
+ if (!
fp
) {
continue;
}
GrDrawState* drawState = tt.target()->drawState();
continue;
}
GrDrawState* drawState = tt.target()->drawState();
- drawState->setVertexAttribs<kAttribs>(SK_ARRAY_COUNT(kAttribs));
- drawState->addCoverageEffect(effect, 1);
+ drawState->addCoverageProcessor(fp);
drawState->setIdentityViewMatrix();
drawState->setRenderTarget(rt);
drawState->setColor(0xff000000);
drawState->setIdentityViewMatrix();
drawState->setRenderTarget(rt);
drawState->setColor(0xff000000);