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

Unified Diff: cc/trees/layer_tree_impl.cc

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
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | chrome/android/java_staging/proguard.flags » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index c44eecc1113d7bcae48a11c154f10ca2c8039ac0..f3377af458cc46a1acb664d23e1be9cf2c0f71ce 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -112,9 +112,9 @@ void LayerTreeImpl::GatherFrameTimingRequestIds(
});
}
-bool LayerTreeImpl::IsExternalFlingActive() const {
+bool LayerTreeImpl::IsExternalScrollActive() const {
return root_layer_scroll_offset_delegate_ &&
- root_layer_scroll_offset_delegate_->IsExternalFlingActive();
+ root_layer_scroll_offset_delegate_->IsExternalScrollActive();
}
void LayerTreeImpl::DidUpdateScrollOffset(int layer_id) {
« no previous file with comments | « cc/trees/layer_tree_impl.h ('k') | chrome/android/java_staging/proguard.flags » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698