diff options
| author | Chris Craik <ccraik@google.com> | 2012-05-21 14:32:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-21 14:32:33 -0700 |
| commit | d79c461a709fb422b8bf694bd665ca144689bfe6 (patch) | |
| tree | 535b89b714771b7255c11ecedff4ce2e5fe89f2c /Source/WebKit/android | |
| parent | 6d62e2856c7c40b506685d64868333fd39921283 (diff) | |
| parent | 0e518116e66e544a899674ed1a5039b2c7e04f05 (diff) | |
| download | external_webkit-d79c461a709fb422b8bf694bd665ca144689bfe6.zip external_webkit-d79c461a709fb422b8bf694bd665ca144689bfe6.tar.gz external_webkit-d79c461a709fb422b8bf694bd665ca144689bfe6.tar.bz2 | |
am 0e518116: am 261f8950: Add checks for null base layer content
* commit '0e518116e66e544a899674ed1a5039b2c7e04f05':
Add checks for null base layer content
Diffstat (limited to 'Source/WebKit/android')
| -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 fba5b58..9f68177 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(); } |