diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 01:20:39 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-23 01:20:39 +0000 |
| commit | 86306a3216fd4541a07889abbd42d18f1029fb8c (patch) | |
| tree | 7ac590f3d01f10a84d3c7b46a44be49d3a34728e /cc | |
| parent | 1cab1f2a40cf772d187af8bb63075acc93d8b724 (diff) | |
| download | chromium_src-86306a3216fd4541a07889abbd42d18f1029fb8c.zip chromium_src-86306a3216fd4541a07889abbd42d18f1029fb8c.tar.gz chromium_src-86306a3216fd4541a07889abbd42d18f1029fb8c.tar.bz2 | |
cc: The DelegatedFrameData::size field is redundant.
This data is already stored in the root render pass's output_rect.
R=piman
BUG=123444
Review URL: https://chromiumcodereview.appspot.com/12335046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/delegated_frame_data.h | 2 | ||||
| -rw-r--r-- | cc/delegating_renderer.cc | 1 | ||||
| -rw-r--r-- | cc/delegating_renderer_unittest.cc | 5 |
3 files changed, 3 insertions, 5 deletions
diff --git a/cc/delegated_frame_data.h b/cc/delegated_frame_data.h index e27acb6..2a46f09 100644 --- a/cc/delegated_frame_data.h +++ b/cc/delegated_frame_data.h @@ -18,8 +18,6 @@ class CC_EXPORT DelegatedFrameData { DelegatedFrameData(); ~DelegatedFrameData(); - // TODO(danakj): This is redundant with the root render pass outputRect. - gfx::Size size; TransferableResourceList resource_list; ScopedPtrVector<RenderPass> render_pass_list; }; diff --git a/cc/delegating_renderer.cc b/cc/delegating_renderer.cc index 1be86ea..80d0c9c 100644 --- a/cc/delegating_renderer.cc +++ b/cc/delegating_renderer.cc @@ -141,7 +141,6 @@ void DelegatingRenderer::drawFrame( out_frame.delegated_frame_data = make_scoped_ptr(new DelegatedFrameData); DelegatedFrameData& out_data = *out_frame.delegated_frame_data; - out_data.size = viewportSize(); out_data.render_pass_list.swap(render_passes_in_draw_order); ResourceProvider::ResourceIdArray resources; diff --git a/cc/delegating_renderer_unittest.cc b/cc/delegating_renderer_unittest.cc index 8b35f1b..7c06633 100644 --- a/cc/delegating_renderer_unittest.cc +++ b/cc/delegating_renderer_unittest.cc @@ -60,11 +60,12 @@ class DelegatingRendererTestDraw : public DelegatingRendererTest { EXPECT_EQ(1u, output_surface_->num_sent_frames()); CompositorFrame& last_frame = output_surface_->last_sent_frame(); + DelegatedFrameData* last_frame_data = last_frame.delegated_frame_data.get(); ASSERT_TRUE(last_frame.delegated_frame_data); EXPECT_FALSE(last_frame.gl_frame_data); EXPECT_EQ( - host_impl->deviceViewportSize().ToString(), - last_frame.delegated_frame_data->size.ToString()); + gfx::Rect(host_impl->deviceViewportSize()).ToString(), + last_frame_data->render_pass_list.back()->output_rect.ToString()); EXPECT_EQ(0.5f, last_frame.metadata.min_page_scale_factor); EXPECT_EQ(4.f, last_frame.metadata.max_page_scale_factor); |