Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(956)

Unified Diff: ui/aura/mus/window_port_mus.cc

Issue 2804753002: mus: Fix showing guest views in --mash and --mus. (Closed)
Patch Set: tot merge Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_base.h ('k') | ui/aura/window_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/mus/window_port_mus.cc
diff --git a/ui/aura/mus/window_port_mus.cc b/ui/aura/mus/window_port_mus.cc
index 1420228e6649ffec6496402e0a3a33443db489e0..0621b0f8aedeb1c38c22de9e22c2c1f8c5329595 100644
--- a/ui/aura/mus/window_port_mus.cc
+++ b/ui/aura/mus/window_port_mus.cc
@@ -324,6 +324,8 @@ const cc::LocalSurfaceId& WindowPortMus::GetOrAllocateLocalSurfaceId(
void WindowPortMus::SetPrimarySurfaceInfo(const cc::SurfaceInfo& surface_info) {
primary_surface_info_ = surface_info;
UpdateClientSurfaceEmbedder();
+ if (window_->delegate())
+ window_->delegate()->OnWindowSurfaceChanged(surface_info);
}
void WindowPortMus::SetFallbackSurfaceInfo(
@@ -528,11 +530,9 @@ void WindowPortMus::UpdatePrimarySurfaceInfo() {
if (!frame_sink_id_.is_valid() || !local_surface_id_.is_valid())
return;
- primary_surface_info_ =
+ SetPrimarySurfaceInfo(
cc::SurfaceInfo(cc::SurfaceId(frame_sink_id_, local_surface_id_),
- ScaleFactorForDisplay(window_), last_surface_size_);
-
- UpdateClientSurfaceEmbedder();
+ ScaleFactorForDisplay(window_), last_surface_size_));
}
void WindowPortMus::UpdateClientSurfaceEmbedder() {
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_base.h ('k') | ui/aura/window_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698