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

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac.mm

Issue 2096493002: Make cc::CompositorFrames movable [Part 1 of 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Dana's nits Created 4 years, 6 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
Index: content/browser/renderer_host/render_widget_host_view_mac.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index fc97982597f41fc6a0d8db7d6923e4859713bc73..1cdf480e70e960e0afd775b85ddcae14bfaf46af 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -1478,22 +1478,21 @@ bool RenderWidgetHostViewMac::HasAcceleratedSurface(
return false;
}
-void RenderWidgetHostViewMac::OnSwapCompositorFrame(
- uint32_t output_surface_id,
- std::unique_ptr<cc::CompositorFrame> frame) {
+void RenderWidgetHostViewMac::OnSwapCompositorFrame(uint32_t output_surface_id,
+ cc::CompositorFrame frame) {
TRACE_EVENT0("browser", "RenderWidgetHostViewMac::OnSwapCompositorFrame");
- last_scroll_offset_ = frame->metadata.root_scroll_offset;
+ last_scroll_offset_ = frame.metadata.root_scroll_offset;
- page_at_minimum_scale_ = frame->metadata.page_scale_factor ==
- frame->metadata.min_page_scale_factor;
+ page_at_minimum_scale_ =
+ frame.metadata.page_scale_factor == frame.metadata.min_page_scale_factor;
- if (frame->delegated_frame_data) {
- float scale_factor = frame->metadata.device_scale_factor;
+ if (frame.delegated_frame_data) {
+ float scale_factor = frame.metadata.device_scale_factor;
// Compute the frame size based on the root render pass rect size.
cc::RenderPass* root_pass =
- frame->delegated_frame_data->render_pass_list.back().get();
+ frame.delegated_frame_data->render_pass_list.back().get();
gfx::Size pixel_size = root_pass->output_rect.size();
gfx::Size dip_size = gfx::ConvertSizeToDIP(scale_factor, pixel_size);
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.h ('k') | content/public/test/browser_test_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698