Address warnings from clang build bot
http://codereview.appspot.com/6506111/
git-svn-id: http://skia.googlecode.com/svn/trunk@5518 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/samplecode/SampleLayers.cpp b/samplecode/SampleLayers.cpp
index 95061b5..6d57c2a 100644
--- a/samplecode/SampleLayers.cpp
+++ b/samplecode/SampleLayers.cpp
@@ -125,15 +125,11 @@
class RedFilter : public SkDrawFilter {
public:
- virtual bool filter(SkCanvas*, SkPaint* p, SkDrawFilter::Type) {
+ virtual void filter(SkPaint* p, SkDrawFilter::Type) SK_OVERRIDE {
fColor = p->getColor();
if (fColor == SK_ColorRED) {
p->setColor(SK_ColorGREEN);
}
- return true;
- }
- virtual void restore(SkCanvas*, SkPaint* p, SkDrawFilter::Type) {
- p->setColor(fColor);
}
private:
diff --git a/src/animator/SkDisplayEvent.h b/src/animator/SkDisplayEvent.h
index 8b541fc..ef8ec68 100644
--- a/src/animator/SkDisplayEvent.h
+++ b/src/animator/SkDisplayEvent.h
@@ -34,7 +34,7 @@
};
SkDisplayEvent();
virtual ~SkDisplayEvent();
- virtual bool add(SkAnimateMaker& , SkDisplayable* child);
+ virtual bool add(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
virtual bool contains(SkDisplayable*);
virtual SkDisplayable* contains(const SkString& );
#ifdef SK_DEBUG
diff --git a/src/animator/SkDisplayPost.h b/src/animator/SkDisplayPost.h
index b417bab..57ae31c 100644
--- a/src/animator/SkDisplayPost.h
+++ b/src/animator/SkDisplayPost.h
@@ -27,7 +27,7 @@
};
SkPost();
virtual ~SkPost();
- virtual bool add(SkAnimateMaker& , SkDisplayable* child);
+ virtual bool add(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
virtual bool childrenNeedDisposing() const;
virtual void dirty();
#ifdef SK_DUMP_ENABLED
diff --git a/src/animator/SkDrawExtraPathEffect.cpp b/src/animator/SkDrawExtraPathEffect.cpp
index c9de254..65d9cba 100644
--- a/src/animator/SkDrawExtraPathEffect.cpp
+++ b/src/animator/SkDrawExtraPathEffect.cpp
@@ -22,7 +22,7 @@
DECLARE_PRIVATE_MEMBER_INFO(DrawShapePathEffect);
SkDrawShapePathEffect();
virtual ~SkDrawShapePathEffect();
- virtual bool add(SkAnimateMaker& , SkDisplayable* );
+ virtual bool add(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
virtual SkPathEffect* getPathEffect();
protected:
SkDrawable* addPath;
@@ -60,7 +60,7 @@
DECLARE_EXTRAS_MEMBER_INFO(SkDrawComposePathEffect);
SkDrawComposePathEffect(SkDisplayTypes );
virtual ~SkDrawComposePathEffect();
- virtual bool add(SkAnimateMaker& , SkDisplayable* );
+ virtual bool add(SkAnimateMaker& , SkDisplayable* ) SK_OVERRIDE;
virtual SkPathEffect* getPathEffect();
virtual bool isPaint() const;
private:
diff --git a/src/animator/SkDrawGradient.h b/src/animator/SkDrawGradient.h
index d01ee70..d7fc694 100644
--- a/src/animator/SkDrawGradient.h
+++ b/src/animator/SkDrawGradient.h
@@ -20,7 +20,7 @@
DECLARE_PRIVATE_MEMBER_INFO(DrawGradient);
SkDrawGradient();
virtual ~SkDrawGradient();
- virtual bool add(SkAnimateMaker& , SkDisplayable* child);
+ virtual bool add(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
#ifdef SK_DUMP_ENABLED
virtual void dumpRest(SkAnimateMaker*);
#endif
diff --git a/src/animator/SkDrawGroup.h b/src/animator/SkDrawGroup.h
index 8124650..a63a50e 100644
--- a/src/animator/SkDrawGroup.h
+++ b/src/animator/SkDrawGroup.h
@@ -19,7 +19,7 @@
DECLARE_MEMBER_INFO(Group);
SkGroup();
virtual ~SkGroup();
- virtual bool add(SkAnimateMaker& , SkDisplayable* child);
+ virtual bool add(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
virtual bool contains(SkDisplayable* );
SkGroup* copy();
SkBool copySet(int index);
diff --git a/src/animator/SkDrawMatrix.h b/src/animator/SkDrawMatrix.h
index e303424..cb781e7 100644
--- a/src/animator/SkDrawMatrix.h
+++ b/src/animator/SkDrawMatrix.h
@@ -21,7 +21,7 @@
DECLARE_DRAW_MEMBER_INFO(Matrix);
SkDrawMatrix();
virtual ~SkDrawMatrix();
- virtual bool add(SkAnimateMaker& , SkDisplayable* child);
+ virtual bool add(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
virtual bool childrenNeedDisposing() const;
virtual void dirty();
virtual bool draw(SkAnimateMaker& );
diff --git a/src/animator/SkDrawPath.cpp b/src/animator/SkDrawPath.cpp
index 81cbdb1..858db54 100644
--- a/src/animator/SkDrawPath.cpp
+++ b/src/animator/SkDrawPath.cpp
@@ -188,7 +188,7 @@
DEFINE_GET_MEMBER(SkPolyline);
-bool SkPolyline::add(SkAnimateMaker& , SkDisplayable*) const {
+bool SkPolyline::add(SkAnimateMaker& , SkDisplayable*) {
return false;
}
diff --git a/src/animator/SkDrawPath.h b/src/animator/SkDrawPath.h
index 5c26312..76e2e7e 100644
--- a/src/animator/SkDrawPath.h
+++ b/src/animator/SkDrawPath.h
@@ -19,7 +19,7 @@
DECLARE_DRAW_MEMBER_INFO(Path);
SkDrawPath();
virtual ~SkDrawPath();
- virtual bool add(SkAnimateMaker& , SkDisplayable* child);
+ virtual bool add(SkAnimateMaker& , SkDisplayable* child) SK_OVERRIDE;
bool childHasID() { return SkToBool(fChildHasID); }
virtual bool childrenNeedDisposing() const;
virtual void dirty();
@@ -51,7 +51,7 @@
class SkPolyline : public SkDrawPath {
DECLARE_MEMBER_INFO(Polyline);
- virtual bool add(SkAnimateMaker& , SkDisplayable*) const;
+ virtual bool add(SkAnimateMaker& , SkDisplayable*) SK_OVERRIDE;
virtual void onEndElement(SkAnimateMaker& );
protected:
SkTDScalarArray points;
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index 83f4625..9c48849 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -19,13 +19,13 @@
};
SkPictureRecord::SkPictureRecord(uint32_t flags) :
+ fBoundingHierarchy(NULL),
+ fStateTree(NULL),
fFlattenableHeap(HEAP_BLOCK_SIZE),
fMatrices(&fFlattenableHeap),
fPaints(&fFlattenableHeap),
fRegions(&fFlattenableHeap),
fWriter(MIN_WRITER_SIZE),
- fBoundingHierarchy(NULL),
- fStateTree(NULL),
fRecordFlags(flags) {
#ifdef SK_DEBUG_SIZE
fPointBytes = fRectBytes = fTextBytes = 0;
diff --git a/src/core/SkPictureStateTree.cpp b/src/core/SkPictureStateTree.cpp
index fc36e4a..8426c9e 100644
--- a/src/core/SkPictureStateTree.cpp
+++ b/src/core/SkPictureStateTree.cpp
@@ -83,9 +83,9 @@
: fDraws(draws)
, fCanvas(canvas)
, fCurrentNode(root)
+ , fPlaybackMatrix(canvas->getTotalMatrix())
, fCurrentMatrix(NULL)
, fPlaybackIndex(0)
- , fPlaybackMatrix(canvas->getTotalMatrix())
, fSave(false) {
}
diff --git a/src/core/SkPictureStateTree.h b/src/core/SkPictureStateTree.h
index 995f3f7..8ce3050 100644
--- a/src/core/SkPictureStateTree.h
+++ b/src/core/SkPictureStateTree.h
@@ -74,20 +74,22 @@
Iterator(const SkTDArray<void*>& draws, SkCanvas* canvas, Node* root);
// The draws this iterator is associated with
const SkTDArray<void*>& fDraws;
- // The matrix of the canvas we're playing back into
- const SkMatrix fPlaybackMatrix;
+
+ // canvas this is playing into (so we can insert saves/restores as necessary)
+ SkCanvas* fCanvas;
// current state node
Node* fCurrentNode;
// List of nodes whose state we need to apply to reach TargetNode
SkTDArray<Node*> fNodes;
+
+ // The matrix of the canvas we're playing back into
+ const SkMatrix fPlaybackMatrix;
+
// Cache of current matrix, so we can avoid redundantly setting it
SkMatrix* fCurrentMatrix;
- // canvas this is playing into (so we can insert saves/restores as necessary)
- SkCanvas* fCanvas;
-
// current position in the array of draws
int fPlaybackIndex;
// Whether or not we need to do a save next iteration
diff --git a/src/core/SkRTree.cpp b/src/core/SkRTree.cpp
index 96f6b18..42c1c99 100644
--- a/src/core/SkRTree.cpp
+++ b/src/core/SkRTree.cpp
@@ -399,7 +399,7 @@
if (this->isEmpty()) {
return;
}
- SkASSERT(fCount == this->validateSubtree(fRoot.fChild.subtree, fRoot.fBounds, true));
+ SkASSERT(fCount == (size_t)this->validateSubtree(fRoot.fChild.subtree, fRoot.fBounds, true));
#endif
}
diff --git a/tests/RTreeTest.cpp b/tests/RTreeTest.cpp
index d60bf0c..0e06337 100644
--- a/tests/RTreeTest.cpp
+++ b/tests/RTreeTest.cpp
@@ -46,7 +46,7 @@
SkTDArray<void*>& found) {
SkTDArray<void*> expected;
// manually intersect with every rectangle
- for (int i = 0; i < NUM_RECTS; ++i) {
+ for (size_t i = 0; i < NUM_RECTS; ++i) {
if (SkIRect::IntersectsNoEmptyCheck(query, rects[i].rect)) {
expected.push(rects[i].data);
}
@@ -70,7 +70,7 @@
static void runQueries(skiatest::Reporter* reporter, SkRandom& rand, DataRect rects[],
SkRTree& tree) {
- for (int i = 0; i < NUM_QUERIES; ++i) {
+ for (size_t i = 0; i < NUM_QUERIES; ++i) {
SkTDArray<void*> hits;
SkIRect query = random_rect(rand);
tree.search(query, &hits);
@@ -102,11 +102,11 @@
++expectedDepthMax;
}
- for (int i = 0; i < NUM_ITERATIONS; ++i) {
+ for (size_t i = 0; i < NUM_ITERATIONS; ++i) {
random_data_rects(rand, rects, NUM_RECTS);
// First try bulk-loaded inserts
- for (int i = 0; i < NUM_RECTS; ++i) {
+ for (size_t i = 0; i < NUM_RECTS; ++i) {
rtree->insert(rects[i].data, rects[i].rect, true);
}
rtree->flushDeferredInserts();
@@ -118,7 +118,7 @@
REPORTER_ASSERT(reporter, 0 == rtree->getCount());
// Then try immediate inserts
- for (int i = 0; i < NUM_RECTS; ++i) {
+ for (size_t i = 0; i < NUM_RECTS; ++i) {
rtree->insert(rects[i].data, rects[i].rect);
}
runQueries(reporter, rand, rects, *rtree);