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

Unified Diff: android_webview/browser/test/rendering_test.h

Issue 1063853005: Unify Android Webview and Chrome's fling (Closed) Base URL: https://chromium.googlesource.com/a/chromium/src.git@master
Patch Set: add proguard Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: android_webview/browser/test/rendering_test.h
diff --git a/android_webview/browser/test/rendering_test.h b/android_webview/browser/test/rendering_test.h
index c0f65e2f35c26b576cf8f4dd293b789264ace654..1e212b794b16628a599180f8ec62153d7aa9b77a 100644
--- a/android_webview/browser/test/rendering_test.h
+++ b/android_webview/browser/test/rendering_test.h
@@ -36,13 +36,14 @@ class RenderingTest : public testing::Test,
void DetachFunctorFromView() override;
gfx::Point GetLocationOnScreen() override;
void ScrollContainerViewTo(gfx::Vector2d new_value) override {}
- bool IsFlingActive() const override;
+ bool IsSmoothScrollingActive() const override;
void UpdateScrollState(gfx::Vector2d max_scroll_offset,
gfx::SizeF contents_size_dip,
float page_scale_factor,
float min_page_scale_factor,
float max_page_scale_factor) override {}
- void DidOverscroll(gfx::Vector2d overscroll_delta) override {}
+ void DidOverscroll(gfx::Vector2d overscroll_delta,
+ gfx::Vector2dF overscroll_velocity) override {}
void ParentDrawConstraintsUpdated(
const ParentCompositorDrawConstraints& draw_constraints) override {}
// WindowHooks overrides.
« no previous file with comments | « android_webview/browser/browser_view_renderer_client.h ('k') | android_webview/browser/test/rendering_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698