commit db539905bb3af7bd05839a7d2558e97d5cb51ca2
author robertphillips <robertphillips@google.com> Tue Jul 01 08:47:04 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 01 08:47:04 2014 -0700
tree 00e3749598f44533d5980945baeb448608821f86
parent bb6a02823929584231c8e080ee69e7fb1178cbfb

Rename SkPicturePlayback to SkPictureData

This is in preparation for splitting the playback portion of the new SkPictureData class into a new SkPicturePlayback class.

R=reed@google.com, mtklein@google.com

Author: robertphillips@google.com

Review URL: https://codereview.chromium.org/362773002

src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index 318de8d..9041bdf 100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -29,7 +29,7 @@
 #include "SkMaskFilter.h"
 #include "SkPathEffect.h"
 #include "SkPicture.h"
-#include "SkPicturePlayback.h"
+#include "SkPictureData.h"
 #include "SkRRect.h"
 #include "SkStroke.h"
 #include "SkSurface.h"
@@ -1830,7 +1830,7 @@
 
 bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* canvas, const SkPicture* picture) {
 
-    if (NULL == picture->fPlayback.get()) {
+    if (NULL == picture->fData.get()) {
         return false;
     }
 
@@ -1928,7 +1928,7 @@
         }
     }
 
-    SkPicturePlayback::PlaybackReplacements replacements;
+    SkPictureData::PlaybackReplacements replacements;
 
     // Generate the layer and/or ensure it is locked
     for (int i = 0; i < gpuData->numSaveLayers(); ++i) {
@@ -1937,7 +1937,7 @@
 
             const GPUAccelData::SaveLayerInfo& info = gpuData->saveLayerInfo(i);
 
-            SkPicturePlayback::PlaybackReplacements::ReplacementInfo* layerInfo =
+            SkPictureData::PlaybackReplacements::ReplacementInfo* layerInfo =
                                                                         replacements.push();
             layerInfo->fStart = info.fSaveLayerOpID;
             layerInfo->fStop = info.fRestoreOpID;
@@ -2009,9 +2009,9 @@
                                       SkIntToScalar(layer->rect().fTop));
                 } 
 
-                picture->fPlayback->setDrawLimits(info.fSaveLayerOpID, info.fRestoreOpID);
-                picture->fPlayback->draw(*canvas, NULL);
-                picture->fPlayback->setDrawLimits(0, 0);
+                picture->fData->setDrawLimits(info.fSaveLayerOpID, info.fRestoreOpID);
+                picture->fData->draw(*canvas, NULL);
+                picture->fData->setDrawLimits(0, 0);
 
                 canvas->flush();
             }
@@ -2019,9 +2019,9 @@
     }
 
     // Playback using new layers
-    picture->fPlayback->setReplacements(&replacements);
-    picture->fPlayback->draw(*canvas, NULL);
-    picture->fPlayback->setReplacements(NULL);
+    picture->fData->setReplacements(&replacements);
+    picture->fData->draw(*canvas, NULL);
+    picture->fData->setReplacements(NULL);
 
     // unlock the layers
     for (int i = 0; i < gpuData->numSaveLayers(); ++i) {