diff options
| author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 10:31:47 +0000 |
|---|---|---|
| committer | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-03 10:31:47 +0000 |
| commit | 6a7e7d9ee73c0f23ef941311b24f3eb4df6c841b (patch) | |
| tree | 3c4063bc55ac7bfe5bf51922f950b98650b46740 /android_webview/browser | |
| parent | 5ddfadea09667b45f1ef5c40f95516d048938ed9 (diff) | |
| download | chromium_src-6a7e7d9ee73c0f23ef941311b24f3eb4df6c841b.zip chromium_src-6a7e7d9ee73c0f23ef941311b24f3eb4df6c841b.tar.gz chromium_src-6a7e7d9ee73c0f23ef941311b24f3eb4df6c841b.tar.bz2 | |
[android_webview] Don't assert fling is zero on overscroll.
This assert was there to ensure the compositor is not performing a root layer
fling animation on overscroll, however the current_fling_velocity can be
non-zero when a sub-layer fling animation is taking place.
BUG=None
TEST=AndroidWebViewTest
NOTRY=true
Review URL: https://codereview.chromium.org/131513004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248469 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview/browser')
| -rw-r--r-- | android_webview/browser/in_process_view_renderer.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/android_webview/browser/in_process_view_renderer.cc b/android_webview/browser/in_process_view_renderer.cc index 4496f2b..ca649f1 100644 --- a/android_webview/browser/in_process_view_renderer.cc +++ b/android_webview/browser/in_process_view_renderer.cc @@ -862,7 +862,6 @@ void InProcessViewRenderer::DidOverscroll( gfx::Vector2dF accumulated_overscroll, gfx::Vector2dF latest_overscroll_delta, gfx::Vector2dF current_fling_velocity) { - DCHECK(current_fling_velocity.IsZero()); const float physical_pixel_scale = dip_scale_ * page_scale_factor_; if (accumulated_overscroll == latest_overscroll_delta) overscroll_rounding_error_ = gfx::Vector2dF(); |