diff options
| author |  robertphillips <robertphillips@google.com> | 2014-07-10 07:21:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-10 07:21:27 -0700 |
| commit | c26d991bf2d85bb1843a21b0a4f861212b0eaced (patch) | |
| tree | 0ef87c0809c4186bfba2730976bb1ac58069b8fe /src/gpu/SkGpuDevice.cpp | |
| parent | 67a3271f0de9ccc32d559b042b862528272047cc (diff) | |
Split SkPictureReplacementPlayback out of SkPicturePlayback
R=mtklein@google.com, reed@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/383733002
Diffstat (limited to 'src/gpu/SkGpuDevice.cpp')
| -rw-r--r-- | src/gpu/SkGpuDevice.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp index 0dbc2fbbca..870ca4a3f6 100644 --- a/src/gpu/SkGpuDevice.cpp +++ b/src/gpu/SkGpuDevice.cpp @@ -30,8 +30,8 @@ #include "SkPathEffect.h" #include "SkPicture.h" #include "SkPictureData.h" -#include "SkPicturePlayback.h" #include "SkPictureRangePlayback.h" +#include "SkPictureReplacementPlayback.h" #include "SkRRect.h" #include "SkStroke.h" #include "SkSurface.h" @@ -1938,7 +1938,7 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* canvas, const SkPicture* pi } } - SkPicturePlayback::PlaybackReplacements replacements; + SkPictureReplacementPlayback::PlaybackReplacements replacements; // Generate the layer and/or ensure it is locked for (int i = 0; i < gpuData->numSaveLayers(); ++i) { @@ -1947,7 +1947,7 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* canvas, const SkPicture* pi const GPUAccelData::SaveLayerInfo& info = gpuData->saveLayerInfo(i); - SkPicturePlayback::PlaybackReplacements::ReplacementInfo* layerInfo = + SkPictureReplacementPlayback::PlaybackReplacements::ReplacementInfo* layerInfo = replacements.push(); layerInfo->fStart = info.fSaveLayerOpID; layerInfo->fStop = info.fRestoreOpID; @@ -2030,9 +2030,8 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* canvas, const SkPicture* pi } // Playback using new layers - SkPicturePlayback playback(picture); + SkPictureReplacementPlayback playback(picture, &replacements, ops.get()); - playback.setReplacements(&replacements); playback.draw(canvas, NULL); // unlock the layers |