diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 05:08:15 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 05:08:15 +0000 |
| commit | 1940c4ee397232a4948b0328e728024ea19e3f5f (patch) | |
| tree | 34571d6bff7ecc3904b54bfc3df97c906437b7f1 /cc/software_renderer.cc | |
| parent | 45413146bcedc4087f4a8862384dd1508411848d (diff) | |
| download | chromium_src-1940c4ee397232a4948b0328e728024ea19e3f5f.zip chromium_src-1940c4ee397232a4948b0328e728024ea19e3f5f.tar.gz chromium_src-1940c4ee397232a4948b0328e728024ea19e3f5f.tar.bz2 | |
cc: Use skia::RefPtr in place of raw pointers and SkAutoTUnref.
Safe reference counting for skia objects ahoy!
R=jamesr
BUG=163454
Depends on: https://codereview.chromium.org/11418217/
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11412255
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/software_renderer.cc')
| -rw-r--r-- | cc/software_renderer.cc | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/cc/software_renderer.cc b/cc/software_renderer.cc index 7f6e0c9..a2fd08a 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 |