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

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBox.cpp

Issue 2918053002: Move middle-click autoscroll to synthetic fling. (Closed)
Patch Set: Delete redundant cursor shape print Created 3 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: third_party/WebKit/Source/core/layout/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index 1fd325601d713ad5dd94557677fbc2ae982ec446..716d5c01e2c21dc101bc702bf978ad352e7b47bd 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -637,7 +637,7 @@ static bool IsDisallowedAutoscroll(HTMLFrameOwnerElement* owner_element,
HTMLFrameElementBase* frame_element_base =
ToHTMLFrameElementBase(owner_element);
if (Page* page = frame_view->GetFrame().GetPage()) {
- return page->GetAutoscrollController().AutoscrollInProgress() &&
+ return page->GetAutoscrollController().SelectionAutoscrollInProgress() &&
frame_element_base->ScrollingMode() == kScrollbarAlwaysOff;
}
}
@@ -737,7 +737,10 @@ void LayoutBox::ScrollRectToVisibleRecursive(
return;
}
- if (GetFrame()->GetPage()->GetAutoscrollController().AutoscrollInProgress())
+ if (GetFrame()
+ ->GetPage()
+ ->GetAutoscrollController()
+ .SelectionAutoscrollInProgress())
parent_box = EnclosingScrollableBox();
if (parent_box) {
« no previous file with comments | « third_party/WebKit/Source/core/input/ScrollManager.cpp ('k') | third_party/WebKit/Source/core/page/AutoscrollController.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698