diff options
| author | John Reck <jreck@google.com> | 2012-01-18 12:59:43 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-18 12:59:43 -0800 |
| commit | 05bc1104ae257df5a776c433fde0824c0afc0eef (patch) | |
| tree | 6ddf917a64e31bf0bfb5d37916e33155aa9c7c15 /Source/WebKit/android/nav/WebView.cpp | |
| parent | 2cba8ed338fae4c3d5a4ed4c141ce9080ff2e089 (diff) | |
| parent | 7023010bb63a565357556a480114a0db229c7b33 (diff) | |
| download | external_webkit-05bc1104ae257df5a776c433fde0824c0afc0eef.zip external_webkit-05bc1104ae257df5a776c433fde0824c0afc0eef.tar.gz external_webkit-05bc1104ae257df5a776c433fde0824c0afc0eef.tar.bz2 | |
Merge "Fix software extras on base layer"
Diffstat (limited to 'Source/WebKit/android/nav/WebView.cpp')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 9bf95e5..0d8a716 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -581,10 +581,10 @@ PictureSet* draw(SkCanvas* canvas, SkColor bgColor, int extras, bool split) m_baseLayer->setMatrix(canvas->getTotalMatrix()); canvas->resetMatrix(); m_baseLayer->draw(canvas); - if (extra) { - IntRect dummy; // inval area, unused for now - extra->draw(canvas, compositeLayer, &dummy); - } + } + if (extra) { + IntRect dummy; // inval area, unused for now + extra->draw(canvas, compositeLayer, &dummy); } #endif return ret; |