diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-15 13:16:24 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-09-14 08:15:28 +0000 |
commit | baaab31631dcff6075418c95f0220e8fb207dd50 (patch) | |
tree | eea3e8e723f0b142965d7c13ce23d061e73d3cc8 /src/core/render_widget_host_view_qt.cpp | |
parent | e462c0919113b7aae0a24fc438bce648c9fbcfc2 (diff) |
Adaptations to Chromium 52
Change-Id: Idf8a511ba26d263fd9d014d87d5e1101d706da71
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
-rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index a0ad53c1e..a018788c1 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -343,11 +343,6 @@ gfx::NativeView RenderWidgetHostViewQt::GetNativeView() const return gfx::NativeView(); } -gfx::NativeViewId RenderWidgetHostViewQt::GetNativeViewId() const -{ - return 0; -} - gfx::NativeViewAccessible RenderWidgetHostViewQt::GetNativeViewAccessible() { return 0; @@ -576,7 +571,7 @@ void RenderWidgetHostViewQt::SetIsLoading(bool) // We use WebContentsDelegateQt::LoadingStateChanged to notify about loading state. } -void RenderWidgetHostViewQt::TextInputStateChanged(const ViewHostMsg_TextInputState_Params ¶ms) +void RenderWidgetHostViewQt::TextInputStateChanged(const content::TextInputState ¶ms) { m_currentInputType = params.type; m_delegate->inputMethodStateChanged(params.type != ui::TEXT_INPUT_TYPE_NONE); @@ -660,7 +655,7 @@ void RenderWidgetHostViewQt::UnlockCompositingSurface() { } -void RenderWidgetHostViewQt::OnSwapCompositorFrame(uint32_t output_surface_id, scoped_ptr<cc::CompositorFrame> frame) +void RenderWidgetHostViewQt::OnSwapCompositorFrame(uint32_t output_surface_id, std::unique_ptr<cc::CompositorFrame> frame) { bool scrollOffsetChanged = (m_lastScrollOffset != frame->metadata.root_scroll_offset); bool contentsSizeChanged = (m_lastContentsSize != frame->metadata.root_layer_size); |