diff options
| author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 23:42:02 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-14 23:42:02 +0000 |
| commit | b1033da71469d610bb28c5f069a7b7cfc236c953 (patch) | |
| tree | 98ea9d26a05b4d75faf69d0006722deb8b1c10c9 /cc | |
| parent | e6509c896058692578f1d23dc425c473273479f0 (diff) | |
| download | chromium_src-b1033da71469d610bb28c5f069a7b7cfc236c953.zip chromium_src-b1033da71469d610bb28c5f069a7b7cfc236c953.tar.gz chromium_src-b1033da71469d610bb28c5f069a7b7cfc236c953.tar.bz2 | |
setLocalMatrix is deprecated, so pass the matrix to the factory
BUG=
Review URL: https://codereview.chromium.org/286783003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/output/software_renderer.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/cc/output/software_renderer.cc b/cc/output/software_renderer.cc index 348e57d..aabe71b 100644 --- a/cc/output/software_renderer.cc +++ b/cc/output/software_renderer.cc @@ -454,8 +454,7 @@ void SoftwareRenderer::DrawTextureQuad(const DrawingFrame* frame, SkMatrix matrix; matrix.setRectToRect(sk_uv_rect, quad_rect, SkMatrix::kFill_ScaleToFit); skia::RefPtr<SkShader> shader = skia::AdoptRef( - SkShader::CreateBitmapShader(*bitmap, tile_mode, tile_mode)); - shader->setLocalMatrix(matrix); + SkShader::CreateBitmapShader(*bitmap, tile_mode, tile_mode, &matrix)); SkPaint paint; paint.setStyle(SkPaint::kFill_Style); paint.setShader(shader.get()); @@ -548,12 +547,11 @@ void SoftwareRenderer::DrawRenderPassQuad(const DrawingFrame* frame, skia::RefPtr<SkShader> shader; if (filter_bitmap.isNull()) { shader = skia::AdoptRef(SkShader::CreateBitmapShader( - *content, content_tile_mode, content_tile_mode)); + *content, content_tile_mode, content_tile_mode, &content_mat)); } else { shader = skia::AdoptRef(SkShader::CreateBitmapShader( - filter_bitmap, content_tile_mode, content_tile_mode)); + filter_bitmap, content_tile_mode, content_tile_mode, &content_mat)); } - shader->setLocalMatrix(content_mat); current_paint_.setShader(shader.get()); if (quad->mask_resource_id) { @@ -575,9 +573,9 @@ void SoftwareRenderer::DrawRenderPassQuad(const DrawingFrame* frame, SkMatrix mask_mat; mask_mat.setRectToRect(mask_rect, dest_rect, SkMatrix::kFill_ScaleToFit); - skia::RefPtr<SkShader> mask_shader = skia::AdoptRef( - SkShader::CreateBitmapShader(*mask, mask_tile_mode, mask_tile_mode)); - mask_shader->setLocalMatrix(mask_mat); + skia::RefPtr<SkShader> mask_shader = + skia::AdoptRef(SkShader::CreateBitmapShader( + *mask, mask_tile_mode, mask_tile_mode, &mask_mat)); SkPaint mask_paint; mask_paint.setShader(mask_shader.get()); |