From 3bff0bae7e0c660fc25c5c46dedaf9cb89563a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Thu, 24 Jan 2019 13:21:20 +0100 Subject: Delete RenderWidgetHostViewQt::m_localSurfaceId Not needed due to m_localSurfaceIdAllocator.GetCurrentLocalSurfaceId(). Change-Id: I004a75a4abb8785fd202266d6a2c96137529dd04 Reviewed-by: Peter Varga Reviewed-by: Allan Sandfeld Jensen --- src/core/render_widget_host_view_qt.cpp | 6 ++---- src/core/render_widget_host_view_qt.h | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/core') 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) diff --git a/src/core/render_widget_host_view_qt.h b/src/core/render_widget_host_view_qt.h index 14257ecfa..b9efc996f 100644 --- a/src/core/render_widget_host_view_qt.h +++ b/src/core/render_widget_host_view_qt.h @@ -263,7 +263,6 @@ private: gfx::Vector2dF m_lastScrollOffset; gfx::SizeF m_lastContentsSize; - viz::LocalSurfaceId m_localSurfaceId; viz::ParentLocalSurfaceIdAllocator m_localSurfaceIdAllocator; uint m_imState; -- cgit v1.2.3