Scale bounds from dip to pixels in CompositorFrame in content::MusBrowserCompositorOutputSurface.

content/browser/compositor/mus_browser_compositor_output_surface.cc

 // Copyright 2016 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 "content/browser/compositor/mus_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_frame.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/texture_draw_quad.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_compositor_frame_sink.h"
 #include "ui/aura/mus/window_compositor_frame_sink.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/window.h"
 #include "ui/display/screen.h"
+#include "ui/gfx/geometry/dip_util.h"
 
 namespace content {
 
 MusBrowserCompositorOutputSurface::MusBrowserCompositorOutputSurface(
     ui::Window* window,
     scoped_refptr<ui::ContextProviderCommandBuffer> context,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     const UpdateVSyncParametersCallback& update_vsync_parameters_callback,
     std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
         overlay_candidate_validator)
@@ skipping 31 matching lines @@
 }
 
 MusBrowserCompositorOutputSurface::~MusBrowserCompositorOutputSurface() {}
 
 cc::BeginFrameSource* MusBrowserCompositorOutputSurface::GetBeginFrameSource() {
   return begin_frame_source_;
 }
 
 void MusBrowserCompositorOutputSurface::SwapBuffers(
     cc::OutputSurfaceFrame frame) {
-  const gfx::Rect bounds = ui_window_ ? gfx::Rect(ui_window_->bounds().size())
-                                      : gfx::Rect(window_->bounds().size());
   cc::CompositorFrame ui_frame;
   ui_frame.metadata.device_scale_factor = display::Screen::GetScreen()
                                               ->GetDisplayNearestWindow(window_)
                                               .device_scale_factor();
   ui_frame.metadata.latency_info = std::move(frame.latency_info);
   // Reset latency_info to known empty state after moving contents.
   frame.latency_info.clear();
   const int render_pass_id = 1;
+  const gfx::Rect bounds_in_dip = ui_window_
+                                      ? gfx::Rect(ui_window_->bounds().size())
+                                      : gfx::Rect(window_->bounds().size());
+  const gfx::Rect bounds_in_pixels = gfx::ConvertRectToPixel(
+      ui_frame.metadata.device_scale_factor, bounds_in_dip);
   std::unique_ptr<cc::RenderPass> pass = cc::RenderPass::Create();
-  pass->SetNew(render_pass_id, bounds, bounds, gfx::Transform());
+  pass->SetNew(render_pass_id, bounds_in_pixels, bounds_in_pixels,
+               gfx::Transform());
   // The SharedQuadState is owned by the SharedQuadStateList
   // shared_quad_state_list.
   cc::SharedQuadState* sqs = pass->CreateAndAppendSharedQuadState();
-  sqs->SetAll(gfx::Transform(), bounds.size(), bounds, bounds,
-              false /* is_clipped */, 1.f /* opacity */, SkBlendMode::kSrc,
-              0 /* sorting_context_id */);
+  sqs->SetAll(gfx::Transform(), bounds_in_pixels.size(), bounds_in_pixels,
+              bounds_in_pixels, false /* is_clipped */, 1.f /* opacity */,
+              SkBlendMode::kSrc, 0 /* sorting_context_id */);
 
   cc::TransferableResource resource;
   resource.id = AllocateResourceId();
   resource.format = cc::ResourceFormat::RGBA_8888;
   resource.filter = GL_LINEAR;
   resource.size = frame.size;
 
   const gpu::Mailbox& mailbox = GetMailboxFromResourceId(resource.id);
   DCHECK(!mailbox.IsZero());
   const gfx::Rect rect(frame.size);
@@ skipping 106 matching lines @@
 
 const gpu::Mailbox& MusBrowserCompositorOutputSurface::GetMailboxFromResourceId(
     uint32_t id) {
   DCHECK_LT(id, mailboxes_.size());
   DCHECK(std::find(free_resource_ids_.begin(), free_resource_ids_.end(), id) ==
          free_resource_ids_.end());
   return mailboxes_[id];
 }
 
 }  // namespace content