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

Side by Side Diff: content/browser/renderer_host/render_widget_host_impl.cc

Issue 12077046: Plumb an overscroll callback form the compositor to the Android UI thread. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/render_widget_host_impl.h" 5 #include "content/browser/renderer_host/render_widget_host_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
(...skipping 1501 matching lines...) Expand 10 before | Expand all | Expand 10 after
1512 const cc::CompositorFrame& frame) { 1512 const cc::CompositorFrame& frame) {
1513 #if defined(OS_ANDROID) 1513 #if defined(OS_ANDROID)
1514 gfx::Vector2dF scroll_offset = ScaleVector2d( 1514 gfx::Vector2dF scroll_offset = ScaleVector2d(
1515 frame.metadata.root_scroll_offset, frame.metadata.page_scale_factor); 1515 frame.metadata.root_scroll_offset, frame.metadata.page_scale_factor);
1516 gfx::SizeF content_size = ScaleSize( 1516 gfx::SizeF content_size = ScaleSize(
1517 frame.metadata.root_layer_size, frame.metadata.page_scale_factor); 1517 frame.metadata.root_layer_size, frame.metadata.page_scale_factor);
1518 1518
1519 if (view_) { 1519 if (view_) {
1520 view_->UpdateFrameInfo( 1520 view_->UpdateFrameInfo(
1521 gfx::ToRoundedVector2d(scroll_offset), 1521 gfx::ToRoundedVector2d(scroll_offset),
1522 gfx::ToRoundedVector2d(frame.metadata.unused_scroll_delta),
1522 frame.metadata.page_scale_factor, 1523 frame.metadata.page_scale_factor,
1523 frame.metadata.min_page_scale_factor, 1524 frame.metadata.min_page_scale_factor,
1524 frame.metadata.max_page_scale_factor, 1525 frame.metadata.max_page_scale_factor,
1525 gfx::ToCeiledSize(content_size), 1526 gfx::ToCeiledSize(content_size),
1526 frame.metadata.location_bar_offset, 1527 frame.metadata.location_bar_offset,
1527 frame.metadata.location_bar_content_translation); 1528 frame.metadata.location_bar_content_translation);
1528 } 1529 }
1529 #endif 1530 #endif
1530 } 1531 }
1531 1532
(...skipping 830 matching lines...) Expand 10 before | Expand all | Expand 10 after
2362 return; 2363 return;
2363 2364
2364 OnRenderAutoResized(new_size); 2365 OnRenderAutoResized(new_size);
2365 } 2366 }
2366 2367
2367 void RenderWidgetHostImpl::DetachDelegate() { 2368 void RenderWidgetHostImpl::DetachDelegate() {
2368 delegate_ = NULL; 2369 delegate_ = NULL;
2369 } 2370 }
2370 2371
2371 } // namespace content 2372 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698