src/image/SkSurface_Gpu.cpp - Issue 923143002: Split out methods in GrGpuResource::CacheAccess that can be called outside of the cache.

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/image/SkSurface_Gpu.cpp

Issue 923143002: Split out methods in GrGpuResource::CacheAccess that can be called outside of the cache. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: do warning workaround in the right place Created 5 years, 10 months ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/image/SkSurface_Gpu.cpp

diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp

index 34aec2b7bbb0c43ba29779be2c47f2ab3677266a..a1c31f31379ad022735e69dd5a64636f6149fca4 100644

--- a/src/image/SkSurface_Gpu.cpp

+++ b/src/image/SkSurface_Gpu.cpp

@@ -7,7 +7,7 @@

#include "SkSurface_Gpu.h"

-#include "GrGpuResourceCacheAccess.h"

+#include "GrGpuResourcePriv.h"

#include "SkCanvas.h"

#include "SkGpuDevice.h"

#include "SkImage_Base.h"

@@ -70,8 +70,8 @@ void SkSurface_Gpu::onCopyOnWrite(ContentChangeMode mode) {

SkASSERT(image);

if (rt->asTexture() == SkTextureImageGetTexture(image)) {

GrRenderTarget* oldRT = this->fDevice->accessRenderTarget();

- SkSurface::Budgeted budgeted = oldRT->cacheAccess().isBudgeted() ? kYes_Budgeted :

- kNo_Budgeted;

+ SkSurface::Budgeted budgeted = oldRT->resourcePriv().isBudgeted() ? kYes_Budgeted :

+ kNo_Budgeted;

SkAutoTUnref<SkGpuDevice> newDevice(

SkGpuDevice::Create(oldRT->getContext(), budgeted, fDevice->imageInfo(),

oldRT->numSamples(), &this->props(), 0));

« no previous file with comments | « src/image/SkImage_Gpu.h ('k') | tests/ResourceCacheTest.cpp » ('j') | no next file with comments »