content/browser/renderer_host/render_widget_host_view_aura.cc - Issue 2255363002: TextInputManager::GetTextSelection() should be called on focused widget.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 2255363002: TextInputManager::GetTextSelection() should be called on focused widget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Check for focused widget before using its view Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/frame_host/render_widget_host_view_child_frame.cc ('k') | content/browser/renderer_host/render_widget_host_view_aura_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_aura.cc

diff --git a/content/browser/renderer_host/render_widget_host_view_aura.cc b/content/browser/renderer_host/render_widget_host_view_aura.cc

index 5991147c90829ff2176083ab224bce3e3859276d..8dd32e196267945a65260f17f775f9e19753f24a 100644

--- a/content/browser/renderer_host/render_widget_host_view_aura.cc

+++ b/content/browser/renderer_host/render_widget_host_view_aura.cc

@@ -1516,11 +1516,11 @@ bool RenderWidgetHostViewAura::HasCompositionText() const {

}

bool RenderWidgetHostViewAura::GetTextRange(gfx::Range* range) const {

- if (!text_input_manager_)

+ if (!text_input_manager_ || !GetFocusedWidget())

return false;

const TextInputManager::TextSelection* selection =

- text_input_manager_->GetTextSelection();

+ text_input_manager_->GetTextSelection(GetFocusedWidget()->GetView());

if (!selection)

return false;

@@ -1537,11 +1537,11 @@ bool RenderWidgetHostViewAura::GetCompositionTextRange(

}

bool RenderWidgetHostViewAura::GetSelectionRange(gfx::Range* range) const {

- if (!text_input_manager_)

+ if (!text_input_manager_ || !GetFocusedWidget())

return false;

const TextInputManager::TextSelection* selection =

- text_input_manager_->GetTextSelection();

+ text_input_manager_->GetTextSelection(GetFocusedWidget()->GetView());

if (!selection)

return false;

@@ -1565,11 +1565,11 @@ bool RenderWidgetHostViewAura::DeleteRange(const gfx::Range& range) {

bool RenderWidgetHostViewAura::GetTextFromRange(

const gfx::Range& range,

base::string16* text) const {

- if (!text_input_manager_)

+ if (!text_input_manager_ || !GetFocusedWidget())

return false;

const TextInputManager::TextSelection* selection =

- text_input_manager_->GetTextSelection();

+ text_input_manager_->GetTextSelection(GetFocusedWidget()->GetView());

if (!selection)

return false;