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

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

Issue 1147283002: Add ScrollDirectionPhysical enum in Scroll types. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed a conflict on EventHandler Created 5 years, 7 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 | « Source/core/layout/LayoutBox.h ('k') | Source/core/layout/LayoutEmbeddedObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutBox.cpp
diff --git a/Source/core/layout/LayoutBox.cpp b/Source/core/layout/LayoutBox.cpp
index 2b7d8514f1bf07338b2292b26e9487480019bd5c..f4b5ff67df569b6250840ac1dd48358e8ad7309d 100644
--- a/Source/core/layout/LayoutBox.cpp
+++ b/Source/core/layout/LayoutBox.cpp
@@ -711,14 +711,11 @@ int LayoutBox::intrinsicScrollbarLogicalWidth() const
return 0;
}
-bool LayoutBox::scroll(ScrollDirection direction, ScrollGranularity granularity, float delta)
+bool LayoutBox::scroll(ScrollDirectionPhysical direction, ScrollGranularity granularity, float delta)
{
// Presumably the same issue as in setScrollTop. See crbug.com/343132.
DisableCompositingQueryAsserts disabler;
- // Logical scroll is a higher level concept, all directions by here must be physical
- ASSERT(!isLogical(direction));
-
if (!layer() || !layer()->scrollableArea())
return false;
« no previous file with comments | « Source/core/layout/LayoutBox.h ('k') | Source/core/layout/LayoutEmbeddedObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698