diff options
| -rw-r--r-- | WebCore/platform/android/RenderThemeAndroid.cpp | 2 | ||||
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/WebCore/platform/android/RenderThemeAndroid.cpp b/WebCore/platform/android/RenderThemeAndroid.cpp index 09b679d..4cf7a1c 100644 --- a/WebCore/platform/android/RenderThemeAndroid.cpp +++ b/WebCore/platform/android/RenderThemeAndroid.cpp @@ -205,7 +205,7 @@ bool RenderThemeAndroid::paintButton(RenderObject* obj, const RenderObject::Pain // If it is a disabled button, simply paint it to the master picture. Node* node = obj->node(); if (!node || !node->isElementNode() - || !static_cast<Element*>(node)->isEnabledFormControl()) { + || !static_cast<Element*>(node)->isEnabledFormControl()) { RenderSkinButton::Draw(getCanvasFromInfo(info), rect, RenderSkinAndroid::kDisabled); } else { diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index a6e0d37..57c5a95 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -458,6 +458,16 @@ void drawCursorRing(SkCanvas* canvas) root->getSimulatedMousePosition(&m_viewImpl->m_cursorLocation); m_viewImpl->m_cursorNode = node->nodePointer(); m_viewImpl->gCursorBoundsMutex.unlock(); + + WTF::Vector<WebCore::IntRect> oneRing; + bool useHitBounds = node->useHitBounds(); + if (useHitBounds) { + bounds = node->hitBounds(); + } + if (useHitBounds || node->useBounds()) { + oneRing.append(bounds); + rings = &oneRing; + } bounds.inflate(SkScalarCeil(CURSOR_RING_OUTER_DIAMETER)); if (canvas->quickReject(bounds, SkCanvas::kAA_EdgeType)) { DBG_NAV_LOGD("canvas->quickReject cursorNode=%d (nodePointer=%p)" @@ -467,7 +477,6 @@ void drawCursorRing(SkCanvas* canvas) return; } CursorRing::Flavor flavor = CursorRing::NORMAL_FLAVOR; - WTF::Vector<WebCore::IntRect> oneRing; if (!isButton) { flavor = node->type() != NORMAL_CACHEDNODETYPE ? CursorRing::FAKE_FLAVOR : CursorRing::NORMAL_FLAVOR; @@ -479,11 +488,6 @@ void drawCursorRing(SkCanvas* canvas) flavor = static_cast<CursorRing::Flavor> (flavor + CursorRing::NORMAL_ANIMATING); } - bool useHitBounds = node->useHitBounds(); - if (useHitBounds || node->useBounds()) { - oneRing.append(useHitBounds ? node->hitBounds() : node->bounds()); - rings = &oneRing; - } #if DEBUG_NAV_UI const WebCore::IntRect& ring = (*rings)[0]; DBG_NAV_LOGD("cursorNode=%d (nodePointer=%p) flavor=%s rings=%d" |