diff options
Diffstat (limited to 'content')
8 files changed, 12 insertions, 16 deletions
diff --git a/content/browser/compositor/delegated_frame_host.cc b/content/browser/compositor/delegated_frame_host.cc index 9c313b4..b15b49a 100644 --- a/content/browser/compositor/delegated_frame_host.cc +++ b/content/browser/compositor/delegated_frame_host.cc @@ -319,7 +319,7 @@ void DelegatedFrameHost::SwapDelegatedFrame( std::vector<uint32_t>* satisfies_sequences) { DCHECK(!frame_data->render_pass_list.empty()); - cc::RenderPass* root_pass = frame_data->render_pass_list.back(); + cc::RenderPass* root_pass = frame_data->render_pass_list.back().get(); gfx::Size frame_size = root_pass->output_rect.size(); gfx::Size frame_size_in_dip = @@ -349,7 +349,7 @@ void DelegatedFrameHost::SwapDelegatedFrame( damage_rect_in_dip = gfx::Rect(frame_size_in_dip); // Give the same damage rect to the compositor. - cc::RenderPass* root_pass = frame_data->render_pass_list.back(); + cc::RenderPass* root_pass = frame_data->render_pass_list.back().get(); root_pass->damage_rect = damage_rect; } diff --git a/content/browser/frame_host/render_widget_host_view_child_frame.cc b/content/browser/frame_host/render_widget_host_view_child_frame.cc index da5e12d..0492c26 100644 --- a/content/browser/frame_host/render_widget_host_view_child_frame.cc +++ b/content/browser/frame_host/render_widget_host_view_child_frame.cc @@ -271,7 +271,7 @@ void RenderWidgetHostViewChildFrame::OnSwapCompositorFrame( } cc::RenderPass* root_pass = - frame->delegated_frame_data->render_pass_list.back(); + frame->delegated_frame_data->render_pass_list.back().get(); gfx::Size frame_size = root_pass->output_rect.size(); float scale_factor = frame->metadata.device_scale_factor; diff --git a/content/browser/frame_host/render_widget_host_view_guest.cc b/content/browser/frame_host/render_widget_host_view_guest.cc index b389e40..656f2e8 100644 --- a/content/browser/frame_host/render_widget_host_view_guest.cc +++ b/content/browser/frame_host/render_widget_host_view_guest.cc @@ -225,7 +225,7 @@ void RenderWidgetHostViewGuest::OnSwapCompositorFrame( } cc::RenderPass* root_pass = - frame->delegated_frame_data->render_pass_list.back(); + frame->delegated_frame_data->render_pass_list.back().get(); gfx::Size frame_size = root_pass->output_rect.size(); float scale_factor = frame->metadata.device_scale_factor; diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc index abb3ff1..d825cf7c 100644 --- a/content/browser/renderer_host/render_widget_host_view_android.cc +++ b/content/browser/renderer_host/render_widget_host_view_android.cc @@ -1146,7 +1146,7 @@ void RenderWidgetHostViewAndroid::InternalSwapCompositorFrame( DCHECK(!frame->delegated_frame_data->render_pass_list.empty()); cc::RenderPass* root_pass = - frame->delegated_frame_data->render_pass_list.back(); + frame->delegated_frame_data->render_pass_list.back().get(); texture_size_in_layer_ = root_pass->output_rect.size(); cc::CompositorFrameMetadata metadata = frame->metadata; 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 278fa99..8f6dab7 100644 --- a/content/browser/renderer_host/render_widget_host_view_mac.mm +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm @@ -1477,7 +1477,7 @@ void RenderWidgetHostViewMac::OnSwapCompositorFrame( // Compute the frame size based on the root render pass rect size. cc::RenderPass* root_pass = - frame->delegated_frame_data->render_pass_list.back(); + 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); diff --git a/content/common/cc_messages.cc b/content/common/cc_messages.cc index 7b14aeb..34b5614d 100644 --- a/content/common/cc_messages.cc +++ b/content/common/cc_messages.cc @@ -679,8 +679,7 @@ void ParamTraits<cc::DelegatedFrameData>::Write(Message* m, size_t to_reserve = sizeof(p.device_scale_factor); to_reserve += p.resource_list.size() * sizeof(cc::TransferableResource); - for (size_t i = 0; i < p.render_pass_list.size(); ++i) { - const cc::RenderPass* pass = p.render_pass_list[i]; + for (const auto& pass : p.render_pass_list) { to_reserve += sizeof(size_t) * 2; to_reserve += ReserveSizeForRenderPassWrite(*pass); } @@ -689,7 +688,7 @@ void ParamTraits<cc::DelegatedFrameData>::Write(Message* m, WriteParam(m, p.device_scale_factor); WriteParam(m, p.resource_list); WriteParam(m, p.render_pass_list.size()); - for (const auto* pass : p.render_pass_list) { + for (const auto& pass : p.render_pass_list) { WriteParam(m, pass->quad_list.size()); WriteParam(m, pass->shared_quad_state_list.size()); WriteParam(m, *pass); diff --git a/content/common/cc_messages_unittest.cc b/content/common/cc_messages_unittest.cc index 58128b7..a94cd4a 100644 --- a/content/common/cc_messages_unittest.cc +++ b/content/common/cc_messages_unittest.cc @@ -479,13 +479,11 @@ TEST_F(CCMessagesTest, AllQuads) { &iter, &frame_out)); // Make sure the out and cmp RenderPasses match. - scoped_ptr<RenderPass> child_pass_out = - frame_out.render_pass_list.take(frame_out.render_pass_list.begin()); + scoped_ptr<RenderPass> child_pass_out = frame_out.render_pass_list[0].Pass(); Compare(child_pass_cmp.get(), child_pass_out.get()); ASSERT_EQ(0u, child_pass_out->shared_quad_state_list.size()); ASSERT_EQ(0u, child_pass_out->quad_list.size()); - scoped_ptr<RenderPass> pass_out = - frame_out.render_pass_list.take(frame_out.render_pass_list.begin() + 1); + scoped_ptr<RenderPass> pass_out = frame_out.render_pass_list[1].Pass(); Compare(pass_cmp.get(), pass_out.get()); ASSERT_EQ(3u, pass_out->shared_quad_state_list.size()); ASSERT_EQ(9u, pass_out->quad_list.size()); @@ -600,8 +598,7 @@ TEST_F(CCMessagesTest, UnusedSharedQuadStates) { EXPECT_TRUE( IPC::ParamTraits<DelegatedFrameData>::Read(&msg, &iter, &frame_out)); - scoped_ptr<RenderPass> pass_out = - frame_out.render_pass_list.take(frame_out.render_pass_list.begin()); + scoped_ptr<RenderPass> pass_out = frame_out.render_pass_list[0].Pass(); // 2 SharedQuadStates come out. The first and fourth SharedQuadStates were // used by quads, and so serialized. Others were not. diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc index 4f23d6c..2abadbc 100644 --- a/content/renderer/child_frame_compositing_helper.cc +++ b/content/renderer/child_frame_compositing_helper.cc @@ -215,7 +215,7 @@ void ChildFrameCompositingHelper::OnCompositorFrameSwapped( return; DCHECK(!frame_data->render_pass_list.empty()); - cc::RenderPass* root_pass = frame_data->render_pass_list.back(); + cc::RenderPass* root_pass = frame_data->render_pass_list.back().get(); gfx::Size frame_size = root_pass->output_rect.size(); if (last_route_id_ != route_id || |