diff options
| author | Nicolas Roard <nicolas@android.com> | 2011-01-29 16:30:56 -0800 |
|---|---|---|
| committer | Nicolas Roard <nicolas@android.com> | 2011-01-29 16:30:56 -0800 |
| commit | 0ca8045217bb9b308ddb407d7a9ce17d92d9f9fb (patch) | |
| tree | 1304dce930596e41e22b102c1da2814f98c56af0 /WebKit/android/nav | |
| parent | c16810901e8ee3f344e98477aebd306ce8cbeec1 (diff) | |
| download | external_webkit-0ca8045217bb9b308ddb407d7a9ce17d92d9f9fb.zip external_webkit-0ca8045217bb9b308ddb407d7a9ce17d92d9f9fb.tar.gz external_webkit-0ca8045217bb9b308ddb407d7a9ce17d92d9f9fb.tar.bz2 | |
Draw extras on layers.
Fix a potential crash, and draw the extras.
bug:3372985 bug:3367026
Change-Id: I84be0733217c68b75a679de2212c10b891406d05
Diffstat (limited to 'WebKit/android/nav')
| -rw-r--r-- | WebKit/android/nav/WebView.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/WebKit/android/nav/WebView.cpp b/WebKit/android/nav/WebView.cpp index 9eff795..0c18d85 100644 --- a/WebKit/android/nav/WebView.cpp +++ b/WebKit/android/nav/WebView.cpp @@ -474,6 +474,11 @@ bool drawGL(WebCore::IntRect& viewRect, float scale, int extras) picture.endRecording(); } m_glWebViewState->setExtra(m_baseLayer, picture, rect); + + LayerAndroid* compositeLayer = compositeRoot(); + if (compositeLayer) + compositeLayer->setExtra(extra); + SkRect visibleRect; calcOurContentVisibleRect(&visibleRect); bool ret = m_baseLayer->drawGL(viewRect, visibleRect, scale); |