Commit bd3fd6c9 authored by Dave Tapuska's avatar Dave Tapuska Committed by Commit Bot

Fix virtual keyboard not showing for Pepper clients.

For some odd reason I felt it correct to add two methods named very
similar that had different functionality. Remove the TextInputType
method that does not query the pepper text input type and use the
GetTextInputType method that actually does.

BUG=1106562

Change-Id: I5adf9722e6483e23b25324c66365a9236157c0f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2307649
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Reviewed-by: default avatarDavid Bokan <bokan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#790362}
parent 9a43ab1d
...@@ -1515,12 +1515,6 @@ void WebFrameWidgetBase::GetCompositionCharacterBoundsInWindow( ...@@ -1515,12 +1515,6 @@ void WebFrameWidgetBase::GetCompositionCharacterBoundsInWindow(
} }
} }
WebTextInputType WebFrameWidgetBase::TextInputType() {
WebLocalFrame* focused_frame = FocusedWebLocalFrameInWidget();
if (!focused_frame)
return WebTextInputType::kWebTextInputTypeNone;
return focused_frame->GetInputMethodController()->TextInputType();
}
void WebFrameWidgetBase::AddImeTextSpansToExistingText( void WebFrameWidgetBase::AddImeTextSpansToExistingText(
uint32_t start, uint32_t start,
......
...@@ -142,7 +142,6 @@ class CORE_EXPORT WebFrameWidgetBase ...@@ -142,7 +142,6 @@ class CORE_EXPORT WebFrameWidgetBase
void GetCompositionCharacterBoundsInWindow( void GetCompositionCharacterBoundsInWindow(
Vector<gfx::Rect>* bounds) override; Vector<gfx::Rect>* bounds) override;
gfx::Range CompositionRange() override; gfx::Range CompositionRange() override;
WebTextInputType TextInputType() override;
WebTextInputInfo TextInputInfo() override; WebTextInputInfo TextInputInfo() override;
ui::mojom::VirtualKeyboardVisibilityRequest ui::mojom::VirtualKeyboardVisibilityRequest
GetLastVirtualKeyboardVisibilityRequest() override; GetLastVirtualKeyboardVisibilityRequest() override;
......
...@@ -123,7 +123,6 @@ class PLATFORM_EXPORT FrameWidget ...@@ -123,7 +123,6 @@ class PLATFORM_EXPORT FrameWidget
Vector<gfx::Rect>* bounds) = 0; Vector<gfx::Rect>* bounds) = 0;
virtual gfx::Range CompositionRange() = 0; virtual gfx::Range CompositionRange() = 0;
virtual WebTextInputType TextInputType() = 0;
virtual WebTextInputInfo TextInputInfo() = 0; virtual WebTextInputInfo TextInputInfo() = 0;
virtual ui::mojom::blink::VirtualKeyboardVisibilityRequest virtual ui::mojom::blink::VirtualKeyboardVisibilityRequest
GetLastVirtualKeyboardVisibilityRequest() = 0; GetLastVirtualKeyboardVisibilityRequest() = 0;
......
...@@ -669,10 +669,7 @@ bool WidgetBase::ShouldUpdateCompositionInfo(const gfx::Range& range, ...@@ -669,10 +669,7 @@ bool WidgetBase::ShouldUpdateCompositionInfo(const gfx::Range& range,
} }
ui::TextInputType WidgetBase::GetTextInputType() { ui::TextInputType WidgetBase::GetTextInputType() {
FrameWidget* frame_widget = client_->FrameWidget(); return ConvertWebTextInputType(client_->GetTextInputType());
if (!frame_widget)
return ui::TextInputType::TEXT_INPUT_TYPE_NONE;
return ConvertWebTextInputType(frame_widget->TextInputType());
} }
void WidgetBase::UpdateSelectionBounds() { void WidgetBase::UpdateSelectionBounds() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment