mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 2

fix: correct null pointer checks in autoresizing browser views (#25951)

Browse source 
* Correction null pointer checks

* fix: correct null pointer checks in autoresizing browser views

Co-authored-by: mlaurencin <mlaurencin@microsoft.com>
This commit is contained in:
Michaela Laurencin 2020-10-19 09:26:38 -07:00 • committed by GitHub
parent 87d3f3584c
commit 11ce55628e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
shell/browser/native_browser_view_views.cc
View file

@ -27,7 +27,7 @@ void NativeBrowserViewViews::SetAutoResizeProportions(
if ((auto_resize_flags_ & AutoResizeFlags::kAutoResizeHorizontal) && if ((auto_resize_flags_ & AutoResizeFlags::kAutoResizeHorizontal) &&
!auto_horizontal_proportion_set_) { !auto_horizontal_proportion_set_) {
auto* iwc_view = GetInspectableWebContentsView(); auto* iwc_view = GetInspectableWebContentsView();
if (iwc_view) if (!iwc_view)
return; return;
auto* view = iwc_view->GetView(); auto* view = iwc_view->GetView();
auto view_bounds = view->bounds(); auto view_bounds = view->bounds();
@ -41,7 +41,7 @@ void NativeBrowserViewViews::SetAutoResizeProportions(
if ((auto_resize_flags_ & AutoResizeFlags::kAutoResizeVertical) && if ((auto_resize_flags_ & AutoResizeFlags::kAutoResizeVertical) &&
!auto_vertical_proportion_set_) { !auto_vertical_proportion_set_) {
auto* iwc_view = GetInspectableWebContentsView(); auto* iwc_view = GetInspectableWebContentsView();
if (iwc_view) if (!iwc_view)
return; return;
auto* view = iwc_view->GetView(); auto* view = iwc_view->GetView();
auto view_bounds = view->bounds(); auto view_bounds = view->bounds();
@ -58,7 +58,7 @@ void NativeBrowserViewViews::AutoResize(const gfx::Rect& new_window,
int width_delta, int width_delta,
int height_delta) { int height_delta) {
auto* iwc_view = GetInspectableWebContentsView(); auto* iwc_view = GetInspectableWebContentsView();
if (iwc_view) if (!iwc_view)
return; return;
auto* view = iwc_view->GetView(); auto* view = iwc_view->GetView();
const auto flags = GetAutoResizeFlags(); const auto flags = GetAutoResizeFlags();