diff options
| author |  bungeman <bungeman@google.com> | 2015-01-27 11:01:42 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-27 11:01:43 -0800 |
| commit | 8ece6eb37b4f3c98587efa071ce565d26b156e9a (patch) | |
| tree | 6d8a48fd74c2177fd1f565f8adf4d88fd13a3690 /src | |
| parent | 52b64b45e98c7f0342ecbfb16a6da51065e8262a (diff) | |
Remove unused methods from SkScalerContext.
The methods getLocalMatrixWithoutTextSize and
getSingleMatrixWithoutTextSize on SkScalerContext were added as a
temporary measure for CoreText issues. Now that the CoreText
SkScalerContext is using other means to fix these issues more completely,
remove these now unused methods.
Review URL: https://codereview.chromium.org/883833002
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkScalerContext.cpp | 13 | ||||
| -rw-r--r-- | src/core/SkScalerContext.h | 2 |
2 files changed, 0 insertions, 15 deletions
diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp index 16cc940c06..a3ff95ca0a 100644 --- a/src/core/SkScalerContext.cpp +++ b/src/core/SkScalerContext.cpp @@ -700,10 +700,6 @@ void SkScalerContextRec::getLocalMatrix(SkMatrix* m) const { SkPaint::SetTextMatrix(m, fTextSize, fPreScaleX, fPreSkewX); } -void SkScalerContextRec::getLocalMatrixWithoutTextSize(SkMatrix* m) const { - SkPaint::SetTextMatrix(m, SK_Scalar1, fPreScaleX, fPreSkewX); -} - void SkScalerContextRec::getSingleMatrix(SkMatrix* m) const { this->getLocalMatrix(m); @@ -713,15 +709,6 @@ void SkScalerContextRec::getSingleMatrix(SkMatrix* m) const { m->postConcat(deviceMatrix); } -void SkScalerContextRec::getSingleMatrixWithoutTextSize(SkMatrix* m) const { - this->getLocalMatrixWithoutTextSize(m); - - // now concat the device matrix - SkMatrix deviceMatrix; - this->getMatrixFrom2x2(&deviceMatrix); - m->postConcat(deviceMatrix); -} - void SkScalerContextRec::computeMatrices(PreMatrixScale preMatrixScale, SkVector* s, SkMatrix* sA, SkMatrix* GsA, SkMatrix* G_inv, SkMatrix* A_out) { diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h index 88b52860fb..9d3bdc8a8f 100644 --- a/src/core/SkScalerContext.h +++ b/src/core/SkScalerContext.h @@ -82,9 +82,7 @@ struct SkScalerContextRec { void getMatrixFrom2x2(SkMatrix*) const; void getLocalMatrix(SkMatrix*) const; - void getLocalMatrixWithoutTextSize(SkMatrix*) const; void getSingleMatrix(SkMatrix*) const; - void getSingleMatrixWithoutTextSize(SkMatrix*) const; /** The kind of scale which will be applied by the underlying port (pre-matrix). */ enum PreMatrixScale { |