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

Unified Diff: content/public/test/text_input_test_utils.cc

Issue 2057803002: Tracking SelectionBounds for all RenderWidgets on the Browser Side (Aura Only) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/public/test/text_input_test_utils.cc
diff --git a/content/public/test/text_input_test_utils.cc b/content/public/test/text_input_test_utils.cc
index 895f7b743d0bee0f76c7df4b0aa4641cdf921927..e5ae150e1478eb537a8a56c2240ea28dfa309acd 100644
--- a/content/public/test/text_input_test_utils.cc
+++ b/content/public/test/text_input_test_utils.cc
@@ -10,6 +10,7 @@
#include "content/browser/renderer_host/text_input_manager.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/common/text_input_state.h"
+#include "content/common/view_messages.h"
#include "content/public/browser/render_widget_host_view.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
@@ -23,6 +24,12 @@ class TextInputClient;
namespace content {
+namespace {
+void DefaultTextInputManagerObserverCallback(TextInputManagerTester* tester) {}
+TextInputManagerTester::Callback default_text_input_manager_observer_callback =
+ base::Bind(&DefaultTextInputManagerObserverCallback);
EhsanK 2016/06/27 17:18:13 This is to avoid crashes in the observers in 'site
+} // namespace
+
// This class is an observer of TextInputManager associated with the provided
// WebContents. An instance of this class is used in TextInputManagerTester to
// expose the required API for testing outside of content/.
@@ -34,7 +41,11 @@ class TextInputManagerTester::InternalObserver
: WebContentsObserver(web_contents),
tester_(tester),
updated_view_(nullptr),
- text_input_state_changed_(false) {
+ text_input_state_changed_(false),
+ update_text_input_state_callback_(
+ default_text_input_manager_observer_callback),
+ on_selection_bounds_changed_callback_(
+ default_text_input_manager_observer_callback) {
text_input_manager_ =
static_cast<WebContentsImpl*>(web_contents)->GetTextInputManager();
DCHECK(!!text_input_manager_);
@@ -51,6 +62,11 @@ class TextInputManagerTester::InternalObserver
update_text_input_state_callback_ = callback;
}
+ void set_on_selection_bounds_changed_callback(
+ const TextInputManagerTester::Callback& callback) {
+ on_selection_bounds_changed_callback_ = callback;
+ }
+
const RenderWidgetHostView* GetUpdatedView() const { return updated_view_; }
bool text_input_state_changed() const { return text_input_state_changed_; }
@@ -68,6 +84,12 @@ class TextInputManagerTester::InternalObserver
update_text_input_state_callback_.Run(tester_);
}
+ void OnSelectionBoundsChanged(TextInputManager* text_input_manager_,
+ RenderWidgetHostViewBase* updated_view) {
+ updated_view_ = updated_view;
+ on_selection_bounds_changed_callback_.Run(tester_);
+ }
+
// WebContentsObserver implementation.
void WebContentsDestroyed() override { text_input_manager_ = nullptr; }
@@ -77,6 +99,7 @@ class TextInputManagerTester::InternalObserver
RenderWidgetHostViewBase* updated_view_;
bool text_input_state_changed_;
TextInputManagerTester::Callback update_text_input_state_callback_;
+ TextInputManagerTester::Callback on_selection_bounds_changed_callback_;
DISALLOW_COPY_AND_ASSIGN(InternalObserver);
};
@@ -215,6 +238,11 @@ void TextInputManagerTester::SetUpdateTextInputStateCalledCallback(
observer_->set_update_text_input_state_called_callback(callback);
}
+void TextInputManagerTester::SetOnSelectionBoundsChangedCallback(
+ const Callback& callback) {
+ observer_->set_on_selection_bounds_changed_callback(callback);
+}
+
bool TextInputManagerTester::GetTextInputType(ui::TextInputType* type) {
DCHECK(observer_->text_input_manager());
const TextInputState* state =

Powered by Google App Engine
This is Rietveld 408576698