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

Unified Diff: cc/software_renderer.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: ref() Created 8 years 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
« no previous file with comments | « cc/resource_update_controller.cc ('k') | content/common/cc_messages.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/software_renderer.cc
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc
index 7f6e0c9dd7c3f857ca6d3fb4b26d5e7536b4514c..a2fd08a55642f2d993ac633fae9ad26a7d663053 100644
--- a/cc/software_renderer.cc
+++ b/cc/software_renderer.cc
@@ -307,13 +307,14 @@ void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende
SkMatrix contentMat;
contentMat.setRectToRect(contentRect, destRect, SkMatrix::kFill_ScaleToFit);
- SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(*content,
- SkShader::kClamp_TileMode,
- SkShader::kClamp_TileMode));
+ skia::RefPtr<SkShader> shader = skia::AdoptRef(
+ SkShader::CreateBitmapShader(*content,
+ SkShader::kClamp_TileMode,
+ SkShader::kClamp_TileMode));
shader->setLocalMatrix(contentMat);
- m_skCurrentPaint.setShader(shader);
+ m_skCurrentPaint.setShader(shader.get());
- SkImageFilter* filter = renderPass->filter;
+ SkImageFilter* filter = renderPass->filter.get();
if (filter)
m_skCurrentPaint.setImageFilter(filter);
@@ -331,18 +332,19 @@ void SoftwareRenderer::drawRenderPassQuad(const DrawingFrame& frame, const Rende
SkMatrix maskMat;
maskMat.setRectToRect(maskRect, destRect, SkMatrix::kFill_ScaleToFit);
- SkAutoTUnref<SkShader> maskShader(SkShader::CreateBitmapShader(*mask,
- SkShader::kClamp_TileMode,
- SkShader::kClamp_TileMode));
+ skia::RefPtr<SkShader> maskShader = skia::AdoptRef(
+ SkShader::CreateBitmapShader(*mask,
+ SkShader::kClamp_TileMode,
+ SkShader::kClamp_TileMode));
maskShader->setLocalMatrix(maskMat);
SkPaint maskPaint;
- maskPaint.setShader(maskShader);
+ maskPaint.setShader(maskShader.get());
- SkAutoTUnref<SkLayerRasterizer> maskRasterizer(new SkLayerRasterizer);
+ skia::RefPtr<SkLayerRasterizer> maskRasterizer = skia::AdoptRef(new SkLayerRasterizer);
maskRasterizer->addLayer(maskPaint);
- m_skCurrentPaint.setRasterizer(maskRasterizer);
+ m_skCurrentPaint.setRasterizer(maskRasterizer.get());
m_skCurrentCanvas->drawRect(destRect, m_skCurrentPaint);
} else {
// FIXME: Apply background filters and blend with content
« no previous file with comments | « cc/resource_update_controller.cc ('k') | content/common/cc_messages.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698