diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2019-01-24 13:21:20 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-31 18:30:25 +0000 |
| commit | 3bff0bae7e0c660fc25c5c46dedaf9cb89563a58 (patch) | |
| tree | 7a062c2209d11ef6ae4181aa441f4e4e8c08ad1e /src/core/render_widget_host_view_qt.cpp | |
| parent | 84d2a8e10b8b2c94681391544091f4ab483eca3a (diff) | |
Delete RenderWidgetHostViewQt::m_localSurfaceId
Not needed due to m_localSurfaceIdAllocator.GetCurrentLocalSurfaceId().
Change-Id: I004a75a4abb8785fd202266d6a2c96137529dd04
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/render_widget_host_view_qt.cpp')
| -rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index 95d10379e..ac7357f0e 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -280,8 +280,6 @@ RenderWidgetHostViewQt::RenderWidgetHostViewQt(content::RenderWidgetHost *widget const QPlatformInputContext *context = QGuiApplicationPrivate::platformIntegration()->inputContext(); m_imeHasHiddenTextCapability = context && context->hasCapability(QPlatformInputContext::HiddenTextCapability); - m_localSurfaceId = m_localSurfaceIdAllocator.GenerateId(); - if (host()->delegate() && host()->delegate()->GetInputEventRouter()) host()->delegate()->GetInputEventRouter()->AddFrameSinkIdOwner(GetFrameSinkId(), this); @@ -938,7 +936,7 @@ void RenderWidgetHostViewQt::OnDidUpdateVisualPropertiesComplete(const cc::Rende if (metadata.local_surface_id) m_localSurfaceIdAllocator.UpdateFromChild(*metadata.local_surface_id); - m_localSurfaceId = m_localSurfaceIdAllocator.GenerateId(); + m_localSurfaceIdAllocator.GenerateId(); host()->SendScreenRects(); if (m_pendingResize) { if (host()->SynchronizeVisualProperties()) @@ -1732,7 +1730,7 @@ const viz::FrameSinkId &RenderWidgetHostViewQt::GetFrameSinkId() const const viz::LocalSurfaceId &RenderWidgetHostViewQt::GetLocalSurfaceId() const { - return m_localSurfaceId; + return m_localSurfaceIdAllocator.GetCurrentLocalSurfaceId(); } void RenderWidgetHostViewQt::TakeFallbackContentFrom(content::RenderWidgetHostView *view) |