OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/renderer_host/render_widget_host_view_mus.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_mus.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "components/mus/public/cpp/window.h" | 10 #include "components/mus/public/cpp/window.h" |
11 #include "components/mus/public/cpp/window_tree_connection.h" | 11 #include "components/mus/public/cpp/window_tree_connection.h" |
12 #include "content/browser/mojo/mojo_child_connection.h" | 12 #include "content/browser/mojo/mojo_child_connection.h" |
13 #include "content/browser/renderer_host/render_process_host_impl.h" | 13 #include "content/browser/renderer_host/render_process_host_impl.h" |
14 #include "content/browser/renderer_host/render_widget_host_impl.h" | 14 #include "content/browser/renderer_host/render_widget_host_impl.h" |
15 #include "content/common/render_widget_window_tree_client_factory.mojom.h" | 15 #include "content/common/render_widget_window_tree_client_factory.mojom.h" |
| 16 #include "content/common/text_input_state.h" |
16 #include "content/public/common/mojo_shell_connection.h" | 17 #include "content/public/common/mojo_shell_connection.h" |
17 #include "mojo/shell/public/cpp/connector.h" | 18 #include "mojo/shell/public/cpp/connector.h" |
18 #include "ui/aura/client/screen_position_client.h" | 19 #include "ui/aura/client/screen_position_client.h" |
19 #include "ui/aura/window.h" | 20 #include "ui/aura/window.h" |
20 #include "ui/base/hit_test.h" | 21 #include "ui/base/hit_test.h" |
21 | 22 |
22 namespace blink { | 23 namespace blink { |
23 struct WebScreenInfo; | 24 struct WebScreenInfo; |
24 } | 25 } |
25 | 26 |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 gfx::Vector2dF RenderWidgetHostViewMus::GetLastScrollOffset() const { | 118 gfx::Vector2dF RenderWidgetHostViewMus::GetLastScrollOffset() const { |
118 return gfx::Vector2dF(); | 119 return gfx::Vector2dF(); |
119 } | 120 } |
120 | 121 |
121 void RenderWidgetHostViewMus::RenderProcessGone(base::TerminationStatus status, | 122 void RenderWidgetHostViewMus::RenderProcessGone(base::TerminationStatus status, |
122 int error_code) { | 123 int error_code) { |
123 NOTIMPLEMENTED(); | 124 NOTIMPLEMENTED(); |
124 } | 125 } |
125 | 126 |
126 void RenderWidgetHostViewMus::Destroy() { | 127 void RenderWidgetHostViewMus::Destroy() { |
| 128 // The WebContentsImpl should be notified about us so that it will not hold |
| 129 // an invalid text input state which was due to active text on this view. |
| 130 NotifyHostDelegateAboutShutdown(); |
| 131 |
127 delete aura_window_; | 132 delete aura_window_; |
128 } | 133 } |
129 | 134 |
130 gfx::Size RenderWidgetHostViewMus::GetPhysicalBackingSize() const { | 135 gfx::Size RenderWidgetHostViewMus::GetPhysicalBackingSize() const { |
131 return RenderWidgetHostViewBase::GetPhysicalBackingSize(); | 136 return RenderWidgetHostViewBase::GetPhysicalBackingSize(); |
132 } | 137 } |
133 | 138 |
134 base::string16 RenderWidgetHostViewMus::GetSelectedText() const { | 139 base::string16 RenderWidgetHostViewMus::GetSelectedText() const { |
135 NOTIMPLEMENTED(); | 140 NOTIMPLEMENTED(); |
136 return base::string16(); | 141 return base::string16(); |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 } | 185 } |
181 | 186 |
182 void RenderWidgetHostViewMus::UpdateCursor(const WebCursor& cursor) { | 187 void RenderWidgetHostViewMus::UpdateCursor(const WebCursor& cursor) { |
183 // TODO(fsamuel): Implement cursors in Mus. | 188 // TODO(fsamuel): Implement cursors in Mus. |
184 NOTIMPLEMENTED(); | 189 NOTIMPLEMENTED(); |
185 } | 190 } |
186 | 191 |
187 void RenderWidgetHostViewMus::SetIsLoading(bool is_loading) { | 192 void RenderWidgetHostViewMus::SetIsLoading(bool is_loading) { |
188 } | 193 } |
189 | 194 |
190 void RenderWidgetHostViewMus::TextInputStateChanged( | 195 void RenderWidgetHostViewMus::UpdateInputMethodIfNecessary( |
191 const ViewHostMsg_TextInputState_Params& params) { | 196 bool text_input_state_changed) { |
192 // TODO(fsamuel): Implement an IME mojo app. | 197 // TODO: Implement the IME logic when input state changes. |
193 } | 198 } |
194 | 199 |
195 void RenderWidgetHostViewMus::ImeCancelComposition() { | 200 void RenderWidgetHostViewMus::ImeCancelComposition() { |
196 // TODO(fsamuel): Implement an IME mojo app. | 201 // TODO(fsamuel): Implement an IME mojo app. |
197 } | 202 } |
198 | 203 |
199 void RenderWidgetHostViewMus::ImeCompositionRangeChanged( | 204 void RenderWidgetHostViewMus::ImeCompositionRangeChanged( |
200 const gfx::Range& range, | 205 const gfx::Range& range, |
201 const std::vector<gfx::Rect>& character_bounds) { | 206 const std::vector<gfx::Rect>& character_bounds) { |
202 // TODO(fsamuel): Implement IME. | 207 // TODO(fsamuel): Implement IME. |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
297 | 302 |
298 void RenderWidgetHostViewMus::LockCompositingSurface() { | 303 void RenderWidgetHostViewMus::LockCompositingSurface() { |
299 NOTIMPLEMENTED(); | 304 NOTIMPLEMENTED(); |
300 } | 305 } |
301 | 306 |
302 void RenderWidgetHostViewMus::UnlockCompositingSurface() { | 307 void RenderWidgetHostViewMus::UnlockCompositingSurface() { |
303 NOTIMPLEMENTED(); | 308 NOTIMPLEMENTED(); |
304 } | 309 } |
305 | 310 |
306 } // namespace content | 311 } // namespace content |
OLD | NEW |