OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv
ed. |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 1017 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1028 setHasBoxDecorationBackground(true); | 1028 setHasBoxDecorationBackground(true); |
1029 } | 1029 } |
1030 | 1030 |
1031 bool LayoutView::allowsOverflowClip() const | 1031 bool LayoutView::allowsOverflowClip() const |
1032 { | 1032 { |
1033 return document().settings() && document().settings()->rootLayerScrolls(); | 1033 return document().settings() && document().settings()->rootLayerScrolls(); |
1034 } | 1034 } |
1035 | 1035 |
1036 ScrollResult LayoutView::scroll(ScrollGranularity granularity, const FloatSize&
delta) | 1036 ScrollResult LayoutView::scroll(ScrollGranularity granularity, const FloatSize&
delta) |
1037 { | 1037 { |
| 1038 // TODO(bokan): This should never get called on the main frame but it |
| 1039 // currently does via the Windows pan scrolling path. That should go through |
| 1040 // a more normalized EventHandler-like scrolling path and we should |
| 1041 // ASSERT(!frame()->isMainFrame()) here. All main frame scrolling should |
| 1042 // be handled by the ViewportScrollCallback. |
| 1043 |
1038 if (!frameView()) | 1044 if (!frameView()) |
1039 return ScrollResult(); | 1045 return ScrollResult(false, false, delta.width(), delta.height()); |
1040 | 1046 |
1041 return frame()->applyScrollDelta(granularity, delta, false); | 1047 return frameView()->getScrollableArea()->userScroll(granularity, delta); |
1042 } | 1048 } |
1043 | 1049 |
1044 } // namespace blink | 1050 } // namespace blink |
OLD | NEW |