diff options
| -rw-r--r-- | chrome/renderer/render_widget.cc | 3 | ||||
| -rw-r--r-- | webkit/glue/webview_impl.cc | 1 | ||||
| -rw-r--r-- | webkit/glue/webview_impl.h | 1 | ||||
| -rw-r--r-- | webkit/glue/webwidget.h | 3 | ||||
| -rw-r--r-- | webkit/glue/webwidget_impl.cc | 1 | ||||
| -rw-r--r-- | webkit/glue/webwidget_impl.h | 1 |
6 files changed, 2 insertions, 8 deletions
diff --git a/chrome/renderer/render_widget.cc b/chrome/renderer/render_widget.cc index 7782fd5..b42ff18 100644 --- a/chrome/renderer/render_widget.cc +++ b/chrome/renderer/render_widget.cc @@ -738,10 +738,9 @@ void RenderWidget::UpdateIME() { // Retrieve the caret position from the focused widget and verify we should // enabled IMEs attached to the browser process. bool enable_ime = false; - const void* node = NULL; gfx::Rect caret_rect; if (!webwidget_ || - !webwidget_->ImeUpdateStatus(&enable_ime, &node, &caret_rect)) { + !webwidget_->ImeUpdateStatus(&enable_ime, &caret_rect)) { // There are not any editable widgets attached to this process. // We should disable the IME to prevent it from sending CJK strings to // non-editable widgets. diff --git a/webkit/glue/webview_impl.cc b/webkit/glue/webview_impl.cc index 77d5442..2705168 100644 --- a/webkit/glue/webview_impl.cc +++ b/webkit/glue/webview_impl.cc @@ -1177,7 +1177,6 @@ bool WebViewImpl::ImeSetComposition(int string_type, } bool WebViewImpl::ImeUpdateStatus(bool* enable_ime, - const void** new_node, gfx::Rect* caret_rect) { // Store whether the selected node needs IME and the caret rectangle. // This process consists of the following four steps: diff --git a/webkit/glue/webview_impl.h b/webkit/glue/webview_impl.h index c511e7b..f86e9f1 100644 --- a/webkit/glue/webview_impl.h +++ b/webkit/glue/webview_impl.h @@ -72,7 +72,6 @@ class WebViewImpl : public WebView, public base::RefCounted<WebViewImpl> { int target_end, const std::wstring& ime_string); virtual bool ImeUpdateStatus(bool* enable_ime, - const void** node, gfx::Rect* caret_rect); virtual void StopLoading(); virtual void SetBackForwardListSize(int size); diff --git a/webkit/glue/webwidget.h b/webkit/glue/webwidget.h index 0fda0dc..08cab6b 100644 --- a/webkit/glue/webwidget.h +++ b/webkit/glue/webwidget.h @@ -63,8 +63,7 @@ class WebWidget { const std::wstring& ime_string) = 0; // Retrieve the status of this widget required by IME APIs. - virtual bool ImeUpdateStatus(bool* enable_ime, const void** node, - gfx::Rect* caret_rect) = 0; + virtual bool ImeUpdateStatus(bool* enable_ime, gfx::Rect* caret_rect) = 0; protected: virtual ~WebWidget() {} diff --git a/webkit/glue/webwidget_impl.cc b/webkit/glue/webwidget_impl.cc index aff0d1d..721bbd3 100644 --- a/webkit/glue/webwidget_impl.cc +++ b/webkit/glue/webwidget_impl.cc @@ -197,7 +197,6 @@ bool WebWidgetImpl::ImeSetComposition(int string_type, } bool WebWidgetImpl::ImeUpdateStatus(bool* enable_ime, - const void** node, gfx::Rect* caret_rect) { return false; } diff --git a/webkit/glue/webwidget_impl.h b/webkit/glue/webwidget_impl.h index 7a67044..46db004 100644 --- a/webkit/glue/webwidget_impl.h +++ b/webkit/glue/webwidget_impl.h @@ -48,7 +48,6 @@ class WebWidgetImpl : public WebWidget, int target_end, const std::wstring& ime_string); virtual bool ImeUpdateStatus(bool* enable_ime, - const void** node, gfx::Rect* caret_rect); // WebWidgetImpl |