diff options
| author | Chris Craik <ccraik@google.com> | 2012-05-21 11:08:49 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2012-05-21 11:08:49 -0700 |
| commit | 261f89503d6606bb4896a4effe0ab4d5b4e01d8a (patch) | |
| tree | 3ddb3048d2de217d9ff943c968d44de9cd6e26d0 /Source/WebKit/android/nav | |
| parent | 6baa213e1806af132b1f0b1170343c5ac2bf75d3 (diff) | |
| download | external_webkit-261f89503d6606bb4896a4effe0ab4d5b4e01d8a.zip external_webkit-261f89503d6606bb4896a4effe0ab4d5b4e01d8a.tar.gz external_webkit-261f89503d6606bb4896a4effe0ab4d5b4e01d8a.tar.bz2 | |
Add checks for null base layer content
bug:6519982
Change-Id: I1ef0eda2b94090cc894441c1620ae85e7fd86d22
Diffstat (limited to 'Source/WebKit/android/nav')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 473efdb..7485e83 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -530,7 +530,7 @@ bool setBaseLayer(BaseLayerAndroid* newBaseLayer, bool showVisualIndicator, void copyBaseContentToPicture(SkPicture* picture) { - if (!m_baseLayer) + if (!m_baseLayer || !m_baseLayer->content()) return; LayerContent* content = m_baseLayer->content(); content->draw(picture->beginRecording(content->width(), content->height(), @@ -539,7 +539,7 @@ void copyBaseContentToPicture(SkPicture* picture) } bool hasContent() { - if (!m_baseLayer) + if (!m_baseLayer || !m_baseLayer->content()) return false; return !m_baseLayer->content()->isEmpty(); } |