diff options
author | 2012-08-31 16:25:46 +0000 | |
---|---|---|
committer | 2012-08-31 16:25:46 +0000 | |
commit | 8e073ba2d63f4d2aab7532f1421df00bb1f88003 (patch) | |
tree | 01e9385a673be4e5c830a7ea818292434e48fb8e /tools | |
parent | 58b4ead36c62d8c0256ee4da554f3df2744d904c (diff) |
Rename my DeferredPipeController to not conflict with the other.
Fixes build.
Review URL: https://codereview.appspot.com/6506055
git-svn-id: http://skia.googlecode.com/svn/trunk@5372 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tools')
-rw-r--r-- | tools/PictureRenderer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp index d5b72ab7ce..3429285cfd 100644 --- a/tools/PictureRenderer.cpp +++ b/tools/PictureRenderer.cpp @@ -283,9 +283,9 @@ void TiledPictureRenderer::deleteTiles() { // Draw using Pipe struct TileData { - TileData(SkCanvas* canvas, DeferredPipeController* controller); + TileData(SkCanvas* canvas, ThreadSafePipeController* controller); SkCanvas* fCanvas; - DeferredPipeController* fController; + ThreadSafePipeController* fController; SkThread fThread; }; @@ -295,7 +295,7 @@ static void DrawTile(void* data) { tileData->fController->playback(tileData->fCanvas); } -TileData::TileData(SkCanvas* canvas, DeferredPipeController* controller) +TileData::TileData(SkCanvas* canvas, ThreadSafePipeController* controller) : fCanvas(canvas) , fController(controller) , fThread(&DrawTile, static_cast<void*>(this)) {} @@ -328,7 +328,7 @@ void TiledPictureRenderer::drawTiles() { if (fUsePipe) { // First, draw into a pipe controller SkGPipeWriter writer; - DeferredPipeController controller(fTiles.count()); + ThreadSafePipeController controller(fTiles.count()); SkCanvas* pipeCanvas = writer.startRecording(&controller, SkGPipeWriter::kSimultaneousReaders_Flag); pipeCanvas->drawPicture(*(fPicture)); |