summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-05-18 11:29:30 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-05-18 11:29:30 -0700
commitabec1581469efd99a49b0508a4d833b9cd69aa53 (patch)
tree061e19fe3e8ac425eacb0699e2b303da45705ffc
parent73d131bc28aa2a68fe686ffd9426814448f5da7b (diff)
parent117d84f8c6e041c716766d519f10b5844c2968ea (diff)
downloadexternal_webkit-abec1581469efd99a49b0508a4d833b9cd69aa53.zip
external_webkit-abec1581469efd99a49b0508a4d833b9cd69aa53.tar.gz
external_webkit-abec1581469efd99a49b0508a4d833b9cd69aa53.tar.bz2
Merge change 1884
* changes: skip rectangular focus ring check in browser if no picture
-rw-r--r--WebKit/android/nav/CachedRoot.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebKit/android/nav/CachedRoot.cpp b/WebKit/android/nav/CachedRoot.cpp
index 41f642c..cf8578f 100644
--- a/WebKit/android/nav/CachedRoot.cpp
+++ b/WebKit/android/nav/CachedRoot.cpp
@@ -626,6 +626,8 @@ void CachedRoot::checkForJiggle(int* xDeltaPtr) const
bool CachedRoot::checkRings(const WTF::Vector<WebCore::IntRect>& rings,
const WebCore::IntRect& bounds) const
{
+ if (!mPicture)
+ return false;
RingCheck ringCheck(rings, bounds.location());
BoundsCanvas checker(&ringCheck);
SkBitmap bitmap;