src/gpu/SkGpuDevice.cpp - Issue 719133002: Rename GrAccelData to SkLayerInfo and move it to src/core

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/gpu/SkGpuDevice.cpp

Issue 719133002: Rename GrAccelData to SkLayerInfo and move it to src/core (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Fix up unit test Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/gpu/SkGpuDevice.cpp

diff --git a/src/gpu/SkGpuDevice.cpp b/src/gpu/SkGpuDevice.cpp

index 06f6eb7778fd8dd925af8fc5683ab924ed4b0f92..124f994612da23a9a96137599ca794e2ba624eee 100644

--- a/src/gpu/SkGpuDevice.cpp

+++ b/src/gpu/SkGpuDevice.cpp

@@ -15,9 +15,7 @@

#include "GrContext.h"

#include "GrBitmapTextContext.h"

#include "GrDistanceFieldTextContext.h"

-#include "GrLayerCache.h"

#include "GrLayerHoister.h"

-#include "GrPictureUtils.h"

#include "GrRecordReplaceDraw.h"

#include "GrStrokeInfo.h"

#include "GrTracing.h"

@@ -29,6 +27,7 @@

#include "SkDrawProcs.h"

#include "SkGlyphCache.h"

#include "SkImageFilter.h"

+#include "SkLayerInfo.h"

#include "SkMaskFilter.h"

#include "SkPathEffect.h"

#include "SkPicture.h"

@@ -1796,7 +1795,7 @@ bool SkGpuDevice::EXPERIMENTAL_drawPicture(SkCanvas* mainCanvas, const SkPicture

return false;

}

- SkPicture::AccelData::Key key = GrAccelData::ComputeAccelDataKey();

+ SkPicture::AccelData::Key key = SkLayerInfo::ComputeKey();

const SkPicture::AccelData* data = mainPicture->EXPERIMENTAL_getAccelData(key);

if (!data) {

« no previous file with comments | « src/gpu/GrPictureUtils.cpp ('k') | tests/PictureTest.cpp » ('j') | no next file with comments »