summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2012-04-12 14:50:27 -0700
committerJohn Reck <jreck@google.com>2012-04-12 14:50:27 -0700
commitb62fb73a22ae38019efcdb050bf61e0e22327b9d (patch)
tree60fe529306bffb2509ea258cb716c3a9f1e5ce11
parent85213faae54abd12e8debbf768235403a22faa03 (diff)
downloadexternal_webkit-b62fb73a22ae38019efcdb050bf61e0e22327b9d.zip
external_webkit-b62fb73a22ae38019efcdb050bf61e0e22327b9d.tar.gz
external_webkit-b62fb73a22ae38019efcdb050bf61e0e22327b9d.tar.bz2
Fix funky rects in some cases
Bug: 6138337 Change-Id: Ibbfee2f451a0f05c25832122e1debd53d7fce4b6
-rw-r--r--Source/WebKit/android/jni/AndroidHitTestResult.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/WebKit/android/jni/AndroidHitTestResult.cpp b/Source/WebKit/android/jni/AndroidHitTestResult.cpp
index 9be5613..a135c42 100644
--- a/Source/WebKit/android/jni/AndroidHitTestResult.cpp
+++ b/Source/WebKit/android/jni/AndroidHitTestResult.cpp
@@ -141,9 +141,10 @@ void AndroidHitTestResult::buildHighlightRects()
IntPoint frameOffset = m_webViewCore->convertGlobalContentToFrameContent(IntPoint(), frame);
RenderObject* renderer = node->renderer();
Vector<FloatQuad> quads;
- renderer->absoluteFocusRingQuads(quads);
+ if (renderer->isInline())
+ renderer->absoluteFocusRingQuads(quads);
if (!quads.size())
- renderer->absoluteQuads(quads); // No fancy rings, grab some backups
+ renderer->absoluteQuads(quads); // No fancy rings, grab a bounding box
for (size_t i = 0; i < quads.size(); i++) {
IntRect boundingBox = quads[i].enclosingBoundingBox();
boundingBox.move(-frameOffset.x(), -frameOffset.y());