diff options
| author | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-21 07:54:54 +0000 |
|---|---|---|
| committer | aelias@chromium.org <aelias@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-21 07:54:54 +0000 |
| commit | 42ccdbef1f431fd79495854618527c21cd6c2085 (patch) | |
| tree | f0848fac7905db6982e5a9a848c00e90e8f24436 /cc/layer_tree_impl.h | |
| parent | 1b4b59eddc2daadbddf268c03179d2f23d7f4bdc (diff) | |
| download | chromium_src-42ccdbef1f431fd79495854618527c21cd6c2085.zip chromium_src-42ccdbef1f431fd79495854618527c21cd6c2085.tar.gz chromium_src-42ccdbef1f431fd79495854618527c21cd6c2085.tar.bz2 | |
Make new-style page scale work on Android.
- Fix CC's PinchZoomViewport and MaxScrollOffset logic to work in fixed
layout mode. Root layer max scroll offset is based on
WebKit-perceived outer viewport and therefore should logically use
layout_viewport_size_, whereas the inner one is the true user-visible
viewport and therefore should use device_viewport_size_.
- Fix Android to send down viewport size in DIP when
--enable-css-transform-pinch is not specified. Default to
non-CSS-transform mode when in impl-side painting.
- Make ContentSize() return bounds() instead of contentBounds() and
rename to ScrollableSize for clarity. This lets us avoid coordinate
space conversions when computing max scroll offset.
BUG=152505
NOTRY=true
Review URL: https://chromiumcodereview.appspot.com/11958004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layer_tree_impl.h')
| -rw-r--r-- | cc/layer_tree_impl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/layer_tree_impl.h b/cc/layer_tree_impl.h index 01caba4..bae0cb9 100644 --- a/cc/layer_tree_impl.h +++ b/cc/layer_tree_impl.h @@ -121,7 +121,7 @@ class CC_EXPORT LayerTreeImpl { const LayerList& RenderSurfaceLayerList() const; - gfx::Size ContentSize() const; + gfx::Size ScrollableSize() const; LayerImpl* LayerById(int id); |