diff options
| author | Nicolas Roard <nicolas@android.com> | 2010-11-03 19:49:27 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2011-05-05 17:06:08 -0700 |
| commit | 714b8a5696d6c82268757bc6eb711eddbabc872e (patch) | |
| tree | 321d08bc5a37904875bf1b16093c550f67423c6a /WebKit | |
| parent | 2d60bef786645e5b9e2da0e8374d3f06a40d0638 (diff) | |
| download | external_webkit-714b8a5696d6c82268757bc6eb711eddbabc872e.zip external_webkit-714b8a5696d6c82268757bc6eb711eddbabc872e.tar.gz external_webkit-714b8a5696d6c82268757bc6eb711eddbabc872e.tar.bz2 | |
DO NOT MERGE cursor ring drawing in GL
Cherry pick of 3 CLs:
105851, 105988, 108900
Diffstat (limited to 'WebKit')
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index 09fcd67..6816611 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -478,13 +478,18 @@ bool drawGL(WebCore::IntRect& viewRect, WebCore::IntRect* invalRect, WebCore::In SkPicture picture; IntRect rect(0, 0, 0, 0); bool allowSame = false; + m_glWebViewState->resetRings(); if (extra) { - LayerAndroid mainPicture(m_navPictureUI); - PictureSet* content = m_baseLayer->content(); - SkCanvas* canvas = picture.beginRecording(content->width(), - content->height()); - extra->draw(canvas, &mainPicture, &rect); - picture.endRecording(); + if (extra == &m_ring) { + m_glWebViewState->setRings(m_ring.rings(), m_ring.m_isPressed); + } else { + LayerAndroid mainPicture(m_navPictureUI); + PictureSet* content = m_baseLayer->content(); + SkCanvas* canvas = picture.beginRecording(content->width(), + content->height()); + extra->draw(canvas, &mainPicture, &rect); + picture.endRecording(); + } } else if (extras == DrawExtrasCursorRing && m_ring.m_isButton) { const CachedFrame* cachedFrame; const CachedNode* cachedCursor = root->currentCursor(&cachedFrame); |