diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-07 00:14:55 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-07 00:14:55 +0000 |
| commit | d62dec3c656653ee15e2281e88075b84a191ac79 (patch) | |
| tree | 3750ba3edef1e236d2a1f3198430b5e847342a37 /content | |
| parent | 45d5cc8f48a03aa335e833e75168b789dc4a077b (diff) | |
| download | chromium_src-d62dec3c656653ee15e2281e88075b84a191ac79.zip chromium_src-d62dec3c656653ee15e2281e88075b84a191ac79.tar.gz chromium_src-d62dec3c656653ee15e2281e88075b84a191ac79.tar.bz2 | |
Coverity: Fix a couple possible NULL dereferences in RenderWidgetHostViewWin.
CID=102442,102443
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8956037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_view_win.cc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc index 39ab6be..5df9594 100644 --- a/content/browser/renderer_host/render_widget_host_view_win.cc +++ b/content/browser/renderer_host/render_widget_host_view_win.cc @@ -1122,21 +1122,26 @@ LRESULT RenderWidgetHostViewWin::OnSetCursor(HWND window, UINT hittest_code, } void RenderWidgetHostViewWin::OnSetFocus(HWND window) { + if (!render_widget_host_) + return; + if (GetBrowserAccessibilityManager()) GetBrowserAccessibilityManager()->GotFocus(); - if (render_widget_host_) { - render_widget_host_->GotFocus(); - render_widget_host_->SetActive(true); - } + + render_widget_host_->GotFocus(); + render_widget_host_->SetActive(true); + if (touch_state_.ReleaseTouchPoints()) render_widget_host_->ForwardTouchEvent(touch_state_.touch_event()); } void RenderWidgetHostViewWin::OnKillFocus(HWND window) { - if (render_widget_host_) { - render_widget_host_->SetActive(false); - render_widget_host_->Blur(); - } + if (!render_widget_host_) + return; + + render_widget_host_->SetActive(false); + render_widget_host_->Blur(); + if (touch_state_.ReleaseTouchPoints()) render_widget_host_->ForwardTouchEvent(touch_state_.touch_event()); } @@ -2571,4 +2576,3 @@ void RenderWidgetHostViewWin::ResetPointerDownContext() { received_focus_change_after_pointer_down_ = false; pointer_down_context_ = false; } - |