From 318c419d3e373487a8bb28f56ea921ed850e61ac Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Wed, 17 May 2017 09:36:38 -0400 Subject: Remove RenderTarget pointer from GrRenderTargetOpList::RecordedOp Change-Id: I08afe531cd9c65af4b3f6b6006bc3eaf7071cfec Change-Id: I08afe531cd9c65af4b3f6b6006bc3eaf7071cfec Reviewed-on: https://skia-review.googlesource.com/17117 Commit-Queue: Robert Phillips Reviewed-by: Brian Salomon --- tools/debugger/SkDebugCanvas.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tools/debugger/SkDebugCanvas.cpp') diff --git a/tools/debugger/SkDebugCanvas.cpp b/tools/debugger/SkDebugCanvas.cpp index 23f4ae3f21..fdde0a6cc8 100644 --- a/tools/debugger/SkDebugCanvas.cpp +++ b/tools/debugger/SkDebugCanvas.cpp @@ -287,7 +287,7 @@ void SkDebugCanvas::drawTo(SkCanvas* originalCanvas, int index, int m) { // drawn offscreen GrRenderTargetContext* rtc = originalCanvas->internal_private_accessTopLayerRenderTargetContext(); - GrGpuResource::UniqueID rtID = rtc->accessRenderTarget()->uniqueID(); + GrSurfaceProxy::UniqueID proxyID = rtc->asSurfaceProxy()->uniqueID(); // get the bounding boxes to draw SkTArray childrenBounds; @@ -301,8 +301,7 @@ void SkDebugCanvas::drawTo(SkCanvas* originalCanvas, int index, int m) { paint.setStyle(SkPaint::kStroke_Style); paint.setStrokeWidth(1); for (int i = 0; i < childrenBounds.count(); i++) { - SkASSERT(childrenBounds[i].sameDecision(rtID, rtc->asSurfaceProxy()->uniqueID())); - if (childrenBounds[i].fResourceUniqueID != rtID) { + if (childrenBounds[i].fProxyUniqueID != proxyID) { // offscreen draw, ignore for now continue; } -- cgit v1.2.3