Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Unified Diff: tools/PictureRenderer.h

Issue 500373005: Remove SkQuadTree. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tests/PictureTest.cpp ('k') | tools/PictureRenderer.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/PictureRenderer.h
diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h
index f11b198cf3d428187acc13e85a2919ca308e5512..04ac20fcb609e0acf16a12961daef83173a0e57d 100644
--- a/tools/PictureRenderer.h
+++ b/tools/PictureRenderer.h
@@ -56,7 +56,6 @@ public:
enum BBoxHierarchyType {
kNone_BBoxHierarchyType = 0,
- kQuadTree_BBoxHierarchyType,
kRTree_BBoxHierarchyType,
kTileGrid_BBoxHierarchyType,
@@ -90,10 +89,10 @@ public:
* @param useChecksumBasedFilenames Whether to use checksum-based filenames when writing
* bitmap images to disk.
*/
- virtual void init(const SkPicture* pict,
- const SkString* writePath,
+ virtual void init(const SkPicture* pict,
+ const SkString* writePath,
const SkString* mismatchPath,
- const SkString* inputFilename,
+ const SkString* inputFilename,
bool useChecksumBasedFilenames);
/**
@@ -261,8 +260,6 @@ public:
}
if (kRTree_BBoxHierarchyType == fBBoxHierarchyType) {
config.append("_rtree");
- } else if (kQuadTree_BBoxHierarchyType == fBBoxHierarchyType) {
- config.append("_quadtree");
} else if (kTileGrid_BBoxHierarchyType == fBBoxHierarchyType) {
config.append("_grid");
config.append("_");
@@ -311,8 +308,6 @@ public:
}
if (kRTree_BBoxHierarchyType == fBBoxHierarchyType) {
result["bbh"] = "rtree";
- } else if (kQuadTree_BBoxHierarchyType == fBBoxHierarchyType) {
- result["bbh"] = "quadtree";
} else if (kTileGrid_BBoxHierarchyType == fBBoxHierarchyType) {
SkString tmp("grid_");
tmp.appendS32(fGridInfo.fTileInterval.width());
@@ -416,7 +411,7 @@ public:
const SkPicture* getPicture() {
return fPicture;
}
-
+
#if SK_SUPPORT_GPU
explicit PictureRenderer(const GrContext::Options &opts)
#else
@@ -550,9 +545,9 @@ public:
#endif
virtual void init(const SkPicture* pict,
- const SkString* writePath,
+ const SkString* writePath,
const SkString* mismatchPath,
- const SkString* inputFilename,
+ const SkString* inputFilename,
bool useChecksumBasedFilenames) SK_OVERRIDE;
virtual bool render(SkBitmap** out = NULL) SK_OVERRIDE;
@@ -571,10 +566,10 @@ public:
TiledPictureRenderer();
#endif
- virtual void init(const SkPicture* pict,
- const SkString* writePath,
+ virtual void init(const SkPicture* pict,
+ const SkString* writePath,
const SkString* mismatchPath,
- const SkString* inputFilename,
+ const SkString* inputFilename,
bool useChecksumBasedFilenames) SK_OVERRIDE;
/**
« no previous file with comments | « tests/PictureTest.cpp ('k') | tools/PictureRenderer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698