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

Unified Diff: cc/layers/layer_impl.cc

Issue 1689293002: cc: Move TryScroll from LayerImpl to LayerTreeHostImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with master and fix unit test failures. Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/layers/layer_impl.h ('k') | cc/layers/scrollbar_layer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.cc
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 69ade49a54d2b4b081afd225b0b191c63568f392..0e4d32608ad2f00a0f18230f7a7dbb19a989eb49 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -492,92 +492,6 @@ void LayerImpl::ApplySentScrollDeltasFromAbortedCommit() {
scroll_offset_->AbortCommit();
}
-InputHandler::ScrollStatus LayerImpl::TryScroll(
- const gfx::PointF& screen_space_point,
- InputHandler::ScrollInputType type) const {
- InputHandler::ScrollStatus scroll_status;
- scroll_status.main_thread_scrolling_reasons =
- MainThreadScrollingReason::kNotScrollingOnMain;
- if (should_scroll_on_main_thread()) {
- TRACE_EVENT0("cc", "LayerImpl::TryScroll: Failed ShouldScrollOnMainThread");
- scroll_status.thread = InputHandler::SCROLL_ON_MAIN_THREAD;
- scroll_status.main_thread_scrolling_reasons =
- main_thread_scrolling_reasons_;
- return scroll_status;
- }
-
- gfx::Transform screen_space_transform = ScreenSpaceTransform();
- if (!screen_space_transform.IsInvertible()) {
- TRACE_EVENT0("cc", "LayerImpl::TryScroll: Ignored NonInvertibleTransform");
- scroll_status.thread = InputHandler::SCROLL_IGNORED;
- scroll_status.main_thread_scrolling_reasons =
- MainThreadScrollingReason::kNonInvertibleTransform;
- return scroll_status;
- }
-
- if (!non_fast_scrollable_region().IsEmpty()) {
- bool clipped = false;
- gfx::Transform inverse_screen_space_transform(
- gfx::Transform::kSkipInitialization);
- if (!screen_space_transform.GetInverse(&inverse_screen_space_transform)) {
- // TODO(shawnsingh): We shouldn't be applying a projection if screen space
- // transform is uninvertible here. Perhaps we should be returning
- // SCROLL_ON_MAIN_THREAD in this case?
- }
-
- gfx::PointF hit_test_point_in_layer_space = MathUtil::ProjectPoint(
- inverse_screen_space_transform, screen_space_point, &clipped);
- if (!clipped &&
- non_fast_scrollable_region().Contains(
- gfx::ToRoundedPoint(hit_test_point_in_layer_space))) {
- TRACE_EVENT0("cc",
- "LayerImpl::tryScroll: Failed NonFastScrollableRegion");
- scroll_status.thread = InputHandler::SCROLL_ON_MAIN_THREAD;
- scroll_status.main_thread_scrolling_reasons =
- MainThreadScrollingReason::kNonFastScrollableRegion;
- return scroll_status;
- }
- }
-
- if (type == InputHandler::WHEEL || type == InputHandler::ANIMATED_WHEEL) {
- EventListenerProperties event_properties =
- layer_tree_impl_->event_listener_properties(
- EventListenerClass::kMouseWheel);
- if (event_properties == EventListenerProperties::kBlocking ||
- event_properties == EventListenerProperties::kBlockingAndPassive ||
- (!layer_tree_impl_->settings().use_mouse_wheel_gestures &&
- event_properties == EventListenerProperties::kPassive)) {
- TRACE_EVENT0("cc", "LayerImpl::tryScroll: Failed WheelEventHandlers");
- scroll_status.thread = InputHandler::SCROLL_ON_MAIN_THREAD;
- scroll_status.main_thread_scrolling_reasons =
- MainThreadScrollingReason::kEventHandlers;
- return scroll_status;
- }
- }
-
- if (!scrollable()) {
- TRACE_EVENT0("cc", "LayerImpl::tryScroll: Ignored not scrollable");
- scroll_status.thread = InputHandler::SCROLL_IGNORED;
- scroll_status.main_thread_scrolling_reasons =
- MainThreadScrollingReason::kNotScrollable;
- return scroll_status;
- }
-
- gfx::ScrollOffset max_scroll_offset = MaxScrollOffset();
- if (max_scroll_offset.x() <= 0 && max_scroll_offset.y() <= 0) {
- TRACE_EVENT0("cc",
- "LayerImpl::tryScroll: Ignored. Technically scrollable,"
- " but has no affordance in either direction.");
- scroll_status.thread = InputHandler::SCROLL_IGNORED;
- scroll_status.main_thread_scrolling_reasons =
- MainThreadScrollingReason::kNotScrollable;
- return scroll_status;
- }
-
- scroll_status.thread = InputHandler::SCROLL_ON_IMPL_THREAD;
- return scroll_status;
-}
-
skia::RefPtr<SkPicture> LayerImpl::GetPicture() {
return skia::RefPtr<SkPicture>();
}
« no previous file with comments | « cc/layers/layer_impl.h ('k') | cc/layers/scrollbar_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698