diff options
author | shuchen <shuchen@chromium.org> | 2015-07-31 06:22:43 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-07-31 13:23:29 +0000 |
commit | 913f8b627c442721376c7ae6c5ceaf33f684a434 (patch) | |
tree | a699118db2c1277a859cff685cc39c73f5b21933 /content/test/test_render_view_host.h | |
parent | d9e20147dd5649be4c9b742d3e6984034853715c (diff) | |
download | chromium_src-913f8b627c442721376c7ae6c5ceaf33f684a434.zip chromium_src-913f8b627c442721376c7ae6c5ceaf33f684a434.tar.gz chromium_src-913f8b627c442721376c7ae6c5ceaf33f684a434.tar.bz2 |
Merge ViewHostMsg_TextInputTypeChanged and ViewHostMsg_TextInputStateChanged into one.
This is reland of cl https://codereview.chromium.org/326403002, which
used to cause regresssion crbug.com/417152.
As mentioned #13 of crbug.com/417152, the regression root cause was due
to the |input_method_active_| flag in RenderWidget which caused on
windows, UpdateTextInputType() always sends IPC while
UpdateTextInputState() doesn't.
After |input_method_active_| is removed by cl
https://codereview.chromium.org/1234193002, we can reland it safely.
BUG=377169,474828
TEST=crbug.com/417152 not repro with this cl and trybots green.
Review URL: https://codereview.chromium.org/1249013005
Cr-Commit-Position: refs/heads/master@{#341324}
Diffstat (limited to 'content/test/test_render_view_host.h')
-rw-r--r-- | content/test/test_render_view_host.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/content/test/test_render_view_host.h b/content/test/test_render_view_host.h index 6eb3a24..0e0a579 100644 --- a/content/test/test_render_view_host.h +++ b/content/test/test_render_view_host.h @@ -29,6 +29,7 @@ // To use, derive your test base class from RenderViewHostImplTestHarness. struct FrameHostMsg_DidCommitProvisionalLoad_Params; +struct ViewHostMsg_TextInputState_Params; namespace gfx { class Rect; @@ -99,10 +100,8 @@ class TestRenderWidgetHostView : public RenderWidgetHostViewBase { void Focus() override {} void SetIsLoading(bool is_loading) override {} void UpdateCursor(const WebCursor& cursor) override {} - void TextInputTypeChanged(ui::TextInputType type, - ui::TextInputMode input_mode, - bool can_compose_inline, - int flags) override {} + void TextInputStateChanged( + const ViewHostMsg_TextInputState_Params& params) override {} void ImeCancelComposition() override {} void ImeCompositionRangeChanged( const gfx::Range& range, |