summaryrefslogtreecommitdiffstats
path: root/WebKit/android/nav
diff options
context:
space:
mode:
authorCary Clark <cary@android.com>2010-03-05 07:06:09 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-03-05 07:06:09 -0800
commit485aae7ebcd6872e4bd4c6cf7077cf25f855e1b8 (patch)
treee597a377bb62a6360c235fcf1e23fdb37575d180 /WebKit/android/nav
parent1c0c5112e9c2ef9e4b14b57ff15ed03500cbdb57 (diff)
parentc657c686e52dc255b3967ab8744c2e9cde4a16de (diff)
downloadexternal_webkit-485aae7ebcd6872e4bd4c6cf7077cf25f855e1b8.zip
external_webkit-485aae7ebcd6872e4bd4c6cf7077cf25f855e1b8.tar.gz
external_webkit-485aae7ebcd6872e4bd4c6cf7077cf25f855e1b8.tar.bz2
Merge "fixes with find drawing in layers"
Diffstat (limited to 'WebKit/android/nav')
-rw-r--r--WebKit/android/nav/FindCanvas.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/WebKit/android/nav/FindCanvas.cpp b/WebKit/android/nav/FindCanvas.cpp
index 139bd2c..5f02888 100644
--- a/WebKit/android/nav/FindCanvas.cpp
+++ b/WebKit/android/nav/FindCanvas.cpp
@@ -553,7 +553,12 @@ void FindOnPage::draw(SkCanvas* canvas, LayerAndroid* layer) {
if (matchInfo.layerId() == layerId) {
drawMatch(currentMatchRegion, canvas, true);
// Now draw the picture, so that it shows up on top of the rectangle
+ int saveCount = canvas->save();
+ SkPath matchPath;
+ currentMatchRegion.getBoundaryPath(&matchPath);
+ canvas->clipPath(matchPath);
canvas->drawPicture(*matchInfo.getPicture());
+ canvas->restoreToCount(saveCount);
}
// Draw the rest
unsigned numberOfMatches = m_matches->size();