diff options
| author | John Reck <jreck@google.com> | 2011-05-12 16:29:48 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-12 16:29:48 -0700 |
| commit | 58348114645f3987aaabae40612a876cfd2bc678 (patch) | |
| tree | 07f7fec51f6721e09fc3e7565ebbf11d2c78d449 /WebKit | |
| parent | c74d30ac1079750a0d7f87704a9962f8045cce94 (diff) | |
| parent | 714b8a5696d6c82268757bc6eb711eddbabc872e (diff) | |
| download | external_webkit-58348114645f3987aaabae40612a876cfd2bc678.zip external_webkit-58348114645f3987aaabae40612a876cfd2bc678.tar.gz external_webkit-58348114645f3987aaabae40612a876cfd2bc678.tar.bz2 | |
Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
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 b294112..f29d218 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -470,13 +470,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); |