diff options
| author | Mike Reed <reed@google.com> | 2009-04-29 10:47:10 -0400 |
|---|---|---|
| committer | Mike Reed <reed@google.com> | 2009-04-29 11:30:19 -0400 |
| commit | 8535e17115184dbb5e448b6364b88eb52df34482 (patch) | |
| tree | e282875c82ad48dd67a46b0d4efbdcfebcc56ce2 /WebKit/android/nav/WebView.cpp | |
| parent | 6a813290b2f6bb173cda985d26b231d3c539696d (diff) | |
| download | external_webkit-8535e17115184dbb5e448b6364b88eb52df34482.zip external_webkit-8535e17115184dbb5e448b6364b88eb52df34482.tar.gz external_webkit-8535e17115184dbb5e448b6364b88eb52df34482.tar.bz2 | |
share xfermode and color routines with chrome port
Besides sharing those routines in SkiaUtils.cpp, also remove our (now redundant)
android_setrect, etc. calls, since the type-conversion extras we added earlier
take care of this by using constructors.
Diffstat (limited to 'WebKit/android/nav/WebView.cpp')
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index 8431d80..7b98e56 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -666,8 +666,7 @@ void drawMatches(SkCanvas* canvas) unsigned numberOfMatches = m_matches->size(); if (numberOfMatches > 1 && numberOfMatches < MAX_NUMBER_OF_MATCHES_TO_DRAW) { - SkIRect visibleIRect; - android_setrect(&visibleIRect, visible); + SkIRect visibleIRect(visible); for(unsigned i = 0; i < numberOfMatches; i++) { // The current match has already been drawn if (i == m_findIndex) @@ -726,9 +725,7 @@ void drawFocusRing(SkCanvas* canvas) m_viewImpl->gButtonMutex.unlock(); WebCore::IntRect bounds = node->bounds(); bounds.inflate(SkScalarCeil(FOCUS_RING_OUTER_DIAMETER)); - SkRect sbounds; - android_setrect(&sbounds, bounds); - if (canvas->quickReject(sbounds, SkCanvas::kAA_EdgeType)) { + if (canvas->quickReject(bounds, SkCanvas::kAA_EdgeType)) { DBG_NAV_LOG("canvas->quickReject"); m_followedLink = false; return; |