aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests
diff options
context:
space:
mode:
authorGravatar robertphillips <robertphillips@google.com>2014-08-18 09:39:34 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-08-18 09:39:34 -0700
commit6617d509ab0b056c57952bb1ee04b4c94904284b (patch)
tree639d0a2a1efc3a24367f5c28c0a1f868c17f2c49 /tests
parent81d92659cf809f301c57bcf56c3f93fbebde16e6 (diff)
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/) R=bsalomon@google.com Author: robertphillips@google.com Review URL: https://codereview.chromium.org/482773002
Diffstat (limited to 'tests')
-rw-r--r--tests/PictureTest.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 7abef0edc1..b3f13f03a6 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -860,20 +860,20 @@ static void test_gpu_picture_optimization(skiatest::Reporter* reporter,
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);