diff options
| author | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 08:12:24 +0000 |
|---|---|---|
| committer | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 08:12:24 +0000 |
| commit | 2e6810c678edf9de668fa35821dd2c14ab2c19a7 (patch) | |
| tree | fe77f766ec472996f95a99865160b2797ab05925 | |
| parent | 72f70905b509db15835467274d327fb91ecd2b12 (diff) | |
| download | chromium_src-2e6810c678edf9de668fa35821dd2c14ab2c19a7.zip chromium_src-2e6810c678edf9de668fa35821dd2c14ab2c19a7.tar.gz chromium_src-2e6810c678edf9de668fa35821dd2c14ab2c19a7.tar.bz2 | |
Speculative fix for a browser crash.
Add a null check, content_view_core_ can theoretically be NULL.
Return null in those scenarios instead of a segfault.
BUG=248709
Review URL: https://chromiumcodereview.appspot.com/16816020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207353 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/web_contents/web_contents_view_android.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/content/browser/web_contents/web_contents_view_android.cc b/content/browser/web_contents/web_contents_view_android.cc index 2ae977e..38ce95e 100644 --- a/content/browser/web_contents/web_contents_view_android.cc +++ b/content/browser/web_contents/web_contents_view_android.cc @@ -63,15 +63,15 @@ void WebContentsViewAndroid::NotifyExternalSurface( #endif gfx::NativeView WebContentsViewAndroid::GetNativeView() const { - return content_view_core_->GetViewAndroid(); + return content_view_core_ ? content_view_core_->GetViewAndroid() : NULL; } gfx::NativeView WebContentsViewAndroid::GetContentNativeView() const { - return content_view_core_->GetViewAndroid(); + return content_view_core_ ? content_view_core_->GetViewAndroid() : NULL; } gfx::NativeWindow WebContentsViewAndroid::GetTopLevelNativeWindow() const { - return content_view_core_->GetWindowAndroid(); + return content_view_core_ ? content_view_core_->GetWindowAndroid() : NULL; } void WebContentsViewAndroid::GetContainerBounds(gfx::Rect* out) const { |