Rename GPUAccelData to GrAccelData

Rename GPUAccelData to GrAccelData

This is calved off of (Add new API to allow layer hoisting/atlasing across picture piles 
- https://codereview.chromium.org/474623002/)

Committed: https://skia.googlesource.com/skia/+/6617d509ab0b056c57952bb1ee04b4c94904284b

[bsalomon, 2014-08-18 16:23:34]

lgtm

[robertphillips, 2014-08-18 16:25:09]

The CQ bit was checked by robertphillips@google.com

[commit-bot: I haz the power, 2014-08-18 16:25:22]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/robertphillips@google.com/482773002/1

[commit-bot: I haz the power, 2014-08-18 16:25:24]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-08-18 16:25:26]

Failed to apply patch for src/gpu/SkGpuDevice.cpp:
While running git apply --index -p1;
  error: patch failed: src/gpu/SkGpuDevice.cpp:1987
  error: src/gpu/SkGpuDevice.cpp: patch does not apply

Patch:       src/gpu/SkGpuDevice.cpp
Index: src/gpu/SkGpuDevice.cpp
diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp
index
e459a116dfc975b98ff94dbd2024111ac8d305dc..ad0509178fc1e1dc8ddf0171bf50948ae76a83e4
100644
--- a/src/gpu/SkGpuDevice.cpp
+++ b/src/gpu/SkGpuDevice.cpp
@@ -1854,14 +1854,14 @@ void SkGpuDevice::EXPERIMENTAL_optimize(const SkPicture*
picture) {
         return;
     }
 
-    SkPicture::AccelData::Key key = GPUAccelData::ComputeAccelDataKey();
+    SkPicture::AccelData::Key key = GrAccelData::ComputeAccelDataKey();
 
     const SkPicture::AccelData* existing =
picture->EXPERIMENTAL_getAccelData(key);
     if (NULL != existing) {
         return;
     }
 
-    SkAutoTUnref<GPUAccelData> data(SkNEW_ARGS(GPUAccelData, (key)));
+    SkAutoTUnref<GrAccelData> data(SkNEW_ARGS(GrAccelData, (key)));
 
     picture->EXPERIMENTAL_addAccelData(data);
 
@@ -1885,14 +1885,14 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas*
mainCanvas, const SkPicture
 
     fContext->getLayerCache()->processDeletedPictures();
 
-    SkPicture::AccelData::Key key = GPUAccelData::ComputeAccelDataKey();
+    SkPicture::AccelData::Key key = GrAccelData::ComputeAccelDataKey();
 
     const SkPicture::AccelData* data = picture->EXPERIMENTAL_getAccelData(key);
     if (NULL == data) {
         return false;
     }
 
-    const GPUAccelData *gpuData = static_cast<const GPUAccelData*>(data);
+    const GrAccelData *gpuData = static_cast<const GrAccelData*>(data);
 
     if (0 == gpuData->numSaveLayers()) {
         return false;
@@ -1925,11 +1925,11 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas*
mainCanvas, const SkPicture
         for (int i = 0; i < ops->numOps(); ++i) {
             uint32_t offset = ops->offset(i);
 
-            // For now we're saving all the layers in the GPUAccelData so they
+            // For now we're saving all the layers in the GrAccelData so they
             // can be nested. Additionally, the nested layers appear before
             // their parent in the list.
             for (int j = 0 ; j < gpuData->numSaveLayers(); ++j) {
-                const GPUAccelData::SaveLayerInfo& info =
gpuData->saveLayerInfo(j);
+                const GrAccelData::SaveLayerInfo& info =
gpuData->saveLayerInfo(j);
 
                 if (pullForward[j]) {
                     continue;            // already pulling forward
@@ -1955,7 +1955,7 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas*
mainCanvas, const SkPicture
         // In this case there is no BBH associated with the picture. Pre-render
         // all the layers that intersect the drawn region
         for (int j = 0; j < gpuData->numSaveLayers(); ++j) {
-            const GPUAccelData::SaveLayerInfo& info =
gpuData->saveLayerInfo(j);
+            const GrAccelData::SaveLayerInfo& info = gpuData->saveLayerInfo(j);
 
             SkIRect layerRect = SkIRect::MakeXYWH(info.fOffset.fX,
                                                   info.fOffset.fY,
@@ -1987,7 +1987,7 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas*
mainCanvas, const SkPicture
     // Generate the layer and/or ensure it is locked
     for (int i = 0; i < gpuData->numSaveLayers(); ++i) {
         if (pullForward[i]) {
-            const GPUAccelData::SaveLayerInfo& info =
gpuData->saveLayerInfo(i);
+            const GrAccelData::SaveLayerInfo& info = gpuData->saveLayerInfo(i);
 
             GrCachedLayer* layer =
fContext->getLayerCache()->findLayerOrCreate(picture, 
                                                                                
info.fSaveLayerOpID, 
@@ -2124,7 +2124,7 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas*
mainCanvas, const SkPicture
 
     // unlock the layers
     for (int i = 0; i < gpuData->numSaveLayers(); ++i) {
-        const GPUAccelData::SaveLayerInfo& info = gpuData->saveLayerInfo(i);
+        const GrAccelData::SaveLayerInfo& info = gpuData->saveLayerInfo(i);
 
         GrCachedLayer* layer = fContext->getLayerCache()->findLayer(picture, 
                                                                    
info.fSaveLayerOpID,

[robertphillips, 2014-08-18 16:30:14]

The CQ bit was checked by robertphillips@google.com

[commit-bot: I haz the power, 2014-08-18 16:31:22]

CQ is trying da patch. Follow status at

https://skia-tree-status.appspot.com/cq/robertphillips@google.com/482773002/2...

[commit-bot: I haz the power, 2014-08-18 16:39:42]

Committed patchset #2 (20001) as 6617d509ab0b056c57952bb1ee04b4c94904284b