Commit d8e7d60e authored by dmazzoni@chromium.org's avatar dmazzoni@chromium.org

Always check if View::GetWidget() is NULL.

BUG=309121
NOTRY=true

Review URL: https://codereview.chromium.org/57833004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233429 0039d316-1c4b-4281-b951-d872f2087c98
parent df8e638a
...@@ -253,7 +253,7 @@ STDMETHODIMP NativeViewAccessibilityWin::accHitTest( ...@@ -253,7 +253,7 @@ STDMETHODIMP NativeViewAccessibilityWin::accHitTest(
if (!child) if (!child)
return E_INVALIDARG; return E_INVALIDARG;
if (!view_) if (!view_ || !view_->GetWidget())
return E_FAIL; return E_FAIL;
// If this is a root view, our widget might have child widgets. // If this is a root view, our widget might have child widgets.
...@@ -461,7 +461,7 @@ STDMETHODIMP NativeViewAccessibilityWin::get_accChild(VARIANT var_child, ...@@ -461,7 +461,7 @@ STDMETHODIMP NativeViewAccessibilityWin::get_accChild(VARIANT var_child,
if (var_child.vt != VT_I4 || !disp_child) if (var_child.vt != VT_I4 || !disp_child)
return E_INVALIDARG; return E_INVALIDARG;
if (!view_) if (!view_ || !view_->GetWidget())
return E_FAIL; return E_FAIL;
LONG child_id = V_I4(&var_child); LONG child_id = V_I4(&var_child);
...@@ -530,10 +530,10 @@ STDMETHODIMP NativeViewAccessibilityWin::get_accChild(VARIANT var_child, ...@@ -530,10 +530,10 @@ STDMETHODIMP NativeViewAccessibilityWin::get_accChild(VARIANT var_child,
} }
STDMETHODIMP NativeViewAccessibilityWin::get_accChildCount(LONG* child_count) { STDMETHODIMP NativeViewAccessibilityWin::get_accChildCount(LONG* child_count) {
if (!child_count || !view_) if (!child_count)
return E_INVALIDARG; return E_INVALIDARG;
if (!view_) if (!view_ || !view_->GetWidget())
return E_FAIL; return E_FAIL;
*child_count = view_->child_count(); *child_count = view_->child_count();
...@@ -1392,6 +1392,9 @@ LONG NativeViewAccessibilityWin::FindBoundary( ...@@ -1392,6 +1392,9 @@ LONG NativeViewAccessibilityWin::FindBoundary(
void NativeViewAccessibilityWin::PopulateChildWidgetVector( void NativeViewAccessibilityWin::PopulateChildWidgetVector(
std::vector<Widget*>* result_child_widgets) { std::vector<Widget*>* result_child_widgets) {
const Widget* widget = view()->GetWidget(); const Widget* widget = view()->GetWidget();
if (!widget)
return;
std::set<Widget*> child_widgets; std::set<Widget*> child_widgets;
Widget::GetAllChildWidgets(widget->GetNativeView(), &child_widgets); Widget::GetAllChildWidgets(widget->GetNativeView(), &child_widgets);
Widget::GetAllOwnedWidgets(widget->GetNativeView(), &child_widgets); Widget::GetAllOwnedWidgets(widget->GetNativeView(), &child_widgets);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment