summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-03-22 19:31:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-22 19:31:35 -0700
commitefe35076f0066a6ed0e326ea15c6d5b42a7bbf60 (patch)
treec5d5a0fc2368e42f7a55ad41473b9f3aeecdd493
parent176fb0a1767db036303ab2df17d9e889b5e88db0 (diff)
parent55c8e9b1b75caff31e804a6f4da404da9f67af93 (diff)
downloadexternal_webkit-efe35076f0066a6ed0e326ea15c6d5b42a7bbf60.zip
external_webkit-efe35076f0066a6ed0e326ea15c6d5b42a7bbf60.tar.gz
external_webkit-efe35076f0066a6ed0e326ea15c6d5b42a7bbf60.tar.bz2
am 55c8e9b1: Merge "Workaround for poor dashed line performance" into honeycomb-mr1
* commit '55c8e9b1b75caff31e804a6f4da404da9f67af93': Workaround for poor dashed line performance
-rw-r--r--WebCore/platform/graphics/android/GraphicsContextAndroid.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
index 2f5a4b9..f9df8cc 100644
--- a/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
+++ b/WebCore/platform/graphics/android/GraphicsContextAndroid.cpp
@@ -317,9 +317,10 @@ public:
}
if (width > 0) {
- SkScalar intervals[] = { width, width };
- pe = new SkDashPathEffect(intervals, 2, 0);
- paint->setPathEffect(pe)->unref();
+ // TODO: Add this back when SkDashPathEffect's performance has been improved
+ //SkScalar intervals[] = { width, width };
+ //pe = new SkDashPathEffect(intervals, 2, 0);
+ //paint->setPathEffect(pe)->unref();
// Return true if we're basically a dotted dash of squares
return RoundToInt(width) == RoundToInt(paint->getStrokeWidth());
}