Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(258)

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

Issue 2208093004: Use focused RenderWidgetHostImpl instead of TextInputManager::GetActiveWidget() to obtain TextSelec… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed some crashes 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
Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index 56469f056cde1fad9ef325091ab76f4c4c38616c..d917c7276f2a671d4aece554ee3c00ca1c368eb0 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -163,7 +163,8 @@ class TestOverscrollDelegate : public OverscrollControllerDelegate {
class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate {
public:
- MockRenderWidgetHostDelegate() : rwh_(nullptr), is_fullscreen_(false) {}
+ MockRenderWidgetHostDelegate()
+ : rwh_(nullptr), is_fullscreen_(false), focused_widget_(nullptr) {}
~MockRenderWidgetHostDelegate() override {}
const NativeWebKeyboardEvent* last_event() const { return last_event_.get(); }
void set_widget_host(RenderWidgetHostImpl* rwh) { rwh_ = rwh; }
@@ -171,6 +172,14 @@ class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate {
TextInputManager* GetTextInputManager() override {
return &text_input_manager_;
}
+ RenderWidgetHostImpl* GetFocusedRenderWidgetHost(
+ RenderWidgetHostImpl* receiving_widget) override {
+ return !!focused_widget_ ? focused_widget_ : receiving_widget;
+ }
+
+ void set_focused_widget(RenderWidgetHostImpl* focused) {
+ focused_widget_ = focused;
+ }
protected:
// RenderWidgetHostDelegate:
@@ -194,6 +203,7 @@ class MockRenderWidgetHostDelegate : public RenderWidgetHostDelegate {
RenderWidgetHostImpl* rwh_;
bool is_fullscreen_;
TextInputManager text_input_manager_;
+ RenderWidgetHostImpl* focused_widget_;
DISALLOW_COPY_AND_ASSIGN(MockRenderWidgetHostDelegate);
};
@@ -4504,6 +4514,8 @@ TEST_F(InputMethodStateAuraTest, GetTextRange) {
gfx::Range selection_range;
for (auto index : active_view_sequence_) {
+ render_widget_host_delegate()->set_focused_widget(
+ RenderWidgetHostImpl::From(views_[index]->GetRenderWidgetHost()));
ActivateViewForTextInputManager(views_[index], ui::TEXT_INPUT_TYPE_TEXT);
gfx::Range expected_range(offset, offset + text.length());
views_[index]->SelectionChanged(text, offset, selection_range);
@@ -4525,6 +4537,8 @@ TEST_F(InputMethodStateAuraTest, GetSelectionRange) {
gfx::Range expected_range(0U, 1U);
for (auto index : active_view_sequence_) {
+ render_widget_host_delegate()->set_focused_widget(
+ RenderWidgetHostImpl::From(views_[index]->GetRenderWidgetHost()));
ActivateViewForTextInputManager(views_[index], ui::TEXT_INPUT_TYPE_TEXT);
views_[index]->SelectionChanged(text, 0U, expected_range);
gfx::Range range_from_client;

Powered by Google App Engine
This is Rietveld 408576698