Rename GPUAccelData to GrAccelData

tests/PictureTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBlurImageFilter.h"
 #include "SkCanvas.h"
 #include "SkColorPriv.h"
@@ skipping 842 matching lines @@
         // Now test out the SaveLayer extraction
         {
             SkImageInfo info = SkImageInfo::MakeN32Premul(kWidth, kHeight);
 
             SkAutoTUnref<SkSurface> surface(SkSurface::NewScratchRenderTarget(context, info));
 
             SkCanvas* canvas = surface->getCanvas();
 
             canvas->EXPERIMENTAL_optimize(pict);
 
-            SkPicture::AccelData::Key key = GPUAccelData::ComputeAccelDataKey();
+            SkPicture::AccelData::Key key = GrAccelData::ComputeAccelDataKey();
 
             const SkPicture::AccelData* data = pict->EXPERIMENTAL_getAccelData(key);
             REPORTER_ASSERT(reporter, NULL != data);
 
-            const GPUAccelData *gpuData = static_cast<const GPUAccelData*>(data);
+            const GrAccelData *gpuData = static_cast<const GrAccelData*>(data);
             REPORTER_ASSERT(reporter, 5 == gpuData->numSaveLayers());
 
-            const GPUAccelData::SaveLayerInfo& info0 = gpuData->saveLayerInfo(0);
+            const GrAccelData::SaveLayerInfo& info0 = gpuData->saveLayerInfo(0);
             // The parent/child layer appear in reverse order
-            const GPUAccelData::SaveLayerInfo& info1 = gpuData->saveLayerInfo(2);
-            const GPUAccelData::SaveLayerInfo& info2 = gpuData->saveLayerInfo(1);
-            const GPUAccelData::SaveLayerInfo& info3 = gpuData->saveLayerInfo(3);
-//        const GPUAccelData::SaveLayerInfo& info4 = gpuData->saveLayerInfo(4);
+            const GrAccelData::SaveLayerInfo& info1 = gpuData->saveLayerInfo(2);
+            const GrAccelData::SaveLayerInfo& info2 = gpuData->saveLayerInfo(1);
+            const GrAccelData::SaveLayerInfo& info3 = gpuData->saveLayerInfo(3);
+//        const GrAccelData::SaveLayerInfo& info4 = gpuData->saveLayerInfo(4);
 
             REPORTER_ASSERT(reporter, info0.fValid);
             REPORTER_ASSERT(reporter, kWidth == info0.fSize.fWidth && kHeight == info0.fSize.fHeight);
             REPORTER_ASSERT(reporter, info0.fCTM.isIdentity());
             REPORTER_ASSERT(reporter, 0 == info0.fOffset.fX && 0 == info0.fOffset.fY);
             REPORTER_ASSERT(reporter, NULL != info0.fPaint);
             REPORTER_ASSERT(reporter, !info0.fIsNested && !info0.fHasNestedLayers);
 
             REPORTER_ASSERT(reporter, info1.fValid);
             REPORTER_ASSERT(reporter, kWidth == info1.fSize.fWidth && kHeight == info1.fSize.fHeight);
@@ skipping 764 matching lines @@
     make_bm(&replayBM, 100, 100, SK_ColorBLACK, false);
     SkCanvas replayCanvas(replayBM);
     picture->draw(&replayCanvas);
     replayCanvas.flush();
 
     // With the bug present, at (55, 55) we would get a fully opaque red
     // intead of a dark red.
     REPORTER_ASSERT(reporter, replayBM.getColor(30, 30) == 0xff000080);
     REPORTER_ASSERT(reporter, replayBM.getColor(55, 55) == 0xff800000);
 }