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

Unified Diff: src/fonts/SkRandomScalerContext.cpp

Issue 1880873002: Revert "Revert of Pass effects directly to fontcache (patchset #8 id:140001 of https://codereview.c… (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/fonts/SkRandomScalerContext.h ('k') | src/fonts/SkTestScalerContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/fonts/SkRandomScalerContext.cpp
diff --git a/src/fonts/SkRandomScalerContext.cpp b/src/fonts/SkRandomScalerContext.cpp
index c555dd2294457012f5384bfcf0a0e840554c7083..245052053e3d40f77413913d4bf7ff7d60e93908 100644
--- a/src/fonts/SkRandomScalerContext.cpp
+++ b/src/fonts/SkRandomScalerContext.cpp
@@ -13,7 +13,8 @@
class SkRandomScalerContext : public SkScalerContext {
public:
- SkRandomScalerContext(SkRandomTypeface*, const SkDescriptor*, bool fFakeIt);
+ SkRandomScalerContext(SkRandomTypeface*, const SkScalerContextEffects&,
+ const SkDescriptor*, bool fFakeIt);
virtual ~SkRandomScalerContext();
protected:
@@ -35,12 +36,14 @@ private:
#include "SkDescriptor.h"
-SkRandomScalerContext::SkRandomScalerContext(SkRandomTypeface* face, const SkDescriptor* desc,
+SkRandomScalerContext::SkRandomScalerContext(SkRandomTypeface* face,
+ const SkScalerContextEffects& effects,
+ const SkDescriptor* desc,
bool fakeIt)
- : SkScalerContext(face, desc)
+ : SkScalerContext(face, effects, desc)
, fFace(face)
, fFakeIt(fakeIt) {
- fProxy = face->proxy()->createScalerContext(desc);
+ fProxy = face->proxy()->createScalerContext(effects, desc);
}
SkRandomScalerContext::~SkRandomScalerContext() { delete fProxy; }
@@ -197,9 +200,9 @@ SkRandomTypeface::~SkRandomTypeface() {
fProxy->unref();
}
-SkScalerContext* SkRandomTypeface::onCreateScalerContext(
- const SkDescriptor* desc) const {
- return new SkRandomScalerContext(const_cast<SkRandomTypeface*>(this), desc, fFakeIt);
+SkScalerContext* SkRandomTypeface::onCreateScalerContext(const SkScalerContextEffects& effects,
+ const SkDescriptor* desc) const {
+ return new SkRandomScalerContext(const_cast<SkRandomTypeface*>(this), effects, desc, fFakeIt);
}
void SkRandomTypeface::onFilterRec(SkScalerContextRec* rec) const {
« no previous file with comments | « src/fonts/SkRandomScalerContext.h ('k') | src/fonts/SkTestScalerContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698