Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5a829cbf: Merge "Fix for testPaintFlagsDrawFilter CTS test" into jb-mr1-dev

Browse Source 
* commit '5a829cbf5862d6c41f709b86ed5fc1085fea95ee':
  Fix for testPaintFlagsDrawFilter CTS test
This commit is contained in:
Raph Levien
2012-10-03 16:01:15 -07:00
committed by Android Git Automerger
parent 6ae69899be 5a829cbf58
commit 1ca8d35f4d
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/jni/android/graphics/Canvas.cpp
View File

@@ -20,6 +20,7 @@
#include "SkCanvas.h" #include "SkCanvas.h"
#include "SkDevice.h" #include "SkDevice.h"
#include "SkDrawFilter.h"
#include "SkGraphics.h" #include "SkGraphics.h"
#include "SkImageRef_GlobalPool.h" #include "SkImageRef_GlobalPool.h"
#include "SkPorterDuff.h" #include "SkPorterDuff.h"
@@ -784,7 +785,15 @@ public:
#define kStdUnderline_Thickness (1.0f / 18.0f) #define kStdUnderline_Thickness (1.0f / 18.0f)
static void doDrawTextDecorations(SkCanvas* canvas, jfloat x, jfloat y, jfloat length, SkPaint* paint) { static void doDrawTextDecorations(SkCanvas* canvas, jfloat x, jfloat y, jfloat length, SkPaint* paint) {
uint32_t flags = paint->getFlags(); uint32_t flags;
SkDrawFilter* drawFilter = canvas->getDrawFilter();
if (drawFilter) {
SkPaint paintCopy(*paint);
drawFilter->filter(&paintCopy, SkDrawFilter::kText_Type);
flags = paintCopy.getFlags();
} else {
flags = paint->getFlags();
}
if (flags & (SkPaint::kUnderlineText_Flag | SkPaint::kStrikeThruText_Flag)) { if (flags & (SkPaint::kUnderlineText_Flag | SkPaint::kStrikeThruText_Flag)) {
SkScalar left = SkFloatToScalar(x); SkScalar left = SkFloatToScalar(x);
SkScalar right = SkFloatToScalar(x + length); SkScalar right = SkFloatToScalar(x + length);