Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2542)

Unified Diff: cc/resource_update_controller.cc

Issue 11412255: cc: Use skia::RefPtr in place of raw pointers and SkAutoTUnref. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add webkit Created 8 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:
View side-by-side diff with in-line comments
Download patch
Index: cc/resource_update_controller.cc
diff --git a/cc/resource_update_controller.cc b/cc/resource_update_controller.cc
index 4ff729c846082cf780eb051f904998898b362393..44e8abe16a8299f5a8c866262eccc3d3958d8c7c 100644
--- a/cc/resource_update_controller.cc
+++ b/cc/resource_update_controller.cc
@@ -9,6 +9,7 @@
#include "cc/resource_provider.h"
#include "cc/texture_copier.h"
#include "cc/thread.h"
+#include "skia/ext/refptr.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "third_party/skia/include/gpu/SkGpuDevice.h"
#include <limits>
@@ -36,7 +37,7 @@ const double uploaderBusyTickRate = 0.001;
// Number of blocking update intervals to allow.
const size_t maxBlockingUpdateIntervals = 4;
-scoped_ptr<SkCanvas> createAcceleratedCanvas(
+skia::RefPtr<SkCanvas> createAcceleratedCanvas(
GrContext* grContext, gfx::Size canvasSize, unsigned textureId)
{
GrPlatformTextureDesc textureDesc;
@@ -45,10 +46,11 @@ scoped_ptr<SkCanvas> createAcceleratedCanvas(
textureDesc.fHeight = canvasSize.height();
textureDesc.fConfig = kSkia8888_GrPixelConfig;
textureDesc.fTextureHandle = textureId;
- SkAutoTUnref<GrTexture> target(
- grContext->createPlatformTexture(textureDesc));
- SkAutoTUnref<SkDevice> device(new SkGpuDevice(grContext, target.get()));
- return make_scoped_ptr(new SkCanvas(device.get()));
+ skia::RefPtr<GrTexture> target =
+ skia::AdoptRef(grContext->createPlatformTexture(textureDesc));
+ skia::RefPtr<SkDevice> device =
+ skia::AdoptRef(new SkGpuDevice(grContext, target.get()));
+ return skia::AdoptRef(new SkCanvas(device.get()));
}
} // namespace
@@ -150,7 +152,7 @@ void ResourceUpdateController::updateTexture(ResourceUpdate update)
paintContext->makeContextCurrent();
// Create an accelerated canvas to draw on.
- scoped_ptr<SkCanvas> canvas = createAcceleratedCanvas(
+ skia::RefPtr<SkCanvas> canvas = createAcceleratedCanvas(
paintGrContext, texture->size(), lock.textureId());
// The compositor expects the textures to be upside-down so it can flip

Powered by Google App Engine
This is Rietveld 408576698