diff options
| author | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-31 05:04:20 +0000 |
|---|---|---|
| committer | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-31 05:04:20 +0000 |
| commit | b9cdb3c4f674f49a8601aa7f60cd7b75dc719bd2 (patch) | |
| tree | c41084e1a1bb12e9500e9486f83db7adc2629dbf /content/browser/renderer_host/render_widget_host_impl.cc | |
| parent | 40f3786d3f3e7bc0d9f266c1792ae2b23a65f246 (diff) | |
| download | chromium_src-b9cdb3c4f674f49a8601aa7f60cd7b75dc719bd2.zip chromium_src-b9cdb3c4f674f49a8601aa7f60cd7b75dc719bd2.tar.gz chromium_src-b9cdb3c4f674f49a8601aa7f60cd7b75dc719bd2.tar.bz2 | |
Delete scaling of metadata scroll offset.
These lines should've been deleted as part of my coordinate space
changes but I missed it. Therefore scroll offset were in a weird space in Java
when --enable-compositor-frame-metadata is enabled.
NOTRY=true
BUG=152505
Review URL: https://chromiumcodereview.appspot.com/12087093
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_widget_host_impl.cc')
| -rw-r--r-- | content/browser/renderer_host/render_widget_host_impl.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index 0af11da..7e1f6c6 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -1539,18 +1539,13 @@ void RenderWidgetHostImpl::OnCompositorSurfaceBuffersSwapped( void RenderWidgetHostImpl::OnSwapCompositorFrame( const cc::CompositorFrame& frame) { #if defined(OS_ANDROID) - gfx::Vector2dF scroll_offset = ScaleVector2d( - frame.metadata.root_scroll_offset, frame.metadata.page_scale_factor); - gfx::SizeF content_size = ScaleSize( - frame.metadata.root_layer_size, frame.metadata.page_scale_factor); - if (view_) { view_->UpdateFrameInfo( - gfx::ToRoundedVector2d(scroll_offset), + gfx::ToRoundedVector2d(frame.metadata.root_scroll_offset), frame.metadata.page_scale_factor, frame.metadata.min_page_scale_factor, frame.metadata.max_page_scale_factor, - gfx::ToCeiledSize(content_size), + gfx::ToCeiledSize(frame.metadata.root_layer_size), frame.metadata.location_bar_offset, frame.metadata.location_bar_content_translation); } |