Commit 383a1a1f authored by akaba's avatar akaba Committed by Commit Bot

Don't send OnFirstSurfaceActivation to renderer processes when surface sync is active.

This CL prevents the following messages from being sent to renderers when surface
sync is enabled:

FrameMsg_FirstSurfaceActivation
BrowserPluginMsg_FirstSurfaceActivation

This is because the extra IPC for updating is not needed anymore after fallback surfaces
are fully optional.

Bug: 870452
Change-Id: I4a96fc759e230031d82ed4feb3c7c5697ca3c3c8
TBR: tsepez@chromium.org
Reviewed-on: https://chromium-review.googlesource.com/1183588
Commit-Queue: Andre Kaba <akaba@google.com>
Reviewed-by: default avatarFady Samuel <fsamuel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585186}
parent 2d034f86
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "base/pickle.h" #include "base/pickle.h"
#include "base/strings/utf_string_conversions.h" #include "base/strings/utf_string_conversions.h"
#include "build/build_config.h" #include "build/build_config.h"
#include "components/viz/common/features.h"
#include "components/viz/common/surfaces/surface_info.h" #include "components/viz/common/surfaces/surface_info.h"
#include "components/viz/service/surfaces/surface.h" #include "components/viz/service/surfaces/surface.h"
#include "content/browser/browser_plugin/browser_plugin_embedder.h" #include "content/browser/browser_plugin/browser_plugin_embedder.h"
...@@ -408,7 +409,8 @@ void BrowserPluginGuest::PointerLockPermissionResponse(bool allow) { ...@@ -408,7 +409,8 @@ void BrowserPluginGuest::PointerLockPermissionResponse(bool allow) {
void BrowserPluginGuest::FirstSurfaceActivation( void BrowserPluginGuest::FirstSurfaceActivation(
const viz::SurfaceInfo& surface_info) { const viz::SurfaceInfo& surface_info) {
if (!features::IsUsingWindowService()) { if (!features::IsUsingWindowService() &&
!features::IsSurfaceSynchronizationEnabled()) {
SendMessageToEmbedder( SendMessageToEmbedder(
std::make_unique<BrowserPluginMsg_FirstSurfaceActivation>( std::make_unique<BrowserPluginMsg_FirstSurfaceActivation>(
browser_plugin_instance_id(), surface_info)); browser_plugin_instance_id(), surface_info));
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
#include "base/bind.h" #include "base/bind.h"
#include "base/metrics/histogram_macros.h" #include "base/metrics/histogram_macros.h"
#include "components/viz/common/features.h"
#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h" #include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
#include "components/viz/service/surfaces/surface.h" #include "components/viz/service/surfaces/surface.h"
#include "components/viz/service/surfaces/surface_hittest.h" #include "components/viz/service/surfaces/surface_hittest.h"
...@@ -147,8 +148,10 @@ void CrossProcessFrameConnector::RenderProcessGone() { ...@@ -147,8 +148,10 @@ void CrossProcessFrameConnector::RenderProcessGone() {
void CrossProcessFrameConnector::FirstSurfaceActivation( void CrossProcessFrameConnector::FirstSurfaceActivation(
const viz::SurfaceInfo& surface_info) { const viz::SurfaceInfo& surface_info) {
if (!features::IsSurfaceSynchronizationEnabled()) {
frame_proxy_in_parent_renderer_->Send(new FrameMsg_FirstSurfaceActivation( frame_proxy_in_parent_renderer_->Send(new FrameMsg_FirstSurfaceActivation(
frame_proxy_in_parent_renderer_->GetRoutingID(), surface_info)); frame_proxy_in_parent_renderer_->GetRoutingID(), surface_info));
}
} }
void CrossProcessFrameConnector::SendIntrinsicSizingInfoToParent( void CrossProcessFrameConnector::SendIntrinsicSizingInfoToParent(
......
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