diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-02-07 11:35:08 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-03-23 00:24:54 +0000 |
| commit | ce6a1a74d16deecf0c150aa1f5bae2cc6a95e7b1 (patch) | |
| tree | e1ce3f92b50c0c0e5140019134e70e70a1ddb88d /src/core/render_widget_host_view_qt.cpp | |
| parent | 5c6201f6c393967e9284bb9841281d286126541d (diff) | |
Adaptations for Chromium 73
Change-Id: I565d1e327852110a5abebed3388d7cd6986bef06
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 6d3460e0f..39ec14382 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -51,6 +51,8 @@ #include "web_event_factory.h" #include "components/viz/common/surfaces/frame_sink_id_allocator.h" +#include "components/viz/host/host_frame_sink_manager.h" +#include "content/browser/compositor/surface_utils.h" #include "content/browser/frame_host/frame_tree.h" #include "content/browser/frame_host/render_frame_host_impl.h" #include "content/browser/renderer_host/render_view_host_delegate.h" @@ -279,9 +281,7 @@ RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost *widget , m_emptyPreviousSelection(true) , m_wheelAckPending(false) , m_mouseWheelPhaseHandler(this) - // This frame-sink id is based on what RenderWidgetHostViewChildFrame does: - , m_frameSinkId(base::checked_cast<uint32_t>(widget->GetProcess()->GetID()), - base::checked_cast<uint32_t>(widget->GetRoutingID())) + , m_frameSinkId(host()->GetFrameSinkId()) { host()->SetView(this); @@ -720,7 +720,7 @@ void RenderWidgetHostViewQt::OnUpdateTextInputStateCalled(content::TextInputMana ui::TextInputType type = getTextInputType(); m_delegate->setInputMethodHints(toQtInputMethodHints(getTextInputType()) | Qt::ImhNoPredictiveText | Qt::ImhNoTextHandles | Qt::ImhNoEditMenu); - m_surroundingText = QString::fromStdString(state->value); + m_surroundingText = toQt(state->value); // Remove IME composition text from the surrounding text if (state->composition_start != -1 && state->composition_end != -1) m_surroundingText.remove(state->composition_start, state->composition_end - state->composition_start); @@ -905,7 +905,7 @@ viz::ScopedSurfaceIdAllocator RenderWidgetHostViewQt::DidUpdateVisualProperties( void RenderWidgetHostViewQt::OnDidUpdateVisualPropertiesComplete(const cc::RenderFrameMetadata &metadata) { - synchronizeVisualProperties(metadata.local_surface_allocation_id); + synchronizeVisualProperties(metadata.local_surface_id_allocation); } QSGNode *RenderWidgetHostViewQt::updatePaintNode(QSGNode *oldNode) @@ -1699,7 +1699,7 @@ void RenderWidgetHostViewQt::TakeFallbackContentFrom(content::RenderWidgetHostVi SetBackgroundColor(*color); } -void RenderWidgetHostViewQt::EnsureSurfaceSynchronizedForLayoutTest() +void RenderWidgetHostViewQt::EnsureSurfaceSynchronizedForWebTest() { NOTIMPLEMENTED(); } @@ -1711,7 +1711,6 @@ uint32_t RenderWidgetHostViewQt::GetCaptureSequenceNumber() const void RenderWidgetHostViewQt::ResetFallbackToFirstNavigationSurface() { - Q_UNIMPLEMENTED(); } void RenderWidgetHostViewQt::OnRenderFrameMetadataChangedAfterActivation() @@ -1726,7 +1725,7 @@ void RenderWidgetHostViewQt::OnRenderFrameMetadataChangedAfterActivation() } } -void RenderWidgetHostViewQt::synchronizeVisualProperties(const base::Optional<viz::LocalSurfaceId> &childSurfaceId) +void RenderWidgetHostViewQt::synchronizeVisualProperties(const base::Optional<viz::LocalSurfaceIdAllocation> &childSurfaceId) { if (childSurfaceId) m_localSurfaceIdAllocator.UpdateFromChild(*childSurfaceId); |