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/jni/WebViewCore.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/jni/WebViewCore.cpp')
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index bfa83a9..b62cb50 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -748,10 +748,8 @@ void WebViewCore::contentDraw() void WebViewCore::contentInvalidate(const WebCore::IntRect &r) { DBG_SET_LOGD("rect={%d,%d,w=%d,h=%d}", r.x(), r.y(), r.width(), r.height()); - SkIRect rect, max; - android_setrect(&rect, r); - max.set(0, 0, INT_MAX, INT_MAX); - if (!rect.intersect(max)) + SkIRect rect(r); + if (!rect.intersect(0, 0, INT_MAX, INT_MAX)) return; m_addInval.op(rect, SkRegion::kUnion_Op); DBG_SET_LOGD("m_addInval={%d,%d,r=%d,b=%d}", |