Unify SurfaceInfo

services/ui/ws/server_window_compositor_frame_sink_manager.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/ws/server_window_compositor_frame_sink_manager.h"
 
 #include "cc/ipc/display_compositor.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/server_window.h"
@@ skipping 76 matching lines @@
              mojom::CompositorFrameSinkType::DEFAULT) ||
          HasCompositorFrameSinkOfType(mojom::CompositorFrameSinkType::UNDERLAY);
 }
 
 gfx::Size ServerWindowCompositorFrameSinkManager::GetLatestFrameSize(
     mojom::CompositorFrameSinkType type) const {
   auto it = type_to_compositor_frame_sink_map_.find(type);
   if (it == type_to_compositor_frame_sink_map_.end())
     return gfx::Size();
 
-  return it->second.latest_submitted_frame_size;
+  return it->second.latest_submitted_surface_info.size_in_pixels();
 }
 
 cc::SurfaceId ServerWindowCompositorFrameSinkManager::GetLatestSurfaceId(
     mojom::CompositorFrameSinkType type) const {
   auto it = type_to_compositor_frame_sink_map_.find(type);
   if (it == type_to_compositor_frame_sink_map_.end())
     return cc::SurfaceId();
 
-  return it->second.latest_submitted_surface_id;
+  return it->second.latest_submitted_surface_info.id();
 }
 
 void ServerWindowCompositorFrameSinkManager::SetLatestSurfaceInfo(
     mojom::CompositorFrameSinkType type,
-    const cc::SurfaceId& surface_id,
-    const gfx::Size& frame_size) {
+    const cc::SurfaceInfo& surface_info) {
   CompositorFrameSinkData& data = type_to_compositor_frame_sink_map_[type];
-  data.latest_submitted_surface_id = surface_id;
-  data.latest_submitted_frame_size = frame_size;
+  data.latest_submitted_surface_info = surface_info;
 }
 
 void ServerWindowCompositorFrameSinkManager::OnRootChanged(
     ServerWindow* old_root,
     ServerWindow* new_root) {
   for (const auto& pair : type_to_compositor_frame_sink_map_) {
     if (old_root) {
       old_root->GetOrCreateCompositorFrameSinkManager()->RemoveChildFrameSinkId(
           pair.first, pair.second.frame_sink_id);
     }
     if (new_root) {
       new_root->GetOrCreateCompositorFrameSinkManager()->AddChildFrameSinkId(
           pair.first, pair.second.frame_sink_id);
     }
   }
 }
 
 bool ServerWindowCompositorFrameSinkManager::
     IsCompositorFrameSinkReadyAndNonEmpty(
         mojom::CompositorFrameSinkType type) const {
   auto iter = type_to_compositor_frame_sink_map_.find(type);
   if (iter == type_to_compositor_frame_sink_map_.end())
     return false;
-  if (iter->second.latest_submitted_frame_size.IsEmpty())
+  if (iter->second.latest_submitted_surface_info.size_in_pixels().IsEmpty())
     return false;
   const gfx::Size& latest_submitted_frame_size =
-      iter->second.latest_submitted_frame_size;
+      iter->second.latest_submitted_surface_info.size_in_pixels();
   return latest_submitted_frame_size.width() >= window_->bounds().width() &&
          latest_submitted_frame_size.height() >= window_->bounds().height();
 }
 
 void ServerWindowCompositorFrameSinkManager::CreateCompositorFrameSinkInternal(
     mojom::CompositorFrameSinkType compositor_frame_sink_type,
     gfx::AcceleratedWidget widget,
     cc::mojom::MojoCompositorFrameSinkRequest request,
     cc::mojom::MojoCompositorFrameSinkClientPtr client,
     cc::mojom::DisplayPrivateRequest display_private_request) {
@@ skipping 36 matching lines @@
     }
   }
 }
 
 CompositorFrameSinkData::CompositorFrameSinkData() {}
 
 CompositorFrameSinkData::~CompositorFrameSinkData() {}
 
 CompositorFrameSinkData::CompositorFrameSinkData(
     CompositorFrameSinkData&& other)
-    : latest_submitted_surface_id(other.latest_submitted_surface_id),
+    : latest_submitted_surface_info(other.latest_submitted_surface_info),
       compositor_frame_sink(std::move(other.compositor_frame_sink)) {}
 
 CompositorFrameSinkData& CompositorFrameSinkData::operator=(
     CompositorFrameSinkData&& other) {
-  latest_submitted_surface_id = other.latest_submitted_surface_id;
+  latest_submitted_surface_info = other.latest_submitted_surface_info;
   compositor_frame_sink = std::move(other.compositor_frame_sink);
   return *this;
 }
 
 }  // namespace ws
 }  // namespace ui