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

Side by Side Diff: src/core/SkPictureShader.cpp

Issue 1372593002: SkInstallDiscardablePixelRef is deprecated, enforce that (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 2 months 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 unified diff | Download patch
« no previous file with comments | « src/core/SkImageGeneratorPriv.h ('k') | src/lazy/SkDiscardablePixelRef.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkPictureShader.h" 8 #include "SkPictureShader.h"
9 9
10 #include "SkBitmap.h" 10 #include "SkBitmap.h"
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 fTmx, 212 fTmx,
213 fTmy, 213 fTmy,
214 tileScale, 214 tileScale,
215 this->getLocalMatrix()); 215 this->getLocalMatrix());
216 216
217 if (!SkResourceCache::Find(key, BitmapShaderRec::Visitor, &tileShader)) { 217 if (!SkResourceCache::Find(key, BitmapShaderRec::Visitor, &tileShader)) {
218 SkMatrix tileMatrix; 218 SkMatrix tileMatrix;
219 tileMatrix.setRectToRect(fTile, SkRect::MakeIWH(tileSize.width(), tileSi ze.height()), 219 tileMatrix.setRectToRect(fTile, SkRect::MakeIWH(tileSize.width(), tileSi ze.height()),
220 SkMatrix::kFill_ScaleToFit); 220 SkMatrix::kFill_ScaleToFit);
221 SkBitmap bm; 221 SkBitmap bm;
222 if (!SkInstallDiscardablePixelRef( 222 if (!SkDEPRECATED_InstallDiscardablePixelRef(
223 SkImageGenerator::NewFromPicture(tileSize, fPicture, &tileMatrix, nu llptr), &bm)) { 223 SkImageGenerator::NewFromPicture(tileSize, fPicture, &tileMatrix, nu llptr), &bm)) {
224 return nullptr; 224 return nullptr;
225 } 225 }
226 226
227 SkMatrix shaderMatrix = this->getLocalMatrix(); 227 SkMatrix shaderMatrix = this->getLocalMatrix();
228 shaderMatrix.preScale(1 / tileScale.width(), 1 / tileScale.height()); 228 shaderMatrix.preScale(1 / tileScale.width(), 1 / tileScale.height());
229 tileShader.reset(CreateBitmapShader(bm, fTmx, fTmy, &shaderMatrix)); 229 tileShader.reset(CreateBitmapShader(bm, fTmx, fTmy, &shaderMatrix));
230 230
231 SkResourceCache::Add(new BitmapShaderRec(key, tileShader.get(), bm.getSi ze())); 231 SkResourceCache::Add(new BitmapShaderRec(key, tileShader.get(), bm.getSi ze()));
232 } 232 }
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 if (context) { 324 if (context) {
325 maxTextureSize = context->caps()->maxTextureSize(); 325 maxTextureSize = context->caps()->maxTextureSize();
326 } 326 }
327 SkAutoTUnref<SkShader> bitmapShader(this->refBitmapShader(viewM, localMatrix , maxTextureSize)); 327 SkAutoTUnref<SkShader> bitmapShader(this->refBitmapShader(viewM, localMatrix , maxTextureSize));
328 if (!bitmapShader) { 328 if (!bitmapShader) {
329 return nullptr; 329 return nullptr;
330 } 330 }
331 return bitmapShader->asFragmentProcessor(context, viewM, nullptr, fq, procDa taManager); 331 return bitmapShader->asFragmentProcessor(context, viewM, nullptr, fq, procDa taManager);
332 } 332 }
333 #endif 333 #endif
OLDNEW
« no previous file with comments | « src/core/SkImageGeneratorPriv.h ('k') | src/lazy/SkDiscardablePixelRef.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698