diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-02 10:15:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-02 10:15:12 -0700 |
| commit | 18bb2bddde12f110c539b1517a53f58d74c48bc7 (patch) | |
| tree | dfd6fe470db981974c65a01e542732bb14ec8f16 | |
| parent | 9fc4ce243202ae664e2aefaa89123ae69b48e011 (diff) | |
| parent | fa3976234409edb5477e8950204c597cf2a6dda9 (diff) | |
| download | external_webkit-18bb2bddde12f110c539b1517a53f58d74c48bc7.zip external_webkit-18bb2bddde12f110c539b1517a53f58d74c48bc7.tar.gz external_webkit-18bb2bddde12f110c539b1517a53f58d74c48bc7.tar.bz2 | |
am fa397623: Merge "Workaround a crash" into jb-dev
* commit 'fa3976234409edb5477e8950204c597cf2a6dda9':
Workaround a crash
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index 92fbef6..07b69c7 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -304,8 +304,14 @@ PictureSet* draw(SkCanvas* canvas, SkColor bgColor, DrawExtras extras, bool spli // draw the content of the base layer first LayerContent* content = m_baseLayer->content(); int sc = canvas->save(SkCanvas::kClip_SaveFlag); - canvas->clipRect(SkRect::MakeLTRB(0, 0, content->width(), - content->height()), SkRegion::kDifference_Op); + int contentWidth = 0; + int contentHeight = 0; + if (content) { + contentWidth = content->width(); + contentHeight = content->height(); + } + canvas->clipRect(SkRect::MakeLTRB(0, 0, contentWidth, contentHeight), + SkRegion::kDifference_Op); Color c = m_baseLayer->getBackgroundColor(); canvas->drawColor(SkColorSetARGBInline(c.alpha(), c.red(), c.green(), c.blue())); canvas->restoreToCount(sc); |