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

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.h

Issue 2694543002: [refactor] Cleanup IME State in RenderWidgetHostViewMac which is already tracked by TextInputManager (Closed)
Patch Set: Fixed another compile error for Android test Created 3 years, 10 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_mac.h
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index 3395188313c87beea099e7e6bccffd511549acce..aff124f7cd29e6473ba1e611ad81e2fedd9c893a 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -377,11 +377,6 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
void SetTextInputActive(bool active);
- const std::string& selected_text() const { return selected_text_; }
- const gfx::Range& composition_range() const { return composition_range_; }
- const base::string16& selection_text() const { return selection_text_; }
- size_t selection_text_offset() const { return selection_text_offset_; }
-
// Returns true and stores first rectangle for character range if the
// requested |range| is already cached, otherwise returns false.
// Exposed for testing.
@@ -477,6 +472,16 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
// |TextInputState.type| which is not ui::TEXT_INPUT_TYPE_NONE.
RenderWidgetHostImpl* GetActiveWidget();
+ // Returns the composition range information for the active RenderWidgetHost
+ // (accepting IME and keyboard input).
+ const TextInputManager::CompositionRangeInfo* GetCompositionRangeInfo();
+
+ // Returns the TextSelection information for the active widget. If
+ // |is_guest_view_hack_| is true, then it will return the TextSelection
+ // information for this RenderWidgetHostViewMac (which is serving as a
+ // platform view for a guest).
+ const TextInputManager::TextSelection* GetTextSelection();
+
private:
friend class RenderWidgetHostViewMacTest;
@@ -543,28 +548,12 @@ class CONTENT_EXPORT RenderWidgetHostViewMac
base::TimeTicks vsync_timebase_;
base::TimeDelta vsync_interval_;
- // The current composition character range and its bounds.
- gfx::Range composition_range_;
- std::vector<gfx::Rect> composition_bounds_;
-
// Whether a request for begin frames has been issued.
bool needs_begin_frames_;
// Whether a request to flush input has been issued.
bool needs_flush_input_;
- // TODO(ekaramad): Remove the following locals and get the selection
- // information directly from TextInputManager.
- // A buffer containing the text inside and around the current selection range.
- base::string16 selection_text_;
-
- // The offset of the text stored in |selection_text_| relative to the start of
- // the web page.
- size_t selection_text_offset_;
-
- // The current selection range relative to the start of the web page.
- gfx::Range selection_range_;
-
// Factory used to safely scope delayed calls to ShutdownHost().
base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;

Powered by Google App Engine
This is Rietveld 408576698