diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2012-05-02 10:11:03 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-02 10:11:03 -0700 |
| commit | fa3976234409edb5477e8950204c597cf2a6dda9 (patch) | |
| tree | 7f1a132c5daed405896b85ad74a8879975652e4c /Source/WebKit/android/nav | |
| parent | e0b5cd3a7762688630b380296675a47aa013992d (diff) | |
| parent | 829229abf10ddf6135c682d42a291925ef0da35f (diff) | |
| download | external_webkit-fa3976234409edb5477e8950204c597cf2a6dda9.zip external_webkit-fa3976234409edb5477e8950204c597cf2a6dda9.tar.gz external_webkit-fa3976234409edb5477e8950204c597cf2a6dda9.tar.bz2 | |
Merge "Workaround a crash" into jb-dev
Diffstat (limited to 'Source/WebKit/android/nav')
| -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); |